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

3D Input/Stierbg.jpg.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Stierbg.jpg-b439c056e778b8fb16ae62aa15547147.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://3D Input/Stierbg.jpg"
+dest_files=[ "res://.import/Stierbg.jpg-b439c056e778b8fb16ae62aa15547147.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/horselegimg.jpg.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/horselegimg.jpg-8935d9a9effef767d66fb9866f38d2c4.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://3D Input/horselegimg.jpg"
+dest_files=[ "res://.import/horselegimg.jpg-8935d9a9effef767d66fb9866f38d2c4.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/LoadBodyParts.gd

@@ -0,0 +1,14 @@
+extends VBoxContainer
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	for entry in BodyPartLoader.bodyparts:
+		#var button = Button.new()
+		#button.text = entry.key
+		pass
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+#	pass

BodyConfig/bodyBuilderMenu.tscn

@@ -1,8 +1,8 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://BodyParts/Tesso.tscn" type="PackedScene" id=1]
+[ext_resource path="res://BodyParts/BodyBase/BodyBase.tscn" type="PackedScene" id=1]
 [ext_resource path="res://BodyConfig/bodyBuildingScript.gd" type="Script" id=2]
-
+[ext_resource path="res://BodyConfig/LoadBodyParts.gd" type="Script" id=3]
 
 [node name="Body Builder Menu" type="Spatial"]
 script = ExtResource( 2 )
@@ -30,29 +30,7 @@ __meta__ = {
 margin_right = 300.0
 margin_bottom = 600.0
 rect_min_size = Vector2( 300, 500 )
-
+script = ExtResource( 3 )
-[node name="Button" type="Button" parent="GUI/HBoxC/VBoxC"]
-margin_right = 300.0
-margin_bottom = 20.0
-text = "Button 1"
-
-[node name="Button2" type="Button" parent="GUI/HBoxC/VBoxC"]
-margin_top = 24.0
-margin_right = 300.0
-margin_bottom = 44.0
-text = "Button 2"
-
-[node name="Button3" type="Button" parent="GUI/HBoxC/VBoxC"]
-margin_top = 48.0
-margin_right = 300.0
-margin_bottom = 68.0
-text = "Button 3"
-
-[node name="Button4" type="Button" parent="GUI/HBoxC/VBoxC"]
-margin_top = 72.0
-margin_right = 300.0
-margin_bottom = 92.0
-text = "Button 4"
 
 [node name="ViewportContainer" type="ViewportContainer" parent="GUI/HBoxC"]
 margin_left = 304.0
@@ -73,5 +51,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 3 )
 
 [node name="MouseLook" type="RayCast" parent="GUI/HBoxC/ViewportContainer/Viewport"]
 enabled = true
+collide_with_areas = true
+collide_with_bodies = false
 
 [node name="Torso" parent="." instance=ExtResource( 1 )]

BodyConfig/bodyBuildingScript.gd

@@ -70,13 +70,11 @@ func _physics_process(delta):
 
 
 func _input(event):
-	if _viewport.get_viewport().get_mouse_position().x >= 0:
+	if event is InputEventMouseButton:
-		if event is InputEventMouseButton:
+		if event.pressed and _viewport.get_viewport().get_mouse_position().x >= 0:
-			if event.pressed:
+			print("Mouse Click at: ", event.position)
-				print("Mouse Click at: ", event.position)
+			_prev_mouse_pos = event.position
-				_prev_mouse_pos = event.position
+			_viewRot = true
-				_viewRot = true
+		else: 
-			else: 
+			print("mouse unpressed at: ", event.position)
-				print("mouse unpressed at: ", event.position)
+			_viewRot = false
-				_viewRot = false
-	

BodyParts/BodyBase/BodyBase.tscn

@@ -20,6 +20,7 @@ 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( 2 )
 
 [node name="FrontLeft" type="Spatial" parent="."]

Global/BodyPartLoader.gd

@@ -0,0 +1,7 @@
+extends Node
+
+var bodyparts : Dictionary
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	bodyparts["Arm"] = load("res://BodyParts/Arm.tscn")

project.godot

@@ -33,12 +33,11 @@ _global_script_class_icons={
 [application]
 
 config/name="BodyPartFighter"
-run/main_scene="res://Ingame/Testing.tscn"
 config/icon="res://icon.png"
 
 [autoload]
 
-InGameState="*res://Global/InGameState.gd"
+BodyPartLoader="*res://Global/BodyPartLoader.gd"
 
 [rendering]