mark/escape
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix anim bug

Browse Source
This commit is contained in:
Mark Hoekveen
2023-02-08 00:14:20 +01:00
parent 3dd42f7a71
commit 5aa477fc5c
5 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Objects/Meshes/textures/desk_lamp_arm_01_arm_1k.jpg.import
+3 -4
View File
@@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://ofv48ac0172p" uid="uid://ofv48ac0172p"
path.s3tc="res://.godot/imported/desk_lamp_arm_01_arm_1k.jpg-c091f6ca878d730684a9ce1cd926bd23.s3tc.ctex" path.s3tc="res://.godot/imported/desk_lamp_arm_01_arm_1k.jpg-c091f6ca878d730684a9ce1cd926bd23.s3tc.ctex"
path.etc2="res://.godot/imported/desk_lamp_arm_01_arm_1k.jpg-c091f6ca878d730684a9ce1cd926bd23.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc", "etc2"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
[deps] [deps]
source_file="res://Objects/Meshes/textures/desk_lamp_arm_01_arm_1k.jpg" source_file="res://Objects/Meshes/textures/desk_lamp_arm_01_arm_1k.jpg"
dest_files=["res://.godot/imported/desk_lamp_arm_01_arm_1k.jpg-c091f6ca878d730684a9ce1cd926bd23.s3tc.ctex", "res://.godot/imported/desk_lamp_arm_01_arm_1k.jpg-c091f6ca878d730684a9ce1cd926bd23.etc2.ctex"] dest_files=["res://.godot/imported/desk_lamp_arm_01_arm_1k.jpg-c091f6ca878d730684a9ce1cd926bd23.s3tc.ctex"]
[params] [params]
compress/mode=2 compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7 compress/lossy_quality=0.7
compress/hdr_compression=1 compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0 compress/normal_map=0
compress/channel_pack=0 compress/channel_pack=0
mipmaps/generate=true mipmaps/generate=true
Objects/Meshes/textures/desk_lamp_arm_01_diff_1k.jpg.import
+3 -4
View File
@@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://bml3ndlkxky1y" uid="uid://bml3ndlkxky1y"
path.s3tc="res://.godot/imported/desk_lamp_arm_01_diff_1k.jpg-68fab11dccbe615662093c80fb488065.s3tc.ctex" path.s3tc="res://.godot/imported/desk_lamp_arm_01_diff_1k.jpg-68fab11dccbe615662093c80fb488065.s3tc.ctex"
path.etc2="res://.godot/imported/desk_lamp_arm_01_diff_1k.jpg-68fab11dccbe615662093c80fb488065.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc", "etc2"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
[deps] [deps]
source_file="res://Objects/Meshes/textures/desk_lamp_arm_01_diff_1k.jpg" source_file="res://Objects/Meshes/textures/desk_lamp_arm_01_diff_1k.jpg"
dest_files=["res://.godot/imported/desk_lamp_arm_01_diff_1k.jpg-68fab11dccbe615662093c80fb488065.s3tc.ctex", "res://.godot/imported/desk_lamp_arm_01_diff_1k.jpg-68fab11dccbe615662093c80fb488065.etc2.ctex"] dest_files=["res://.godot/imported/desk_lamp_arm_01_diff_1k.jpg-68fab11dccbe615662093c80fb488065.s3tc.ctex"]
[params] [params]
compress/mode=2 compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7 compress/lossy_quality=0.7
compress/hdr_compression=1 compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0 compress/normal_map=0
compress/channel_pack=0 compress/channel_pack=0
mipmaps/generate=true mipmaps/generate=true
Objects/Meshes/textures/desk_lamp_arm_01_nor_gl_1k.jpg.import
+3 -4
View File
@@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://c8vcpqnxmx3bu" uid="uid://c8vcpqnxmx3bu"
path.s3tc="res://.godot/imported/desk_lamp_arm_01_nor_gl_1k.jpg-0223ef76fe0483eea5c983275ecd8e5e.s3tc.ctex" path.s3tc="res://.godot/imported/desk_lamp_arm_01_nor_gl_1k.jpg-0223ef76fe0483eea5c983275ecd8e5e.s3tc.ctex"
path.etc2="res://.godot/imported/desk_lamp_arm_01_nor_gl_1k.jpg-0223ef76fe0483eea5c983275ecd8e5e.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc", "etc2"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
[deps] [deps]
source_file="res://Objects/Meshes/textures/desk_lamp_arm_01_nor_gl_1k.jpg" source_file="res://Objects/Meshes/textures/desk_lamp_arm_01_nor_gl_1k.jpg"
dest_files=["res://.godot/imported/desk_lamp_arm_01_nor_gl_1k.jpg-0223ef76fe0483eea5c983275ecd8e5e.s3tc.ctex", "res://.godot/imported/desk_lamp_arm_01_nor_gl_1k.jpg-0223ef76fe0483eea5c983275ecd8e5e.etc2.ctex"] dest_files=["res://.godot/imported/desk_lamp_arm_01_nor_gl_1k.jpg-0223ef76fe0483eea5c983275ecd8e5e.s3tc.ctex"]
[params] [params]
compress/mode=2 compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7 compress/lossy_quality=0.7
compress/hdr_compression=1 compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=1 compress/normal_map=1
compress/channel_pack=0 compress/channel_pack=0
mipmaps/generate=true mipmaps/generate=true
Scripts/Splash.gd
+1 -2
View File
@@ -9,7 +9,7 @@ var start = false
func _ready(): func _ready():
get_tree().get_root().print_tree() get_tree().get_root().print_tree()
anim.playing = true anim.play("default")
$Draakje/Hoest.playing = true $Draakje/Hoest.playing = true
var size = get_viewport_rect().size var size = get_viewport_rect().size
anim.position = Vector2(size.x/2, size.y/2) anim.position = Vector2(size.x/2, size.y/2)
@@ -25,7 +25,6 @@ func _process(delta):
if !start: if !start:
get_tree().root.add_child(room) get_tree().root.add_child(room)
var bg = get_theme_stylebox("panel") var bg = get_theme_stylebox("panel")
#bg.bg_color = Color.BLACK
opacity_panel -= delta * 0.5 opacity_panel -= delta * 0.5
bg.bg_color.a = opacity_panel bg.bg_color.a = opacity_panel
if opacity_panel <= 0: if opacity_panel <= 0:
Splash.tscn
+1 -1
View File
@@ -176,7 +176,7 @@ script = ExtResource("1_ab4lr")
material = ExtResource("2_cayiq") material = ExtResource("2_cayiq")
position = Vector2(580, 280) position = Vector2(580, 280)
scale = Vector2(2, 2) scale = Vector2(2, 2)
frames = SubResource("SpriteFrames_wd2ai") sprite_frames = SubResource("SpriteFrames_wd2ai")
[node name="Label" type="Label" parent="Panel/Draakje"] [node name="Label" type="Label" parent="Panel/Draakje"]
material = ExtResource("2_cayiq") material = ExtResource("2_cayiq")