diff --git a/Models/3-Stage/3stHelen.glb b/Models/3-Stage/3stHelen.glb index bc99f83..a3e3958 100644 Binary files a/Models/3-Stage/3stHelen.glb and b/Models/3-Stage/3stHelen.glb differ diff --git a/Models/3-Stage/3stHelen_cheer dress.png b/Models/3-Stage/3stHelen_cheer dress.png new file mode 100644 index 0000000..5ecb4bf Binary files /dev/null and b/Models/3-Stage/3stHelen_cheer dress.png differ diff --git a/Models/3-Stage/3stHelen_cheer dress.png.import b/Models/3-Stage/3stHelen_cheer dress.png.import new file mode 100644 index 0000000..040e12e --- /dev/null +++ b/Models/3-Stage/3stHelen_cheer dress.png.import @@ -0,0 +1,39 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c78fctfafkuon" +path.s3tc="res://.godot/imported/3stHelen_cheer dress.png-c2a1c708bd40884f6dbb3748c5660c8c.s3tc.ctex" +path.etc2="res://.godot/imported/3stHelen_cheer dress.png-c2a1c708bd40884f6dbb3748c5660c8c.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "7cedb51b071905707d033e23c77584cb" +} + +[deps] + +source_file="res://Models/3-Stage/3stHelen_cheer dress.png" +dest_files=["res://.godot/imported/3stHelen_cheer dress.png-c2a1c708bd40884f6dbb3748c5660c8c.s3tc.ctex", "res://.godot/imported/3stHelen_cheer dress.png-c2a1c708bd40884f6dbb3748c5660c8c.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/Scenes/Stages/ChuckEsCorner.tscn b/Scenes/Stages/ChuckEsCorner.tscn index c707b67..e492602 100644 --- a/Scenes/Stages/ChuckEsCorner.tscn +++ b/Scenes/Stages/ChuckEsCorner.tscn @@ -18,6 +18,24 @@ script = ExtResource("2_8qvk7") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.25, 4, 0.5) script = ExtResource("2_8qvk7") +[node name="Spots" type="Node3D" parent="."] + +[node name="Chuck" type="SpotLight3D" parent="Spots"] +transform = Transform3D(-0.972974, -0.0597654, 0.223048, 2.26267e-08, 0.965926, 0.258819, -0.230916, 0.251824, -0.939821, -1.57812, 4.57895, -1.25599) +light_color = Color(1, 0.9625, 0.85, 1) +light_energy = 2.0 +spot_range = 6.53799 +spot_angle = 30.5982 +spot_angle_attenuation = 0.1 + +[node name="Warblettes" type="SpotLight3D" parent="Spots"] +transform = Transform3D(-0.963761, 0.0690445, -0.257677, 1.9697e-08, 0.965926, 0.258819, 0.266767, 0.24944, -0.930922, -0.309492, 5.86862, -0.75) +light_color = Color(1, 0.9625, 0.85, 1) +light_energy = 2.0 +spot_range = 12.8142 +spot_angle = 28.4779 +spot_angle_attenuation = 0.1 + [node name="Angle 1" type="Camera3D" parent="."] transform = Transform3D(-0.984612, -0.00554278, 0.174664, 0.0289131, 0.980555, 0.194105, -0.172344, 0.196168, -0.965306, -0.658302, 4.93729, -4) current = true @@ -34,22 +52,6 @@ fov = 60.0 [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_4uxdq") -[node name="Chuck Spotlight" type="SpotLight3D" parent="."] -transform = Transform3D(-0.972974, -0.0597654, 0.223048, 2.26267e-08, 0.965926, 0.258819, -0.230916, 0.251824, -0.939821, -1.57812, 4.57895, -1.25599) -light_color = Color(1, 0.9625, 0.85, 1) -light_energy = 2.0 -spot_range = 6.53799 -spot_angle = 30.5982 -spot_angle_attenuation = 0.1 - -[node name="Warblettes Spotlight" type="SpotLight3D" parent="."] -transform = Transform3D(-0.963761, 0.0690445, -0.257677, 1.9697e-08, 0.965926, 0.258819, 0.266767, 0.24944, -0.930922, -0.309492, 5.86862, -0.75) -light_color = Color(1, 0.9625, 0.85, 1) -light_energy = 2.0 -spot_range = 12.8142 -spot_angle = 28.4779 -spot_angle_attenuation = 0.1 - [node name="OmniLight3D" type="OmniLight3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 3.5, -2) light_color = Color(1, 0.960784, 0.85098, 1) diff --git a/Scenes/Stages/HelenHouse.tscn b/Scenes/Stages/HelenHouse.tscn index e7ab03b..8a69767 100644 --- a/Scenes/Stages/HelenHouse.tscn +++ b/Scenes/Stages/HelenHouse.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=6 format=3 uid="uid://btre5j66mpchy"] +[gd_scene load_steps=7 format=3 uid="uid://btre5j66mpchy"] [ext_resource type="PackedScene" uid="uid://f0fkcs7erhop" path="res://Models/3-Stage/3stHelen.glb" id="1_s1mol"] [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="2_odcb6"] [ext_resource type="PackedScene" uid="uid://bhoeqcsdb0fx2" path="res://Models/HelenHouse/HelenHouse-Room.glb" id="3_e7oou"] [ext_resource type="PackedScene" uid="uid://btvomf1ayoypu" path="res://Models/HelenHouse/HelenHouse-Stage.glb" id="4_e2vvs"] +[ext_resource type="Script" uid="uid://d1p4ite8ts2wi" path="res://Scripts/LightController.gd" id="5_odcb6"] [sub_resource type="Environment" id="Environment_axk5g"] ambient_light_source = 1 @@ -14,6 +15,18 @@ ambient_light_source = 1 transform = Transform3D(0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0, 0.25, 0) script = ExtResource("2_odcb6") +[node name="Spots" type="Node3D" parent="."] +script = ExtResource("5_odcb6") + +[node name="Helen" type="SpotLight3D" parent="Spots"] +transform = Transform3D(-1, 3.69465e-08, -7.92319e-08, 0, 0.906308, 0.422618, 8.74228e-08, 0.422618, -0.906308, 0, 2.5, -2) +visible = false +light_color = Color(1, 0.9625, 0.85, 1) +light_energy = 5.0 +spot_attenuation = 2.0 +spot_angle = 10.0 +spot_angle_attenuation = 0.15 + [node name="Room" parent="." instance=ExtResource("3_e7oou")] transform = Transform3D(0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0, 0, 0) @@ -31,14 +44,6 @@ fov = 60.0 [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_axk5g") -[node name="SpotLight3D" type="SpotLight3D" parent="."] -transform = Transform3D(-0.972974, -0.0597654, 0.223048, 2.26267e-08, 0.965926, 0.258819, -0.230916, 0.251824, -0.939821, 0.217544, 1.75308, -1.04223) -light_color = Color(1, 0.9625, 0.85, 1) -light_energy = 2.0 -spot_range = 1.3068 -spot_angle = 27.449 -spot_angle_attenuation = 0.1 - [node name="OmniLight3D" type="OmniLight3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 2.5, -3) light_color = Color(1, 0.960784, 0.85098, 1) diff --git a/Scripts/EditorScreen.gd b/Scripts/EditorScreen.gd index f163cf2..aab1064 100644 --- a/Scripts/EditorScreen.gd +++ b/Scripts/EditorScreen.gd @@ -17,7 +17,7 @@ var current_stage : String var stages_info = { "Helen House": { - "bits": 19, + "bits": 20, "scene": "res://Scenes/Stages/HelenHouse.tscn", "scene_ref_base": "SubViewport/HelenHouse/", "camera_count": 2, @@ -45,13 +45,46 @@ var stages_info = { 39: { "bot": "Helen", "movement": "Body Left", "flow_in": 0.7, "flow_out": 0.7 }, 40: { "bot": "Helen", "movement": "Body Right", "flow_in": 0.7, "flow_out": 0.7 }, 41: { "bot": "Helen", "movement": "Body Lean", "flow_in": 1.0, "flow_out": 0.8 }, + 125: { "bot": "Spots", "movement": "Helen", "flow_in": "None", "flow_out": "None" }, }, - "cosmetics": { } + "cosmetics": + { + "Helen Hair": + { + "Black and White": + { + "Helen/Helen/Skeleton3D/BWHair": true, + "Helen/Helen/Skeleton3D/YellowHair": false, + }, + "Yellow": + { + "Helen/Helen/Skeleton3D/BWHair": false, + "Helen/Helen/Skeleton3D/YellowHair": true, + }, + }, + "Helen Dress": + { + "Tux": + { + "Helen/Helen/Skeleton3D/Collar": true, + "Helen/Helen/Skeleton3D/Torso": true, + "Helen/Helen/Skeleton3D/Skirt": true, + "Helen/Helen/Skeleton3D/CheerDress": false, + }, + "Cheerleader": + { + "Helen/Helen/Skeleton3D/Collar": false, + "Helen/Helen/Skeleton3D/Torso": false, + "Helen/Helen/Skeleton3D/Skirt": false, + "Helen/Helen/Skeleton3D/CheerDress": true, + } + } + } }, "Chuck E's Corner": { - "bits": 10, + "bits": 12, "scene": "res://Scenes/Stages/ChuckEsCorner.tscn", "scene_ref_base": "SubViewport/ChuckEsCorner/", "camera_count": 3, @@ -70,6 +103,8 @@ var stages_info = { 8: { "bot": "Chuck", "movement": "Right Arm", "flow_in": 2.0, "flow_out": 1.0 }, 41: { "bot": "Warblettes", "movement": "Mouth", "flow_in": 4.0, "flow_out": 3.0 }, 44: { "bot": "Warblettes", "movement": "Body Rock", "flow_in": 1.0, "flow_out": 1.0 }, + 50: { "bot": "Spots", "movement": "Chuck", "flow_in": "None", "flow_out": "None" }, + 56: { "bot": "Spots", "movement": "Warblettes", "flow_in": "None", "flow_out": "None" }, }, "cosmetics": diff --git a/Scripts/LightController.gd b/Scripts/LightController.gd new file mode 100644 index 0000000..b5dc91d --- /dev/null +++ b/Scripts/LightController.gd @@ -0,0 +1,7 @@ +extends Node3D + +func _movement_in(movement, _rate): + get_node(movement).visible = true + +func _movement_out(movement, _rate): + get_node(movement).visible = false diff --git a/Scripts/LightController.gd.uid b/Scripts/LightController.gd.uid new file mode 100644 index 0000000..2a8204c --- /dev/null +++ b/Scripts/LightController.gd.uid @@ -0,0 +1 @@ +uid://d1p4ite8ts2wi