als je zo nodig moet weten wat ga je alles maar doorlezen ofzo.
This commit is contained in:
2023-02-04 22:35:42 +01:00
parent 2ea631b8e3
commit 800bf98f84
23 changed files with 463 additions and 65 deletions
Binary file not shown.
-19
View File
@@ -1,19 +0,0 @@
[remap]
importer="mp3"
type="AudioStreamMP3"
uid="uid://cef415jpowey"
path="res://.godot/imported/bluegrass.mp3-e656c2d043ae709d5190eeb354a96570.mp3str"
[deps]
source_file="res://Audio/bluegrass.mp3"
dest_files=["res://.godot/imported/bluegrass.mp3-e656c2d043ae709d5190eeb354a96570.mp3str"]
[params]
loop=true
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
BIN
View File
Binary file not shown.
+19
View File
@@ -0,0 +1,19 @@
[remap]
importer="mp3"
type="AudioStreamMP3"
uid="uid://5j6yfy6y1o67"
path="res://.godot/imported/vis.mp3-e464bc0c4cb99623895ca6d9cd9729af.mp3str"
[deps]
source_file="res://Audio/vis.mp3"
dest_files=["res://.godot/imported/vis.mp3-e464bc0c4cb99623895ca6d9cd9729af.mp3str"]
[params]
loop=true
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
+23 -7
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=19 format=3 uid="uid://cm3uix0tqqavw"]
[gd_scene load_steps=21 format=3 uid="uid://cm3uix0tqqavw"]
[ext_resource type="PackedScene" uid="uid://d4hqxyxouje7e" path="res://Objects/Meshes/kamer.glb" id="1_50aco"]
[ext_resource type="Texture2D" uid="uid://bjok373y2ssb3" path="res://Images/sky.hdr" id="2_2aenl"]
@@ -9,6 +9,8 @@
[ext_resource type="PackedScene" uid="uid://b5rve73suh7fc" path="res://Objects/lichtkastje.tscn" id="7_ahvul"]
[ext_resource type="Shader" path="res://Shaders/Blacklight.gdshader" id="8_oclf0"]
[ext_resource type="PackedScene" uid="uid://bm3d233ul4asx" path="res://Objects/Slot.tscn" id="9_pjl12"]
[ext_resource type="PackedScene" uid="uid://5iw01h08cchr" path="res://Objects/redherring.tscn" id="10_4kyam"]
[ext_resource type="PackedScene" uid="uid://bxahadoddp0ml" path="res://Objects/desklamp.tscn" id="11_dlgxa"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xcyqt"]
transparency = 1
@@ -70,7 +72,6 @@ surface_material_override/0 = SubResource("StandardMaterial3D_xcyqt")
[node name="OmniLight3D2" type="OmniLight3D" parent="Room" index="2"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.533369, 1.5549, -0.629147)
visible = false
light_color = Color(1, 0.960784, 0.933333, 1)
light_energy = 6.867
light_indirect_energy = 0.0
@@ -104,15 +105,15 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.175659, -1.13536, 0.499683
transform = Transform3D(-0.4, 0, -3.49691e-08, 0, 0.4, 0, 3.49691e-08, 0, -0.4, 1.25, -1.279, 1.596)
[node name="Painting" parent="." index="6" instance=ExtResource("5_jk1xx")]
transform = Transform3D(1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, 1.969, 0.214, 0.40291)
transform = Transform3D(1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, 1.969, 0.214, 0.67903)
[node name="FlashLight" type="MeshInstance3D" parent="." index="7"]
transform = Transform3D(0.0965925, -0.0258819, -1.13134e-09, 0, -4.37114e-09, 0.1, -0.0258819, -0.0965925, -4.2222e-09, 1.1837, -0.403786, 1.58481)
transform = Transform3D(0.0965925, -0.0258819, -1.13134e-09, 0, -4.37114e-09, 0.1, -0.0258819, -0.0965925, -4.2222e-09, -1.21576, -0.391011, -1.00824)
mesh = SubResource("CapsuleMesh_ivvkw")
skeleton = NodePath("../safe")
[node name="FlashLight" type="StaticBody3D" parent="FlashLight" index="0"]
transform = Transform3D(1, 0, 0, 0, 1, 3.55271e-15, 0, 0, 1, 0, 0, 0)
transform = Transform3D(1, 0, 8.88178e-16, 0, 1, 7.10543e-15, 0, 0, 1, 0, 0, 0)
collision_layer = 2
[node name="CollisionShape3D" type="CollisionShape3D" parent="FlashLight/FlashLight" index="0"]
@@ -126,10 +127,25 @@ transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -1.50079, -0.0682462, -
transform = Transform3D(-8.74228e-09, 0, 0.2, 0, 0.2, 0, -0.2, 0, -8.74228e-09, -1.01622, 0.0241756, 1.95736)
[node name="CombiCode" type="MeshInstance3D" parent="." index="10"]
transform = Transform3D(0.709362, -0.704845, -1.97442e-10, -4.37114e-08, -4.37114e-08, -1, 0.704845, 0.709362, -6.18169e-08, 1.7588, 1.2253, -1.70749)
transform = Transform3D(0.709362, 0.443678, -0.547682, -5.96046e-08, 0.777026, 0.62947, 0.704845, -0.446522, 0.551192, 1.84123, -0.566121, -1.81842)
mesh = SubResource("TextMesh_k0gcf")
[node name="Slot" parent="." index="11" instance=ExtResource("9_pjl12")]
transform = Transform3D(-4.37114e-09, 0, 0.1, 0, 0.1, 0, -0.1, 0, -4.37114e-09, -1.95266, 0.223687, 0.0309203)
transform = Transform3D(-4.37114e-09, 0, 0.1, 0, 0.1, 0, -0.1, 0, -4.37114e-09, -1.95266, 0.0372345, 0.0309203)
[node name="redherring" parent="." index="12" instance=ExtResource("10_4kyam")]
transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 1.9478, 0.1703, -1.05829)
[node name="desk_lamp_arm_01_1k" parent="." index="13" instance=ExtResource("11_dlgxa")]
transform = Transform3D(0.745232, 0, 0.666806, 0, 1, 0, -0.666806, 0, 0.745232, 1.63545, -0.479, 1.47139)
[node name="SpotLight3D" type="SpotLight3D" parent="desk_lamp_arm_01_1k" index="1"]
transform = Transform3D(0.967982, -0.160466, 0.193034, -0.0877337, 0.504229, 0.859102, -0.23519, -0.848531, 0.474006, -0.022891, 0.621018, -0.21039)
light_color = Color(1, 0.901961, 0.67451, 1)
light_energy = 0.5
shadow_enabled = true
spot_range = 1.883
spot_attenuation = 0.0796601
spot_angle = 31.15
[connection signal="input_event" from="FlashLight/FlashLight" to="Player" method="_on_flash_light_input_event"]
Binary file not shown.
+250
View File
@@ -0,0 +1,250 @@
{
"asset": {
"generator": "Khronos glTF Blender I/O v3.2.40",
"version": "2.0"
},
"scene": 0,
"scenes": [
{
"name": "Scene",
"nodes": [
0
]
}
],
"nodes": [
{
"mesh": 0,
"name": "desk_lamp_arm_01"
}
],
"materials": [
{
"doubleSided": true,
"name": "desk_lamp_arm_01",
"normalTexture": {
"index": 0
},
"pbrMetallicRoughness": {
"baseColorTexture": {
"index": 1
},
"metallicRoughnessTexture": {
"index": 2
}
}
},
{
"doubleSided": true,
"emissiveFactor": [
1,
0.9837890267372131,
0.649111270904541
],
"name": "desk_lamp_arm_01_light",
"normalTexture": {
"index": 3
},
"pbrMetallicRoughness": {
"baseColorTexture": {
"index": 4
},
"metallicRoughnessTexture": {
"index": 5
}
}
}
],
"meshes": [
{
"name": "Box.001",
"primitives": [
{
"attributes": {
"POSITION": 0,
"NORMAL": 1,
"TEXCOORD_0": 2
},
"indices": 3,
"material": 0
},
{
"attributes": {
"POSITION": 4,
"NORMAL": 5,
"TEXCOORD_0": 6
},
"indices": 7,
"material": 1
}
]
}
],
"textures": [
{
"sampler": 0,
"source": 0
},
{
"sampler": 0,
"source": 1
},
{
"sampler": 0,
"source": 2
},
{
"sampler": 0,
"source": 0
},
{
"sampler": 0,
"source": 1
},
{
"sampler": 0,
"source": 2
}
],
"images": [
{
"mimeType": "image/jpeg",
"name": "desk_lamp_arm_01_nor_gl",
"uri": "textures/desk_lamp_arm_01_nor_gl_1k.jpg"
},
{
"mimeType": "image/jpeg",
"name": "desk_lamp_arm_01_diff",
"uri": "textures/desk_lamp_arm_01_diff_1k.jpg"
},
{
"mimeType": "image/jpeg",
"name": "desk_lamp_arm_01_metal-desk_lamp_arm_01_rough",
"uri": "textures/desk_lamp_arm_01_arm_1k.jpg"
}
],
"accessors": [
{
"bufferView": 0,
"componentType": 5126,
"count": 17533,
"max": [
0.08325615525245667,
0.8046169281005859,
0.3172350823879242
],
"min": [
-0.11847317218780518,
-0.08799377083778381,
-0.29663750529289246
],
"type": "VEC3"
},
{
"bufferView": 1,
"componentType": 5126,
"count": 17533,
"type": "VEC3"
},
{
"bufferView": 2,
"componentType": 5126,
"count": 17533,
"type": "VEC2"
},
{
"bufferView": 3,
"componentType": 5123,
"count": 67794,
"type": "SCALAR"
},
{
"bufferView": 4,
"componentType": 5126,
"count": 973,
"max": [
0.027660036459565163,
0.7424256801605225,
-0.1412101536989212
],
"min": [
-0.03705751523375511,
0.6487915515899658,
-0.21220247447490692
],
"type": "VEC3"
},
{
"bufferView": 5,
"componentType": 5126,
"count": 973,
"type": "VEC3"
},
{
"bufferView": 6,
"componentType": 5126,
"count": 973,
"type": "VEC2"
},
{
"bufferView": 7,
"componentType": 5123,
"count": 4512,
"type": "SCALAR"
}
],
"bufferViews": [
{
"buffer": 0,
"byteLength": 210396,
"byteOffset": 0
},
{
"buffer": 0,
"byteLength": 210396,
"byteOffset": 210396
},
{
"buffer": 0,
"byteLength": 140264,
"byteOffset": 420792
},
{
"buffer": 0,
"byteLength": 135588,
"byteOffset": 561056
},
{
"buffer": 0,
"byteLength": 11676,
"byteOffset": 696644
},
{
"buffer": 0,
"byteLength": 11676,
"byteOffset": 708320
},
{
"buffer": 0,
"byteLength": 7784,
"byteOffset": 719996
},
{
"buffer": 0,
"byteLength": 9024,
"byteOffset": 727780
}
],
"samplers": [
{
"magFilter": 9729,
"minFilter": 9987
}
],
"buffers": [
{
"byteLength": 736804,
"uri": "desk_lamp_arm_01.bin"
}
]
}
@@ -0,0 +1,30 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://dv6my5nbd4nt8"
path="res://.godot/imported/desk_lamp_arm_01_1k.gltf-c894ccccc3588b3f0dd1055a7fb387c9.scn"
[deps]
source_file="res://Objects/Meshes/desk_lamp_arm_01_1k.gltf"
dest_files=["res://.godot/imported/desk_lamp_arm_01_1k.gltf-c894ccccc3588b3f0dd1055a7fb387c9.scn"]
[params]
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
import_script/path=""
_subresources={}
Binary file not shown.

