This commit is contained in:
buchibob 2020-02-01 19:54:07 +01:00
commit bbe863642a
20 changed files with 2423 additions and 47 deletions

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

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

View File

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

View File

@ -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
@ -66,8 +66,9 @@ collide_with_areas = true
collide_with_bodies = false
[node name="Torso" parent="." instance=ExtResource( 1 )]
[node name="TorsoCollider" parent="Torso" index="0"]
shape = null
[connection signal="pressed" from="GUI/HBoxC/VBoxC/Start" to="." method="_on_Start_pressed"]
[editable path="Torso"]
[editable path="Torso/FrontLeft"]

View File

@ -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

View File

@ -1,38 +1,58 @@
[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]
radius = 0.855929
height = 1.48749
[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"]

20
BodyParts/HumanArm.gd Normal file
View File

@ -0,0 +1,20 @@
extends PushingBodyPart
onready var anim = get_node("Mesh/AnimationPlayer")
func action():
anim.play("ArmatureAction")
func push(body):
# We multiply by 0.1 because we only want it to spin slightly, it should mostly go up
var offset = transform.basis.xform(touch_area.global_transform.origin - base.global_transform.origin) * 0.1
var direction = (base.transform.basis.y - base.transform.basis.z).normalized() * 5.0
base.apply_impulse(offset, direction)
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta: float) -> void:
# pass

43
BodyParts/HumanArm.tscn Normal file
View File

@ -0,0 +1,43 @@
[gd_scene load_steps=6 format=2]
[ext_resource path="res://BodyParts/PushingBodyPart.tscn" type="PackedScene" id=1]
[ext_resource path="res://BodyParts/HumanArm.gd" type="Script" id=2]
[ext_resource path="res://3D Input/Fertige GLBs/Arm_Mensch.glb" type="PackedScene" id=4]
[sub_resource type="BoxShape" id=1]
extents = Vector3( 0.533899, 0.203146, 2.17243 )
[sub_resource type="SphereShape" id=2]
radius = 0.125064
[node name="HumanArm" instance=ExtResource( 1 )]
transform = Transform( -4.37114e-08, 1, 4.37114e-08, 0, -4.37114e-08, 1, 1, 4.37114e-08, 1.91069e-15, 0, 0, 0 )
script = ExtResource( 2 )
[node name="PartCollider" parent="." index="0"]
transform = Transform( 0.796097, 0, -0.605169, 0, 1, -3.55271e-15, 0.605169, 8.35188e-23, 0.796097, -0.894889, 1.42109e-14, -2.6182 )
shape = SubResource( 1 )
[node name="TouchArea" parent="." index="1"]
transform = Transform( -0.114995, 2.15415, 2.55188, -3.31495, -0.382831, 0.173782, 0.404395, -2.52562, 2.15021, -0.0333271, -0.131349, -3.878 )
[node name="CollisionShape" type="CollisionShape" parent="TouchArea" index="0"]
shape = SubResource( 2 )
[node name="Mesh" parent="." index="2" instance=ExtResource( 4 )]
transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 2, -0.357728, -8.51476, 0 )
[node name="Skeleton" parent="Mesh/Armature" index="0"]
bones/7/bound_children = [ NodePath("BoneAttachment") ]
[node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"]
transform = Transform( 0.0638506, -0.727912, -0.682691, -0.242273, 0.652315, -0.718184, 0.968104, 0.211254, -0.134703, 0.0541456, 1.16231, 0.134369 )
bone_name = "bone_6"
[node name="RemoteTransform" type="RemoteTransform" parent="Mesh/Armature/Skeleton/BoneAttachment" index="0"]
remote_path = NodePath("../../../../../TouchArea")
[node name="AnimationPlayer" parent="Mesh" index="2"]
playback_speed = 3.0
[editable path="Mesh"]

View File

@ -15,7 +15,7 @@ func action():
func push(body):
# We multiply by 0.1 because we only want it to spin slightly, it should mostly go up
var offset = transform.basis.xform(Vector3.ZERO)
var offset = transform.basis.xform(touch_area.global_transform.origin - base.global_transform.origin) * 0.1
var direction = (base.transform.basis.y - base.transform.basis.z).normalized() * 5.0
base.apply_impulse(offset, direction)

View File

@ -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,23 +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="Skeleton" parent="Mesh/Armature" index="0"]
bones/2/bound_children = [ NodePath("BoneAttachment") ]
[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 )

