gamejam/bodypartfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix colliders of torch and fence

Browse Source
This commit is contained in:
karl 2020-02-02 13:00:46 +01:00
parent de6f912981
commit 1538b665e3
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ingame/Arena.tscn
View File

@ -5,7 +5,7 @@
[ext_resource path="res://default_env.tres" type="Environment" id=3] [ext_resource path="res://default_env.tres" type="Environment" id=3]
[ext_resource path="res://Ingame/Level/Fence.tscn" type="PackedScene" id=5] [ext_resource path="res://Ingame/Level/Fence.tscn" type="PackedScene" id=5]
[sub_resource type="Curve3D" id=2] [sub_resource type="Curve3D" id=1]
_data = { _data = {
"points": PoolVector3Array( -6.18582, 0, 7.84923, 6.18582, 0, -7.84923, -49.9513, 0, -34.3585, -4.51454, 0, 0.679321, 4.51454, 0, -0.679321, -15.3927, 0, -53.766, -21.9094, 0, -9.41343, 21.9094, 0, 9.41343, 23.1226, 0, -50.5878, -3.51591, 0, -8.89224, 3.51591, 0, 8.89224, 48.9412, 0, -26.3448, -0.144619, 0, -5.61391, 0.144619, 0, 5.61391, 60.7732, 0, 13.6973, 4.99704, -4.57764e-05, -11.0807, -4.99704, 4.57764e-05, 11.0807, 54.4575, 0, 49.3261, 10.0432, 0, -5.64291, -10.0432, 0, 5.64291, 32.3244, 0, 71.386, 10.2301, 0, -1.21242, -10.2301, 0, 1.21242, 2.64864, -1.52588e-05, 80.1473, 8.65666, 0, 3.83833, -8.65666, 0, -3.83833, -24.225, 0, 77.5418, 6.10191, 0, 6.62698, -6.10191, 0, -6.62698, -47.3545, 0, 62.2559, 2.38824, 0, 9.77866, -2.38824, 0, -9.77866, -62.2404, 0, 29.8337, -1.39743, 0, 9.2999, 1.39743, 0, -9.2999, -65.2092, 0, -9.54412, 0, 0, 0, 0, 0, 0, -49.9513, 0, -34.3585 ), "points": PoolVector3Array( -6.18582, 0, 7.84923, 6.18582, 0, -7.84923, -49.9513, 0, -34.3585, -4.51454, 0, 0.679321, 4.51454, 0, -0.679321, -15.3927, 0, -53.766, -21.9094, 0, -9.41343, 21.9094, 0, 9.41343, 23.1226, 0, -50.5878, -3.51591, 0, -8.89224, 3.51591, 0, 8.89224, 48.9412, 0, -26.3448, -0.144619, 0, -5.61391, 0.144619, 0, 5.61391, 60.7732, 0, 13.6973, 4.99704, -4.57764e-05, -11.0807, -4.99704, 4.57764e-05, 11.0807, 54.4575, 0, 49.3261, 10.0432, 0, -5.64291, -10.0432, 0, 5.64291, 32.3244, 0, 71.386, 10.2301, 0, -1.21242, -10.2301, 0, 1.21242, 2.64864, -1.52588e-05, 80.1473, 8.65666, 0, 3.83833, -8.65666, 0, -3.83833, -24.225, 0, 77.5418, 6.10191, 0, 6.62698, -6.10191, 0, -6.62698, -47.3545, 0, 62.2559, 2.38824, 0, 9.77866, -2.38824, 0, -9.77866, -62.2404, 0, 29.8337, -1.39743, 0, 9.2999, 1.39743, 0, -9.2999, -65.2092, 0, -9.54412, 0, 0, 0, 0, 0, 0, -49.9513, 0, -34.3585 ),
"tilts": PoolRealArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ) "tilts": PoolRealArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 )
@ -37,7 +37,7 @@ environment = ExtResource( 3 )
[node name="ground" parent="." instance=ExtResource( 2 )] [node name="ground" parent="." instance=ExtResource( 2 )]
[node name="Path" type="Path" parent="."] [node name="Path" type="Path" parent="."]
curve = SubResource( 2 ) curve = SubResource( 1 )
[node name="PathFollow" type="PathFollow" parent="Path"] [node name="PathFollow" type="PathFollow" parent="Path"]
transform = Transform( -0.564546, 0, 0.825401, 0, 1, 0, -0.825402, 0, -0.564546, -43.137, 0, -40.2265 ) transform = Transform( -0.564546, 0, 0.825401, 0, 1, 0, -0.825402, 0, -0.564546, -43.137, 0, -40.2265 )
@ -56,7 +56,7 @@ rotation_mode = 4
transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 ) transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
[node name="PathFollow3" type="PathFollow" parent="Path"] [node name="PathFollow3" type="PathFollow" parent="Path"]
transform = Transform( 0.0525302, 0, 0.998617, 0, 1, 0, -0.998619, 0, 0.05253, 1.77306, 0, -55.9514 ) transform = Transform( 0.0525302, 0, 0.998617, 0, 1, 0, -0.998619, 0, 0.0525301, 1.77306, 0, -55.9514 )
offset = 57.5 offset = 57.5
rotation_mode = 4 rotation_mode = 4

