diff --git a/BodyConfig/bodyBuilderMenu.tscn b/BodyConfig/bodyBuilderMenu.tscn index a022634..b7420b0 100644 --- a/BodyConfig/bodyBuilderMenu.tscn +++ b/BodyConfig/bodyBuilderMenu.tscn @@ -58,7 +58,7 @@ handle_input_locally = false render_target_update_mode = 3 [node name="Camera" type="Camera" parent="GUI/HBoxC/ViewportContainer/Viewport"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 7.8064 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 17.1507 ) [node name="MouseLook" type="RayCast" parent="GUI/HBoxC/ViewportContainer/Viewport"] enabled = true @@ -69,5 +69,3 @@ collide_with_bodies = false [connection signal="pressed" from="GUI/HBoxC/VBoxC/Start" to="." method="_on_Start_pressed"] [editable path="Torso"] - -[editable path="Torso/FrontLeft"] diff --git a/BodyParts/BodyBase/AttachmentPoint.tscn b/BodyParts/BodyBase/AttachmentPoint.tscn index c91a9e5..4209fff 100644 --- a/BodyParts/BodyBase/AttachmentPoint.tscn +++ b/BodyParts/BodyBase/AttachmentPoint.tscn @@ -12,7 +12,7 @@ mesh = SubResource( 1 ) material/0 = null [node name="OmniLight" type="OmniLight" parent="."] -transform = Transform( 1, 3.12639e-13, -1.77715e-26, -3.12639e-13, 1, -5.68434e-14, 0, 5.68434e-14, 1, -0.680858, 0, -1.38872 ) +transform = Transform( 1, 3.12639e-13, -1.77715e-26, -3.12639e-13, 1, -5.68434e-14, 0, 5.68434e-14, 1, 0, 0, -1.5 ) visible = false light_color = Color( 0.956863, 0.121569, 0.121569, 1 ) light_energy = 3.86 diff --git a/BodyParts/BodyBase/BodyBase.tscn b/BodyParts/BodyBase/BodyBase.tscn index 0ae8c54..9a00373 100644 --- a/BodyParts/BodyBase/BodyBase.tscn +++ b/BodyParts/BodyBase/BodyBase.tscn @@ -1,38 +1,56 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=5 format=2] [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/Torso.glb" type="PackedScene" id=3] -[sub_resource type="CapsuleMesh" id=1] - -[sub_resource type="CapsuleShape" id=2] +[sub_resource type="CapsuleShape" id=1] [node name="Torso" type="RigidBody" groups=[ "Player", ]] script = ExtResource( 1 ) -[node name="TorsoMesh" type="MeshInstance" parent="."] -visible = false -mesh = SubResource( 1 ) -material/0 = null - [node name="TorsoCollider" type="CollisionShape" parent="."] transform = Transform( 2.5, 0, 0, 0, 2.5, 0, 0, 0, 2.5, 0, 0, 0 ) -shape = SubResource( 2 ) +shape = SubResource( 1 ) [node name="DownFrontLeft" parent="." instance=ExtResource( 2 )] -transform = Transform( 0.996194, 3.24601e-07, -0.0871556, 3.25841e-07, -1, 0, -0.0871556, -2.83989e-08, -0.996194, 1.5, 1.1, 4.2 ) +transform = Transform( -0.965926, 0, -0.258819, 0, 1, 0, 0.258819, 0, -0.965926, 1.3, 1, 4.2 ) + +[node name="Mesh" parent="DownFrontLeft" index="0"] +transform = Transform( 0.2, 0, 3.72529e-09, 0, 0.2, 0, -3.72529e-09, 0, 0.2, 0, 0, 0 ) [node name="DownFrontRight" parent="." instance=ExtResource( 2 )] -transform = Transform( 0.982402, -3.24601e-07, 0.0859489, -3.2133e-07, -1, 0, 0.0859489, -2.83989e-08, -0.982402, -1.5, 1.1, 4.2 ) +transform = Transform( -0.965926, 0, 0.258819, 0, 1, 0, -0.258819, 0, -0.965926, -1.3, 1, 4.2 ) + +[node name="OmniLight" parent="DownFrontRight" index="1"] +transform = Transform( 1, 3.13083e-13, 0, -3.09641e-13, 1, -5.59552e-14, 0, 5.59552e-14, 1, -0.680858, -1.19209e-07, -1.38872 ) + +[node name="CollisionShape" parent="DownFrontRight/Area" index="0"] +transform = Transform( 0.5, 1.4988e-15, 0, 1.4988e-15, 0.5, 0, 0, 0, 0.5, 0, 0, 0 ) [node name="DownBackRight" parent="." instance=ExtResource( 2 )] transform = Transform( 0.982402, -3.24601e-07, 0.0859489, -3.2133e-07, -1, 0, 0.0859489, -2.83989e-08, -0.982402, -1.9, -1, 3.6 ) [node name="DownBackLeft" parent="." instance=ExtResource( 2 )] -transform = Transform( 0.982402, -3.24601e-07, 0.0859489, -3.2133e-07, -1, 0, 0.0859489, -2.83989e-08, -0.982402, 1.9, -1, 3.6 ) +transform = Transform( 0.982402, 3.24601e-07, -0.0859489, 3.2133e-07, -1, 0, -0.0859489, -2.83989e-08, -0.982402, 1.9, -1, 3.6 ) + +[node name="UpFrontLeft" parent="." instance=ExtResource( 2 )] +transform = Transform( 0.103081, -3.40598e-08, -0.980752, -3.2133e-07, -1, 0, -0.980752, 3.24056e-07, -0.103081, 2.9, 0, -2 ) + +[node name="UpFrontRight" parent="." instance=ExtResource( 2 )] +transform = Transform( 0.103081, 3.40598e-08, 0.980752, 3.2133e-07, -1, 0, 0.980752, 3.24056e-07, -0.103081, -2.9, 0, -2 ) + +[node name="UpBackRight" parent="." instance=ExtResource( 2 )] +transform = Transform( -0.870723, 0.384569, 0.26555, -1.84307e-07, -0.573576, 0.807811, 0.462972, 0.723268, 0.499426, -1, -1.9, -2.5 ) + +[node name="UpBackLeft" parent="." instance=ExtResource( 2 )] +transform = Transform( -0.870723, -0.384569, -0.26555, 1.84307e-07, -0.573576, 0.807811, -0.462972, 0.723268, 0.499426, 1, -1.9, -2.5 ) [node name="Torso" parent="." instance=ExtResource( 3 )] transform = Transform( 0.5, 0, 0, 0, -2.18557e-08, 0.5, 0, -0.5, -2.18557e-08, 0, 0, 0 ) + +[editable path="DownFrontLeft"] + +[editable path="DownFrontRight"] diff --git a/BodyParts/HumanLeg.tscn b/BodyParts/HumanLeg.tscn index bf8d922..8fdd94c 100644 --- a/BodyParts/HumanLeg.tscn +++ b/BodyParts/HumanLeg.tscn @@ -5,13 +5,13 @@ [ext_resource path="res://3D Input/Fertige GLBs/Bein_Mensch.glb" type="PackedScene" id=3] [ext_resource path="res://3D Input/beinimage.png" type="Texture" id=4] -[sub_resource type="BoxShape" id=2] +[sub_resource type="BoxShape" id=1] extents = Vector3( 0.312908, 1.16904, 0.82381 ) -[sub_resource type="SphereShape" id=3] +[sub_resource type="SphereShape" id=2] radius = 0.108468 -[sub_resource type="SpatialMaterial" id=1] +[sub_resource type="SpatialMaterial" id=3] albedo_texture = ExtResource( 4 ) [node name="HumanLeg" instance=ExtResource( 1 )] @@ -20,20 +20,20 @@ script = ExtResource( 2 ) [node name="PartCollider" parent="." index="0"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.77838, 0.0523456 ) -shape = SubResource( 2 ) +shape = SubResource( 1 ) [node name="TouchArea" parent="." index="1"] -transform = Transform( 1.97878, 4.49418e-13, -2.27374e-13, -6.82121e-13, -0.277472, -1.95923, 7.89663e-14, 1.95923, -0.277471, -6.25278e-13, -2.74829, -0.692869 ) +transform = Transform( 1.97878, 4.51195e-13, -2.27374e-13, -6.82121e-13, -0.277472, -1.95923, 7.89663e-14, 1.95923, -0.277471, -6.53699e-13, -2.74829, -0.692869 ) [node name="CollisionShape" type="CollisionShape" parent="TouchArea" index="0"] -shape = SubResource( 3 ) +shape = SubResource( 2 ) [node name="Mesh" parent="." index="2" instance=ExtResource( 3 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.42109e-14, -2.28512, -0.0490953 ) [node name="Cube" parent="Mesh/Armature/Skeleton" index="0"] transform = Transform( 1, 0, 0, 0, 1, -3.72529e-09, 0, 3.72529e-09, 1, 0, 0, 0 ) -material/0 = SubResource( 1 ) +material/0 = SubResource( 3 ) [node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"] transform = Transform( 1, 2.27374e-13, -1.13687e-13, 3.41061e-13, 0.0910855, 0.995843, -5.68434e-14, -0.995843, 0.0910852, -3.3393e-13, 1.43368, 0.260799 ) diff --git a/BodyParts/Tesso.tscn b/BodyParts/Tesso.tscn deleted file mode 100644 index 43225cc..0000000 --- a/BodyParts/Tesso.tscn +++ /dev/null @@ -1,14 +0,0 @@ -[gd_scene load_steps=3 format=2] - -[sub_resource type="CubeMesh" id=1] - -[sub_resource type="BoxShape" id=2] - -[node name="Torso" type="RigidBody"] - -[node name="MeshInstance" type="MeshInstance" parent="."] -mesh = SubResource( 1 ) -material/0 = null - -[node name="CollisionShape" type="CollisionShape" parent="."] -shape = SubResource( 2 ) diff --git a/Global/BodyPartLoader.gd b/Global/BodyPartLoader.gd index 4bc3b22..ca049d6 100644 --- a/Global/BodyPartLoader.gd +++ b/Global/BodyPartLoader.gd @@ -5,4 +5,4 @@ var bodyparts : Dictionary # Called when the node enters the scene tree for the first time. func _ready(): bodyparts["Arm"] = load("res://BodyParts/Arm.tscn") - + bodyparts["Humanleg"] = load("res://BodyParts/HumanLeg.tscn") diff --git a/Ingame/Testing.tscn b/Ingame/Testing.tscn index 66c4334..a234ac6 100644 --- a/Ingame/Testing.tscn +++ b/Ingame/Testing.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://BodyParts/Arm.tscn" type="PackedScene" id=1] [ext_resource path="res://UI/UI.tscn" type="PackedScene" id=2] @@ -6,6 +6,7 @@ [ext_resource path="res://Ingame/Ingame.gd" type="Script" id=4] [ext_resource path="res://Ingame/Arena.tscn" type="PackedScene" id=5] [ext_resource path="res://Ingame/CameraFocus.gd" type="Script" id=6] +[ext_resource path="res://BodyParts/HumanLeg.tscn" type="PackedScene" id=7] [node name="InGame" type="Spatial"] script = ExtResource( 4 ) @@ -20,8 +21,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0 ) [node name="Torso2" parent="." instance=ExtResource( 3 )] transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 2, -10 ) -[node name="Arm" parent="Torso2/DownFrontLeft/Limb" index="0" instance=ExtResource( 1 )] -key = 65 +[node name="HumanLeg" parent="Torso2/DownFrontLeft/Limb" index="0" instance=ExtResource( 7 )] [node name="Arm" parent="Torso2/DownFrontRight/Limb" index="0" instance=ExtResource( 1 )] key = 83 diff --git a/project.godot b/project.godot index 743f9c2..c6ecc5d 100644 --- a/project.godot +++ b/project.godot @@ -43,5 +43,4 @@ InGameState="*res://Global/InGameState.gd" [rendering] -quality/shadows/filter_mode=2 environment/default_environment="res://default_env.tres"