gamejam/bodypartfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added collision-areas to the AttachmentPoints. Restructured the testing scene with new torso.

Browse Source
This commit is contained in:
mathias 2020-02-01 12:02:39 +01:00
parent 7e7cffab61
commit 6b23bb8af8
9 changed files with 55 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ingame/BodyBase/BodyBase.gd
View File

@ -1,5 +1,5 @@
extends RigidBody extends Spatial
class_name BodyBaseNew class_name BodyBase
# Declare member variables here. Examples: # Declare member variables here. Examples:
# var a = 2 # var a = 2

32
Ingame/BodyBase/BodyBase.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=7 format=2]
[ext_resource path="res://Ingame/BodyBase/BodyBase.gd" type="Script" id=1] [ext_resource path="res://Ingame/BodyBase/BodyBase.gd" type="Script" id=1]
@ -8,6 +8,10 @@
[sub_resource type="SphereMesh" id=3] [sub_resource type="SphereMesh" id=3]
[sub_resource type="SphereShape" id=4]
[sub_resource type="SphereShape" id=5]
[node name="Torso" type="RigidBody"] [node name="Torso" type="RigidBody"]
script = ExtResource( 1 ) script = ExtResource( 1 )
@ -18,12 +22,30 @@ material/0 = null
[node name="TorsoCollider" type="CollisionShape" parent="."] [node name="TorsoCollider" type="CollisionShape" parent="."]
shape = SubResource( 2 ) shape = SubResource( 2 )
[node name="FrontLeftAttachMent" type="MeshInstance" parent="."] [node name="FrontLeft" type="Spatial" parent="."]
transform = Transform( -4.88762e-08, 0, 0.3, 0, 0.3, 0, -0.3, 0, -4.88762e-08, 0.6, 0, 1 ) transform = Transform( 1.62921e-07, -5.30863e-14, -1, -3.25841e-07, -1, 0, -1, 3.25841e-07, -1.62921e-07, 0.6, 0, 1 )
[node name="FrontLeftAttachMent" type="MeshInstance" parent="FrontLeft"]
transform = Transform( 0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0 )
mesh = SubResource( 3 ) mesh = SubResource( 3 )
material/0 = null material/0 = null
[node name="FrontRightAttachMent" type="MeshInstance" parent="."] [node name="Area" type="Area" parent="FrontLeft"]
transform = Transform( -4.88762e-08, 0, -0.3, 0, 0.3, 0, 0.3, 0, -4.88762e-08, -0.6, 0, 1 )
[node name="CollisionShape" type="CollisionShape" parent="FrontLeft/Area"]
transform = Transform( 0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0 )
shape = SubResource( 4 )
[node name="FrontRight" type="Spatial" parent="."]
transform = Transform( 1.62921e-07, -5.30863e-14, 1, -3.25841e-07, -1, 0, 1, -3.25841e-07, -1.62921e-07, -0.6, 0, 1 )
[node name="FrontRightAttachMent" type="MeshInstance" parent="FrontRight"]
transform = Transform( 0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0 )
mesh = SubResource( 3 ) mesh = SubResource( 3 )
material/0 = null material/0 = null
[node name="Area" type="Area" parent="FrontRight"]
[node name="CollisionShape" type="CollisionShape" parent="FrontRight/Area"]
transform = Transform( 0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0 )
shape = SubResource( 5 )

2
Ingame/BodyParts/Arm.gd
View File

@ -10,7 +10,7 @@ func _ready() -> void:
func action(): func action():
anim.play("ArmatureAction001") anim.play("ArmatureAction.001")
func push(body): func push(body):

14
Ingame/BodyParts/Arm.tscn
View File

@ -4,17 +4,17 @@
[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] [ext_resource path="res://Ingame/BodyParts/Arm.gd" type="Script" id=3]
[sub_resource type="SphereShape" id=4] [sub_resource type="SphereShape" id=1]
[sub_resource type="SphereShape" id=3] [sub_resource type="SphereShape" id=2]
radius = 0.591769 radius = 0.591769
[node name="Arm" instance=ExtResource( 1 )] [node name="Arm" index="0" instance=ExtResource( 1 )]
script = ExtResource( 3 ) 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 )
shape = SubResource( 4 ) shape = SubResource( 1 )
[node name="Mesh" parent="." index="1" instance=ExtResource( 2 )] [node name="Mesh" parent="." index="1" instance=ExtResource( 2 )]
@ -22,17 +22,17 @@ shape = SubResource( 4 )
bones/2/bound_children = [ NodePath("BoneAttachment") ] 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.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 )
bone_name = "bone_2" bone_name = "bone_2"
[node name="RemoteTransform" type="RemoteTransform" parent="Mesh/Armature/Skeleton/BoneAttachment" index="0"] [node name="RemoteTransform" type="RemoteTransform" parent="Mesh/Armature/Skeleton/BoneAttachment" index="0"]
remote_path = NodePath("../../../../../TouchArea") remote_path = NodePath("../../../../../TouchArea")
[node name="TouchArea" parent="." index="2"] [node name="TouchArea" parent="." index="2"]
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, -7.60024 ) 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, -7.60024 )
[node name="CollisionShape" type="CollisionShape" parent="TouchArea" index="0"] [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, 2.23781e-16, 0.399765, 0.00782054 ) transform = Transform( 1, 2.98291e-24, -1.98247e-23, -2.07684e-23, -9.49949e-08, -1, -6.50669e-24, 1, -9.49949e-08, 2.23781e-16, 0.399765, 0.00782054 )
shape = SubResource( 3 ) shape = SubResource( 2 )
[editable path="Mesh"] [editable path="Mesh"]