After

Width:  |  Height:  |  Size: 762 KiB

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ofv48ac0172p"
path.s3tc="res://.godot/imported/desk_lamp_arm_01_arm_1k.jpg-c091f6ca878d730684a9ce1cd926bd23.s3tc.ctex"
path.etc2="res://.godot/imported/desk_lamp_arm_01_arm_1k.jpg-c091f6ca878d730684a9ce1cd926bd23.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"vram_texture": true
}
[deps]
source_file="res://Objects/Meshes/textures/desk_lamp_arm_01_arm_1k.jpg"
dest_files=["res://.godot/imported/desk_lamp_arm_01_arm_1k.jpg-c091f6ca878d730684a9ce1cd926bd23.s3tc.ctex", "res://.godot/imported/desk_lamp_arm_01_arm_1k.jpg-c091f6ca878d730684a9ce1cd926bd23.etc2.ctex"]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
Binary file not shown.

After

Width:  |  Height:  |  Size: 686 KiB

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bml3ndlkxky1y"
path.s3tc="res://.godot/imported/desk_lamp_arm_01_diff_1k.jpg-68fab11dccbe615662093c80fb488065.s3tc.ctex"
path.etc2="res://.godot/imported/desk_lamp_arm_01_diff_1k.jpg-68fab11dccbe615662093c80fb488065.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"vram_texture": true
}
[deps]
source_file="res://Objects/Meshes/textures/desk_lamp_arm_01_diff_1k.jpg"
dest_files=["res://.godot/imported/desk_lamp_arm_01_diff_1k.jpg-68fab11dccbe615662093c80fb488065.s3tc.ctex", "res://.godot/imported/desk_lamp_arm_01_diff_1k.jpg-68fab11dccbe615662093c80fb488065.etc2.ctex"]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
Binary file not shown.