View File

@ -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 )

View File

@ -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")

View File

@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2]
[gd_scene load_steps=4 format=2]
[ext_resource path="res://3D Input/torch.glb" type="PackedScene" id=1]
[ext_resource path="res://Ingame/Level/Wood.tres" type="Material" id=2]
[ext_resource path="res://Textures/Particles/Smoke.tscn" type="PackedScene" id=3]
[node name="Torch" instance=ExtResource( 1 )]
@ -15,3 +16,5 @@ light_color = Color( 0.996078, 0.568627, 0.380392, 1 )
light_energy = 3.0
shadow_enabled = true
omni_range = 87.1226
[node name="Smoke" parent="." index="2" instance=ExtResource( 3 )]

View File

@ -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

View File

@ -0,0 +1,76 @@
[gd_scene load_steps=10 format=2]
[ext_resource path="res://Textures/Particles/smoke.png" type="Texture" id=1]
[sub_resource type="SpatialMaterial" id=1]
flags_transparent = true
flags_unshaded = true
vertex_color_use_as_albedo = true
params_blend_mode = 1
params_billboard_mode = 3
particles_anim_h_frames = 1
particles_anim_v_frames = 1
particles_anim_loop = false
albedo_texture = ExtResource( 1 )
[sub_resource type="Gradient" id=2]
offsets = PoolRealArray( 0, 0.621849, 1 )
colors = PoolColorArray( 1, 0, 0, 1, 0.40625, 0.00317383, 0.00317383, 1, 1, 1, 1, 0 )
[sub_resource type="GradientTexture" id=3]
gradient = SubResource( 2 )
[sub_resource type="Curve" id=4]
_data = [ Vector2( 0, 0 ), 0.0, 2.01322, 0, 0, Vector2( 0.532567, 0.990909 ), 0.0, 0.0, 0, 0, Vector2( 1, 0.3 ), -2.28485, 0.0, 0, 0 ]
[sub_resource type="CurveTexture" id=5]
curve = SubResource( 4 )
[sub_resource type="ParticlesMaterial" id=6]
emission_shape = 1
emission_sphere_radius = 0.5
gravity = Vector3( 0, 5, 0 )
angular_velocity = 40.0
angular_velocity_random = 0.07
linear_accel = -1.45
angle = 360.0
angle_random = 1.0
scale = 0.7
scale_random = 0.2
scale_curve = SubResource( 5 )
color_ramp = SubResource( 3 )
[sub_resource type="QuadMesh" id=7]
[sub_resource type="ParticlesMaterial" id=8]
emission_shape = 1
emission_sphere_radius = 0.2
gravity = Vector3( 0, 4, 0 )
angular_velocity = 40.0
angular_velocity_random = 0.07
linear_accel = -1.45
angle = 360.0
angle_random = 1.0
scale = 0.7
scale_random = 0.2
scale_curve = SubResource( 5 )
color_ramp = SubResource( 3 )
[node name="Smoke" type="Spatial"]
[node name="SpottedSmoke" type="Particles" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.701113, 7.2704, 0 )
visible = false
material_override = SubResource( 1 )
amount = 4
lifetime = 1.71
process_material = SubResource( 6 )
draw_pass_1 = SubResource( 7 )
[node name="ContinuousSmoke" type="Particles" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.701113, 7.2704, 0 )
material_override = SubResource( 1 )
amount = 40
lifetime = 1.71
process_material = SubResource( 8 )
draw_pass_1 = SubResource( 7 )

Binary file not shown.

After

Width:  |  Height:  |  Size: 373 KiB

View File

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="StreamTexture"
path.s3tc="res://.import/smoke.png-4ce1013daebb410fe4d198a233010763.s3tc.stex"
path.etc2="res://.import/smoke.png-4ce1013daebb410fe4d198a233010763.etc2.stex"
metadata={
"imported_formats": [ "s3tc", "etc2" ],
"vram_texture": true
}
[deps]
source_file="res://Textures/Particles/smoke.png"
dest_files=[ "res://.import/smoke.png-4ce1013daebb410fe4d198a233010763.s3tc.stex", "res://.import/smoke.png-4ce1013daebb410fe4d198a233010763.etc2.stex" ]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=true
flags/filter=true
flags/mipmaps=true
flags/anisotropic=false
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=false
svg/scale=1.0