From 13fc04e912161ffc19cce62e5ed55a8efd88ae96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 15 Sep 2023 22:35:18 +0200 Subject: [PATCH] Fix wrong paths on case sensitive systems - Renamed `Main.tscn` to `main.tscn` to match path in `project.godot`. - Fixed path to texture in its `.import` file; can't rename the `Textures` folder to lowercase without changing the .glb's it seems. - Removed temporary file. The change to the binary `cloud.res` seems gratuitous and a Godot bug, I've seen it on another project but couldn't figure out yet how to solve it for good. --- models/Textures/colormap.png.import | 6 +-- models/cloud.glb.import | 2 +- prefabs/cloud.res | Bin 38672 -> 38672 bytes scenes/MaiA34B.tmp | 67 ---------------------------- scenes/{Main.tscn => main.tscn} | 0 5 files changed, 4 insertions(+), 71 deletions(-) delete mode 100644 scenes/MaiA34B.tmp rename scenes/{Main.tscn => main.tscn} (100%) diff --git a/models/Textures/colormap.png.import b/models/Textures/colormap.png.import index 73c2d57..51e1164 100644 --- a/models/Textures/colormap.png.import +++ b/models/Textures/colormap.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://0odt7cvj574e" -path.bptc="res://.godot/imported/colormap.png-c5d1d841e2d3dfd437d36ec333adedff.bptc.ctex" +path.bptc="res://.godot/imported/colormap.png-c1bc3c3aabeec406ff4b53328583776a.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://models/textures/colormap.png" -dest_files=["res://.godot/imported/colormap.png-c5d1d841e2d3dfd437d36ec333adedff.bptc.ctex"] +source_file="res://models/Textures/colormap.png" +dest_files=["res://.godot/imported/colormap.png-c1bc3c3aabeec406ff4b53328583776a.bptc.ctex"] [params] diff --git a/models/cloud.glb.import b/models/cloud.glb.import index 9cc6e18..5e11808 100644 --- a/models/cloud.glb.import +++ b/models/cloud.glb.import @@ -38,7 +38,7 @@ _subresources={ "lods/normal_split_angle": 25.0, "save_to_file/enabled": true, "save_to_file/make_streamable": "", -"save_to_file/path": "res://Prefabs/cloud.res" +"save_to_file/path": "res://prefabs/cloud.res" } } } diff --git a/prefabs/cloud.res b/prefabs/cloud.res index 17f43768411176a5e205d61ef2b4c7e20199ba26..e1be0faefa870f3cb60cf3757f5a55ba7fe3fb73 100644 GIT binary patch delta 49 zcmbQRj%mU=rVYVdj3JXlxExs1Q%lneC(q=P=P)TXE=^(Z;+{N*ONOV`xK(Z*c*h*hN ZpeQvhF{xNTIVZm~MGq*p`5~8n4*)jU7BT<; diff --git a/scenes/MaiA34B.tmp b/scenes/MaiA34B.tmp deleted file mode 100644 index 0d2f64f..0000000 --- a/scenes/MaiA34B.tmp +++ /dev/null @@ -1,67 +0,0 @@ -[gd_scene load_steps=8 format=3 uid="uid://d0ymn6u246bv2"] - -[ext_resource type="Script" path="res://Scripts/view.gd" id="1_7db0s"] -[ext_resource type="Script" path="res://Scripts/player.gd" id="1_t4rwr"] -[ext_resource type="PackedScene" uid="uid://cr2qtafbhvr3w" path="res://Models/figurine.glb" id="2_13t4n"] - -[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_iakcd"] -sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) -ground_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) - -[sub_resource type="Sky" id="Sky_nhnet"] -sky_material = SubResource("ProceduralSkyMaterial_iakcd") - -[sub_resource type="Environment" id="Environment_kt478"] -background_mode = 1 -background_color = Color(0.529412, 0.560784, 0.643137, 1) -sky = SubResource("Sky_nhnet") -tonemap_mode = 2 -ssao_enabled = true -ssao_intensity = 4.0 -glow_enabled = true - -[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_gdq8c"] -radius = 0.3 -height = 1.0 - -[node name="Main" type="Node3D"] - -[node name="WorldEnvironment" type="WorldEnvironment" parent="."] -environment = SubResource("Environment_kt478") - -[node name="Player" type="CharacterBody3D" parent="." node_paths=PackedStringArray("model", "animation")] -script = ExtResource("1_t4rwr") -model = NodePath("Model") -animation = NodePath("Model/AnimationPlayer") -movementSpeed = null - -[node name="CollisionShape3D" type="CollisionShape3D" parent="Player"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, 0) -shape = SubResource("CapsuleShape3D_gdq8c") - -[node name="Cube" type="CSGBox3D" parent="Player"] -visible = false - -[node name="Model" parent="Player" instance=ExtResource("2_13t4n")] - -[node name="View" type="Node3D" parent="." node_paths=PackedStringArray("target")] -transform = Transform3D(0.707107, -0.298836, 0.640856, 0, 0.906308, 0.422618, -0.707107, -0.298836, 0.640856, 0, 0, 0) -script = ExtResource("1_7db0s") -target = NodePath("../Player") - -[node name="Camera" type="Camera3D" parent="View"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 16) -fov = 40.0 - -[node name="World" type="Node3D" parent="."] - -[node name="CSGBox3D" type="CSGBox3D" parent="World"] -use_collision = true -size = Vector3(10, 0.1, 10) - -[node name="Sun" type="DirectionalLight3D" parent="."] -transform = Transform3D(-0.422618, -0.694272, 0.582563, 0, 0.642788, 0.766044, -0.906308, 0.323744, -0.271654, 0, 0, 0) -shadow_enabled = true -shadow_opacity = 0.75 - -[editable path="Player/Model"] diff --git a/scenes/Main.tscn b/scenes/main.tscn similarity index 100% rename from scenes/Main.tscn rename to scenes/main.tscn