diff --git a/README.md b/README.md index 2c38780..bc0cca2 100644 --- a/README.md +++ b/README.md @@ -219,6 +219,7 @@ This project has been tested to work on [Godot 4.3-stable](https://godotengine.o # Credits - Thanks to laamaa for creating [m8c](https://github.com/laamaa/m8c)! This was used as a reference when creating `libm8gd`. +- Thanks to rm for creating a model of the M8 M:02! - m8stealth57 and m8stealth89 fonts by Trash80. These fonts were converted to bitmaps. - [M8 Tracker 3D Model](https://sketchfab.com/3d-models/dirtywave-m8-tracker-05ba530f902e4474b0e01ae2750eec3c) by David Junghanns - [Prototype Textures](https://kenney-assets.itch.io/prototype-textures) by Kenney diff --git a/project/assets/m8_tracker/m8_model.glb b/project/assets/m8_tracker/m8_model.glb index b4fba47..78cb28e 100644 Binary files a/project/assets/m8_tracker/m8_model.glb and b/project/assets/m8_tracker/m8_model.glb differ diff --git a/project/assets/m8_tracker/m8_model.glb.import b/project/assets/m8_tracker/m8_model.glb.import index 2dda1cb..5b96304 100644 --- a/project/assets/m8_tracker/m8_model.glb.import +++ b/project/assets/m8_tracker/m8_model.glb.import @@ -21,7 +21,7 @@ nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true -meshes/light_baking=1 +meshes/light_baking=2 meshes/lightmap_texel_size=0.2 meshes/force_disable_compression=false skins/use_named_skins=true diff --git a/project/assets/m8_tracker/m8_model.glb.unwrap_cache b/project/assets/m8_tracker/m8_model.glb.unwrap_cache new file mode 100644 index 0000000..b3b8e5d Binary files /dev/null and b/project/assets/m8_tracker/m8_model.glb.unwrap_cache differ diff --git a/project/assets/m8_tracker/m8_model_labels_02.png b/project/assets/m8_tracker/m8_model_labels_02.png index 51dd5f7..8551ca0 100644 Binary files a/project/assets/m8_tracker/m8_model_labels_02.png and b/project/assets/m8_tracker/m8_model_labels_02.png differ diff --git a/project/assets/m8_tracker/m8_model_labels_02.png.import b/project/assets/m8_tracker/m8_model_labels_02.png.import index 45154dc..e0a51b9 100644 --- a/project/assets/m8_tracker/m8_model_labels_02.png.import +++ b/project/assets/m8_tracker/m8_model_labels_02.png.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "1b4dcf55b851208e43ed2dbd8d2afe24" +"md5": "54b13dbdd254d587cb02e9b90b25a290" } [deps] diff --git a/project/assets/m8_tracker/m8_model_screen_placeholder_01.png b/project/assets/m8_tracker/m8_model_screen_placeholder_01.png new file mode 100644 index 0000000..d3071ce Binary files /dev/null and b/project/assets/m8_tracker/m8_model_screen_placeholder_01.png differ diff --git a/project/assets/m8_tracker/m8_model_screen_placeholder_01.png.import b/project/assets/m8_tracker/m8_model_screen_placeholder_01.png.import new file mode 100644 index 0000000..aed574d --- /dev/null +++ b/project/assets/m8_tracker/m8_model_screen_placeholder_01.png.import @@ -0,0 +1,39 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bl3v8loshs2pg" +path.s3tc="res://.godot/imported/m8_model_screen_placeholder_01.png-4383acd57ee72fe7522f78e1ffe1296f.s3tc.ctex" +path.etc2="res://.godot/imported/m8_model_screen_placeholder_01.png-4383acd57ee72fe7522f78e1ffe1296f.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "f46d0ed2f9eb531324737617e16d08e7" +} + +[deps] + +source_file="res://assets/m8_tracker/m8_model_screen_placeholder_01.png" +dest_files=["res://.godot/imported/m8_model_screen_placeholder_01.png-4383acd57ee72fe7522f78e1ffe1296f.s3tc.ctex", "res://.godot/imported/m8_model_screen_placeholder_01.png-4383acd57ee72fe7522f78e1ffe1296f.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/project/assets/m8_tracker/m8_model_screen_placeholder_02.png b/project/assets/m8_tracker/m8_model_screen_placeholder_02.png new file mode 100644 index 0000000..f704926 Binary files /dev/null and b/project/assets/m8_tracker/m8_model_screen_placeholder_02.png differ diff --git a/project/assets/m8_tracker/m8_model_screen_placeholder_02.png.import b/project/assets/m8_tracker/m8_model_screen_placeholder_02.png.import new file mode 100644 index 0000000..bea0ed5 --- /dev/null +++ b/project/assets/m8_tracker/m8_model_screen_placeholder_02.png.import @@ -0,0 +1,39 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ctmenab88t3xs" +path.s3tc="res://.godot/imported/m8_model_screen_placeholder_02.png-6966e3e6690d4b24e21ab8174f663b32.s3tc.ctex" +path.etc2="res://.godot/imported/m8_model_screen_placeholder_02.png-6966e3e6690d4b24e21ab8174f663b32.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "d9f136b14228e019987af4f524f47e77" +} + +[deps] + +source_file="res://assets/m8_tracker/m8_model_screen_placeholder_02.png" +dest_files=["res://.godot/imported/m8_model_screen_placeholder_02.png-6966e3e6690d4b24e21ab8174f663b32.s3tc.ctex", "res://.godot/imported/m8_model_screen_placeholder_02.png-6966e3e6690d4b24e21ab8174f663b32.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/project/assets/m8_tracker/textures/labels_02.png b/project/assets/m8_tracker/textures/labels_02.png index 51dd5f7..8551ca0 100644 Binary files a/project/assets/m8_tracker/textures/labels_02.png and b/project/assets/m8_tracker/textures/labels_02.png differ diff --git a/project/main_menu.tscn b/project/main_menu.tscn index aa3f5ca..a7dd992 100644 --- a/project/main_menu.tscn +++ b/project/main_menu.tscn @@ -218,7 +218,7 @@ offset_left = 38.0 offset_top = 21.0 offset_right = 62.0 offset_bottom = 45.0 -value = Color(0.0901961, 0.0901961, 0.0901961, 1) +value = Color(0.15, 0.15, 0.15, 1) edit_alpha = false show_html = false panel_style_value = SubResource("StyleBoxEmpty_23yct") @@ -230,7 +230,7 @@ offset_left = 38.0 offset_top = 45.0 offset_right = 62.0 offset_bottom = 69.0 -value = Color(0.0901961, 0.0901961, 0.0901961, 1) +value = Color(0.15, 0.15, 0.15, 1) edit_alpha = false show_html = false panel_style_value = SubResource("StyleBoxEmpty_23yct") @@ -242,7 +242,7 @@ offset_left = 14.0 offset_top = 45.0 offset_right = 38.0 offset_bottom = 69.0 -value = Color(0.0901961, 0.0901961, 0.0901961, 1) +value = Color(0.15, 0.15, 0.15, 1) edit_alpha = false show_html = false panel_style_value = SubResource("StyleBoxEmpty_23yct") @@ -254,7 +254,7 @@ offset_left = 62.0 offset_top = 45.0 offset_right = 86.0 offset_bottom = 69.0 -value = Color(0.0901961, 0.0901961, 0.0901961, 1) +value = Color(0.15, 0.15, 0.15, 1) edit_alpha = false show_html = false panel_style_value = SubResource("StyleBoxEmpty_23yct") @@ -266,7 +266,7 @@ offset_left = 38.0 offset_top = 77.0 offset_right = 62.0 offset_bottom = 101.0 -value = Color(0.0901961, 0.0901961, 0.0901961, 1) +value = Color(0.15, 0.15, 0.15, 1) edit_alpha = false show_html = false panel_style_value = SubResource("StyleBoxEmpty_23yct") @@ -278,7 +278,7 @@ offset_left = 62.0 offset_top = 77.0 offset_right = 86.0 offset_bottom = 101.0 -value = Color(0.0901961, 0.0901961, 0.0901961, 1) +value = Color(0.15, 0.15, 0.15, 1) edit_alpha = false show_html = false panel_style_value = SubResource("StyleBoxEmpty_23yct") @@ -290,7 +290,7 @@ offset_left = 70.0 offset_top = 13.0 offset_right = 94.0 offset_bottom = 37.0 -value = Color(0.0901961, 0.0901961, 0.0901961, 1) +value = Color(0.15, 0.15, 0.15, 1) edit_alpha = false show_html = false panel_style_value = SubResource("StyleBoxEmpty_23yct") @@ -302,7 +302,7 @@ offset_left = 94.0 offset_top = 13.0 offset_right = 118.0 offset_bottom = 37.0 -value = Color(0.0901961, 0.0901961, 0.0901961, 1) +value = Color(0.15, 0.15, 0.15, 1) edit_alpha = false show_html = false panel_style_value = SubResource("StyleBoxEmpty_23yct") @@ -402,7 +402,7 @@ size_flags_horizontal = 3 [node name="Setting_ModelColorBody" parent="ScrollContainer/CenterContainer/VBoxContainer/TabContainer/Scene/VBoxContainer/HBoxContainer3/VBoxContainer2" instance=ExtResource("5_i4355")] unique_name_in_owner = true layout_mode = 2 -value = Color(0.15, 0.15, 0.15, 1) +value = Color(0.08, 0.08, 0.08, 1) setting_name = "Body Color" setting_name_min_width = 100 diff --git a/project/models/m8_model.tscn b/project/models/m8_model.tscn index 7998f5c..c02f932 100644 --- a/project/models/m8_model.tscn +++ b/project/models/m8_model.tscn @@ -19,292 +19,336 @@ script = ExtResource("2_ag158") [node name="M02_Body" parent="." index="0"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.000492573, 0.414844, 0.0302715) material_override = ExtResource("2_jmko1") [node name="M02_Screen" parent="." index="1"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.000492573, 0.414844, 0.0302715) material_override = ExtResource("10_3s7in") [node name="M02_ScreenOuter" parent="." index="2"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.000492573, 0.414844, 0.0302715) surface_material_override/0 = ExtResource("3_8hyn2") [node name="M02_ScreenGlass" parent="." index="3"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.000492573, 0.414844, 0.0302715) surface_material_override/0 = ExtResource("4_feft7") -[node name="M02_KeyUpCap" parent="." index="4"] +[node name="M02_AudioJack_001" parent="." index="4"] +unique_name_in_owner = true + +[node name="M02_AudioJack_002" parent="." index="5"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.75375, 0.355, -3.06688) + +[node name="M02_AudioJack_003" parent="." index="6"] +unique_name_in_owner = true + +[node name="M02_AudioJack_004" parent="." index="7"] +unique_name_in_owner = true + +[node name="M02_KeyUpCap" parent="." index="8"] unique_name_in_owner = true -visible = false material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M02_KeyUpSwitch" parent="." index="5"] +[node name="M02_KeyUpSwitch" parent="." index="9"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.555657, 0.555001, 0.598967) -[node name="M02_KeyUpStem" parent="." index="6"] +[node name="M02_KeyUpStem" parent="." index="10"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.556011, 0.555001, 0.604048) -[node name="M02_KeyDownCap" parent="." index="7"] +[node name="M02_KeyDownCap" parent="." index="11"] unique_name_in_owner = true -visible = false material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M02_KeyDownSwitch" parent="." index="8"] +[node name="M02_KeyDownSwitch" parent="." index="12"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.555892, 0.555001, 1.46867) -[node name="M02_KeyDownStem" parent="." index="9"] +[node name="M02_KeyDownStem" parent="." index="13"] unique_name_in_owner = true -visible = false -[node name="M02_KeyLeftCap" parent="." index="10"] +[node name="M02_KeyLeftCap" parent="." index="14"] unique_name_in_owner = true -visible = false material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M02_KeyLeftSwitch" parent="." index="11"] +[node name="M02_KeyLeftSwitch" parent="." index="15"] unique_name_in_owner = true -visible = false -[node name="M02_KeyLeftStem" parent="." index="12"] +[node name="M02_KeyLeftStem" parent="." index="16"] unique_name_in_owner = true -visible = false -[node name="M02_KeyRightCap" parent="." index="13"] +[node name="M02_KeyRightCap" parent="." index="17"] unique_name_in_owner = true -visible = false material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M02_KeyRightSwitch" parent="." index="14"] +[node name="M02_KeyRightSwitch" parent="." index="18"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.363841, 0.555001, 1.46845) -[node name="M02_KeyRightStem" parent="." index="15"] +[node name="M02_KeyRightStem" parent="." index="19"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.363487, 0.555001, 1.47353) -[node name="M02_KeyOptionCap" parent="." index="16"] +[node name="M02_KeyOptionCap" parent="." index="20"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.555905, 0.555001, 0.38875) material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M02_KeyOptionSwitch" parent="." index="17"] +[node name="M02_KeyOptionSwitch" parent="." index="21"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.55626, 0.555001, 0.38867) -[node name="M02_KeyOptionStem" parent="." index="18"] +[node name="M02_KeyOptionStem" parent="." index="22"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.555905, 0.555002, 0.39375) -[node name="M02_KeyEditCap" parent="." index="19"] +[node name="M02_KeyEditCap" parent="." index="23"] unique_name_in_owner = true -visible = false material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M02_KeyEditSwitch" parent="." index="20"] +[node name="M02_KeyEditSwitch" parent="." index="24"] unique_name_in_owner = true -visible = false -[node name="M02_KeyEditStem" parent="." index="21"] +[node name="M02_KeyEditStem" parent="." index="25"] unique_name_in_owner = true -visible = false -[node name="M02_KeyShiftCap" parent="." index="22"] +[node name="M02_KeyShiftCap" parent="." index="26"] unique_name_in_owner = true -visible = false material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M02_KeyShiftSwitch" parent="." index="23"] +[node name="M02_KeyShiftSwitch" parent="." index="27"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.555892, 0.555001, 2.55867) -[node name="M02_KeyShiftStem" parent="." index="24"] +[node name="M02_KeyShiftStem" parent="." index="28"] unique_name_in_owner = true -visible = false -[node name="M02_KeyPlayCap" parent="." index="25"] +[node name="M02_KeyPlayCap" parent="." index="29"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.363487, 0.555001, 2.55875) material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M02_KeyPlaySwitch" parent="." index="26"] +[node name="M02_KeyPlaySwitch" parent="." index="30"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.363842, 0.555001, 2.55867) -[node name="M02_KeyPlayStem" parent="." index="27"] +[node name="M02_KeyPlayStem" parent="." index="31"] unique_name_in_owner = true -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.363487, 0.555001, 2.56375) -[node name="M01_ScrewBottomLeft" parent="." index="28"] +[node name="M01_ScrewBottomLeft" parent="." index="32"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.00944, 0.569455, 2.98131) surface_material_override/0 = ExtResource("7_kboll") -[node name="M01_ScrewBottomRight" parent="." index="29"] +[node name="M01_ScrewBottomRight" parent="." index="33"] unique_name_in_owner = true surface_material_override/0 = ExtResource("7_kboll") -[node name="M01_ScrewTopLeft" parent="." index="30"] +[node name="M01_ScrewTopLeft" parent="." index="34"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.00944, 0.569455, -3.0131) surface_material_override/0 = ExtResource("7_kboll") -[node name="M01_ScrewTopRight" parent="." index="31"] +[node name="M01_ScrewTopRight" parent="." index="35"] unique_name_in_owner = true surface_material_override/0 = ExtResource("7_kboll") -[node name="M01_AudioJacks" parent="." index="32"] +[node name="M01_Inside" parent="." index="36"] unique_name_in_owner = true -surface_material_override/0 = ExtResource("2_jmh23") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00296831, 0.298363, 0.0230579) +surface_material_override/0 = ExtResource("3_8hyn2") -[node name="M01_Bezel" parent="." index="33"] +[node name="M01_Labels" parent="." index="37"] unique_name_in_owner = true -surface_material_override/0 = ExtResource("2_jmh23") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00296831, 0.569454, 0.0230579) +surface_material_override/0 = ExtResource("10_6f2qv") -[node name="M01_Body" parent="." index="34"] +[node name="M01_MicroUSBPort" parent="." index="38"] unique_name_in_owner = true -material_override = ExtResource("9_u5rgg") +transform = Transform3D(1, 2.99663e-06, -2.99662e-06, 2.99663e-06, -3.57628e-06, 1, 2.99662e-06, -1, -3.57628e-06, 0.000820875, 0.369429, -2.97897) +surface_material_override/0 = ExtResource("2_jmh23") -[node name="M01_Feet" parent="." index="35"] +[node name="M01_Screen" parent="." index="39"] unique_name_in_owner = true -surface_material_override/0 = ExtResource("9_u5rgg") +transform = Transform3D(-1, 0, 3.25841e-07, 0, 1, 0, -3.25841e-07, 0, -1, -0.00296831, 0.83264, -1.58842) +material_override = ExtResource("10_3s7in") -[node name="M01_Inside" parent="." index="36"] +[node name="M01_ScreenBlackPart" parent="." index="40"] unique_name_in_owner = true +transform = Transform3D(-1, 0, 3.25841e-07, 0, 1, 0, -3.25841e-07, 0, -1, -0.00296831, 0.83264, -1.58842) surface_material_override/0 = ExtResource("3_8hyn2") -[node name="M01_Labels" parent="." index="37"] +[node name="M01_ScreenGlass" parent="." index="41"] unique_name_in_owner = true -surface_material_override/0 = ExtResource("10_6f2qv") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0190179, 0.208428, -0.985955) +surface_material_override/0 = ExtResource("4_feft7") -[node name="M01_MicroUSBPort" parent="." index="38"] +[node name="M01_ScreenHousing" parent="." index="42"] unique_name_in_owner = true -surface_material_override/0 = ExtResource("2_jmh23") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00296831, 0.125907, -0.985955) +surface_material_override/0 = ExtResource("11_j3nc0") -[node name="M01_PowerButton" parent="." index="39"] +[node name="M01_SDCard" parent="." index="43"] unique_name_in_owner = true surface_material_override/0 = ExtResource("2_jmh23") -[node name="M01_Screen" parent="." index="40"] +[node name="M01_Feet_001" parent="." index="44"] unique_name_in_owner = true -material_override = ExtResource("10_3s7in") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.67, 0.010371, 2.55309) -[node name="M01_ScreenBlackPart" parent="." index="41"] +[node name="M01_Feet_002" parent="." index="45"] unique_name_in_owner = true -surface_material_override/0 = ExtResource("3_8hyn2") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.67, 0.010371, -2.55309) -[node name="M01_ScreenGlass" parent="." index="42"] +[node name="M01_Feet_003" parent="." index="46"] unique_name_in_owner = true -surface_material_override/0 = ExtResource("4_feft7") -[node name="M01_ScreenHousing" parent="." index="43"] +[node name="M01_Feet_004" parent="." index="47"] unique_name_in_owner = true -surface_material_override/0 = ExtResource("11_j3nc0") -[node name="M01_SDCard" parent="." index="44"] +[node name="M01_PowerButton" parent="." index="48"] unique_name_in_owner = true surface_material_override/0 = ExtResource("2_jmh23") -[node name="M01_SDCardSlot" parent="." index="45"] +[node name="M01_AudioJacks_001" parent="." index="49"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.33405, 0.392775, -3.06688) + +[node name="M01_AudioJacks_002" parent="." index="50"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.748246, 0.392775, -3.06688) + +[node name="M01_AudioJacks_003" parent="." index="51"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.74231, 0.392775, -3.06688) + +[node name="M01_AudioJacks_004" parent="." index="52"] unique_name_in_owner = true + +[node name="M01_CaseBack" parent="." index="53"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00296831, 0.297712, 0) surface_material_override/0 = ExtResource("2_jmh23") -[node name="M01_KeyUpCap" parent="." index="46"] +[node name="M01_Body" parent="." index="54"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00296831, 0.297712, 0) +material_override = ExtResource("9_u5rgg") +lod_bias = 3.0 + +[node name="M01_KeyUpCap" parent="." index="55"] unique_name_in_owner = true material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M01_KeyUpSwitch" parent="." index="47"] +[node name="M01_KeyUpSwitch" parent="." index="56"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.566151, 0.576503, 0.443681) -[node name="M01_KeyUpStem" parent="." index="48"] +[node name="M01_KeyUpStem" parent="." index="57"] unique_name_in_owner = true -[node name="M01_KeyShiftCap" parent="." index="49"] +[node name="M01_KeyShiftCap" parent="." index="58"] unique_name_in_owner = true material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M01_KeyShiftSwitch" parent="." index="50"] +[node name="M01_KeyShiftSwitch" parent="." index="59"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.563623, 0.576503, 2.44812) -[node name="M01_KeyShiftStem" parent="." index="51"] +[node name="M01_KeyShiftStem" parent="." index="60"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.563968, 0.576503, 2.45312) -[node name="M01_KeyRightCap" parent="." index="52"] +[node name="M01_KeyRightCap" parent="." index="61"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.385003, 0.576503, 1.3517) material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M01_KeyRightSwitch" parent="." index="53"] +[node name="M01_KeyRightSwitch" parent="." index="62"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.385348, 0.576503, 1.3517) -[node name="M01_KeyRightStem" parent="." index="54"] +[node name="M01_KeyRightStem" parent="." index="63"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.385003, 0.576503, 1.3567) -[node name="M01_KeyPlayCap" parent="." index="55"] +[node name="M01_KeyPlayCap" parent="." index="64"] unique_name_in_owner = true material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M01_KeyPlaySwitch" parent="." index="56"] +[node name="M01_KeyPlaySwitch" parent="." index="65"] unique_name_in_owner = true -[node name="M01_KeyPlayStem" parent="." index="57"] +[node name="M01_KeyPlayStem" parent="." index="66"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.385003, 0.576503, 2.45312) -[node name="M01_KeyOptionCap" parent="." index="58"] +[node name="M01_KeyOptionCap" parent="." index="67"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.571587, 0.576503, 0.25366) material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M01_KeyOptionSwitch" parent="." index="59"] +[node name="M01_KeyOptionSwitch" parent="." index="68"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.571933, 0.576503, 0.25366) -[node name="M01_KeyOptionStem" parent="." index="60"] +[node name="M01_KeyOptionStem" parent="." index="69"] unique_name_in_owner = true -[node name="M01_KeyLeftCap" parent="." index="61"] +[node name="M01_KeyLeftCap" parent="." index="70"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.51648, 0.576503, 1.3517) material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M01_KeyLeftSwitch" parent="." index="62"] +[node name="M01_KeyLeftSwitch" parent="." index="71"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.51613, 0.576503, 1.3517) -[node name="M01_KeyLeftStem" parent="." index="63"] +[node name="M01_KeyLeftStem" parent="." index="72"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.51648, 0.576503, 1.3567) -[node name="M01_KeyEditCap" parent="." index="64"] +[node name="M01_KeyEditCap" parent="." index="73"] unique_name_in_owner = true material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M01_KeyEditSwitch" parent="." index="65"] +[node name="M01_KeyEditSwitch" parent="." index="74"] unique_name_in_owner = true -[node name="M01_KeyEditStem" parent="." index="66"] +[node name="M01_KeyEditStem" parent="." index="75"] unique_name_in_owner = true -[node name="M01_KeyDownCap" parent="." index="67"] +[node name="M01_KeyDownCap" parent="." index="76"] unique_name_in_owner = true material_override = ExtResource("3_3rxoc") material_overlay = ExtResource("8_plqn4") -[node name="M01_KeyDownSwitch" parent="." index="68"] +[node name="M01_KeyDownSwitch" parent="." index="77"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.563623, 0.576503, 1.3517) -[node name="M01_KeyDownStem" parent="." index="69"] +[node name="M01_KeyDownStem" parent="." index="78"] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.563968, 0.576503, 1.3567) diff --git a/project/models/material_body_01.tres b/project/models/material_body_01.tres index 4ccccd1..1c3189c 100644 --- a/project/models/material_body_01.tres +++ b/project/models/material_body_01.tres @@ -1,10 +1,14 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://g8po1mp7xinq"] -[ext_resource type="Texture2D" uid="uid://cnm2iqhf11y5c" path="res://models/material_noise.tres" id="1_qx8x5"] +[ext_resource type="Texture2D" uid="uid://dkl4iuf1hg2la" path="res://models/noise_normal.tres" id="2_boms1"] [resource] -albedo_color = Color(0.25, 0.25, 0.25, 1) -albedo_texture = ExtResource("1_qx8x5") -metallic = 1.0 +albedo_color = Color(0.15, 0.15, 0.15, 1) +metallic = 0.9 roughness = 0.6 +normal_enabled = true +normal_scale = 1.25 +normal_texture = ExtResource("2_boms1") +uv1_triplanar = true +uv1_world_triplanar = true texture_filter = 2 diff --git a/project/models/material_body_02.tres b/project/models/material_body_02.tres index 76e2ac3..263d9f9 100644 --- a/project/models/material_body_02.tres +++ b/project/models/material_body_02.tres @@ -1,23 +1,26 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://ceus1nseg5p1a"] +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://ceus1nseg5p1a"] [ext_resource type="Texture2D" uid="uid://cm84lsw54cq8t" path="res://assets/m8_tracker/textures/labels_02.png" id="1_dyl76"] [ext_resource type="Texture2D" uid="uid://cnm2iqhf11y5c" path="res://models/material_noise.tres" id="1_gsvwo"] +[ext_resource type="Texture2D" uid="uid://dkl4iuf1hg2la" path="res://models/noise_normal.tres" id="3_y2xpi"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ujn6n"] transparency = 1 albedo_texture = ExtResource("1_dyl76") -emission_enabled = true +metallic = 0.6 +roughness = 0.3 emission = Color(1, 1, 1, 1) -emission_energy_multiplier = 0.1 -texture_filter = 5 +emission_energy_multiplier = 0.15 texture_repeat = false [resource] next_pass = SubResource("StandardMaterial3D_ujn6n") -albedo_color = Color(0.157034, 0.157034, 0.157034, 1) +albedo_color = Color(0.15, 0.15, 0.15, 1) albedo_texture = ExtResource("1_gsvwo") -metallic = 0.9 -roughness = 0.5 +metallic = 0.8 +roughness = 0.4 +normal_enabled = true +normal_texture = ExtResource("3_y2xpi") +uv1_scale = Vector3(1.25, 1.25, 1.25) uv1_triplanar = true uv1_world_triplanar = true -texture_filter = 2 diff --git a/project/models/material_m8_keycap.tres b/project/models/material_m8_keycap.tres index c372fae..f0b6eef 100644 --- a/project/models/material_m8_keycap.tres +++ b/project/models/material_m8_keycap.tres @@ -1,12 +1,17 @@ -[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://bteaijler8fto"] +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://bteaijler8fto"] [ext_resource type="Texture2D" uid="uid://cnm2iqhf11y5c" path="res://models/material_noise.tres" id="1_i3ir3"] +[ext_resource type="Texture2D" uid="uid://dkl4iuf1hg2la" path="res://models/noise_normal.tres" id="2_y1ht5"] [resource] albedo_color = Color(0.153436, 0.153437, 0.153436, 1) albedo_texture = ExtResource("1_i3ir3") -metallic = 0.65 -roughness = 0.55 +metallic = 0.9 +roughness = 0.4 +normal_enabled = true +normal_scale = 0.8 +normal_texture = ExtResource("2_y1ht5") +uv1_scale = Vector3(1.25, 1.25, 1.25) uv1_triplanar = true uv1_world_triplanar = true texture_filter = 2 diff --git a/project/models/material_m8_labels.tres b/project/models/material_m8_labels.tres index b2b3a69..452bf43 100644 --- a/project/models/material_m8_labels.tres +++ b/project/models/material_m8_labels.tres @@ -4,4 +4,7 @@ [resource] transparency = 1 +albedo_color = Color(1, 1, 1, 0.191) albedo_texture = ExtResource("1_pp58m") +metallic = 0.3 +roughness = 0.5 diff --git a/project/models/material_m8_rim.tres b/project/models/material_m8_rim.tres index d3c4994..7e3fdd5 100644 --- a/project/models/material_m8_rim.tres +++ b/project/models/material_m8_rim.tres @@ -1,12 +1,14 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://be3p66xqo7iqm"] -[ext_resource type="Texture2D" uid="uid://cnm2iqhf11y5c" path="res://models/material_noise.tres" id="1_vj53q"] +[ext_resource type="Texture2D" uid="uid://dkl4iuf1hg2la" path="res://models/noise_normal.tres" id="1_v4j5g"] [resource] -albedo_color = Color(0.090866, 0.0908659, 0.0908659, 1) -albedo_texture = ExtResource("1_vj53q") -metallic = 0.5 -roughness = 0.3 +albedo_color = Color(0.1, 0.1, 0.1, 1) +metallic = 0.8 +roughness = 0.4 +normal_enabled = true +normal_texture = ExtResource("1_v4j5g") +uv1_scale = Vector3(1.2, 1.2, 1.2) uv1_triplanar = true uv1_world_triplanar = true texture_filter = 2 diff --git a/project/models/material_m8_screen_bezel.tres b/project/models/material_m8_screen_bezel.tres index be24ee9..8def04a 100644 --- a/project/models/material_m8_screen_bezel.tres +++ b/project/models/material_m8_screen_bezel.tres @@ -1,4 +1,13 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://brl2lskfjpwxk"] +[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://brl2lskfjpwxk"] + +[ext_resource type="Texture2D" uid="uid://dkl4iuf1hg2la" path="res://models/noise_normal.tres" id="1_bxwck"] [resource] albedo_color = Color(0, 0, 0, 1) +metallic = 0.6 +roughness = 0.7 +normal_enabled = true +normal_scale = 4.0 +normal_texture = ExtResource("1_bxwck") +uv1_triplanar = true +uv1_world_triplanar = true diff --git a/project/models/material_m8_screw.tres b/project/models/material_m8_screw.tres index 11b8942..4335980 100644 --- a/project/models/material_m8_screw.tres +++ b/project/models/material_m8_screw.tres @@ -2,5 +2,5 @@ [resource] albedo_color = Color(0.0117647, 0.0117647, 0.0117647, 1) -metallic = 0.64 -roughness = 0.32 +metallic = 0.8 +roughness = 0.35 diff --git a/project/models/noise_normal.tres b/project/models/noise_normal.tres new file mode 100644 index 0000000..5b515d5 --- /dev/null +++ b/project/models/noise_normal.tres @@ -0,0 +1,17 @@ +[gd_resource type="NoiseTexture2D" load_steps=3 format=3 uid="uid://dkl4iuf1hg2la"] + +[sub_resource type="Gradient" id="Gradient_mneab"] + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_axpvc"] +noise_type = 3 +seed = 2 +frequency = 0.8 +domain_warp_enabled = true + +[resource] +width = 1024 +height = 1024 +as_normal_map = true +bump_strength = 4.0 +color_ramp = SubResource("Gradient_mneab") +noise = SubResource("FastNoiseLite_axpvc") diff --git a/project/scenes/desktop_scene.tscn b/project/scenes/desktop_scene.tscn index ae44b5b..f84b29e 100644 --- a/project/scenes/desktop_scene.tscn +++ b/project/scenes/desktop_scene.tscn @@ -11,7 +11,7 @@ [sub_resource type="Environment" id="Environment_ayqpk"] ambient_light_source = 2 ambient_light_color = Color(1, 1, 1, 1) -ambient_light_energy = 0.1 +ambient_light_energy = 0.05 tonemap_mode = 2 tonemap_white = 10.0 fog_light_color = Color(0, 0, 0, 1) @@ -136,49 +136,46 @@ environment = SubResource("Environment_ayqpk") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] unique_name_in_owner = true -transform = Transform3D(0.477159, -0.528885, -0.701855, -6.98189e-08, -0.798635, 0.601815, -0.878817, -0.287161, -0.381076, 0.087698, 4.97022, -16.5359) +transform = Transform3D(0.5, -0.496732, -0.709407, 7.16125e-08, -0.819151, 0.573577, -0.866025, -0.286788, -0.409576, 0.087698, 4.97022, -16.5359) light_color = Color(1, 0.958, 0.91, 1) +light_angular_distance = 4.0 shadow_enabled = true -shadow_bias = 0.01 -shadow_opacity = 0.83 -shadow_blur = 3.0 +shadow_normal_bias = 4.0 +shadow_opacity = 0.9 [node name="LightLamp" type="SpotLight3D" parent="."] unique_name_in_owner = true -transform = Transform3D(0.266284, 0.95967, -0.0901449, -0.46377, 0.209544, 0.860819, 0.844991, -0.187416, 0.500865, -0.919, 16.42, 9.424) +transform = Transform3D(0.0908976, 0.974832, -0.20357, -0.491037, 0.221712, 0.842452, 0.866383, 0.0233833, 0.498832, -0.311, 13.482, 5.885) visible = false light_color = Color(0.8, 0.866667, 1, 1) -light_size = 3.0 +light_size = 2.5 shadow_enabled = true shadow_bias = 0.06 spot_range = 43.892 -spot_attenuation = 0.0 -spot_angle = 16.72 -spot_angle_attenuation = 0.406125 +spot_attenuation = 0.3 +spot_angle = 30.0 [node name="LightLeft" type="SpotLight3D" parent="."] unique_name_in_owner = true -transform = Transform3D(0.231346, 0.952383, -0.198611, -0.918842, 0.280983, 0.27709, 0.319702, 0.118389, 0.940093, -4.77328, 6.32057, 10.2875) -visible = false +transform = Transform3D(0.720551, 0.383723, -0.577549, 0, 0.832921, 0.553392, 0.693402, -0.398747, 0.600162, -8.65174, 6.441, 6.68209) light_color = Color(1, 0.11, 0.11, 1) light_energy = 16.0 -light_size = 3.0 +light_size = 1.0 +light_specular = 0.1 shadow_enabled = true -shadow_blur = 0.5 -spot_range = 43.892 -spot_angle = 36.8368 +shadow_bias = 0.04 +spot_range = 23.064 +spot_attenuation = 0.3 [node name="LightRight" type="SpotLight3D" parent="."] unique_name_in_owner = true -transform = Transform3D(0.652098, -0.104201, 0.750939, 0, 0.990509, 0.137445, -0.758134, -0.0896274, 0.64591, 6.968, 5.274, 6.753) -visible = false -light_color = Color(0.614333, 0.11, 1, 1) -light_energy = 16.0 -light_size = 3.0 +transform = Transform3D(0.711885, -0.460246, 0.530466, 0.0999514, 0.814039, 0.572146, -0.695147, -0.354281, 0.625504, 7.74783, 8.51745, 7.10884) +light_color = Color(0.781815, 0, 0.294521, 1) shadow_enabled = true -shadow_blur = 0.5 -spot_range = 43.892 -spot_angle = 36.8368 +shadow_bias = 0.01 +shadow_blur = 0.884 +spot_range = 50.0 +spot_attenuation = 0.5 [node name="PlantModel" parent="." instance=ExtResource("9_c3a4o")] unique_name_in_owner = true @@ -201,6 +198,5 @@ num_meshes = 32000 [node name="M8Model" parent="." instance=ExtResource("7_y135g")] unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.410945, 0) [editable path="Camera3D"] diff --git a/project/scenes/floating_scene.tscn b/project/scenes/floating_scene.tscn index 4672907..efda946 100644 --- a/project/scenes/floating_scene.tscn +++ b/project/scenes/floating_scene.tscn @@ -183,11 +183,11 @@ shadow_blur = 3.0 [node name="LightLamp" type="SpotLight3D" parent="."] unique_name_in_owner = true transform = Transform3D(0.949972, 0.233564, -0.207367, 0, 0.663926, 0.747798, 0.312335, -0.710387, 0.630711, -2.964, 11.885, 10.369) -light_size = 1.0 shadow_enabled = true -shadow_bias = 0.01 -shadow_opacity = 0.7 -shadow_blur = 4.0 +shadow_bias = 0.001 +shadow_normal_bias = 0.0 +shadow_opacity = 0.72 +shadow_blur = 3.0 spot_range = 128.0 spot_attenuation = 0.0 spot_angle = 15.0