diff --git a/project/assets/character/player/player.blend b/project/assets/character/player/player.blend index 0ee9ab93..19c6b298 100644 --- a/project/assets/character/player/player.blend +++ b/project/assets/character/player/player.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d773aa276793597dc2159df6d6be184983d935e1a61662e0e54794e1f518cb12 -size 352170 +oid sha256:0c100c50f3b5df2b60732e6bce476c5b1bc12c94a6061f17fa16f0d24e61382c +size 370094 diff --git a/project/assets/character/player/player.blend.import b/project/assets/character/player/player.blend.import index ebe58e1f..9177c923 100644 --- a/project/assets/character/player/player.blend.import +++ b/project/assets/character/player/player.blend.import @@ -16492,14 +16492,19 @@ _subresources={ }, "materials": { "Base": { -"use_external/enabled": false, -"use_external/fallback_path": "res://assets/materials/kaleidoscope_mosaic.tres", -"use_external/path": "uid://dg5o46l14axjg" +"use_external/enabled": true, +"use_external/fallback_path": "res://assets/character/player/player_body.tres", +"use_external/path": "uid://4jw7ckdluil6" +}, +"Boots": { +"use_external/enabled": true, +"use_external/fallback_path": "res://assets/character/player/player_boots.tres", +"use_external/path": "uid://c0khp3qs2pfx5" }, "Top": { "use_external/enabled": true, -"use_external/fallback_path": "res://assets/materials/kaleidoscope_mosaic.tres", -"use_external/path": "uid://dvasanummja3u" +"use_external/fallback_path": "res://assets/character/player/player_jacket.tres", +"use_external/path": "uid://b10ub178s77na" } } } diff --git a/project/assets/character/player/player.blend1 b/project/assets/character/player/player.blend1 index 0222471c..a39e8506 100644 Binary files a/project/assets/character/player/player.blend1 and b/project/assets/character/player/player.blend1 differ diff --git a/project/assets/character/player/player.tscn b/project/assets/character/player/player.tscn index d06e5b5d..7a14b9a4 100644 --- a/project/assets/character/player/player.tscn +++ b/project/assets/character/player/player.tscn @@ -1,13 +1,8 @@ [gd_scene format=3 uid="uid://c1g1vy67lf550"] [ext_resource type="PackedScene" uid="uid://t3vyihwed4ko" path="res://assets/character/player/player.blend" id="1_1oybq"] -[ext_resource type="Material" uid="uid://4jw7ckdluil6" path="res://assets/character/player/player_body.tres" id="2_0o6ap"] [node name="PlayerModel" unique_id=1710695753 instance=ExtResource("1_1oybq")] -[node name="HumanArmature" parent="." index="0" unique_id=144184076] +[node name="HumanArmature" parent="." index="0" unique_id=831744418] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 0, 0) - -[node name="BlankCharacterMesh_003" parent="HumanArmature/Skeleton3D" parent_id_path=PackedInt32Array(589423230) index="0" unique_id=855668379] -layers = 2 -material_override = ExtResource("2_0o6ap") diff --git a/project/assets/character/player/player_body.tres b/project/assets/character/player/player_body.tres index 53f6f622..945d209c 100644 --- a/project/assets/character/player/player_body.tres +++ b/project/assets/character/player/player_body.tres @@ -29,4 +29,4 @@ heightmap_deep_parallax = true heightmap_min_layers = 8 heightmap_max_layers = 32 heightmap_texture = ExtResource("3_cd41l") -uv1_scale = Vector3(6.758, 6.758, 6.758) +uv1_scale = Vector3(11.551, 11.551, 11.551) diff --git a/project/assets/character/player/player_boots.tres b/project/assets/character/player/player_boots.tres new file mode 100644 index 00000000..d4955d4b --- /dev/null +++ b/project/assets/character/player/player_boots.tres @@ -0,0 +1,23 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://c0khp3qs2pfx5"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_v7if1"] +render_priority = 1 +transparency = 1 +shading_mode = 0 +albedo_color = Color(0, 0, 0, 1) +grow = true +grow_amount = 0.01 +stencil_mode = 3 +stencil_flags = 1 +stencil_compare = 5 +metadata/_stencil_owned = true + +[resource] +next_pass = SubResource("StandardMaterial3D_v7if1") +diffuse_mode = 3 +specular_mode = 1 +albedo_color = Color(0.14550123, 0.14550123, 0.14550123, 1) +metallic_specular = 0.0 +roughness = 0.0 +stencil_mode = 1 +stencil_flags = 2 diff --git a/project/assets/character/player/player_jacket.tres b/project/assets/character/player/player_jacket.tres new file mode 100644 index 00000000..8c92a53f --- /dev/null +++ b/project/assets/character/player/player_jacket.tres @@ -0,0 +1,23 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://b10ub178s77na"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_v7if1"] +render_priority = 1 +transparency = 1 +shading_mode = 0 +albedo_color = Color(0, 0, 0, 1) +grow = true +grow_amount = 0.01 +stencil_mode = 3 +stencil_flags = 1 +stencil_compare = 5 +metadata/_stencil_owned = true + +[resource] +next_pass = SubResource("StandardMaterial3D_v7if1") +diffuse_mode = 3 +specular_mode = 1 +albedo_color = Color(0.14550123, 0.14550123, 0.14550123, 1) +metallic_specular = 0.0 +roughness = 0.0 +stencil_mode = 1 +stencil_flags = 2 diff --git a/project/assets/character/player/player_skin.png b/project/assets/character/player/player_skin.png index 38fe2b14..6a154011 100644 --- a/project/assets/character/player/player_skin.png +++ b/project/assets/character/player/player_skin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92eda5725b7b4943834b364ce3b5d15072ed3abb39c53105f95fc36409ed9e74 -size 27877 +oid sha256:d714dce8d032002583ccda40f428fe084ee6b1b3e64525b8a7b45ccf13bbbcb6 +size 24243 diff --git a/project/assets/character/player/skin.tres b/project/assets/character/player/skin.tres index 2c49eecc..780a5663 100644 --- a/project/assets/character/player/skin.tres +++ b/project/assets/character/player/skin.tres @@ -20,10 +20,11 @@ next_pass = SubResource("StandardMaterial3D_bgydp") transparency = 2 alpha_scissor_threshold = 0.0 alpha_antialiasing_mode = 2 -alpha_antialiasing_edge = 0.3 +alpha_antialiasing_edge = 0.32 depth_draw_mode = 1 diffuse_mode = 3 specular_mode = 1 +disable_specular_occlusion = true albedo_texture = ExtResource("1_bgydp") metallic_specular = 0.0 roughness = 0.0 diff --git a/project/assets/materials/kaleidoscope_mosaic.tres b/project/assets/materials/kaleidoscope_mosaic.tres index 09fe84f3..53e4b2aa 100644 --- a/project/assets/materials/kaleidoscope_mosaic.tres +++ b/project/assets/materials/kaleidoscope_mosaic.tres @@ -1,22 +1,27 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://c5si8tfw024di"] - -[ext_resource type="Texture2D" uid="uid://ddaso2y8ooove" path="res://assets/materials/kaleidoscope_mosaic_albedo.png" id="1"] -[ext_resource type="Texture2D" uid="uid://dwskfat6ut10d" path="res://assets/materials/kaleidoscope_mosaic_normal.png" id="3"] -[ext_resource type="Texture2D" uid="uid://b0yi45ldkax5s" path="res://assets/materials/kaleidoscope_mosaic_heightmap.png" id="4"] -[ext_resource type="Texture2D" uid="uid://34f1swwafqoa" path="res://assets/materials/kaleidoscope_mosaic_emission.png" id="5"] - +[gd_resource type="StandardMaterial3D" load_steps=5 format=2] +[ext_resource path="kaleidoscope_mosaic_albedo.png" type="Texture" id=1] +[ext_resource path="kaleidoscope_mosaic_normal.png" type="Texture" id=3] +[ext_resource path="kaleidoscope_mosaic_heightmap.png" type="Texture" id=4] +[ext_resource path="kaleidoscope_mosaic_emission.png" type="Texture" id=5] [resource] -albedo_texture = ExtResource("1") +albedo_color = Color(1.0, 1.0, 1.0, 1.0) +albedo_texture = ExtResource( 1 ) metallic = 1.0 roughness = 0.19 -emission_enabled = true -emission_energy_multiplier = 0.03 -emission_texture = ExtResource("5") normal_enabled = true -normal_texture = ExtResource("3") +normal_scale = 1.0 +normal_texture = ExtResource( 3 ) +emission_enabled = true +emission = Color( 0, 0, 0, 1 ) +emission_energy = 0.03 +emission_operator = 0 +emission_texture = ExtResource( 5 ) heightmap_enabled = true heightmap_scale = 25.0 heightmap_deep_parallax = true heightmap_min_layers = 8 heightmap_max_layers = 32 -heightmap_texture = ExtResource("4") +heightmap_texture = ExtResource( 4 ) + + + diff --git a/project/assets/materials/kaleidoscope_mosaic_albedo.png b/project/assets/materials/kaleidoscope_mosaic_albedo.png index c7fe9773..7420008e 100644 --- a/project/assets/materials/kaleidoscope_mosaic_albedo.png +++ b/project/assets/materials/kaleidoscope_mosaic_albedo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99da1dfd4cabe2a2d6466ea0e8fccc791c51f3d12a142517c66581fdb8112356 -size 349713 +oid sha256:46940fcac597d042f55e90fa52257bfe3600e30b41a0f248cacce4f724422ad1 +size 63407 diff --git a/project/assets/materials/kaleidoscope_mosaic_emission.png b/project/assets/materials/kaleidoscope_mosaic_emission.png index c7fe9773..7420008e 100644 --- a/project/assets/materials/kaleidoscope_mosaic_emission.png +++ b/project/assets/materials/kaleidoscope_mosaic_emission.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99da1dfd4cabe2a2d6466ea0e8fccc791c51f3d12a142517c66581fdb8112356 -size 349713 +oid sha256:46940fcac597d042f55e90fa52257bfe3600e30b41a0f248cacce4f724422ad1 +size 63407 diff --git a/project/assets/materials/kaleidoscope_mosaic_heightmap.png b/project/assets/materials/kaleidoscope_mosaic_heightmap.png index a95523a8..690d5b74 100644 --- a/project/assets/materials/kaleidoscope_mosaic_heightmap.png +++ b/project/assets/materials/kaleidoscope_mosaic_heightmap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f961eed77c49337b2f14481059655b17955b7466d2a222257bee88a264a28101 -size 423061 +oid sha256:6ab90e6173233c20fe57770a2aa36355c2aff66406519d5d3dd449b3c4812529 +size 320700 diff --git a/project/assets/materials/kaleidoscope_mosaic_normal.png b/project/assets/materials/kaleidoscope_mosaic_normal.png index 2bd77106..c75b3d27 100644 --- a/project/assets/materials/kaleidoscope_mosaic_normal.png +++ b/project/assets/materials/kaleidoscope_mosaic_normal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7785381d9505706a66809578d351ba14d8a127bb9b3300406265a44c924e2e45 -size 2039431 +oid sha256:e2396ff6654e5a7e8a7b2ab72057ac463d56859255818d270aec9908746027dc +size 1165853