diff --git a/game/models/entities/cat/panther/Panther.tscn b/game/models/entities/cat/panther/Panther.tscn index 0c277a39..c292e2f9 100644 --- a/game/models/entities/cat/panther/Panther.tscn +++ b/game/models/entities/cat/panther/Panther.tscn @@ -25,7 +25,7 @@ flags_vertex_lighting = true albedo_color = Color( 0.145098, 0.145098, 0.145098, 1 ) albedo_texture = ExtResource( 5 ) -[node name="Boar" type="Spatial"] +[node name="Panther" type="Spatial"] [node name="LegBack" type="MeshDataInstance" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0645008, 0, -0.820011 ) @@ -78,7 +78,7 @@ texture = ExtResource( 6 ) material = SubResource( 5 ) [node name="Back" type="MeshDataInstance" parent="FullPreview"] -transform = Transform( 1, 0, 0, 0, -0.172084, 0.985082, 0, -0.985082, -0.172084, 0, 0.39121, 0 ) +transform = Transform( 1, 0, 0, 0, -0.172084, 0.985082, 0, -0.985082, -0.172084, 0, 0.39121, -0.271277 ) mesh_data = ExtResource( 8 ) texture = ExtResource( 6 ) material = SubResource( 5 ) @@ -90,7 +90,7 @@ texture = ExtResource( 6 ) material = SubResource( 5 ) [node name="LegBackRight" type="MeshDataInstance" parent="FullPreview"] -transform = Transform( 1, 1.50996e-07, 0, 1.48506e-07, -0.983512, -0.180845, 2.73069e-08, -0.180845, 0.983512, -0.11, 0.230661, -0.215081 ) +transform = Transform( 1, 1.50996e-07, 0, 1.48506e-07, -0.983512, -0.180845, 2.73069e-08, -0.180845, 0.983512, -0.11, 0.230661, -0.554374 ) mesh_data = ExtResource( 3 ) texture = ExtResource( 6 ) material = SubResource( 5 ) @@ -102,7 +102,7 @@ texture = ExtResource( 6 ) material = SubResource( 5 ) [node name="LegBackLeft" type="MeshDataInstance" parent="FullPreview"] -transform = Transform( -1, 8.74228e-08, 0, -8.59813e-08, -0.983512, -0.180845, -1.581e-08, -0.180845, 0.983512, 0.110449, 0.230661, -0.215081 ) +transform = Transform( -1, 8.74228e-08, 0, -8.59813e-08, -0.983512, -0.180845, -1.581e-08, -0.180845, 0.983512, 0.110449, 0.230661, -0.554374 ) mesh_data = ExtResource( 3 ) texture = ExtResource( 6 ) material = SubResource( 5 ) diff --git a/game/models/entities/cat/panther/panther_fur.tres b/game/models/entities/cat/panther/panther_fur.tres index 2b6d3ccc..3d20681c 100644 --- a/game/models/entities/cat/panther/panther_fur.tres +++ b/game/models/entities/cat/panther/panther_fur.tres @@ -1,4 +1,4 @@ -[gd_resource type="MMMaterial" load_steps=8 format=2] +[gd_resource type="MMMaterial" load_steps=9 format=2] [sub_resource type="MMNodeUniversalProperty" id=8] default_type = 5 @@ -6,7 +6,7 @@ output_slot_type = 0 [sub_resource type="MMFbmNoise" id=9] graph_position = Vector2( 20, 60 ) -output_properties = [ SubResource( 8 ) ] +output_properties = [ SubResource( 8 ), SubResource( 8 ) ] image = SubResource( 8 ) type = 1 scale = Vector2( 5, 5 ) @@ -24,12 +24,18 @@ input_property = SubResource( 8 ) [sub_resource type="MMColorize" id=12] graph_position = Vector2( 280, 80 ) -input_properties = [ SubResource( 11 ) ] -output_properties = [ SubResource( 10 ) ] -points = PoolRealArray( 0, 0.0390625, 0.0239754, 0.00457764, 1, 0.135593, 0, 0, 0, 1, 0.338983, 0.0351562, 0.0236807, 0.00892639, 1, 1, 0.15625, 0.0926876, 0.0250244, 1 ) +input_properties = [ SubResource( 11 ), SubResource( 11 ) ] +output_properties = [ SubResource( 10 ), SubResource( 10 ) ] +points = PoolRealArray( 0, 0.0390625, 0.0239754, 0.00457764, 1, 0.135593, 0, 0, 0, 1, 0.40678, 0.0081619, 0.00801086, 0.0273438, 1, 1, 0.0509804, 0.0588235, 0.12549, 1 ) image = SubResource( 10 ) input = SubResource( 11 ) +[sub_resource type="MMNodeUniversalProperty" id=15] +default_type = 5 +input_slot_type = 6 +slot_name = "image" +input_property = SubResource( 10 ) + [sub_resource type="MMNodeUniversalProperty" id=13] default_type = 5 input_slot_type = 6 @@ -38,8 +44,8 @@ input_property = SubResource( 10 ) [sub_resource type="MMOutputImage" id=14] graph_position = Vector2( 620, 140 ) -input_properties = [ SubResource( 13 ) ] -image = SubResource( 13 ) +input_properties = [ SubResource( 13 ), SubResource( 15 ) ] +image = SubResource( 15 ) postfix = "_albedo" [resource] diff --git a/game/models/entities/cat/panther/panther_fur_albedo.png b/game/models/entities/cat/panther/panther_fur_albedo.png index 2008d1ea..30fa6d7a 100644 Binary files a/game/models/entities/cat/panther/panther_fur_albedo.png and b/game/models/entities/cat/panther/panther_fur_albedo.png differ