From d5c67fabbfe82825d71277023c4423904ae4e5d0 Mon Sep 17 00:00:00 2001 From: Techwizz Date: Tue, 14 Mar 2023 12:06:48 -0600 Subject: [PATCH] Added cam events for controllers --- characters/teddy/Teddy.gd | 21 ++++++++++++++++++- ...de65735b80db47e8535_BrownFabric.png.import | 6 +++--- ...35b80db47e8535_BrownFabricBelly.png.import | 6 +++--- ...3de65735b80db47e8535_FabricNose.png.import | 6 +++--- .../model_glb/teddy_BrownFabric.png.import | 6 +++--- .../teddy_BrownFabricBelly.png.import | 6 +++--- .../model_glb/teddy_FabricNose.png.import | 6 +++--- objects/toyland/toyland_BlockBlue.png.import | 6 +++--- objects/toyland/toyland_BlockGreen.png.import | 6 +++--- .../toyland/toyland_BlockOrange.png.import | 6 +++--- .../toyland/toyland_BlockPurple.png.import | 6 +++--- objects/toyland/toyland_BlockRed.png.import | 6 +++--- .../toyland/toyland_BlockRed_18.png.import | 6 +++--- objects/toyland/toyland_BlockTan.png.import | 6 +++--- .../toyland/toyland_BlockYellow.png.import | 6 +++--- objects/toyland/toyland_BookTEMP.png.import | 6 +++--- .../toyland_Carpet012_4K_Color.png.import | 6 +++--- .../toyland_Fabric001_2K_Color.png.import | 6 +++--- .../toyland_Fabric056_2K_Color.png.import | 6 +++--- objects/toyland/toyland_Metal.png.import | 6 +++--- .../toyland/toyland_Toy Blocks Box.png.import | 6 +++--- .../toyland_Wood067_2K_Color.png.import | 6 +++--- objects/toyland/toyland_newplaster.png.import | 6 +++--- objects/toyland/toyland_outlet.png.import | 6 +++--- objects/toyland/toyland_white door.png.import | 6 +++--- .../toyland_windows_xp_bliss-wide.png.import | 6 +++--- .../toyland/toyland_woodfloor4k.png.import | 6 +++--- 27 files changed, 98 insertions(+), 79 deletions(-) diff --git a/characters/teddy/Teddy.gd b/characters/teddy/Teddy.gd index a8ba4e2..a53409f 100644 --- a/characters/teddy/Teddy.gd +++ b/characters/teddy/Teddy.gd @@ -19,6 +19,7 @@ var teddyParent var menuOpen = false var globalscene var ranRemovePlayer = false +var mousesense = Global.mouseSensitivity func _ready(): name = str(teddyAuthority) @@ -42,10 +43,28 @@ func _unhandled_input(event): elif event.is_action_pressed("ui_cancel"): Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) if Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED: + mousesense = Global.mouseSensitivity if event is InputEventMouseMotion: - var mousesense = Global.mouseSensitivity neck.rotate_y(-event.relative.x * mousesense) camera.rotate_x(-event.relative.y * mousesense) + ## FOR CONTROLLERS + var cam_dir = Input.is_action_pressed("cam_left") or Input.is_action_pressed("cam_right") or Input.is_action_pressed("cam_up") or Input.is_action_pressed("cam_down") + if cam_dir: + var x = -event.relative.x * mousesense + var y = -event.relative.y * mousesense + if Input.is_action_pressed("cam_left"): + x -= 1 * mousesense + if Input.is_action_pressed("cam_right"): + x += 1 * mousesense + if Input.is_action_pressed("cam_up"): + y -= 1 * mousesense + if Input.is_action_pressed("cam_down"): + y += 1 * mousesense + neck.rotate_y(x) + camera.rotate_x(y) + ################## + + # Clamps the camera camera.rotation.x = clamp(camera.rotation.x, deg_to_rad(-50), deg_to_rad(60)) if menuOpen == false: if Input.is_action_just_pressed("menu"): diff --git a/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png.import b/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png.import index fc91657..1384fc5 100644 --- a/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png.import +++ b/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://cro0qy8p8j1nc" -path.s3tc="res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png-e262ea1b1791f537d156e62ada10e3d9.s3tc.ctex" +path.etc2="res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png-e262ea1b1791f537d156e62ada10e3d9.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png" -dest_files=["res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png-e262ea1b1791f537d156e62ada10e3d9.s3tc.ctex"] +dest_files=["res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png-e262ea1b1791f537d156e62ada10e3d9.etc2.ctex"] [params] diff --git a/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png.import b/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png.import index 3fac468..adc6a62 100644 --- a/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png.import +++ b/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://t4uhkvweq55l" -path.s3tc="res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png-f48e4aaa79e2a0cf3814c7dbef28823a.s3tc.ctex" +path.etc2="res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png-f48e4aaa79e2a0cf3814c7dbef28823a.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png" -dest_files=["res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png-f48e4aaa79e2a0cf3814c7dbef28823a.s3tc.ctex"] +dest_files=["res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png-f48e4aaa79e2a0cf3814c7dbef28823a.etc2.ctex"] [params] diff --git a/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png.import b/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png.import index 2b6b749..82c55fb 100644 --- a/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png.import +++ b/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://c1fr5ak803h0k" -path.s3tc="res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png-12c7438645ca0861b049ecee40b0b65c.s3tc.ctex" +path.etc2="res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png-12c7438645ca0861b049ecee40b0b65c.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png" -dest_files=["res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png-12c7438645ca0861b049ecee40b0b65c.s3tc.ctex"] +dest_files=["res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png-12c7438645ca0861b049ecee40b0b65c.etc2.ctex"] [params] diff --git a/characters/teddy/model_glb/teddy_BrownFabric.png.import b/characters/teddy/model_glb/teddy_BrownFabric.png.import index fad6ae5..7256841 100644 --- a/characters/teddy/model_glb/teddy_BrownFabric.png.import +++ b/characters/teddy/model_glb/teddy_BrownFabric.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://bcx8hi3wfgmjm" -path.s3tc="res://.godot/imported/teddy_BrownFabric.png-a0848c50880febd342859d548681f9c4.s3tc.ctex" +path.etc2="res://.godot/imported/teddy_BrownFabric.png-a0848c50880febd342859d548681f9c4.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://characters/teddy/model_glb/teddy_BrownFabric.png" -dest_files=["res://.godot/imported/teddy_BrownFabric.png-a0848c50880febd342859d548681f9c4.s3tc.ctex"] +dest_files=["res://.godot/imported/teddy_BrownFabric.png-a0848c50880febd342859d548681f9c4.etc2.ctex"] [params] diff --git a/characters/teddy/model_glb/teddy_BrownFabricBelly.png.import b/characters/teddy/model_glb/teddy_BrownFabricBelly.png.import index 6b7cc08..b2e1542 100644 --- a/characters/teddy/model_glb/teddy_BrownFabricBelly.png.import +++ b/characters/teddy/model_glb/teddy_BrownFabricBelly.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://b25on3sg58fj0" -path.s3tc="res://.godot/imported/teddy_BrownFabricBelly.png-1bd897be98ecc156ecc97dbffeccc079.s3tc.ctex" +path.etc2="res://.godot/imported/teddy_BrownFabricBelly.png-1bd897be98ecc156ecc97dbffeccc079.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://characters/teddy/model_glb/teddy_BrownFabricBelly.png" -dest_files=["res://.godot/imported/teddy_BrownFabricBelly.png-1bd897be98ecc156ecc97dbffeccc079.s3tc.ctex"] +dest_files=["res://.godot/imported/teddy_BrownFabricBelly.png-1bd897be98ecc156ecc97dbffeccc079.etc2.ctex"] [params] diff --git a/characters/teddy/model_glb/teddy_FabricNose.png.import b/characters/teddy/model_glb/teddy_FabricNose.png.import index 06f583b..d8bb62d 100644 --- a/characters/teddy/model_glb/teddy_FabricNose.png.import +++ b/characters/teddy/model_glb/teddy_FabricNose.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://r61f275fmhx0" -path.s3tc="res://.godot/imported/teddy_FabricNose.png-d56f6fc7c66beaf71d8f62ebfefbaa3e.s3tc.ctex" +path.etc2="res://.godot/imported/teddy_FabricNose.png-d56f6fc7c66beaf71d8f62ebfefbaa3e.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://characters/teddy/model_glb/teddy_FabricNose.png" -dest_files=["res://.godot/imported/teddy_FabricNose.png-d56f6fc7c66beaf71d8f62ebfefbaa3e.s3tc.ctex"] +dest_files=["res://.godot/imported/teddy_FabricNose.png-d56f6fc7c66beaf71d8f62ebfefbaa3e.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_BlockBlue.png.import b/objects/toyland/toyland_BlockBlue.png.import index 9ee8002..a598e8e 100644 --- a/objects/toyland/toyland_BlockBlue.png.import +++ b/objects/toyland/toyland_BlockBlue.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://bo7jvntxkhppu" -path.s3tc="res://.godot/imported/toyland_BlockBlue.png-a52adfdc8686bc65ad5f9a5780e179d8.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_BlockBlue.png-a52adfdc8686bc65ad5f9a5780e179d8.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockBlue.png" -dest_files=["res://.godot/imported/toyland_BlockBlue.png-a52adfdc8686bc65ad5f9a5780e179d8.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_BlockBlue.png-a52adfdc8686bc65ad5f9a5780e179d8.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_BlockGreen.png.import b/objects/toyland/toyland_BlockGreen.png.import index c065940..ee21d42 100644 --- a/objects/toyland/toyland_BlockGreen.png.import +++ b/objects/toyland/toyland_BlockGreen.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://vwuoaxh1iwdu" -path.s3tc="res://.godot/imported/toyland_BlockGreen.png-5814475d1a0c89ec7c608da4846b49c5.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_BlockGreen.png-5814475d1a0c89ec7c608da4846b49c5.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockGreen.png" -dest_files=["res://.godot/imported/toyland_BlockGreen.png-5814475d1a0c89ec7c608da4846b49c5.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_BlockGreen.png-5814475d1a0c89ec7c608da4846b49c5.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_BlockOrange.png.import b/objects/toyland/toyland_BlockOrange.png.import index 60741ee..3eb7ba9 100644 --- a/objects/toyland/toyland_BlockOrange.png.import +++ b/objects/toyland/toyland_BlockOrange.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://56wkrfm5ikxn" -path.s3tc="res://.godot/imported/toyland_BlockOrange.png-31f8be914355966bedab55ef5995366e.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_BlockOrange.png-31f8be914355966bedab55ef5995366e.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockOrange.png" -dest_files=["res://.godot/imported/toyland_BlockOrange.png-31f8be914355966bedab55ef5995366e.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_BlockOrange.png-31f8be914355966bedab55ef5995366e.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_BlockPurple.png.import b/objects/toyland/toyland_BlockPurple.png.import index 3df59fe..8d0c9c3 100644 --- a/objects/toyland/toyland_BlockPurple.png.import +++ b/objects/toyland/toyland_BlockPurple.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://d4j8vsjlnhhhv" -path.s3tc="res://.godot/imported/toyland_BlockPurple.png-9983b4ce99c2af8139af423f8e3afc17.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_BlockPurple.png-9983b4ce99c2af8139af423f8e3afc17.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockPurple.png" -dest_files=["res://.godot/imported/toyland_BlockPurple.png-9983b4ce99c2af8139af423f8e3afc17.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_BlockPurple.png-9983b4ce99c2af8139af423f8e3afc17.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_BlockRed.png.import b/objects/toyland/toyland_BlockRed.png.import index b26e6d8..acce9af 100644 --- a/objects/toyland/toyland_BlockRed.png.import +++ b/objects/toyland/toyland_BlockRed.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://bkp5ureoqykyg" -path.s3tc="res://.godot/imported/toyland_BlockRed.png-cdd24aaa97dc9516a0656c73d5e3f0b5.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_BlockRed.png-cdd24aaa97dc9516a0656c73d5e3f0b5.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockRed.png" -dest_files=["res://.godot/imported/toyland_BlockRed.png-cdd24aaa97dc9516a0656c73d5e3f0b5.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_BlockRed.png-cdd24aaa97dc9516a0656c73d5e3f0b5.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_BlockRed_18.png.import b/objects/toyland/toyland_BlockRed_18.png.import index 8bc8d65..2e99be5 100644 --- a/objects/toyland/toyland_BlockRed_18.png.import +++ b/objects/toyland/toyland_BlockRed_18.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://3xwvv7w5ktrw" -path.s3tc="res://.godot/imported/toyland_BlockRed_18.png-400bcbd8ef6ab3c84f7e4b25ea5eb629.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_BlockRed_18.png-400bcbd8ef6ab3c84f7e4b25ea5eb629.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockRed_18.png" -dest_files=["res://.godot/imported/toyland_BlockRed_18.png-400bcbd8ef6ab3c84f7e4b25ea5eb629.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_BlockRed_18.png-400bcbd8ef6ab3c84f7e4b25ea5eb629.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_BlockTan.png.import b/objects/toyland/toyland_BlockTan.png.import index b967973..c8f3a51 100644 --- a/objects/toyland/toyland_BlockTan.png.import +++ b/objects/toyland/toyland_BlockTan.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://yjj7ejf6mkxt" -path.s3tc="res://.godot/imported/toyland_BlockTan.png-a782891763a3230847d4a3dcd0880a12.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_BlockTan.png-a782891763a3230847d4a3dcd0880a12.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockTan.png" -dest_files=["res://.godot/imported/toyland_BlockTan.png-a782891763a3230847d4a3dcd0880a12.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_BlockTan.png-a782891763a3230847d4a3dcd0880a12.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_BlockYellow.png.import b/objects/toyland/toyland_BlockYellow.png.import index 600df44..dd6baab 100644 --- a/objects/toyland/toyland_BlockYellow.png.import +++ b/objects/toyland/toyland_BlockYellow.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://e458sexc3r07" -path.s3tc="res://.godot/imported/toyland_BlockYellow.png-2ceec08f7b413fed128f0e0020357d0f.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_BlockYellow.png-2ceec08f7b413fed128f0e0020357d0f.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockYellow.png" -dest_files=["res://.godot/imported/toyland_BlockYellow.png-2ceec08f7b413fed128f0e0020357d0f.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_BlockYellow.png-2ceec08f7b413fed128f0e0020357d0f.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_BookTEMP.png.import b/objects/toyland/toyland_BookTEMP.png.import index 177c345..cbd98df 100644 --- a/objects/toyland/toyland_BookTEMP.png.import +++ b/objects/toyland/toyland_BookTEMP.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://ce0qey274v0xt" -path.s3tc="res://.godot/imported/toyland_BookTEMP.png-68be4988e0a6c940ad9863dbe326d246.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_BookTEMP.png-68be4988e0a6c940ad9863dbe326d246.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BookTEMP.png" -dest_files=["res://.godot/imported/toyland_BookTEMP.png-68be4988e0a6c940ad9863dbe326d246.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_BookTEMP.png-68be4988e0a6c940ad9863dbe326d246.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_Carpet012_4K_Color.png.import b/objects/toyland/toyland_Carpet012_4K_Color.png.import index e669505..ca2a56b 100644 --- a/objects/toyland/toyland_Carpet012_4K_Color.png.import +++ b/objects/toyland/toyland_Carpet012_4K_Color.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://brjtbiny72xas" -path.s3tc="res://.godot/imported/toyland_Carpet012_4K_Color.png-150aed057e3b394b36294bd2766cb931.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_Carpet012_4K_Color.png-150aed057e3b394b36294bd2766cb931.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_Carpet012_4K_Color.png" -dest_files=["res://.godot/imported/toyland_Carpet012_4K_Color.png-150aed057e3b394b36294bd2766cb931.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_Carpet012_4K_Color.png-150aed057e3b394b36294bd2766cb931.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_Fabric001_2K_Color.png.import b/objects/toyland/toyland_Fabric001_2K_Color.png.import index 53369d1..f5cdf58 100644 --- a/objects/toyland/toyland_Fabric001_2K_Color.png.import +++ b/objects/toyland/toyland_Fabric001_2K_Color.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://dvpx4klulv3r5" -path.s3tc="res://.godot/imported/toyland_Fabric001_2K_Color.png-e2cb42c432b43221fc167225f08b3de1.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_Fabric001_2K_Color.png-e2cb42c432b43221fc167225f08b3de1.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_Fabric001_2K_Color.png" -dest_files=["res://.godot/imported/toyland_Fabric001_2K_Color.png-e2cb42c432b43221fc167225f08b3de1.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_Fabric001_2K_Color.png-e2cb42c432b43221fc167225f08b3de1.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_Fabric056_2K_Color.png.import b/objects/toyland/toyland_Fabric056_2K_Color.png.import index e4aa165..9409df9 100644 --- a/objects/toyland/toyland_Fabric056_2K_Color.png.import +++ b/objects/toyland/toyland_Fabric056_2K_Color.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://dyfe0td3jm5m2" -path.s3tc="res://.godot/imported/toyland_Fabric056_2K_Color.png-d2cc9e7a6e2ff1021c46721ca2a5f483.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_Fabric056_2K_Color.png-d2cc9e7a6e2ff1021c46721ca2a5f483.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_Fabric056_2K_Color.png" -dest_files=["res://.godot/imported/toyland_Fabric056_2K_Color.png-d2cc9e7a6e2ff1021c46721ca2a5f483.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_Fabric056_2K_Color.png-d2cc9e7a6e2ff1021c46721ca2a5f483.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_Metal.png.import b/objects/toyland/toyland_Metal.png.import index 2d81f58..26095f4 100644 --- a/objects/toyland/toyland_Metal.png.import +++ b/objects/toyland/toyland_Metal.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://dxi7lik787q0u" -path.s3tc="res://.godot/imported/toyland_Metal.png-fb2306928aae15d8c05cd3f7d428f8b2.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_Metal.png-fb2306928aae15d8c05cd3f7d428f8b2.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_Metal.png" -dest_files=["res://.godot/imported/toyland_Metal.png-fb2306928aae15d8c05cd3f7d428f8b2.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_Metal.png-fb2306928aae15d8c05cd3f7d428f8b2.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_Toy Blocks Box.png.import b/objects/toyland/toyland_Toy Blocks Box.png.import index e6c88d5..bd654ad 100644 --- a/objects/toyland/toyland_Toy Blocks Box.png.import +++ b/objects/toyland/toyland_Toy Blocks Box.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://cq7us15jsbxwa" -path.s3tc="res://.godot/imported/toyland_Toy Blocks Box.png-77c23bf266ede7360aee6c2a8af551d3.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_Toy Blocks Box.png-77c23bf266ede7360aee6c2a8af551d3.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_Toy Blocks Box.png" -dest_files=["res://.godot/imported/toyland_Toy Blocks Box.png-77c23bf266ede7360aee6c2a8af551d3.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_Toy Blocks Box.png-77c23bf266ede7360aee6c2a8af551d3.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_Wood067_2K_Color.png.import b/objects/toyland/toyland_Wood067_2K_Color.png.import index 05895ba..06ba0cc 100644 --- a/objects/toyland/toyland_Wood067_2K_Color.png.import +++ b/objects/toyland/toyland_Wood067_2K_Color.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://c84wp1eeof83o" -path.s3tc="res://.godot/imported/toyland_Wood067_2K_Color.png-88d58072b673ae25da1f3e4fb3df5aab.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_Wood067_2K_Color.png-88d58072b673ae25da1f3e4fb3df5aab.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_Wood067_2K_Color.png" -dest_files=["res://.godot/imported/toyland_Wood067_2K_Color.png-88d58072b673ae25da1f3e4fb3df5aab.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_Wood067_2K_Color.png-88d58072b673ae25da1f3e4fb3df5aab.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_newplaster.png.import b/objects/toyland/toyland_newplaster.png.import index 9f71759..1f4a449 100644 --- a/objects/toyland/toyland_newplaster.png.import +++ b/objects/toyland/toyland_newplaster.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://cw686scwg66bl" -path.s3tc="res://.godot/imported/toyland_newplaster.png-2e56bf44283ffffe4d8bac4c57043582.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_newplaster.png-2e56bf44283ffffe4d8bac4c57043582.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_newplaster.png" -dest_files=["res://.godot/imported/toyland_newplaster.png-2e56bf44283ffffe4d8bac4c57043582.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_newplaster.png-2e56bf44283ffffe4d8bac4c57043582.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_outlet.png.import b/objects/toyland/toyland_outlet.png.import index 8fef017..69a1fc7 100644 --- a/objects/toyland/toyland_outlet.png.import +++ b/objects/toyland/toyland_outlet.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://wh7nb85cisoc" -path.s3tc="res://.godot/imported/toyland_outlet.png-152b0cb79ecd73aaf3419f7619f48c80.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_outlet.png-152b0cb79ecd73aaf3419f7619f48c80.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_outlet.png" -dest_files=["res://.godot/imported/toyland_outlet.png-152b0cb79ecd73aaf3419f7619f48c80.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_outlet.png-152b0cb79ecd73aaf3419f7619f48c80.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_white door.png.import b/objects/toyland/toyland_white door.png.import index 4d1d78a..627fb52 100644 --- a/objects/toyland/toyland_white door.png.import +++ b/objects/toyland/toyland_white door.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://d3bc7otex1q4o" -path.s3tc="res://.godot/imported/toyland_white door.png-a69689bb62057806552eccfcc82952b1.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_white door.png-a69689bb62057806552eccfcc82952b1.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_white door.png" -dest_files=["res://.godot/imported/toyland_white door.png-a69689bb62057806552eccfcc82952b1.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_white door.png-a69689bb62057806552eccfcc82952b1.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_windows_xp_bliss-wide.png.import b/objects/toyland/toyland_windows_xp_bliss-wide.png.import index df8baba..fc6ff84 100644 --- a/objects/toyland/toyland_windows_xp_bliss-wide.png.import +++ b/objects/toyland/toyland_windows_xp_bliss-wide.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://cx6lua0t37lxi" -path.s3tc="res://.godot/imported/toyland_windows_xp_bliss-wide.png-4deec299561dadd05f6a7830bf14662c.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_windows_xp_bliss-wide.png-4deec299561dadd05f6a7830bf14662c.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_windows_xp_bliss-wide.png" -dest_files=["res://.godot/imported/toyland_windows_xp_bliss-wide.png-4deec299561dadd05f6a7830bf14662c.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_windows_xp_bliss-wide.png-4deec299561dadd05f6a7830bf14662c.etc2.ctex"] [params] diff --git a/objects/toyland/toyland_woodfloor4k.png.import b/objects/toyland/toyland_woodfloor4k.png.import index 2fa9af0..449ece5 100644 --- a/objects/toyland/toyland_woodfloor4k.png.import +++ b/objects/toyland/toyland_woodfloor4k.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://bbwn5v87prkhy" -path.s3tc="res://.godot/imported/toyland_woodfloor4k.png-4a943154d5a37396f9a7cf5a106c2a78.s3tc.ctex" +path.etc2="res://.godot/imported/toyland_woodfloor4k.png-4a943154d5a37396f9a7cf5a106c2a78.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["etc2_astc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_woodfloor4k.png" -dest_files=["res://.godot/imported/toyland_woodfloor4k.png-4a943154d5a37396f9a7cf5a106c2a78.s3tc.ctex"] +dest_files=["res://.godot/imported/toyland_woodfloor4k.png-4a943154d5a37396f9a7cf5a106c2a78.etc2.ctex"] [params]