diff --git a/assets/pickaxe_arm.glb b/assets/pickaxe_arm.glb index 9c676a8..d441e82 100644 Binary files a/assets/pickaxe_arm.glb and b/assets/pickaxe_arm.glb differ diff --git a/assets/pickaxe_arm.glb.import b/assets/pickaxe_arm.glb.import index 3464c83..3723c51 100644 --- a/assets/pickaxe_arm.glb.import +++ b/assets/pickaxe_arm.glb.import @@ -3,7 +3,7 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://ccggyhqyue6fr" +uid="uid://d1o8g8quh77ll" path="res://.godot/imported/pickaxe_arm.glb-fc7bd95af30a47e37063710c848429b2.scn" [deps] diff --git a/pickaxe_arm.blend b/pickaxe_arm.blend index a4a170c..0cdf6f4 100644 Binary files a/pickaxe_arm.blend and b/pickaxe_arm.blend differ diff --git a/pickaxe_arm.blend1 b/pickaxe_arm.blend1 index c2604e4..13416a3 100644 Binary files a/pickaxe_arm.blend1 and b/pickaxe_arm.blend1 differ diff --git a/scenes/body.tscn b/scenes/body.tscn index 83cb40e..721665d 100644 --- a/scenes/body.tscn +++ b/scenes/body.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=3 format=3 uid="uid://dgm3241ceqpim"] +[gd_scene load_steps=4 format=3 uid="uid://dgm3241ceqpim"] -[ext_resource type="Script" path="res://body.gd" id="1_21au4"] +[ext_resource type="Script" path="res://scripts/body.gd" id="1_21au4"] +[ext_resource type="PackedScene" uid="uid://nusoljma3t55" path="res://scenes/pickaxe_arm.tscn" id="2_m4hhp"] [sub_resource type="SphereMesh" id="SphereMesh_jcpb6"] radius = 5.0 @@ -12,5 +13,7 @@ script = ExtResource("1_21au4") [node name="MeshInstance3D" type="MeshInstance3D" parent="."] mesh = SubResource("SphereMesh_jcpb6") -[node name="Marker3D" type="Marker3D" parent="."] +[node name="ArmPivot" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.03716, 0) + +[node name="pickaxe_arm" parent="ArmPivot" instance=ExtResource("2_m4hhp")] diff --git a/scenes/icepick_arm.tscn b/scenes/icepick_arm.tscn deleted file mode 100644 index 17fe165..0000000 --- a/scenes/icepick_arm.tscn +++ /dev/null @@ -1,19 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://cgqpfh5j5v3yd"] - -[ext_resource type="PackedScene" uid="uid://ccggyhqyue6fr" path="res://assets/pickaxe_arm.glb" id="1_grvsx"] - -[node name="pickaxe_arm" instance=ExtResource("1_grvsx")] - -[node name="Sphere_004" parent="Armature/Skeleton3D" index="0"] -transform = Transform3D(0.919691, 0, -2.19271e-07, 0, 0.919691, 0, 2.19271e-07, 0, 0.919691, 0, -9.53674e-07, 0) - -[node name="Sphere_001" parent="Armature/Skeleton3D" index="1"] -transform = Transform3D(0.919691, 0, 0, 0, 0.919691, 0, 0, 0, 0.919691, 0, 0, 0) - -[node name="SkeletonIK3D" type="SkeletonIK3D" parent="Armature/Skeleton3D" index="3"] -root_bone = &"Bone" -tip_bone = &"Bone.011" -target_node = NodePath("../../Target") - -[node name="Target" type="Marker3D" parent="Armature" index="1"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 10.2, 0) diff --git a/scenes/pickaxe_arm.tscn b/scenes/pickaxe_arm.tscn new file mode 100644 index 0000000..5f4a26c --- /dev/null +++ b/scenes/pickaxe_arm.tscn @@ -0,0 +1,19 @@ +[gd_scene load_steps=2 format=3 uid="uid://nusoljma3t55"] + +[ext_resource type="PackedScene" uid="uid://d1o8g8quh77ll" path="res://assets/pickaxe_arm.glb" id="1_74cmy"] + +[node name="pickaxe_arm" instance=ExtResource("1_74cmy")] + +[node name="Sphere_004" parent="Skeleton3D" index="0"] +transform = Transform3D(0.919691, 0, -2.19271e-07, 0, 0.919691, 0, 2.19271e-07, 0, 0.919691, -0.000102931, 10, 6.39492e-09) + +[node name="Sphere_001" parent="Skeleton3D" index="1"] +transform = Transform3D(0.919691, 0, 0, 0, 0.919691, 0, 0, 0, 0.919691, 0, 0, 0) + +[node name="SkeletonIK3D" type="SkeletonIK3D" parent="Skeleton3D" index="3"] +root_bone = &"Bone" +tip_bone = &"Bone.011" +target_node = NodePath("../../Target") + +[node name="Target" type="Marker3D" parent="." index="1"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 10.1, 0)