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

3D Input/Beintextur.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Beintextur.png-2ae020ac9731826dac97bd29939f551e.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://3D Input/Beintextur.png"
+dest_files=[ "res://.import/Beintextur.png-2ae020ac9731826dac97bd29939f551e.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+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
+svg/scale=1.0

3D Input/beinimage.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/beinimage.png-a7e3863a81de772333653d8998415984.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://3D Input/beinimage.png"
+dest_files=[ "res://.import/beinimage.png-a7e3863a81de772333653d8998415984.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+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
+svg/scale=1.0

BodyConfig/bodyBuildingScript.gd

@@ -87,13 +87,21 @@ func _input(event):
 					_prev_mouse_pos = event.position
 					_viewRot = true
 			else: 
-				print("mouse unpressed at: ", event.position)
 				_viewRot = false
 
 
 func body_part_chosen(params):
-	var limb = _attachment_point.get_node("Limb")
+	#no _attachment_point 
-	if limb != null:
+	if _attachment_point != null:
+		var limb = _attachment_point.get_node("Limb")
+		
+		#adding only possible if no first child
+		#if limb.get_child(0) == null:
+		#	limb.add_child(BodyPartLoader.bodyparts[params].instance())
+		
+		#if spot already taken, DELETE
+		if limb.get_child(0) != null:
+			delete_body_part()
 		limb.add_child(BodyPartLoader.bodyparts[params].instance())
 
 
@@ -103,10 +111,8 @@ func make_it_shine(highlight : bool):
 
 
 func delete_body_part():
-	var body_part = _attachment_point.get_node("Limb").get_child(0)
+	if _attachment_point != null:
-	if body_part != null:
+		var body_part = _attachment_point.get_node("Limb").get_child(0)
-		body_part.queue_free()
+		if body_part != null:
-
+			body_part.queue_free()
-
-
 

BodyParts/BodyBase/BodyBase.tscn

@@ -2,13 +2,18 @@
 
 [ext_resource path="res://BodyParts/BodyBase/BodyBase.gd" type="Script" id=1]
 [ext_resource path="res://BodyParts/BodyBase/AttachmentPoint.tscn" type="PackedScene" id=2]
-[ext_resource path="res://3D Input/Fertige GLBs/Torso.glb" type="PackedScene" id=3]
+
+[sub_resource type="CapsuleMesh" id=1]
 
 [sub_resource type="CapsuleShape" id=1]
 
 [node name="Torso" type="RigidBody"]
 script = ExtResource( 1 )
 
+[node name="TorsoMesh" type="MeshInstance" parent="."]
+mesh = SubResource( 1 )
+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( 1 )
@@ -18,6 +23,3 @@ transform = Transform( 0.5, -1.62921e-07, -0.866025, -3.25841e-07, -1, 0, -0.866
 
 [node name="FrontRight" parent="." instance=ExtResource( 2 )]
 transform = Transform( -0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, -0.5, -0.6, 0, 1 )
-
-[node name="Mesh" parent="." instance=ExtResource( 3 )]
-transform = Transform( 0.2, 0, 0, 0, -8.74228e-09, 0.2, 0, -0.2, -8.74228e-09, 0, 0, 0 )