Merge branch 'nieuwe-kamer'
This commit is contained in:
Binary file not shown.
@@ -0,0 +1,34 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bjok373y2ssb3"
|
||||
path="res://.godot/imported/sky.hdr-74816b93ab188de4096cf623889be2cf.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://Images/sky.hdr"
|
||||
dest_files=["res://.godot/imported/sky.hdr-74816b93ab188de4096cf623889be2cf.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
|
||||
+135
@@ -0,0 +1,135 @@
|
||||
[gd_scene load_steps=19 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"]
|
||||
[ext_resource type="PackedScene" uid="uid://4o2ljtcup5bo" path="res://Player.tscn" id="3_l7pp6"]
|
||||
[ext_resource type="PackedScene" uid="uid://bmuy4jimpch1i" path="res://Objects/ladekast.tscn" id="4_23v8p"]
|
||||
[ext_resource type="PackedScene" uid="uid://cpjo05ataob66" path="res://Objects/Painting.tscn" id="5_jk1xx"]
|
||||
[ext_resource type="PackedScene" uid="uid://2wem3a0y4agb" path="res://Objects/Safe.tscn" id="6_3qx7f"]
|
||||
[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"]
|
||||
|
||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xcyqt"]
|
||||
transparency = 1
|
||||
albedo_color = Color(0.14902, 0.152941, 0.164706, 0.47451)
|
||||
|
||||
[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_ybihp"]
|
||||
data = PackedVector3Array(-2.0289, -1.2789, 2.0289, -2.0289, 1.2789, 2.0289, -2.0289, 1.2789, -2.0289, -2.0289, -1.2789, 2.0289, -2.0289, 1.2789, -2.0289, -2.0289, -1.2789, -2.0289, 2.0289, -1.2789, -2.0289, 2.0289, 1.2789, -2.0289, 2.0289, 1.2789, 2.0289, 2.0289, -1.2789, -2.0289, 2.0289, 1.2789, 2.0289, 2.0289, -1.2789, 2.0289, -2.0289, -1.2789, -2.0289, -2.0289, 1.2789, -2.0289, 2.0289, 1.2789, -2.0289, -2.0289, -1.2789, -2.0289, 2.0289, 1.2789, -2.0289, 2.0289, -1.2789, -2.0289, -0.5269, -1.2789, 2.0289, -0.5269, 0.9153, 2.0289, -2.0289, 1.2789, 2.0289, -0.5269, -1.2789, 2.0289, -2.0289, 1.2789, 2.0289, -2.0289, -1.2789, 2.0289, 0.5269, 0.9153, 2.0289, 0.5269, -1.2789, 2.0289, 2.0289, -1.2789, 2.0289, 0.5269, 0.9153, 2.0289, 2.0289, -1.2789, 2.0289, 2.0289, 1.2789, 2.0289, -0.5269, 0.9153, 2.0289, 0.5269, 0.9153, 2.0289, 2.0289, 1.2789, 2.0289, -0.5269, 0.9153, 2.0289, 2.0289, 1.2789, 2.0289, -2.0289, 1.2789, 2.0289, 0.5269, -1.2789, 2.0289, -0.5269, -1.2789, 2.0289, 2.0289, -1.2789, 2.0289, -0.5269, -1.2789, 2.0289, -2.0289, -1.2789, 2.0289, 2.0289, -1.2789, 2.0289, 0.8296, 1.2789, 0.8296, -0.8296, 1.2789, 0.8296, -2.0289, 1.2789, 2.0289, 0.8296, 1.2789, 0.8296, -2.0289, 1.2789, 2.0289, 2.0289, 1.2789, 2.0289, 0.8296, 1.2789, -0.8296, 0.8296, 1.2789, 0.8296, 2.0289, 1.2789, 2.0289, 0.8296, 1.2789, -0.8296, 2.0289, 1.2789, 2.0289, 2.0289, 1.2789, -2.0289, -0.8296, 1.2789, 0.8296, -0.8296, 1.2789, -0.8296, -2.0289, 1.2789, -2.0289, -0.8296, 1.2789, 0.8296, -2.0289, 1.2789, -2.0289, -2.0289, 1.2789, 2.0289, -0.8296, 1.2789, -0.8296, 0.8296, 1.2789, -0.8296, 2.0289, 1.2789, -2.0289, -0.8296, 1.2789, -0.8296, 2.0289, 1.2789, -2.0289, -2.0289, 1.2789, -2.0289, -2.0731, -1.3202, 2.0702, -2.0711, -1.3211, -2.0711, -2.066, 1.3276, -2.071, -2.0731, -1.3202, 2.0702, -2.066, 1.3276, -2.071, -2.071, 1.3276, 2.066, -2.0711, -1.3211, -2.0711, -2.0731, -1.3202, 2.0702, 2.0731, -1.3202, 2.0702, -2.0711, -1.3211, -2.0711, 2.0731, -1.3202, 2.0702, 2.0711, -1.3212, -2.0711, 2.0711, -1.3212, -2.0711, 2.0731, -1.3202, 2.0702, 2.071, 1.3276, 2.066, 2.0711, -1.3212, -2.0711, 2.071, 1.3276, 2.066, 2.066, 1.3276, -2.071, -2.0711, -1.3211, -2.0711, 2.0711, -1.3212, -2.0711, 2.066, 1.3276, -2.071, -2.0711, -1.3211, -2.0711, 2.066, 1.3276, -2.071, -2.066, 1.3276, -2.071, -0.5269, -1.2789, 2.0711, -2.0731, -1.3202, 2.0702, -2.071, 1.3276, 2.066, -0.5269, -1.2789, 2.0711, -2.071, 1.3276, 2.066, -0.5269, 0.9153, 2.0711, 0.5269, 0.9153, 2.0711, 2.071, 1.3276, 2.066, 2.0731, -1.3202, 2.0702, 0.5269, 0.9153, 2.0711, 2.0731, -1.3202, 2.0702, 0.5269, -1.2789, 2.0711, -0.5269, 0.9153, 2.0711, -2.071, 1.3276, 2.066, 2.071, 1.3276, 2.066, -0.5269, 0.9153, 2.0711, 2.071, 1.3276, 2.066, 0.5269, 0.9153, 2.0711, 0.5269, -1.2789, 2.0711, 2.0731, -1.3202, 2.0702, -2.0731, -1.3202, 2.0702, 0.5269, -1.2789, 2.0711, -2.0731, -1.3202, 2.0702, -0.5269, -1.2789, 2.0711, 0.8294, 1.6416, 0.8294, 2.071, 1.3276, 2.066, -2.071, 1.3276, 2.066, 0.8294, 1.6416, 0.8294, -2.071, 1.3276, 2.066, -0.8294, 1.6416, 0.8294, 0.8294, 1.6416, -0.8294, 2.066, 1.3276, -2.071, 2.071, 1.3276, 2.066, 0.8294, 1.6416, -0.8294, 2.071, 1.3276, 2.066, 0.8294, 1.6416, 0.8294, -0.8294, 1.6416, 0.8294, -2.071, 1.3276, 2.066, -2.066, 1.3276, -2.071, -0.8294, 1.6416, 0.8294, -2.066, 1.3276, -2.071, -0.8294, 1.6416, -0.8294, -0.8294, 1.6416, -0.8294, -2.066, 1.3276, -2.071, 2.066, 1.3276, -2.071, -0.8294, 1.6416, -0.8294, 2.066, 1.3276, -2.071, 0.8294, 1.6416, -0.8294, -0.8296, 1.2789, 0.8296, 0.8296, 1.2789, 0.8296, 0.8294, 1.6416, 0.8294, -0.8296, 1.2789, 0.8296, 0.8294, 1.6416, 0.8294, -0.8294, 1.6416, 0.8294, 0.5269, 0.9153, 2.0289, -0.5269, 0.9153, 2.0289, -0.5269, 0.9153, 2.0711, 0.5269, 0.9153, 2.0289, -0.5269, 0.9153, 2.0711, 0.5269, 0.9153, 2.0711, 0.8296, 1.2789, -0.8296, -0.8296, 1.2789, -0.8296, -0.8294, 1.6416, -0.8294, 0.8296, 1.2789, -0.8296, -0.8294, 1.6416, -0.8294, 0.8294, 1.6416, -0.8294, -0.5269, 0.9153, 2.0289, -0.5269, -1.2789, 2.0289, -0.5269, -1.2789, 2.0711, -0.5269, 0.9153, 2.0289, -0.5269, -1.2789, 2.0711, -0.5269, 0.9153, 2.0711, 0.8296, 1.2789, 0.8296, 0.8296, 1.2789, -0.8296, 0.8294, 1.6416, -0.8294, 0.8296, 1.2789, 0.8296, 0.8294, 1.6416, -0.8294, 0.8294, 1.6416, 0.8294, -0.5269, -1.2789, 2.0289, 0.5269, -1.2789, 2.0289, 0.5269, -1.2789, 2.0711, -0.5269, -1.2789, 2.0289, 0.5269, -1.2789, 2.0711, -0.5269, -1.2789, 2.0711, 0.5269, -1.2789, 2.0289, 0.5269, 0.9153, 2.0289, 0.5269, 0.9153, 2.0711, 0.5269, -1.2789, 2.0289, 0.5269, 0.9153, 2.0711, 0.5269, -1.2789, 2.0711, -0.8296, 1.2789, -0.8296, -0.8296, 1.2789, 0.8296, -0.8294, 1.6416, 0.8294, -0.8296, 1.2789, -0.8296, -0.8294, 1.6416, 0.8294, -0.8294, 1.6416, -0.8294, -2.0289, -1.2789, -2.0289, 2.0289, -1.2789, -2.0289, 2.0289, -1.2789, 2.0289, -2.0289, -1.2789, -2.0289, 2.0289, -1.2789, 2.0289, -2.0289, -1.2789, 2.0289)
|
||||
|
||||
[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_4j80t"]
|
||||
panorama = ExtResource("2_2aenl")
|
||||
|
||||
[sub_resource type="Sky" id="Sky_u0br6"]
|
||||
sky_material = SubResource("PanoramaSkyMaterial_4j80t")
|
||||
radiance_size = 1
|
||||
|
||||
[sub_resource type="Environment" id="Environment_63mw4"]
|
||||
background_mode = 2
|
||||
background_energy_multiplier = 0.5
|
||||
sky = SubResource("Sky_u0br6")
|
||||
ambient_light_sky_contribution = 0.01
|
||||
reflected_light_source = 1
|
||||
tonemap_mode = 3
|
||||
ssao_intensity = 7.65
|
||||
sdfgi_energy = 10.0
|
||||
volumetric_fog_density = 0.1529
|
||||
|
||||
[sub_resource type="CapsuleMesh" id="CapsuleMesh_ivvkw"]
|
||||
height = 3.703
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_n067y"]
|
||||
radius = 0.8
|
||||
height = 4.5
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_y08nn"]
|
||||
render_priority = 0
|
||||
shader = ExtResource("8_oclf0")
|
||||
|
||||
[sub_resource type="TextMesh" id="TextMesh_k0gcf"]
|
||||
material = SubResource("ShaderMaterial_y08nn")
|
||||
text = "1984"
|
||||
depth = 0.01
|
||||
|
||||
[node name="kamer" instance=ExtResource("1_50aco")]
|
||||
|
||||
[node name="IndirectLight" type="OmniLight3D" parent="." index="0"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.68221, -0.692571, -1.67621)
|
||||
light_color = Color(1, 0.952941, 0.898039, 1)
|
||||
light_energy = 1.389
|
||||
light_size = 1.0
|
||||
light_specular = 0.0
|
||||
shadow_enabled = true
|
||||
shadow_opacity = 0.22
|
||||
shadow_blur = 0.445
|
||||
omni_range = 10.0
|
||||
omni_attenuation = 0.435276
|
||||
|
||||
[node name="Dakraam" parent="Room" index="0"]
|
||||
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
|
||||
light_specular = 0.0
|
||||
shadow_enabled = true
|
||||
omni_range = 1.984
|
||||
omni_attenuation = 0.108819
|
||||
|
||||
[node name="StaticBody3D" type="StaticBody3D" parent="Room" index="3"]
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/StaticBody3D" index="0"]
|
||||
shape = SubResource("ConcavePolygonShape3D_ybihp")
|
||||
|
||||
[node name="WorldEnvironment" type="WorldEnvironment" parent="." index="2"]
|
||||
environment = SubResource("Environment_63mw4")
|
||||
|
||||
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="." index="3"]
|
||||
transform = Transform3D(0.744253, 0.38803, -0.543618, 0.0836868, 0.753332, 0.652294, 0.662634, -0.530966, 0.528196, 0, 4.22767, 0)
|
||||
light_color = Color(0.945098, 0.992157, 1, 1)
|
||||
light_energy = 2.333
|
||||
light_angular_distance = 0.5
|
||||
shadow_enabled = true
|
||||
directional_shadow_mode = 0
|
||||
directional_shadow_fade_start = 0.814
|
||||
directional_shadow_max_distance = 8.2
|
||||
|
||||
[node name="Player" parent="." index="4" instance=ExtResource("3_l7pp6")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.175659, -1.13536, 0.499683)
|
||||
|
||||
[node name="ladekast" parent="." index="5" instance=ExtResource("4_23v8p")]
|
||||
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)
|
||||
|
||||
[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)
|
||||
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)
|
||||
collision_layer = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="FlashLight/FlashLight" index="0"]
|
||||
transform = Transform3D(1, 0, 8.88178e-16, 0, 1, -7.10543e-15, 0, 0, 1, 0, 0, 0)
|
||||
shape = SubResource("CapsuleShape3D_n067y")
|
||||
|
||||
[node name="safe" parent="." index="8" instance=ExtResource("6_3qx7f")]
|
||||
transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -1.50079, -0.0682462, -1.05664)
|
||||
|
||||
[node name="lichtkastje" parent="." index="9" instance=ExtResource("7_ahvul")]
|
||||
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)
|
||||
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)
|
||||
|
||||
[connection signal="input_event" from="FlashLight/FlashLight" to="Player" method="_on_flash_light_input_event"]
|
||||
Binary file not shown.
@@ -0,0 +1,30 @@
|
||||
[remap]
|
||||
|
||||
importer="scene"
|
||||
importer_version=1
|
||||
type="PackedScene"
|
||||
uid="uid://d4hqxyxouje7e"
|
||||
path="res://.godot/imported/kamer.glb-47c77df10b23cac4ca89c3d4a4421f09.scn"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://Objects/Meshes/kamer.glb"
|
||||
dest_files=["res://.godot/imported/kamer.glb-47c77df10b23cac4ca89c3d4a4421f09.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={}
|
||||
+1
-1
@@ -25,7 +25,7 @@ fov = 60.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")
|
||||
|
||||
[node name="SpotLight3D" type="SpotLight3D" parent="Pivot/Camera/FlashLight"]
|
||||
|
||||
@@ -30,6 +30,7 @@ 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
|
||||
|
||||
+14
-9
@@ -1,15 +1,13 @@
|
||||
extends Node3D
|
||||
|
||||
@onready var indirect_light = $"../IndirectLight"
|
||||
@onready var dakraam = $"../Room/Dakraam"
|
||||
@onready var light = $"../Light"
|
||||
var dakraam_glas
|
||||
|
||||
# Called when the node enters the scene tree for the first time.
|
||||
func _ready():
|
||||
pass # Replace with function body.
|
||||
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
func _process(delta):
|
||||
pass
|
||||
|
||||
if dakraam:
|
||||
dakraam_glas = $"../Room/Dakraam".get_surface_override_material(0)
|
||||
|
||||
func _on_lock_input_event(camera, event, position, normal, shape_idx):
|
||||
if event is InputEventMouseButton and event.is_action_pressed("interact"):
|
||||
@@ -21,4 +19,11 @@ func _on_lock_input_event(camera, event, position, normal, shape_idx):
|
||||
func _on_lever_input_event(camera, event, position, normal, shape_idx):
|
||||
if event is InputEventMouseButton and event.is_action_pressed("interact"):
|
||||
$Lever.rotation.z = $Lever.rotation.z + PI
|
||||
$".."/Light.visible = !$".."/Light.visible
|
||||
if light != null:
|
||||
light.visible = !light.visible
|
||||
else:
|
||||
indirect_light.visible = !indirect_light.visible
|
||||
if indirect_light.visible:
|
||||
dakraam.set_surface_override_material(0, dakraam_glas)
|
||||
else:
|
||||
dakraam.set_surface_override_material(0, null)
|
||||
|
||||
Reference in New Issue
Block a user