mergin'
This commit is contained in:
parent
db1eeebfcf
commit
27fd9647be
3 changed files with 12 additions and 15 deletions
|
@ -1,7 +1,6 @@
|
|||
[gd_scene load_steps=4 format=3 uid="uid://dgm3241ceqpim"]
|
||||
[gd_scene load_steps=3 format=3 uid="uid://dgm3241ceqpim"]
|
||||
|
||||
[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
|
||||
|
@ -13,7 +12,5 @@ script = ExtResource("1_21au4")
|
|||
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
|
||||
mesh = SubResource("SphereMesh_jcpb6")
|
||||
|
||||
[node name="ArmPivot" type="Node3D" parent="."]
|
||||
[node name="Marker3D" type="Marker3D" 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")]
|
||||
|
|
|
@ -1,21 +1,21 @@
|
|||
[gd_scene load_steps=3 format=3 uid="uid://c4aghhlbletw"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://ccggyhqyue6fr" path="res://assets/pickaxe_arm.glb" id="1_grvsx"]
|
||||
[ext_resource type="PackedScene" uid="uid://d1o8g8quh77ll" path="res://assets/pickaxe_arm.glb" id="1_grvsx"]
|
||||
[ext_resource type="Script" path="res://scripts/arm.gd" id="2_u82st"]
|
||||
|
||||
[node name="pickaxe_arm" instance=ExtResource("1_grvsx")]
|
||||
script = ExtResource("2_u82st")
|
||||
|
||||
[node name="Sphere_004" parent="Armature/Skeleton3D" index="0"]
|
||||
transform = Transform3D(0.919691, 0, 0, 0, 0.919691, 0, 0, 0, 0.919691, 0, -9.53674e-07, 0)
|
||||
[node name="Sphere_004" parent="Skeleton3D" index="0"]
|
||||
transform = Transform3D(0.919691, 0, 0, 0, 0.919691, 0, 0, 0, 0.919691, -0.000102931, 10, 6.41946e-09)
|
||||
|
||||
[node name="Sphere_001" parent="Armature/Skeleton3D" index="1"]
|
||||
[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="Armature/Skeleton3D" index="3"]
|
||||
[node name="Target" type="Marker3D" parent="." index="1"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 10.2, 0)
|
||||
|
||||
[node name="SkeletonIK3D" type="SkeletonIK3D" parent="." index="2"]
|
||||
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)
|
||||
|
|
|
@ -9,8 +9,8 @@ signal arm_disabled(arm)
|
|||
# Called when the node enters the scene tree for the first time.
|
||||
func _ready() -> void:
|
||||
for arm in arms:
|
||||
arm_enabled.connect(arm.arm_enabled)
|
||||
arm_disabled.connect(arm.arm_disabled)
|
||||
arm_enabled.connect(arm._arm_enabled)
|
||||
arm_disabled.connect(arm._arm_disabled)
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
func _physics_process(delta: float) -> void:
|
||||
|
|
Loading…
Add table
Reference in a new issue