diff --git a/asset_dev/characters/clubs/clubs.blend b/asset_dev/characters/clubs/clubs.blend new file mode 100644 index 0000000..7bfc058 --- /dev/null +++ b/asset_dev/characters/clubs/clubs.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21201b892011430f72c9e8eaeccc8ad66e70630410d4d7f03728cc8ee38625a0 +size 911812 diff --git a/asset_dev/characters/clubs/clubs.blend1 b/asset_dev/characters/clubs/clubs.blend1 new file mode 100644 index 0000000..92a0881 Binary files /dev/null and b/asset_dev/characters/clubs/clubs.blend1 differ diff --git a/asset_dev/characters/gfolf_girl/gfolf_girl.blend b/asset_dev/characters/gfolf_girl/gfolf_girl.blend index 7f9784d..3fd75e7 100644 --- a/asset_dev/characters/gfolf_girl/gfolf_girl.blend +++ b/asset_dev/characters/gfolf_girl/gfolf_girl.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab70660ad024b35b7d930a6e72a809378fc48952cfd5b21778d889e6aa91230b -size 3431560 +oid sha256:915bce70bc9989438366b73d04753bb6ee083d718d1597d7db75508243c1be68 +size 3442280 diff --git a/asset_dev/characters/gfolf_girl/gfolf_girl.blend1 b/asset_dev/characters/gfolf_girl/gfolf_girl.blend1 index 312fc7b..456b40a 100644 Binary files a/asset_dev/characters/gfolf_girl/gfolf_girl.blend1 and b/asset_dev/characters/gfolf_girl/gfolf_girl.blend1 differ diff --git a/assets/models/clubs/driver.bin b/assets/models/clubs/driver.bin new file mode 100644 index 0000000..62a348f Binary files /dev/null and b/assets/models/clubs/driver.bin differ diff --git a/assets/models/clubs/driver.gltf b/assets/models/clubs/driver.gltf new file mode 100644 index 0000000..d475e18 --- /dev/null +++ b/assets/models/clubs/driver.gltf @@ -0,0 +1,121 @@ +{ + "asset":{ + "generator":"Khronos glTF Blender I/O v4.2.60", + "version":"2.0" + }, + "scene":0, + "scenes":[ + { + "name":"Scene", + "nodes":[ + 0 + ] + } + ], + "nodes":[ + { + "mesh":0, + "name":"Driver" + } + ], + "materials":[ + { + "doubleSided":true, + "name":"Material", + "pbrMetallicRoughness":{ + "baseColorFactor":[ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1 + ], + "metallicFactor":0, + "roughnessFactor":0.5 + } + } + ], + "meshes":[ + { + "name":"Cube.001", + "primitives":[ + { + "attributes":{ + "POSITION":0, + "NORMAL":1, + "TEXCOORD_0":2 + }, + "indices":3, + "material":0 + } + ] + } + ], + "accessors":[ + { + "bufferView":0, + "componentType":5126, + "count":164, + "max":[ + 0.6112575531005859, + 1.8250000476837158, + 0.4176815152168274 + ], + "min":[ + -0.05376402288675308, + -1.9800440073013306, + -0.05376402288675308 + ], + "type":"VEC3" + }, + { + "bufferView":1, + "componentType":5126, + "count":164, + "type":"VEC3" + }, + { + "bufferView":2, + "componentType":5126, + "count":164, + "type":"VEC2" + }, + { + "bufferView":3, + "componentType":5123, + "count":246, + "type":"SCALAR" + } + ], + "bufferViews":[ + { + "buffer":0, + "byteLength":1968, + "byteOffset":0, + "target":34962 + }, + { + "buffer":0, + "byteLength":1968, + "byteOffset":1968, + "target":34962 + }, + { + "buffer":0, + "byteLength":1312, + "byteOffset":3936, + "target":34962 + }, + { + "buffer":0, + "byteLength":492, + "byteOffset":5248, + "target":34963 + } + ], + "buffers":[ + { + "byteLength":5740, + "uri":"driver.bin" + } + ] +} diff --git a/assets/models/clubs/driver.gltf.import b/assets/models/clubs/driver.gltf.import new file mode 100644 index 0000000..a0ea5e6 --- /dev/null +++ b/assets/models/clubs/driver.gltf.import @@ -0,0 +1,36 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dekwor3a7kqio" +path="res://.godot/imported/driver.gltf-86f10e3eac56a2eef4aed970f2c4d85b.scn" + +[deps] + +source_file="res://assets/models/clubs/driver.gltf" +dest_files=["res://.godot/imported/driver.gltf-86f10e3eac56a2eef4aed970f2c4d85b.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +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/assets/models/clubs/iron.bin b/assets/models/clubs/iron.bin new file mode 100644 index 0000000..e3ed60b Binary files /dev/null and b/assets/models/clubs/iron.bin differ diff --git a/assets/models/clubs/iron.gltf b/assets/models/clubs/iron.gltf new file mode 100644 index 0000000..d6d51e3 --- /dev/null +++ b/assets/models/clubs/iron.gltf @@ -0,0 +1,121 @@ +{ + "asset":{ + "generator":"Khronos glTF Blender I/O v4.2.60", + "version":"2.0" + }, + "scene":0, + "scenes":[ + { + "name":"Scene", + "nodes":[ + 0 + ] + } + ], + "nodes":[ + { + "mesh":0, + "name":"Iron" + } + ], + "materials":[ + { + "doubleSided":true, + "name":"Material", + "pbrMetallicRoughness":{ + "baseColorFactor":[ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1 + ], + "metallicFactor":0, + "roughnessFactor":0.5 + } + } + ], + "meshes":[ + { + "name":"Cube", + "primitives":[ + { + "attributes":{ + "POSITION":0, + "NORMAL":1, + "TEXCOORD_0":2 + }, + "indices":3, + "material":0 + } + ] + } + ], + "accessors":[ + { + "bufferView":0, + "componentType":5126, + "count":126, + "max":[ + 0.5181902050971985, + 1.8250000476837158, + 0.13040459156036377 + ], + "min":[ + -0.05376402288675308, + -1.8918243646621704, + -0.05376402288675308 + ], + "type":"VEC3" + }, + { + "bufferView":1, + "componentType":5126, + "count":126, + "type":"VEC3" + }, + { + "bufferView":2, + "componentType":5126, + "count":126, + "type":"VEC2" + }, + { + "bufferView":3, + "componentType":5123, + "count":192, + "type":"SCALAR" + } + ], + "bufferViews":[ + { + "buffer":0, + "byteLength":1512, + "byteOffset":0, + "target":34962 + }, + { + "buffer":0, + "byteLength":1512, + "byteOffset":1512, + "target":34962 + }, + { + "buffer":0, + "byteLength":1008, + "byteOffset":3024, + "target":34962 + }, + { + "buffer":0, + "byteLength":384, + "byteOffset":4032, + "target":34963 + } + ], + "buffers":[ + { + "byteLength":4416, + "uri":"iron.bin" + } + ] +} diff --git a/assets/models/clubs/iron.gltf.import b/assets/models/clubs/iron.gltf.import new file mode 100644 index 0000000..3174107 --- /dev/null +++ b/assets/models/clubs/iron.gltf.import @@ -0,0 +1,36 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://btpn1j6jwv4pr" +path="res://.godot/imported/iron.gltf-93cf615d2f4119d78d1d3543bb12ef0f.scn" + +[deps] + +source_file="res://assets/models/clubs/iron.gltf" +dest_files=["res://.godot/imported/iron.gltf-93cf615d2f4119d78d1d3543bb12ef0f.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +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/src/characters/gfolf_girl/gfolf_girl.tscn b/src/characters/gfolf_girl/gfolf_girl.tscn index 82454be..dc1efa8 100644 --- a/src/characters/gfolf_girl/gfolf_girl.tscn +++ b/src/characters/gfolf_girl/gfolf_girl.tscn @@ -1,7 +1,9 @@ -[gd_scene load_steps=18 format=3 uid="uid://1s3gywmoi20e"] +[gd_scene load_steps=20 format=3 uid="uid://1s3gywmoi20e"] [ext_resource type="PackedScene" uid="uid://ha6jxf4v5845" path="res://assets/models/characters/gfolf_girl/gfolf_girl.gltf" id="1_j80rr"] [ext_resource type="Script" path="res://src/characters/character_controller.gd" id="2_7o84v"] +[ext_resource type="PackedScene" uid="uid://bfugnkuyflxrd" path="res://src/equipment/clubs/iron.tscn" id="3_fqr7u"] +[ext_resource type="PackedScene" uid="uid://cc5npwiq3m21c" path="res://src/equipment/clubs/driver.tscn" id="4_s7iyi"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_fokhu"] albedo_color = Color(0.226707, 0.226707, 0.226707, 1) @@ -104,7 +106,7 @@ bones/23/rotation = Quaternion(0.000222673, 0.707107, 0.707107, -0.000222504) bones/23/scale = Vector3(1, 1, 1) [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D" index="6"] -transform = Transform3D(0.716166, -0.649102, 0.256463, 0.299879, 0.617999, 0.726739, -0.630221, -0.443557, 0.637242, 2.07189, 5.03856, -0.632428) +transform = Transform3D(-0.945, 0.31608, -0.0840753, -0.325897, -0.931726, 0.160242, -0.0276856, 0.178829, 0.983491, -0.168963, 3.13159, 0.864288) bone_name = "Hand.R" bone_idx = 11 @@ -114,6 +116,7 @@ transform = Transform3D(0.934826, 0.266239, -0.23498, -0.336326, 0.876157, -0.34 [node name="DebugClub" type="MeshInstance3D" parent="Armature/Skeleton3D/BoneAttachment3D/RightHandGrip" index="0"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.205, 0) +visible = false mesh = SubResource("BoxMesh_363n0") skeleton = NodePath("../..") @@ -121,6 +124,13 @@ skeleton = NodePath("../..") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.705, 0.3) mesh = SubResource("BoxMesh_oll6x") +[node name="Iron" parent="Armature/Skeleton3D/BoneAttachment3D/RightHandGrip" index="1" instance=ExtResource("3_fqr7u")] +transform = Transform3D(-7.54979e-08, 8.74228e-08, 1, -8.74228e-08, -1, 8.74228e-08, 1, -8.74228e-08, 7.54979e-08, 0, 1.2, 0) +visible = false + +[node name="Driver" parent="Armature/Skeleton3D/BoneAttachment3D/RightHandGrip" index="2" instance=ExtResource("4_s7iyi")] +transform = Transform3D(-7.63685e-08, 8.75443e-08, 1, -8.9407e-08, -1, 8.84756e-08, 1, -1.78814e-07, 7.82311e-08, -7.45058e-09, 1.2, 2.38419e-07) + [node name="AnimationTree" type="AnimationTree" parent="." index="2"] tree_root = SubResource("AnimationNodeStateMachine_yepp7") anim_player = NodePath("../AnimationPlayer") diff --git a/src/equipment/clubs/driver.tscn b/src/equipment/clubs/driver.tscn new file mode 100644 index 0000000..6ca5a46 --- /dev/null +++ b/src/equipment/clubs/driver.tscn @@ -0,0 +1,5 @@ +[gd_scene load_steps=2 format=3 uid="uid://cc5npwiq3m21c"] + +[ext_resource type="PackedScene" uid="uid://dekwor3a7kqio" path="res://assets/models/clubs/driver.gltf" id="1_8gkvl"] + +[node name="Driver" instance=ExtResource("1_8gkvl")] diff --git a/src/equipment/clubs/iron.tscn b/src/equipment/clubs/iron.tscn new file mode 100644 index 0000000..62711a4 --- /dev/null +++ b/src/equipment/clubs/iron.tscn @@ -0,0 +1,5 @@ +[gd_scene load_steps=2 format=3 uid="uid://bfugnkuyflxrd"] + +[ext_resource type="PackedScene" uid="uid://btpn1j6jwv4pr" path="res://assets/models/clubs/iron.gltf" id="1_dnro0"] + +[node name="Iron" instance=ExtResource("1_dnro0")]