3
Ingame/Level/Fence.tscn
View File

@ -4,7 +4,7 @@
[ext_resource path="res://Ingame/Level/Wood.tres" type="Material" id=2] [ext_resource path="res://Ingame/Level/Wood.tres" type="Material" id=2]
[sub_resource type="BoxShape" id=1] [sub_resource type="BoxShape" id=1]
extents = Vector3( 0.537798, 6.09865, 12.5193 ) extents = Vector3( 0.537798, 23, 12.5193 )
[node name="Fence" instance=ExtResource( 1 )] [node name="Fence" instance=ExtResource( 1 )]
@ -24,6 +24,7 @@ material/0 = ExtResource( 2 )
material/0 = ExtResource( 2 ) material/0 = ExtResource( 2 )
[node name="StaticBody" type="StaticBody" parent="." index="5"] [node name="StaticBody" type="StaticBody" parent="." index="5"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 16, 0 )
[node name="CollisionShape" type="CollisionShape" parent="StaticBody" index="0"] [node name="CollisionShape" type="CollisionShape" parent="StaticBody" index="0"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.12366, -0.572572 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.12366, -0.572572 )

11
Ingame/Level/Torch.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=8 format=2] [gd_scene load_steps=9 format=2]
[ext_resource path="res://3D Input/torch.glb" type="PackedScene" id=1] [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://Ingame/Level/Wood.tres" type="Material" id=2]
@ -19,6 +19,9 @@ normal_enabled = true
normal_scale = 1.0 normal_scale = 1.0
normal_texture = ExtResource( 6 ) normal_texture = ExtResource( 6 )
[sub_resource type="BoxShape" id=2]
extents = Vector3( 0.226179, 3.74534, 0.250637 )
[node name="Torch" instance=ExtResource( 1 )] [node name="Torch" instance=ExtResource( 1 )]
[node name="Cube" parent="." index="0"] [node name="Cube" parent="." index="0"]
@ -34,3 +37,9 @@ shadow_enabled = true
omni_range = 87.1226 omni_range = 87.1226
[node name="Smoke" parent="." index="2" instance=ExtResource( 3 )] [node name="Smoke" parent="." index="2" instance=ExtResource( 3 )]
[node name="StaticBody" type="StaticBody" parent="." index="3"]
[node name="CollisionShape" type="CollisionShape" parent="StaticBody" index="0"]
transform = Transform( 0.99774, -0.0671969, 0, 0.0671969, 0.99774, 0, 0, 0, 1, -0.404917, 3.92084, 0 )
shape = SubResource( 2 )