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/Beintextur.png.import b/3D Input/Beintextur.png.import new file mode 100644 index 0000000..c384a07 --- /dev/null +++ b/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 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 fe92819..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 216ec85..bcaea28 100644 Binary files a/3D Input/Mensch_Bein.blend1 and b/3D Input/Mensch_Bein.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/3D Input/beinimage.png.import b/3D Input/beinimage.png.import new file mode 100644 index 0000000..9f17b69 --- /dev/null +++ b/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 diff --git a/BodyConfig/bodyBuildingScript.gd b/BodyConfig/bodyBuildingScript.gd index 23a958b..2dbc13e 100644 --- a/BodyConfig/bodyBuildingScript.gd +++ b/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") - if limb != null: + #no _attachment_point + 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 body_part != null: - body_part.queue_free() - - - + if _attachment_point != null: + var body_part = _attachment_point.get_node("Limb").get_child(0) + if body_part != null: + body_part.queue_free() diff --git a/BodyParts/BodyBase/BodyBase.tscn b/BodyParts/BodyBase/BodyBase.tscn index a7153f3..cfc08d5 100644 --- a/BodyParts/BodyBase/BodyBase.tscn +++ b/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 )