mark/escape
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates!

Browse Source 
als je zo nodig moet weten wat ga je alles maar doorlezen ofzo.
This commit is contained in:
Mark Hoekveen
2023-02-04 22:35:42 +01:00
parent 2ea631b8e3
commit 800bf98f84
23 changed files with 463 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Objects/Meshes/desk_lamp_arm_01.bin
BIN
View File
Binary file not shown.
Objects/Meshes/desk_lamp_arm_01_1k.gltf
+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"
}
]
}
Objects/Meshes/desk_lamp_arm_01_1k.gltf.import
+30
View File
@@ -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={}
Objects/Meshes/textures/desk_lamp_arm_01_arm_1k.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 762 KiB

Objects/Meshes/textures/desk_lamp_arm_01_arm_1k.jpg.import
+36
View File
@@ -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
Objects/Meshes/textures/desk_lamp_arm_01_diff_1k.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 686 KiB

Objects/Meshes/textures/desk_lamp_arm_01_diff_1k.jpg.import
+36
View File
@@ -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
Objects/Meshes/textures/desk_lamp_arm_01_nor_gl_1k.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 636 KiB

Objects/Meshes/textures/desk_lamp_arm_01_nor_gl_1k.jpg.import
+36
View File
@@ -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
Objects/Painting.tscn
+16 -16
View File
File diff suppressed because one or more lines are too long
Objects/Slot.tscn
-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")
Objects/desklamp.tscn
+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")]
Objects/ladekast.tscn
+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")
Objects/redherring.tscn
+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