diff --git a/assets/megaman.ase b/assets/megaman.ase index c6258124..a69652fa 100644 Binary files a/assets/megaman.ase and b/assets/megaman.ase differ diff --git a/assets/roll.ase b/assets/roll.ase index 5ed28833..1b6176a2 100644 Binary files a/assets/roll.ase and b/assets/roll.ase differ diff --git a/assets/roll_face.ase b/assets/roll_face.ase index d0bd780c..87380c64 100644 Binary files a/assets/roll_face.ase and b/assets/roll_face.ase differ diff --git a/assets/roll_pupil.ase b/assets/roll_pupil.ase index 5dbda13a..0791d4c1 100644 Binary files a/assets/roll_pupil.ase and b/assets/roll_pupil.ase differ diff --git a/project/assets/bike/bike.blend b/project/assets/bike/bike.blend index c6588eeb..7f40b267 100644 --- a/project/assets/bike/bike.blend +++ b/project/assets/bike/bike.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:627c33513eb1b626fb4acbf910e722fae6b800fc10055bf8888a3c41d6bb0459 -size 207886 +oid sha256:2173e7731b425564a7694bde6aa9d0e190153a866f7a230a225a6623b281dda3 +size 203044 diff --git a/project/assets/bike/bike.blend1 b/project/assets/bike/bike.blend1 index 4a97d06e..89a49470 100644 Binary files a/project/assets/bike/bike.blend1 and b/project/assets/bike/bike.blend1 differ diff --git a/project/assets/players/girl/girl.blend b/project/assets/players/girl/girl.blend index d9c868a5..20241b8a 100644 --- a/project/assets/players/girl/girl.blend +++ b/project/assets/players/girl/girl.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cbb5aa6f92403a633fdd44cf34c2b55209d4bb9ac9e57430cfd12ab17f076e6 -size 195658 +oid sha256:24939c333ae1a2a9a987d8ae449e2673b36057233f89fb4c188d9623ab076cc2 +size 199933 diff --git a/project/assets/players/girl/girl.blend.import b/project/assets/players/girl/girl.blend.import index 6a20471e..0179f2ed 100644 --- a/project/assets/players/girl/girl.blend.import +++ b/project/assets/players/girl/girl.blend.import @@ -2110,11 +2110,6 @@ _subresources={ "use_external/fallback_path": "res://assets/players/girl/materials/helmet.tres", "use_external/path": "uid://dkjgeep37d1mf" }, -"helmet_ridge": { -"use_external/enabled": true, -"use_external/fallback_path": "res://assets/players/girl/materials/helmet_ridge.tres", -"use_external/path": "uid://b1gr1mjw42vqi" -}, "mouth": { "use_external/enabled": true, "use_external/fallback_path": "res://assets/players/girl/materials/roll_mouth.tres", diff --git a/project/assets/players/girl/girl.blend1 b/project/assets/players/girl/girl.blend1 index 4e7f1cf0..2e8eadd1 100644 Binary files a/project/assets/players/girl/girl.blend1 and b/project/assets/players/girl/girl.blend1 differ diff --git a/project/assets/players/girl/materials/helmet.tres b/project/assets/players/girl/materials/helmet.tres index 546ed7f7..e14265c5 100644 --- a/project/assets/players/girl/materials/helmet.tres +++ b/project/assets/players/girl/materials/helmet.tres @@ -1,6 +1,7 @@ [gd_resource type="StandardMaterial3D" format=3 uid="uid://dkjgeep37d1mf"] +[ext_resource type="Texture2D" uid="uid://c5hlpvuc8mbmy" path="res://assets/textures/megaman.png" id="1_b3fdv"] + [resource] resource_name = "helmet" -cull_mode = 2 -albedo_color = Color(0.1150608, 0.49752495, 0.73966473, 1) +albedo_texture = ExtResource("1_b3fdv") diff --git a/project/assets/players/girl/materials/helmet_ridge.tres b/project/assets/players/girl/materials/helmet_ridge.tres deleted file mode 100644 index baecc08c..00000000 --- a/project/assets/players/girl/materials/helmet_ridge.tres +++ /dev/null @@ -1,6 +0,0 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://b1gr1mjw42vqi"] - -[resource] -resource_name = "helmet_ridge" -cull_mode = 2 -albedo_color = Color(0.29611614, 0.3984831, 0.59225035, 1) diff --git a/project/assets/players/girl/materials/roll_eyes.tres b/project/assets/players/girl/materials/roll_eyes.tres index 0fc048cb..db08815b 100644 --- a/project/assets/players/girl/materials/roll_eyes.tres +++ b/project/assets/players/girl/materials/roll_eyes.tres @@ -1,8 +1,8 @@ [gd_resource type="ShaderMaterial" format=3 uid="uid://da661tlnr24ki"] [ext_resource type="Shader" uid="uid://dc4jhmqi1k6ia" path="res://shaders/feature_atlas.gdshader" id="1_qi3oo"] -[ext_resource type="Texture2D" uid="uid://du38jvx4b3fhn" path="res://assets/players/girl/texture/roll_face.png" id="2_5hnj8"] -[ext_resource type="Texture2D" uid="uid://da08cweavcdpd" path="res://assets/players/girl/texture/roll_pupil.png" id="3_vegxp"] +[ext_resource type="Texture2D" uid="uid://du38jvx4b3fhn" path="res://assets/textures/roll_face.png" id="2_5hnj8"] +[ext_resource type="Texture2D" uid="uid://da08cweavcdpd" path="res://assets/textures/roll_pupil.png" id="3_vegxp"] [resource] render_priority = 0 diff --git a/project/assets/players/girl/materials/roll_mouth.tres b/project/assets/players/girl/materials/roll_mouth.tres index 61a7fa4f..98c64ac7 100644 --- a/project/assets/players/girl/materials/roll_mouth.tres +++ b/project/assets/players/girl/materials/roll_mouth.tres @@ -1,7 +1,7 @@ [gd_resource type="ShaderMaterial" format=3 uid="uid://mbpmt8wswpvs"] [ext_resource type="Shader" uid="uid://dc4jhmqi1k6ia" path="res://shaders/feature_atlas.gdshader" id="1_x47rn"] -[ext_resource type="Texture2D" uid="uid://du38jvx4b3fhn" path="res://assets/players/girl/texture/roll_face.png" id="2_sylso"] +[ext_resource type="Texture2D" uid="uid://du38jvx4b3fhn" path="res://assets/textures/roll_face.png" id="2_sylso"] [resource] render_priority = 0 diff --git a/project/assets/players/girl/materials/skin.tres b/project/assets/players/girl/materials/skin.tres index fd327333..93a00b2c 100644 --- a/project/assets/players/girl/materials/skin.tres +++ b/project/assets/players/girl/materials/skin.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" format=3 uid="uid://bcmroo7qygey7"] -[ext_resource type="Texture2D" uid="uid://dprtl3e0dabe3" path="res://assets/players/girl/texture/roll.png" id="1_tggkx"] +[ext_resource type="Texture2D" uid="uid://dprtl3e0dabe3" path="res://assets/textures/roll.png" id="1_tggkx"] [resource] resource_name = "skin" diff --git a/project/assets/players/girl/texture/roll.png b/project/assets/players/girl/texture/roll.png deleted file mode 100644 index 75d4013b..00000000 --- a/project/assets/players/girl/texture/roll.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c614500f2c98b1c87a01b2558c5cd247bb80dc3e8fefd1accb55c0bf994e14fe -size 16832 diff --git a/project/assets/players/girl/texture/roll_face.png b/project/assets/players/girl/texture/roll_face.png deleted file mode 100644 index 6e27b7f9..00000000 --- a/project/assets/players/girl/texture/roll_face.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10c2595954055cf5748b145b4cf72b060fff47efaac41ab0a56b4f28d1657757 -size 5086 diff --git a/project/assets/players/girl/texture/roll_pupil.png b/project/assets/players/girl/texture/roll_pupil.png deleted file mode 100644 index 38371229..00000000 --- a/project/assets/players/girl/texture/roll_pupil.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69b88a0c8ead00c2df6874b6b41d78d9e7cc8701bfcc2d76969c16a9689330b1 -size 529 diff --git a/project/assets/textures/megaman.png b/project/assets/textures/megaman.png new file mode 100644 index 00000000..e06ec4cd --- /dev/null +++ b/project/assets/textures/megaman.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e5421db6c37007886cb31e2aebe6ddf60715739fb4e4f72ab558c74b48d2c81 +size 7661 diff --git a/project/assets/textures/megaman.png.import b/project/assets/textures/megaman.png.import new file mode 100644 index 00000000..3f12c064 --- /dev/null +++ b/project/assets/textures/megaman.png.import @@ -0,0 +1,42 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c5hlpvuc8mbmy" +path.bptc="res://.godot/imported/megaman.png-c89e991fe8ef6c8b41249a8ec9919b1d.bptc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/megaman.png" +dest_files=["res://.godot/imported/megaman.png-c89e991fe8ef6c8b41249a8ec9919b1d.bptc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=true +compress/high_quality_mode=0 +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/textures/roll.png b/project/assets/textures/roll.png new file mode 100644 index 00000000..0de50594 --- /dev/null +++ b/project/assets/textures/roll.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b9f00aec9bebad4a5234b81006eeade9cf1c7658458bb94919fdb0c39d3dc22 +size 16934 diff --git a/project/assets/players/girl/texture/roll.png.import b/project/assets/textures/roll.png.import similarity index 77% rename from project/assets/players/girl/texture/roll.png.import rename to project/assets/textures/roll.png.import index 4f1a1d66..bafcf403 100644 --- a/project/assets/players/girl/texture/roll.png.import +++ b/project/assets/textures/roll.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://dprtl3e0dabe3" -path.bptc="res://.godot/imported/roll.png-7b60b0b951d0754360380a3d9f07e4ad.bptc.ctex" +path.bptc="res://.godot/imported/roll.png-340e0438a165f2de225baff3f38cded6.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://assets/players/girl/texture/roll.png" -dest_files=["res://.godot/imported/roll.png-7b60b0b951d0754360380a3d9f07e4ad.bptc.ctex"] +source_file="res://assets/textures/roll.png" +dest_files=["res://.godot/imported/roll.png-340e0438a165f2de225baff3f38cded6.bptc.ctex"] [params] diff --git a/project/assets/textures/roll_face.png b/project/assets/textures/roll_face.png new file mode 100644 index 00000000..9deea152 --- /dev/null +++ b/project/assets/textures/roll_face.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac550987aca61da20ee3909019c1f919e59d96d27a6aa3b30b607867d81877d1 +size 5262 diff --git a/project/assets/players/girl/texture/roll_face.png.import b/project/assets/textures/roll_face.png.import similarity index 76% rename from project/assets/players/girl/texture/roll_face.png.import rename to project/assets/textures/roll_face.png.import index 2e0d316b..06bdbf9f 100644 --- a/project/assets/players/girl/texture/roll_face.png.import +++ b/project/assets/textures/roll_face.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://du38jvx4b3fhn" -path.bptc="res://.godot/imported/roll_face.png-8d09e6518c77e0890a021da51e504edf.bptc.ctex" +path.bptc="res://.godot/imported/roll_face.png-c093cc90b09524f2bb918ca7ea185b90.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://assets/players/girl/texture/roll_face.png" -dest_files=["res://.godot/imported/roll_face.png-8d09e6518c77e0890a021da51e504edf.bptc.ctex"] +source_file="res://assets/textures/roll_face.png" +dest_files=["res://.godot/imported/roll_face.png-c093cc90b09524f2bb918ca7ea185b90.bptc.ctex"] [params] diff --git a/project/assets/textures/roll_pupil.png b/project/assets/textures/roll_pupil.png new file mode 100644 index 00000000..6e4f7473 --- /dev/null +++ b/project/assets/textures/roll_pupil.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44311b009c124e628aff510721f01819d8608197ff093accdf71856a3c85a221 +size 533 diff --git a/project/assets/players/girl/texture/roll_pupil.png.import b/project/assets/textures/roll_pupil.png.import similarity index 73% rename from project/assets/players/girl/texture/roll_pupil.png.import rename to project/assets/textures/roll_pupil.png.import index 6537a367..d630d768 100644 --- a/project/assets/players/girl/texture/roll_pupil.png.import +++ b/project/assets/textures/roll_pupil.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://da08cweavcdpd" -path.s3tc="res://.godot/imported/roll_pupil.png-6e3c975f6a5ff29061c4cf03c53fdfb8.s3tc.ctex" +path.bptc="res://.godot/imported/roll_pupil.png-ea49b4df9a966f9b577d0373158295c6.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,13 +11,13 @@ metadata={ [deps] -source_file="res://assets/players/girl/texture/roll_pupil.png" -dest_files=["res://.godot/imported/roll_pupil.png-6e3c975f6a5ff29061c4cf03c53fdfb8.s3tc.ctex"] +source_file="res://assets/textures/roll_pupil.png" +dest_files=["res://.godot/imported/roll_pupil.png-ea49b4df9a966f9b577d0373158295c6.bptc.ctex"] [params] compress/mode=2 -compress/high_quality=false +compress/high_quality=true compress/high_quality_mode=0 compress/lossy_quality=0.7 compress/uastc_level=0 diff --git a/project/levels/test_level.tscn b/project/levels/test_level.tscn index 1ba83796..c9779d3d 100644 --- a/project/levels/test_level.tscn +++ b/project/levels/test_level.tscn @@ -8,7 +8,6 @@ background_mode = 1 ambient_light_source = 2 ambient_light_color = Color(1, 1, 1, 1) tonemap_white = 16.0 -adjustment_enabled = true [node name="Level" type="Node3D" unique_id=1064267917] @@ -19,12 +18,12 @@ environment = SubResource("Environment_srpys") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.46142268) [node name="Camera3D" type="Camera3D" parent="." unique_id=543279419] -transform = Transform3D(-1, 1.3072795e-08, 8.6439826e-08, 0, 0.98875636, -0.14953534, -8.742278e-08, -0.14953534, -0.98875636, -0.004, 1.493, -0.938) -fov = 33.14007 +transform = Transform3D(-1, 1.3072807e-08, 8.643983e-08, 2.0009457e-08, 0.99673504, 0.080742076, -8.510209e-08, 0.080742076, -0.99673504, -0.004, 1.6712918, -1.9153945) +fov = 12.441895 [node name="girl" parent="." unique_id=575411908 instance=ExtResource("2_x25rp")] -[node name="Helmet" parent="girl/Armature/Skeleton3D" parent_id_path=PackedInt32Array(575411908, 1905349273) index="1" unique_id=1595685542] -visible = true +[node name="Helmet" parent="girl/Armature/Skeleton3D" parent_id_path=PackedInt32Array(575411908, 1126145158) index="2" unique_id=1267990193] +visible = false [editable path="girl"] diff --git a/project/objects/player/girl.tscn b/project/objects/player/girl.tscn index 30be9961..a08927d6 100644 --- a/project/objects/player/girl.tscn +++ b/project/objects/player/girl.tscn @@ -3,6 +3,3 @@ [ext_resource type="PackedScene" uid="uid://cr4y1nqclwsf2" path="res://assets/players/girl/girl.blend" id="1_xv3y3"] [node name="girl" unique_id=575411908 instance=ExtResource("1_xv3y3")] - -[node name="Helmet" parent="Armature/Skeleton3D" parent_id_path=PackedInt32Array(1905349273) index="1" unique_id=1595685542] -visible = false