After

Width:  |  Height:  |  Size: 636 KiB

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://c8vcpqnxmx3bu"
path.s3tc="res://.godot/imported/desk_lamp_arm_01_nor_gl_1k.jpg-0223ef76fe0483eea5c983275ecd8e5e.s3tc.ctex"
path.etc2="res://.godot/imported/desk_lamp_arm_01_nor_gl_1k.jpg-0223ef76fe0483eea5c983275ecd8e5e.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"vram_texture": true
}
[deps]
source_file="res://Objects/Meshes/textures/desk_lamp_arm_01_nor_gl_1k.jpg"
dest_files=["res://.godot/imported/desk_lamp_arm_01_nor_gl_1k.jpg-0223ef76fe0483eea5c983275ecd8e5e.s3tc.ctex", "res://.godot/imported/desk_lamp_arm_01_nor_gl_1k.jpg-0223ef76fe0483eea5c983275ecd8e5e.etc2.ctex"]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=1
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal="res://Objects/Meshes/textures/desk_lamp_arm_01_nor_gl_1k.jpg"
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
+16 -16
View File
File diff suppressed because one or more lines are too long
-4
View File
@@ -50,10 +50,6 @@ shape = SubResource("BoxShape3D_v83up")
[node name="Audio" type="AudioStreamPlayer" parent="Body/Knop"]
stream = ExtResource("3_pbq0q")
[node name="Lamp" type="SpotLight3D" parent="."]
transform = Transform3D(10, 0, 0, 0, 9.99497, 0.317247, 0, -0.317247, 9.99497, 0, -0.226628, 4.81211)
light_energy = 0.05
[node name="Congratulations" type="AudioStreamPlayer" parent="."]
stream = ExtResource("4_aojg2")
+5
View File
@@ -0,0 +1,5 @@
[gd_scene load_steps=2 format=3 uid="uid://bxahadoddp0ml"]
[ext_resource type="PackedScene" uid="uid://dv6my5nbd4nt8" path="res://Objects/Meshes/desk_lamp_arm_01_1k.gltf" id="1_4sfiu"]
[node name="desk_lamp_arm_01_1k" instance=ExtResource("1_4sfiu")]
+2 -1
View File
@@ -50,7 +50,7 @@ shadow_mesh = SubResource("ArrayMesh_ma7fc")
radius = 0.1
[sub_resource type="BoxShape3D" id="BoxShape3D_qmmg3"]
size = Vector3(2, 5, 2)
size = Vector3(2, 4, 2)
[node name="ladekast" instance=ExtResource("1_gw865")]
script = ExtResource("2_y7ua8")
@@ -74,6 +74,7 @@ collision_priority = 2.0
shape = SubResource("SphereShape3D_kdt4n")
[node name="StaticBody3D" type="StaticBody3D" parent="Kast" index="5"]
input_ray_pickable = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="Kast/StaticBody3D" index="0"]
shape = SubResource("BoxShape3D_qmmg3")
+2 -2
View File
@@ -2,7 +2,7 @@
[ext_resource type="PackedScene" uid="uid://cmrvr8egnfm3m" path="res://Objects/Meshes/redherring.glb" id="1_fejfa"]
[ext_resource type="Script" path="res://Scripts/redherring.gd" id="2_cgqr1"]
[ext_resource type="AudioStream" uid="uid://cef415jpowey" path="res://Audio/bluegrass.mp3" id="3_qep0f"]
[ext_resource type="AudioStream" uid="uid://5j6yfy6y1o67" path="res://Audio/vis.mp3" id="3_m84v1"]
[sub_resource type="BoxShape3D" id="BoxShape3D_hprjx"]
size = Vector3(0.3, 0.3, 0.3)
@@ -20,7 +20,7 @@ visible = false
[node name="Music" type="AudioStreamPlayer3D" parent="." index="5"]
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")
stream = ExtResource("3_m84v1")
unit_size = 1.5
attenuation_filter_db = -34.0
+3 -12
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=5 format=3 uid="uid://4o2ljtcup5bo"]
[gd_scene load_steps=4 format=3 uid="uid://4o2ljtcup5bo"]
[ext_resource type="Script" path="res://Scripts/Player.gd" id="1_jx17t"]
@@ -6,10 +6,6 @@
radius = 0.05
height = 0.3
[sub_resource type="CapsuleMesh" id="CapsuleMesh_n30sq"]
radius = 0.3
height = 1.6
[sub_resource type="SphereShape3D" id="SphereShape3D_2j6of"]
radius = 0.3
@@ -21,10 +17,11 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.8, 0)
[node name="Camera" type="Camera3D" parent="Pivot"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.4, 0)
fov = 60.0
fov = 55.0
[node name="FlashLight" type="MeshInstance3D" parent="Pivot/Camera"]
transform = Transform3D(-4.37114e-08, 0, 1, -1, -4.37114e-08, -4.37114e-08, 4.37114e-08, -1, 1.91069e-15, 0.329452, -0.113105, -0.429142)
visible = false
cast_shadow = 0
mesh = SubResource("CapsuleMesh_x6nb0")
@@ -40,12 +37,6 @@ spot_angle_attenuation = 3.13833
[node name="AudioListener3D" type="AudioListener3D" parent="Pivot/Camera"]
current = true
[node name="Mesh" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.8, 0)
visible = false
mesh = SubResource("CapsuleMesh_n30sq")
skeleton = NodePath("../Pivot")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.801599, 0)
shape = SubResource("SphereShape3D_2j6of")
+4 -2
View File
@@ -1,10 +1,11 @@
extends CharacterBody3D
const WALK_SPEED = 5.0
const WALK_SPEED = 3.0
const MOUSE_SENS = 0.002
var has_flashlight = false
var has_key = false
@onready var flashlight = $"../FlashLight"
var mouse_mode = 2
@@ -30,7 +31,8 @@ func _physics_process(delta):
move_and_slide()
func _on_flash_light_input_event(camera, event, position, normal, shape_idx):
print("joehoe")
if event is InputEventMouseButton and event.is_action_pressed("interact"):
$Pivot/Camera/FlashLight.visible = true
has_flashlight = true
if flashlight:
flashlight.visible = false
-1
View File
@@ -16,5 +16,4 @@ 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
if get_number() == combination:
$Lamp.light_color = Color.LIGHT_GREEN
$Congratulations.playing = true
+1 -1
View File
@@ -11,7 +11,7 @@ config_version=5
[application]
config/name="Escape"
run/main_scene="res://Room.tscn"
run/main_scene="res://Kamer.tscn"
config/features=PackedStringArray("4.0", "Forward Plus")
boot_splash/show_image=false
config/icon="res://icon.svg"