diff --git a/3D Input/Beintextur.png b/3D Input/Beintextur.png new file mode 100644 index 0000000..9e98dbe Binary files /dev/null and b/3D Input/Beintextur.png differ diff --git a/3D Input/Grundkörper_3.blend b/3D Input/Grundkörper_3.blend index 43df6b8..ebf09a4 100644 Binary files a/3D Input/Grundkörper_3.blend and b/3D Input/Grundkörper_3.blend differ diff --git a/3D Input/Grundkörper_3.blend1 b/3D Input/Grundkörper_3.blend1 index 6ea74d4..e39e817 100644 Binary files a/3D Input/Grundkörper_3.blend1 and b/3D Input/Grundkörper_3.blend1 differ diff --git a/3D Input/Mensch_Bein.blend b/3D Input/Mensch_Bein.blend index 216ec85..1298a2e 100644 Binary files a/3D Input/Mensch_Bein.blend and b/3D Input/Mensch_Bein.blend differ diff --git a/3D Input/Mensch_Bein.blend1 b/3D Input/Mensch_Bein.blend1 index 7113e98..bcaea28 100644 Binary files a/3D Input/Mensch_Bein.blend1 and b/3D Input/Mensch_Bein.blend1 differ diff --git a/3D Input/Mensch_Hand.blend b/3D Input/Mensch_Hand.blend new file mode 100644 index 0000000..37550ce Binary files /dev/null and b/3D Input/Mensch_Hand.blend differ diff --git a/3D Input/Mensch_Hand.blend1 b/3D Input/Mensch_Hand.blend1 new file mode 100644 index 0000000..9c1b4a0 Binary files /dev/null and b/3D Input/Mensch_Hand.blend1 differ diff --git a/3D Input/alt/Bein_Mensch.blend b/3D Input/alt/Bein_Mensch.blend new file mode 100644 index 0000000..f45e647 Binary files /dev/null and b/3D Input/alt/Bein_Mensch.blend differ diff --git a/3D Input/alt/Bein_Pferd.blend b/3D Input/alt/Bein_Pferd.blend new file mode 100644 index 0000000..1944215 Binary files /dev/null and b/3D Input/alt/Bein_Pferd.blend differ diff --git a/3D Input/Kopf_Stier.blend b/3D Input/alt/Kopf_Stier.blend similarity index 100% rename from 3D Input/Kopf_Stier.blend rename to 3D Input/alt/Kopf_Stier.blend diff --git a/3D Input/Kopf_Vogel.blend b/3D Input/alt/Kopf_Vogel.blend similarity index 100% rename from 3D Input/Kopf_Vogel.blend rename to 3D Input/alt/Kopf_Vogel.blend diff --git a/3D Input/beinimage.png b/3D Input/beinimage.png new file mode 100644 index 0000000..6edf3af Binary files /dev/null and b/3D Input/beinimage.png differ diff --git a/BodyParts/Arm.tscn b/BodyParts/Arm.tscn index 0413105..63e9496 100644 --- a/BodyParts/Arm.tscn +++ b/BodyParts/Arm.tscn @@ -13,8 +13,6 @@ radius = 0.591769 [node name="Arm" instance=ExtResource( 1 )] script = ExtResource( 3 ) -key = 0 -damage = 10.0 [node name="PartCollider" parent="." index="0"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.83 ) @@ -29,14 +27,14 @@ visible = false transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) [node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"] -transform = Transform( 1, -1.98292e-23, -3.18966e-24, 6.71348e-24, -9.49949e-08, 1, -2.07636e-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" [node name="RemoteTransform" type="RemoteTransform" parent="Mesh/Armature/Skeleton/BoneAttachment" index="0"] remote_path = NodePath("../../../../../TouchArea") [node name="TouchArea" parent="." index="2"] -transform = Transform( 1, -1.98292e-23, -3.18966e-24, 6.71348e-24, -9.49949e-08, 1, -2.07636e-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 ) [node name="CollisionShape" type="CollisionShape" parent="TouchArea" index="0"] transform = Transform( 1, 2.98291e-24, -1.98247e-23, -2.07684e-23, -9.49949e-08, -1, -6.50669e-24, 1, -9.49949e-08, 0, 0, 0 ) diff --git a/BodyParts/BodyBase/AttachmentPoint.tscn b/BodyParts/BodyBase/AttachmentPoint.tscn index a579df7..c123639 100644 --- a/BodyParts/BodyBase/AttachmentPoint.tscn +++ b/BodyParts/BodyBase/AttachmentPoint.tscn @@ -5,7 +5,6 @@ [sub_resource type="SphereShape" id=2] [node name="AttachmentPoint" type="Spatial"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) [node name="Mesh" type="MeshInstance" parent="."] transform = Transform( 0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0 ) diff --git a/BodyParts/BodyBase/BodyBase.tscn b/BodyParts/BodyBase/BodyBase.tscn index eb25341..cfc08d5 100644 --- a/BodyParts/BodyBase/BodyBase.tscn +++ b/BodyParts/BodyBase/BodyBase.tscn @@ -5,7 +5,7 @@ [sub_resource type="CapsuleMesh" id=1] -[sub_resource type="CapsuleShape" id=2] +[sub_resource type="CapsuleShape" id=1] [node name="Torso" type="RigidBody"] script = ExtResource( 1 ) @@ -16,7 +16,7 @@ material/0 = null [node name="TorsoCollider" type="CollisionShape" parent="."] transform = Transform( 0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0 ) -shape = SubResource( 2 ) +shape = SubResource( 1 ) [node name="FrontLeft" parent="." instance=ExtResource( 2 )] transform = Transform( 0.5, -1.62921e-07, -0.866025, -3.25841e-07, -1, 0, -0.866025, 2.82187e-07, -0.5, 0.6, 0, 1 ) diff --git a/BodyParts/BodyPart.gd b/BodyParts/BodyPart.gd index 64fc552..c0849d4 100644 --- a/BodyParts/BodyPart.gd +++ b/BodyParts/BodyPart.gd @@ -15,8 +15,6 @@ var setup_done = false # Called when the node enters the scene tree for the first time. func _ready() -> void: assert(base is BodyBase) - - func _process(delta: float) -> void: diff --git a/BodyParts/BodyPart.tscn b/BodyParts/BodyPart.tscn index 8581c4b..ec58519 100644 --- a/BodyParts/BodyPart.tscn +++ b/BodyParts/BodyPart.tscn @@ -2,7 +2,6 @@ [ext_resource path="res://BodyParts/BodyPart.gd" type="Script" id=1] - [node name="BodyPart" type="Spatial"] script = ExtResource( 1 ) diff --git a/Ingame/Testing.tscn b/Ingame/Testing.tscn index 310dcba..647993d 100644 --- a/Ingame/Testing.tscn +++ b/Ingame/Testing.tscn @@ -12,29 +12,33 @@ script = ExtResource( 4 ) [node name="Camera" type="Camera" parent="."] transform = Transform( -4.37114e-08, -0.5, 0.866025, 0, 0.866025, 0.5, -1, 2.18557e-08, -3.78552e-08, 17, 9, -2 ) -[node name="Torso" parent="." instance=ExtResource( 3 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.02111, 0 ) - -[node name="Arm" parent="Torso/FrontLeft" index="1" instance=ExtResource( 1 )] -key = 83 - -[node name="Arm" parent="Torso/FrontRight" index="1" instance=ExtResource( 1 )] -key = 65 - -[node name="Torso2" parent="." instance=ExtResource( 3 )] -transform = Transform( -0.866025, -0.353553, -0.353554, -1.0677e-07, -0.707107, 0.707106, -0.5, 0.612372, 0.612373, 0, 3.02111, -9 ) -player_id = 1 - -[node name="Arm" parent="Torso2/FrontLeft" index="1" instance=ExtResource( 1 )] -key = 81 - -[node name="Arm" parent="Torso2/FrontRight" index="1" instance=ExtResource( 1 )] -key = 87 - [node name="UI" parent="." instance=ExtResource( 2 )] [node name="Arena" parent="." instance=ExtResource( 5 )] +[node name="Torso" parent="." instance=ExtResource( 3 )] + +[node name="Arm" parent="Torso/FrontLeft/Limb" index="0" instance=ExtResource( 1 )] +key = 65 + +[node name="Arm" parent="Torso/FrontRight/Limb" index="0" instance=ExtResource( 1 )] +key = 83 + +[node name="Torso2" parent="." instance=ExtResource( 3 )] + +[node name="Arm" parent="Torso2/FrontLeft/Limb" index="0" instance=ExtResource( 1 )] +transform = Transform( 1, 2.84217e-14, 0, -2.84217e-14, 1, 0, 0, 0, 1, 0, 0, 0 ) + +[node name="Arm" parent="Torso2/FrontRight/Limb" index="0" instance=ExtResource( 1 )] + [editable path="Torso"] +[editable path="Torso/FrontLeft"] + +[editable path="Torso/FrontRight"] + [editable path="Torso2"] + +[editable path="Torso2/FrontLeft"] + +[editable path="Torso2/FrontRight"] diff --git a/project.godot b/project.godot index 0337e80..c6ecc5d 100644 --- a/project.godot +++ b/project.godot @@ -38,8 +38,8 @@ config/icon="res://icon.png" [autoload] -InGameState="*res://Global/InGameState.gd" BodyPartLoader="*res://Global/BodyPartLoader.gd" +InGameState="*res://Global/InGameState.gd" [rendering]