From 5aa477fc5c3e712bc7ed1a152f52cd953efa43e3 Mon Sep 17 00:00:00 2001 From: Mark Hoekveen Date: Wed, 8 Feb 2023 00:14:20 +0100 Subject: [PATCH] fix anim bug --- Objects/Meshes/textures/desk_lamp_arm_01_arm_1k.jpg.import | 7 +++---- .../Meshes/textures/desk_lamp_arm_01_diff_1k.jpg.import | 7 +++---- .../Meshes/textures/desk_lamp_arm_01_nor_gl_1k.jpg.import | 7 +++---- Scripts/Splash.gd | 3 +-- Splash.tscn | 2 +- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Objects/Meshes/textures/desk_lamp_arm_01_arm_1k.jpg.import b/Objects/Meshes/textures/desk_lamp_arm_01_arm_1k.jpg.import index 3c86387..7ea096b 100644 --- a/Objects/Meshes/textures/desk_lamp_arm_01_arm_1k.jpg.import +++ b/Objects/Meshes/textures/desk_lamp_arm_01_arm_1k.jpg.import @@ -4,23 +4,22 @@ importer="texture" type="CompressedTexture2D" uid="uid://ofv48ac0172p" 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={ -"imported_formats": ["s3tc", "etc2"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } [deps] 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] compress/mode=2 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=true diff --git a/Objects/Meshes/textures/desk_lamp_arm_01_diff_1k.jpg.import b/Objects/Meshes/textures/desk_lamp_arm_01_diff_1k.jpg.import index a4146f0..6393373 100644 --- a/Objects/Meshes/textures/desk_lamp_arm_01_diff_1k.jpg.import +++ b/Objects/Meshes/textures/desk_lamp_arm_01_diff_1k.jpg.import @@ -4,23 +4,22 @@ importer="texture" type="CompressedTexture2D" uid="uid://bml3ndlkxky1y" 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={ -"imported_formats": ["s3tc", "etc2"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } [deps] 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] compress/mode=2 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=true diff --git a/Objects/Meshes/textures/desk_lamp_arm_01_nor_gl_1k.jpg.import b/Objects/Meshes/textures/desk_lamp_arm_01_nor_gl_1k.jpg.import index 6cc3769..51726d9 100644 --- a/Objects/Meshes/textures/desk_lamp_arm_01_nor_gl_1k.jpg.import +++ b/Objects/Meshes/textures/desk_lamp_arm_01_nor_gl_1k.jpg.import @@ -4,23 +4,22 @@ importer="texture" type="CompressedTexture2D" uid="uid://c8vcpqnxmx3bu" 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={ -"imported_formats": ["s3tc", "etc2"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } [deps] 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] compress/mode=2 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=1 compress/channel_pack=0 mipmaps/generate=true diff --git a/Scripts/Splash.gd b/Scripts/Splash.gd index 76f9aa1..7692d5b 100644 --- a/Scripts/Splash.gd +++ b/Scripts/Splash.gd @@ -9,7 +9,7 @@ var start = false func _ready(): get_tree().get_root().print_tree() - anim.playing = true + anim.play("default") $Draakje/Hoest.playing = true var size = get_viewport_rect().size anim.position = Vector2(size.x/2, size.y/2) @@ -25,7 +25,6 @@ func _process(delta): if !start: get_tree().root.add_child(room) var bg = get_theme_stylebox("panel") - #bg.bg_color = Color.BLACK opacity_panel -= delta * 0.5 bg.bg_color.a = opacity_panel if opacity_panel <= 0: diff --git a/Splash.tscn b/Splash.tscn index b6f1721..dd54ae2 100644 --- a/Splash.tscn +++ b/Splash.tscn @@ -176,7 +176,7 @@ script = ExtResource("1_ab4lr") material = ExtResource("2_cayiq") position = Vector2(580, 280) scale = Vector2(2, 2) -frames = SubResource("SpriteFrames_wd2ai") +sprite_frames = SubResource("SpriteFrames_wd2ai") [node name="Label" type="Label" parent="Panel/Draakje"] material = ExtResource("2_cayiq")