2
Ingame/BodyParts/BodyBase.gd
View File

@ -1,5 +1,5 @@
extends Spatial extends Spatial
class_name BodyBase class_name BodyBaseOld
# Declare member variables here. Examples: # Declare member variables here. Examples:

4
Ingame/BodyParts/BodyPart.gd
View File

@ -1,10 +1,10 @@
extends Spatial extends Spatial
class_name BodyPart class_name BodyPart
# Must be the direct child of a BodyBase # Must be the direct child of an AttachmentPoint of the BodyBase
onready var base = get_parent() onready var base = get_parent().get_parent()
onready var physics_shape = get_node("PartCollider") onready var physics_shape = get_node("PartCollider")
export(int) var key export(int) var key

2
Ingame/BodyParts/PushingBodyPart.tscn
View File

@ -3,7 +3,7 @@
[ext_resource path="res://Ingame/BodyParts/BodyPart.tscn" type="PackedScene" id=1] [ext_resource path="res://Ingame/BodyParts/BodyPart.tscn" type="PackedScene" id=1]
[ext_resource path="res://Ingame/BodyParts/PushingBodyPart.gd" type="Script" id=2] [ext_resource path="res://Ingame/BodyParts/PushingBodyPart.gd" type="Script" id=2]
[node name="PushingBodyPart" instance=ExtResource( 1 )] [node name="PushingBodyPart" index="0" instance=ExtResource( 1 )]
script = ExtResource( 2 ) script = ExtResource( 2 )
[node name="TouchArea" type="Area" parent="." index="1"] [node name="TouchArea" type="Area" parent="." index="1"]

16
Ingame/Testing.tscn
View File

@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://Ingame/BodyParts/Arm.tscn" type="PackedScene" id=1] [ext_resource path="res://Ingame/BodyParts/Arm.tscn" type="PackedScene" id=1]
[ext_resource path="res://Ingame/BodyParts/BodyBase.tscn" type="PackedScene" id=2] [ext_resource path="res://Ingame/BodyBase/BodyBase.tscn" type="PackedScene" id=3]
[sub_resource type="PlaneMesh" id=1] [sub_resource type="PlaneMesh" id=1]
size = Vector2( 10, 10 ) size = Vector2( 10, 10 )
@ -29,13 +29,13 @@ transform = Transform( -4.37114e-08, -0.5, 0.866025, 0, 0.866025, 0.5, -1, 2.185
transform = Transform( 0.999532, 0.0126075, 0.027872, -0.0305909, 0.411942, 0.910697, 0, -0.911123, 0.412135, 0, 0, 0 ) transform = Transform( 0.999532, 0.0126075, 0.027872, -0.0305909, 0.411942, 0.910697, 0, -0.911123, 0.412135, 0, 0, 0 )
shadow_enabled = true shadow_enabled = true
[node name="BodyBase" parent="." instance=ExtResource( 2 )] [node name="Torso" parent="." instance=ExtResource( 3 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 7, 0 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.02111, 0 )
[node name="Arm" parent="BodyBase" instance=ExtResource( 1 )] [node name="Arm" parent="Torso/FrontLeft" index="1" instance=ExtResource( 1 )]
transform = Transform( -0.965926, 0.258819, 0, -0.258819, -0.965926, 0, 0, 0, 1, 0, -4.76837e-07, 0 ) key = 83
[node name="Arm" parent="Torso/FrontRight" index="1" instance=ExtResource( 1 )]
key = 65 key = 65
[node name="Arm2" parent="BodyBase" instance=ExtResource( 1 )] [editable path="Torso"]
transform = Transform( 0.965926, -0.258819, -8.74228e-08, -0.258819, -0.965926, 0, -8.44439e-08, 2.26267e-08, -1, 0, -4.76837e-07, 0 )
key = 83

6
project.godot
View File

@ -12,6 +12,11 @@ _global_script_classes=[ {
"base": "Spatial", "base": "Spatial",
"class": "BodyBase", "class": "BodyBase",
"language": "GDScript", "language": "GDScript",
"path": "res://Ingame/BodyBase/BodyBase.gd"
}, {
"base": "Spatial",
"class": "BodyBaseOld",
"language": "GDScript",
"path": "res://Ingame/BodyParts/BodyBase.gd" "path": "res://Ingame/BodyParts/BodyBase.gd"
}, { }, {
"base": "Spatial", "base": "Spatial",
@ -26,6 +31,7 @@ _global_script_classes=[ {
} ] } ]
_global_script_class_icons={ _global_script_class_icons={
"BodyBase": "", "BodyBase": "",
"BodyBaseOld": "",
"BodyPart": "", "BodyPart": "",
"PushingBodyPart": "" "PushingBodyPart": ""
} }