This commit is contained in:
karl 2020-02-01 11:29:43 +01:00
parent 214a10d794
commit bcfdd2c6c6
2 changed files with 15 additions and 29 deletions

View File

@ -1,9 +1,7 @@
extends "res://Ingame/BodyParts/PushingBodyPart.gd" extends PushingBodyPart
# Declare member variables here. Examples: onready var anim = get_node("Mesh/AnimationPlayer")
# var a: int = 2
# var b: String = "text"
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
@ -11,6 +9,14 @@ func _ready() -> void:
pass # Replace with function body. pass # Replace with function body.
func action():
anim.play("ArmatureAction001")
func push(body):
# TODO: Hardcoded values - maybe try to generalize
base.apply_impulse(transform.basis.xform(Vector3(0.0, 0.0, -3.0)), base.transform.basis.y * 10.0)
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta: float) -> void: #func _process(delta: float) -> void:
# pass # pass

View File

@ -2,30 +2,7 @@
[ext_resource path="res://Ingame/BodyParts/PushingBodyPart.tscn" type="PackedScene" id=1] [ext_resource path="res://Ingame/BodyParts/PushingBodyPart.tscn" type="PackedScene" id=1]
[ext_resource path="res://3D Input/untitled.glb" type="PackedScene" id=2] [ext_resource path="res://3D Input/untitled.glb" type="PackedScene" id=2]
[ext_resource path="res://Ingame/BodyParts/Arm.gd" type="Script" id=3]
[sub_resource type="GDScript" id=1]
script/source = "extends PushingBodyPart
onready var anim = get_node(\"Mesh/AnimationPlayer\")
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
pass # Replace with function body.
func action():
anim.play(\"ArmatureAction001\")
func push(body):
base.apply_impulse(touch_area.transform.origin, base.transform.basis.y * 6.0)
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta: float) -> void:
# pass
"
[sub_resource type="SphereShape" id=4] [sub_resource type="SphereShape" id=4]
@ -33,7 +10,7 @@ func push(body):
radius = 0.591769 radius = 0.591769
[node name="Arm" instance=ExtResource( 1 )] [node name="Arm" instance=ExtResource( 1 )]
script = SubResource( 1 ) script = ExtResource( 3 )
[node name="PartCollider" parent="." index="0"] [node name="PartCollider" parent="." index="0"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -8 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -8 )
@ -41,6 +18,9 @@ shape = SubResource( 4 )
[node name="Mesh" parent="." index="1" instance=ExtResource( 2 )] [node name="Mesh" parent="." index="1" instance=ExtResource( 2 )]
[node name="Skeleton" parent="Mesh/Armature" index="0"]
bones/2/bound_children = [ NodePath("BoneAttachment") ]
[node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"] [node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"]
transform = Transform( 1, -1.98247e-23, -2.98292e-24, 6.50669e-24, -9.49949e-08, 1, -2.07684e-23, -1, -9.49949e-08, -2.23781e-16, -0.0078205, -5.05441 ) transform = Transform( 1, -1.98247e-23, -2.98292e-24, 6.50669e-24, -9.49949e-08, 1, -2.07684e-23, -1, -9.49949e-08, -2.23781e-16, -0.0078205, -5.05441 )
bone_name = "bone_2" bone_name = "bone_2"