diff --git a/Models/ChuckEsCorner/ChuckEsCornerStage.glb b/Models/ChuckEsCorner/ChuckEsCornerStage.glb new file mode 100644 index 0000000..91f3316 Binary files /dev/null and b/Models/ChuckEsCorner/ChuckEsCornerStage.glb differ diff --git a/Models/ChuckEsCorner/ChuckEsCornerStage.glb.import b/Models/ChuckEsCorner/ChuckEsCornerStage.glb.import new file mode 100644 index 0000000..94fd5f3 --- /dev/null +++ b/Models/ChuckEsCorner/ChuckEsCornerStage.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bv66hlbvtekho" +path="res://.godot/imported/ChuckEsCornerStage.glb-972590d495adda7be8c93e6d0989aa24.scn" + +[deps] + +source_file="res://Models/ChuckEsCorner/ChuckEsCornerStage.glb" +dest_files=["res://.godot/imported/ChuckEsCornerStage.glb-972590d495adda7be8c93e6d0989aa24.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/Models/Cyberamics/Warblettes.glb b/Models/Cyberamics/Warblettes.glb new file mode 100644 index 0000000..a2d85e5 Binary files /dev/null and b/Models/Cyberamics/Warblettes.glb differ diff --git a/Models/Cyberamics/Warblettes.glb.import b/Models/Cyberamics/Warblettes.glb.import new file mode 100644 index 0000000..598bb73 --- /dev/null +++ b/Models/Cyberamics/Warblettes.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dmh5upwts8y11" +path="res://.godot/imported/Warblettes.glb-4411a6da11355afeccccd99ded899996.scn" + +[deps] + +source_file="res://Models/Cyberamics/Warblettes.glb" +dest_files=["res://.godot/imported/Warblettes.glb-4411a6da11355afeccccd99ded899996.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/Models/Cyberamics/Warblettes_fur.png b/Models/Cyberamics/Warblettes_fur.png new file mode 100644 index 0000000..b903419 Binary files /dev/null and b/Models/Cyberamics/Warblettes_fur.png differ diff --git a/Models/Cyberamics/Warblettes_fur.png.import b/Models/Cyberamics/Warblettes_fur.png.import new file mode 100644 index 0000000..aa9cbfb --- /dev/null +++ b/Models/Cyberamics/Warblettes_fur.png.import @@ -0,0 +1,39 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://jp06lvl1l4kf" +path.s3tc="res://.godot/imported/Warblettes_fur.png-9635d2a2f1884e838e8285a0042af334.s3tc.ctex" +path.etc2="res://.godot/imported/Warblettes_fur.png-9635d2a2f1884e838e8285a0042af334.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "e63b9c660d716af6780b5637f38da662" +} + +[deps] + +source_file="res://Models/Cyberamics/Warblettes_fur.png" +dest_files=["res://.godot/imported/Warblettes_fur.png-9635d2a2f1884e838e8285a0042af334.s3tc.ctex", "res://.godot/imported/Warblettes_fur.png-9635d2a2f1884e838e8285a0042af334.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 93bae49..e41781e 100644 --- a/Scenes/Stages/ChuckEsCorner.tscn +++ b/Scenes/Stages/ChuckEsCorner.tscn @@ -1,7 +1,9 @@ -[gd_scene load_steps=4 format=3 uid="uid://dw3eplmapm5gc"] +[gd_scene load_steps=6 format=3 uid="uid://dw3eplmapm5gc"] [ext_resource type="PackedScene" uid="uid://bb70mexwmq1ta" path="res://Models/Cyberamics/PTTChuck.glb" id="1_m77pm"] [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="2_8qvk7"] +[ext_resource type="PackedScene" uid="uid://bv66hlbvtekho" path="res://Models/ChuckEsCorner/ChuckEsCornerStage.glb" id="3_8qvk7"] +[ext_resource type="PackedScene" uid="uid://dmh5upwts8y11" path="res://Models/Cyberamics/Warblettes.glb" id="3_t27ru"] [sub_resource type="Environment" id="Environment_4uxdq"] ambient_light_source = 1 @@ -9,30 +11,53 @@ ambient_light_source = 1 [node name="ChuckEsCorner" type="Node3D"] [node name="Chuck" parent="." instance=ExtResource("1_m77pm")] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 0, 0, 0) +transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -2, 2, 0.5) script = ExtResource("2_8qvk7") +[node name="Warblettes" parent="." instance=ExtResource("3_t27ru")] +transform = Transform3D(0.75, 0, 0, 0, 0.75, 0, 0, 0, 0.75, 0.25, 4, 0.5) + [node name="Angle 1" type="Camera3D" parent="."] -transform = Transform3D(-1, 1.31602e-08, -1.50421e-07, 0, 0.996195, 0.0871557, 1.50996e-07, 0.0871557, -0.996195, 0, 1.5, -3) +transform = Transform3D(-0.984613, -0.00554269, 0.174664, 0.0289131, 0.980555, 0.194105, -0.172344, 0.196168, -0.965306, -0.658302, 4.68552, -4) +current = true +fov = 50.0 + +[node name="Angle 2" type="Camera3D" parent="."] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -2, 3, -1.5) +fov = 60.0 + +[node name="Angle 3" type="Camera3D" parent="."] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0.25, 4.77684, -1.29774) fov = 60.0 [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_4uxdq") -[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.51501, -1.04223) +[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.782, 3.73541, -0.75) light_color = Color(1, 0.9625, 0.85, 1) light_energy = 2.0 -spot_range = 1.3068 -spot_angle = 27.449 +spot_range = 1.59812 +spot_angle = 32.2181 +spot_angle_attenuation = 0.1 + +[node name="Chuck Spotlight2" 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.186226, 5.29432, -0.75) +light_color = Color(1, 0.9625, 0.85, 1) +light_energy = 2.0 +spot_range = 2.26541 +spot_angle = 28.9054 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) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 3.5, -2) light_color = Color(1, 0.960784, 0.85098, 1) light_energy = 0.5 [node name="OmniLight3D2" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 2.5, -3) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 3.5, -2) light_color = Color(1, 0.960784, 0.85098, 1) light_energy = 0.5 + +[node name="ChuckEsCornerStage" parent="." instance=ExtResource("3_8qvk7")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 1) diff --git a/Scripts/EditorScreen.gd b/Scripts/EditorScreen.gd index 4bcd0e4..99e0a20 100644 --- a/Scripts/EditorScreen.gd +++ b/Scripts/EditorScreen.gd @@ -72,7 +72,7 @@ var stages_info = { "bits": 8, "scene": "res://Scenes/Stages/ChuckEsCorner.tscn", "scene_ref_base": "SubViewport/ChuckEsCorner/", - "camera_count": 1, + "camera_count": 3, "ust_character": "Chuck E.", "ust_stage": "Cyberamics (Single Character)",