Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter

3D Input/stiertextur.png.import

@@ -2,33 +2,35 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/stiertextur.png-deb6038266d9a20bfe850d7c34f3aec9.stex"
+path.s3tc="res://.import/stiertextur.png-deb6038266d9a20bfe850d7c34f3aec9.s3tc.stex"
+path.etc2="res://.import/stiertextur.png-deb6038266d9a20bfe850d7c34f3aec9.etc2.stex"
 metadata={
-"vram_texture": false
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://3D Input/stiertextur.png"
-dest_files=[ "res://.import/stiertextur.png-deb6038266d9a20bfe850d7c34f3aec9.stex" ]
+dest_files=[ "res://.import/stiertextur.png-deb6038266d9a20bfe850d7c34f3aec9.s3tc.stex", "res://.import/stiertextur.png-deb6038266d9a20bfe850d7c34f3aec9.etc2.stex" ]
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=true
 flags/filter=true
-flags/mipmaps=false
+flags/mipmaps=true
 flags/anisotropic=false
-flags/srgb=2
+flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false
 svg/scale=1.0

BodyParts/BullHead.gd

@@ -0,0 +1,16 @@
+extends PushingBodyPart
+
+
+# Declare member variables here. Examples:
+# var a = 2
+# var b = "text"
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+#	pass

BodyParts/BullHead.tscn

@@ -0,0 +1,40 @@
+[gd_scene load_steps=7 format=2]
+
+[ext_resource path="res://BodyParts/PushingBodyPart.tscn" type="PackedScene" id=1]
+[ext_resource path="res://BodyParts/BullHead.gd" type="Script" id=2]
+[ext_resource path="res://3D Input/Fertige GLBs/Kopf_Stier.glb" type="PackedScene" id=3]
+[ext_resource path="res://3D Input/stiertextur.png" type="Texture" id=4]
+
+[sub_resource type="CylinderShape" id=1]
+height = 1.94931
+
+[sub_resource type="SpatialMaterial" id=2]
+albedo_texture = ExtResource( 4 )
+
+[node name="Bullhead" instance=ExtResource( 1 )]
+transform = Transform( -1, 3.25841e-07, 0, 5.30863e-14, 1.62921e-07, -1, -3.25841e-07, -1, -1.62921e-07, 0, -3.28412, 0.289329 )
+script = ExtResource( 2 )
+
+[node name="TouchArea" parent="." index="1"]
+transform = Transform( -1.71568, 8.52651e-14, 1.49989e-07, 1.27871e-07, -0.89673, 1.46268, 7.83945e-08, 1.46267, 0.89673, -0.002635, -0.0220304, -0.00495291 )
+
+[node name="CollisionShape" type="CollisionShape" parent="TouchArea" index="0"]
+transform = Transform( 1, 0, 8.88178e-15, 0, 1, -2.98023e-08, -1.06581e-14, 0, 1, 0, 0, 0 )
+shape = SubResource( 1 )
+
+[node name="Mesh" parent="." index="4" instance=ExtResource( 3 )]
+
+[node name="Skeleton" parent="Mesh/Armature" index="0"]
+bones/2/bound_children = [ NodePath("BoneAttachment") ]
+
+[node name="Cube" parent="Mesh/Armature/Skeleton" index="0"]
+material/0 = SubResource( 2 )
+
+[node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"]
+transform = Transform( -1, 2.84217e-14, 8.74227e-08, 3.11325e-08, 0.934442, 0.356115, -8.16914e-08, 0.356115, -0.934442, 1.59719e-14, 1.68091, 0.12745 )
+bone_name = "bone_2"
+
+[node name="RemoteTransform" type="RemoteTransform" parent="Mesh/Armature/Skeleton/BoneAttachment" index="0"]
+remote_path = NodePath("../../../../../TouchArea")
+
+[editable path="Mesh"]

Global/BodyPartLoader.gd

@@ -9,3 +9,5 @@ func _ready():
 	bodyparts["Frog Leg"] = load("res://BodyParts/FrogLeg.tscn")
 	bodyparts["Gorilla Arm"] = load("res://BodyParts/GorillaArm.tscn")
 	bodyparts["Horse Leg"] = load("res://BodyParts/HorseLeg.tscn")
+	
+	bodyparts["Bull Head"] = load("res://BodyParts/BullHead.tscn")