betere collision shapes, wat cleanup

This commit is contained in:
2023-02-02 16:59:05 +01:00
parent 7c5e3b9958
commit 8e6b0784e5
9 changed files with 46 additions and 32 deletions
+26 -13
View File
File diff suppressed because one or more lines are too long
+5 -4
View File
File diff suppressed because one or more lines are too long
+5 -4
View File
File diff suppressed because one or more lines are too long
+3 -3
View File
@@ -2,12 +2,12 @@
[ext_resource type="PackedScene" uid="uid://bjbpkdxe3m235" path="res://Objects/Meshes/ladekast.glb" id="1_gw865"]
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_oani2"]
points = PackedVector3Array(0.881012, 1.2404, -0.991939, 0.971999, 2.0762, 0.989799, -0.976627, 2.0762, 0.989799, -0.88564, 1.2404, 0.991939, -0.976627, 2.0762, -0.989799, 0.971999, 2.0762, -0.989799, 0.881012, 1.2404, 0.991939, -0.88564, 1.2404, -0.991939, 0.977697, 1.89201, -0.995589, -0.981442, 1.92293, 0.994691, 0.913748, 1.36385, 0.993858, -0.981442, 1.92293, -0.994691, 0.977697, 1.89201, 0.995589, -0.917534, 1.39512, -0.992944, 0.913748, 1.36385, -0.993858, -0.917534, 1.39512, 0.992944)
[sub_resource type="BoxShape3D" id="BoxShape3D_qmmg3"]
size = Vector3(2, 5, 2)
[node name="ladekast" instance=ExtResource("1_gw865")]
[node name="StaticBody3D" type="StaticBody3D" parent="Kast" index="5"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Kast/StaticBody3D" index="0"]
shape = SubResource("ConvexPolygonShape3D_oani2")
shape = SubResource("BoxShape3D_qmmg3")
+3 -1
View File
@@ -19,8 +19,10 @@ shape = SubResource("BoxShape3D_hprjx")
visible = false
[node name="Music" type="AudioStreamPlayer3D" parent="." index="5"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.39983, 0.16465, -2.32134)
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -2.39983, 0.16465, -2.32134)
stream = ExtResource("3_qep0f")
unit_size = 3.6
attenuation_filter_db = -34.0
[connection signal="input_event" from="Knop/Knop" to="." method="_on_knop_input_event"]
[connection signal="finished" from="Music" to="." method="_on_music_finished"]
+1
View File
@@ -11,6 +11,7 @@ radius = 0.3
height = 1.6
[sub_resource type="SphereShape3D" id="SphereShape3D_2j6of"]
radius = 0.3
[node name="Player" type="CharacterBody3D"]
script = ExtResource("1_jx17t")
+2 -4
View File
@@ -1,11 +1,10 @@
@tool
extends Node3D
const SIZE = 4
const SIZE = 5
enum Direction {UP, RIGHT, DOWN, LEFT}
var sequence = []
# Called when the node enters the scene tree for the first time.
func _ready():
randomize()
@@ -23,13 +22,12 @@ func _ready():
for i in range(dir):
arrow.rotate_90(0)
painting.blit_rect(arrow, arrow.get_used_rect() ,Vector2i(x*128, y*128))
if randi() % 4 == 0:
if randi() % SIZE == 0:
painting_em.blit_rect(arrow, arrow.get_used_rect() ,Vector2i(x*128, y*128))
sequence.append(dir)
for i in range(4-dir):
arrow.rotate_90(0)
var texture = ImageTexture.create_from_image(painting)
$Canvas.get_surface_override_material(0).albedo_texture = texture
var texture_em = ImageTexture.create_from_image(painting_em)
-1
View File
@@ -28,7 +28,6 @@ func _physics_process(delta):
velocity.z = direction.z * WALK_SPEED
move_and_slide()
func _on_flash_light_input_event(camera, event, position, normal, shape_idx):
if event is InputEventMouseButton and event.is_action_pressed("interact"):
$Pivot/Camera/FlashLight.visible = true
+1 -2
View File
@@ -4,7 +4,7 @@ var combination
func _ready():
combination = randi() % 10000
$".."/CombiCode.mesh.text = str(combination)
$".."/CombiCode.mesh.text = "%04d" % combination #met leading 0'en
func get_number():
return 1000 * $Body/"1"/Cylinder/StaticBody3D.number + \
@@ -12,7 +12,6 @@ func get_number():
10 * $Body/"3"/Cylinder/StaticBody3D.number + \
$Body/"4"/Cylinder/StaticBody3D.number
func _on_static_body_3d_input_event(camera, event, position, normal, shape_idx):
if event is InputEventMouseButton and event.is_action_pressed("interact"):
$Body/Knop/Audio.playing = true