Merge pull request #18 from Nitwel/testing

Add fake living room and improve light entity
This commit is contained in:
Nitwel 2023-11-13 14:16:33 +01:00 committed by GitHub
commit aa6515581e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
95 changed files with 1035 additions and 23 deletions

2
.gitattributes vendored
View File

@ -7,5 +7,7 @@
*.material filter=lfs diff=lfs merge=lfs -text *.material filter=lfs diff=lfs merge=lfs -text
*.svg filter=lfs diff=lfs merge=lfs -text *.svg filter=lfs diff=lfs merge=lfs -text
*.res filter=lfs diff=lfs merge=lfs -text *.res filter=lfs diff=lfs merge=lfs -text
*.tres filter=lfs diff=lfs merge=lfs -text
*.bin filter=lfs diff=lfs merge=lfs -text
*.blend filter=lfs diff=lfs merge=lfs -text *.blend filter=lfs diff=lfs merge=lfs -text
*.gltf filter=lfs diff=lfs merge=lfs -text *.gltf filter=lfs diff=lfs merge=lfs -text

View File

@ -132,10 +132,11 @@ Click at the link to get a list of the supported controls.
5. Make sure to reuse any existing `debug.keystore` when updating an app 5. Make sure to reuse any existing `debug.keystore` when updating an app
6. Don't forget to set the JAVA_HOME variable and restart Godot to take effect 6. Don't forget to set the JAVA_HOME variable and restart Godot to take effect
7. Install the `Godot XR Android OpenXR Loaders` plugin in Godot 7. Install the `Godot XR Android OpenXR Loaders` plugin in Godot
7. Configure the following in the android build template: 8. Configure the following in the android build template:
- XRMode set to OpenXR - XRMode set to OpenXR
- Check `Use Grandle Build` - Check `Use Grandle Build`
- Check `Godot OpenXR Meta` - Check `Godot OpenXR Meta`
- In XRFeatures, select at least optional for passthrough - In XRFeatures, select at least optional for passthrough
- Ckeck Internet under the permissions - Ckeck Internet under the permissions
- Under Resources > Filters to export, add `*.j2` - Under Resources > Filters to export, add `*.j2`
9. `<uses-feature android:name="com.oculus.feature.CONTEXTUAL_BOUNDARYLESS_APP" android:required="true" />` can be added to the `AndroidManifest.xml` to disable the boundary system.

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:d9423ef5121871fe9f60a673f76728265d2618f318a14e73affb4257cb42f73d oid sha256:991ebe1738a0621dd536436b99a7b5149d10e6b185008ec533eb2c5ca79fec0c
size 3906893 size 3087839

View File

@ -0,0 +1,11 @@
Model Information:
* title: Living Room
* source: https://sketchfab.com/3d-models/living-room-2978ca6c93fb4f5c83e346d5ecdef0b0
* author: Chin.Seng.Choy (https://sketchfab.com/Chin.Seng.Choy)
Model License:
* license type: CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
* requirements: Author must be credited. Commercial use is allowed.
If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
This work is based on "Living Room" (https://sketchfab.com/3d-models/living-room-2978ca6c93fb4f5c83e346d5ecdef0b0) by Chin.Seng.Choy (https://sketchfab.com/Chin.Seng.Choy) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1d35a507ec3e0d68d5c53cc2266d9214e05667589d8d296ccf3bb33b006311e5
size 206

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:06af551d079fb8f14d9034254a13cd6e720b7774e17729be01fb8b25ccbf52dd
size 165

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:41d1f8db78ffaa4752c3daf68487be9d363408ea3a4355b7dd1a439e3a5612cb
size 168

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4565c4345dd9333819659492257201dc9f9a33e233c5043c507fa8a77f15dc1a
size 160

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:72a0116bb4f5fef19be7cc52102b7f04a36f16928a7875e22ec55d69e3e648e8
size 162

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f0f0a53b3069e5c5ba445adbb838dbbd1fd4f9c1b0a87f135006d8f38a226faa
size 229

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f96aab51ce82ba130e9af3bd1ec2450090af046914aee958c17818a6e68a15c8
size 224

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:272260cd7eb9909ffc1a5f4a79eed95b167d8b6626ab736cc7c05d1a4c71457d
size 240

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fb417758bcf9b6dd72aef4b1c8617898a369c185ea9f067c5dd36c1424cb889b
size 224

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0b3c087b8ae49fd88047abacea4b1173407b36b5929b2fc2ef4403dc01a458ab
size 227

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:67278f616c6bae36dc399718c3b9a63c3c931aa99aab139a8766a540614f10c9
size 377

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:17f133baf72d6213a990597eb1c61f018407de85246f1fdb7021a2750c619dce
size 235

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a8e3d75b70fc67ea80c56bda41aecbf13192f58f8a4e5028e6cc8370e3569d06
size 216

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:181293527f21640076f522b355c2b6c4734a5f416afdaaebfd93e0bcd59821b2
size 167

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:66d6db9e0279f7d1b57b1b7f9236d590113173ac9cda0af51fe5ac87b7d5e678
size 168

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e7e27a7419e075f41d16c71db152833beec078a0ee09043d6cd4303bd1813406
size 163

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:267b7d699fbc25bac96e045bf6062290bc02f56848dd74b7dfa3b856101c1026
size 660

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e8ff646233fa14f1f4fe6ef98724ff2e3e814eb39e4ad66264b62221c975c44a
size 219

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9045cd2738b39e8f2ee0528754db91d64f7039a011453424d2572bc3fc99f372
size 621

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5822293bd0c6bcbb28f5b1789769aac473743baf402c0e3432a33b41e3b50635
size 215

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7d690799c96b18093d31a7a6d1c375f90972dc0e9ac00b1964405933c94edb21
size 227

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:639ee1b8d10b86730fd9d194c4b20cbdac60395c625e91eba05c28fdf25db183
size 208

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f1fb38003f39696e1c87ba0b49664ee64bd80877ba9a38fb8a0201f470c134bc
size 223

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e68a0de4a57abd6cc06ba5d26f2c18b8bd307332fcf8b442c868ede4dc730928
size 227

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a8bfb725b124a6498f63d50fc6b26cc7aa2393ae13ea365835c93b57fd5500e
size 225

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bf91f7b57835890fe8ecacbc123f31978414a656b242f3289d45782491beb60e
size 197

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be911d163802f6687bc9d8da5ee5f76ca1134a29450327c47ddc07f415f4ce6c
size 359

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:484f1fceda5dbaa63947a3292221145ee795629e9b92f3977835561f01c923d3
size 169

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1cef4e57713fc1b5a8e1a03dca8e54b79ed377352954478c94ace5fb94e975dc
size 628

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fc183d3c91857af38573ba7df9feb64ef718f3e90c319f3f380200e93931aea3
size 215

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b0843c3e0bd30b9e74052d29d9c55ca8c1d04dff314ee2bc83bd7e10b781a928
size 202

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:646f903156e0cb8a2efb01222806683f660d82de75d6c5abaf0ffda248717d7b
size 215

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8a509b0baf0d9974eb1a90c47e3daf5d16e99e4073f885f7c1f208bbb76f5854
size 216

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f4bfe2544f39d1385fe4247d91eddb739649f6ab99ac2cf1289b6c0ff2c6991c
size 213

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cb1e21cbac52e52324a80f9e4f95c821e783fb1b8003507340bdb25e94af6e7f
size 215

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fa150967e7053492bc4437362cbe4cb415f178d68e8e975c7c7724d4c77e14e9
size 201

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cf0b3aece28181c1006963d70de6444747f7567f72a037b858b77c6cac7b2a67
size 208

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78917b188ac5e5647c1de88ef9bb8272c6bd2ce85770e51c108da55feab33c50
size 213

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:90212c466b96497b224955dc00900bea68b7c8b0523dc867f765910daf7f0666
size 214

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e4444c6f626188521d5e6e37c28df98328d58ecf0bd3fc17c1349ee03dfb50b6
size 214

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a1cb92e9878e0d5585176cbaeb5647f9deb7649374fe37d50bbe955d7fe64c27
size 214

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d2489fed6dba64cf2b98ae373fa814505f42e22ab9b5645a08765df510827907
size 218

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d16c0fdfbf9004f7ef3ed281ec27601b1745b60e38347a594bbabd44561b3127
size 244

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6c44f9d82336f5d962a7f2c645237a83e33bf103092c250da1cf211e87a1ccdb
size 172

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fa2ae1910ffa29b46a1f4d43fb1186e748328bd6ba198bdb3bb464ac9274a41e
size 227

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b9e0a4ab478219d4d9649915b7dbdf4717c6577154270a79a80d1fd2029f8a71
size 222

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ab4f454678e5110c603b2e8826362fcc0c0899cd9fbfd60aac07fa0fb27bf3b0
size 171

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f99cc31ed5be4837ecb8d0d612a6fb79992ca528980d02d4b8777c42a3054d84
size 174

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d82bc954137c2789a85bc9f0c3bbdc15dc5e170c107135fb08975f9c1bf78b33
size 178

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9decb410e8b37605ad974bcb7f4b3cbd91bbb9fd8cd3db9274c50fc9fb545486
size 178

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5b64fae4cff5dd609288c6dd6dfd4b023ccfd29f16334bc942d30093a952a87f
size 173

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea5532232af16a2269593307ebd31b5d16c1383fcd97c3c334720df4e0349497
size 178

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:101cda2e8b6bd2f15908fd79036fbe8447d3b670d9fabb831e0fafa95e1b2ce2
size 178

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0f2e41964b6bbfaeb0619088d776c3037a33cbd6733c50a542a7c9823f63ea6b
size 177

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2d2bec6cef3b5a362e0b117ed9a6287aa1d1c5af9e6f30ef5ef9623a3e0d4905
size 178

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4979248e2c5e4de2a6c939054c72ca7f2214edb9d9159d853e4a00d97eb91654
size 178

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9d696ea02f5f7442ac717d1b8246edbaa46d1f9a462167f3eb12f1f70533dfad
size 178

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b0745d725107776c22e9cf91e107ac86f6d5d5bdd067bf372a148015432bf004
size 175

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ac0d0a1ad95acb48740aa4af7e2cba0c58a54ef5757917559cb5f09f75b7bdf1
size 176

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bf39eee07c74dcb28d61e49b028fcedfe5aed37ce15c846ea0e7054fc6c8fcaa
size 164

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:83e8e33a2d813acd3ec5732a492d3e221b26795705e3d3b3b280c737e135cc61
size 362

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c8abcc5f8fc231c639a7933775e0d8a76d694aa9b482458b0f49133e164f7025
size 166

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f51f1e67702f7a88cbc5fe5f8f3d37e12d81ea6ce0abd526619b6a691d34d35
size 218

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:31a5fd8ae8ae07257d4b25194e7b78c37583fc4c8c83bd672d20a45113505b7a
size 32972456

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:61bf4a623c2381daba8e6e45bb7386a394968a0deb621c96b2d1adee6deb4fdc
size 4223512

View File

@ -0,0 +1,287 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://c0pyxkvyd8uca"
path="res://.godot/imported/scene.gltf-e2c2ad1352f0744906d0c5025ff36336.scn"
[deps]
source_file="res://assets/living_room/scene.gltf"
dest_files=["res://.godot/imported/scene.gltf-e2c2ad1352f0744906d0c5025ff36336.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
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={
"materials": {
"0053_Ivory": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/0053_Ivory.tres"
},
"0128_White": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/0128_White.tres"
},
"BARRO_CANECA": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/BARRO_CANECA.tres"
},
"BRO3": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/BRO3.tres"
},
"BRO3_1": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/BRO3_1.tres"
},
"CHALEIRA_BASE_PRETA": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/CHALEIRA_BASE_PRETA.tres"
},
"CINZENTO_FORNO": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/CINZENTO_FORNO.tres"
},
"CROMADO": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/CROMADO.tres"
},
"CROMO_TORNEIRA": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/CROMO_TORNEIRA.tres"
},
"FRIGORIFICO_CORPO": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/FRIGORIFICO_CORPO.tres"
},
"Grass_Light_Green": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/Grass_Light_Green.tres"
},
"INTERRUPTOR_VERMELHO_FORNO": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/INTERRUPTOR_VERMELHO_FORNO.tres"
},
"LACADO": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/LACADO.tres"
},
"LOGO_CANECA": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/LOGO_CANECA.tres"
},
"LOGO_CANECA_3": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/LOGO_CANECA_3.tres"
},
"MOLDURA": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/MOLDURA.tres"
},
"MOLDURA_0": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/MOLDURA_0.tres"
},
"MOSTRADOR": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/MOSTRADOR.tres"
},
"PARQUET": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/PARQUET.tres"
},
"PLASTICO_BOX": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/PLASTICO_BOX.tres"
},
"PRATEADO_CROMO_TV": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/PRATEADO_CROMO_TV.tres"
},
"PRETO": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/PRETO.tres"
},
"PRETO_CADEIRA": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/PRETO_CADEIRA.tres"
},
"PRETO_FRIGORIFICO": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/PRETO_FRIGORIFICO.tres"
},
"PRETO_PORTAFORNO": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/PRETO_PORTAFORNO.tres"
},
"PRETO_TV": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/PRETO_TV.tres"
},
"TECIDO_SOFA": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/TECIDO_SOFA.tres"
},
"TECIDO_SOFA_4": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/TECIDO_SOFA_4.tres"
},
"TIJOLEIRA": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/TIJOLEIRA.tres"
},
"VASO1": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/VASO1.tres"
},
"VASO10": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/VASO10.tres"
},
"VASO11": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/VASO11.tres"
},
"VASO12": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/VASO12.tres"
},
"VASO2": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/VASO2.tres"
},
"VASO3": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/VASO3.tres"
},
"VASO4": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/VASO4.tres"
},
"VASO5": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/VASO5.tres"
},
"VASO6": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/VASO6.tres"
},
"VASO7": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/VASO7.tres"
},
"VASO8": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/VASO8.tres"
},
"VASO9": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/VASO9.tres"
},
"VIDRO": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/VIDRO.tres"
},
"VIDRO_FORNO": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/VIDRO_FORNO.tres"
},
"Vegetation_Grass1": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/Vegetation_Grass1.tres"
},
"cinzentinho_forno": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/cinzentinho_forno.tres"
},
"ecran": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/ecran.tres"
},
"edge_color000255": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/edge_color000255.tres"
},
"edge_color147614255": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/edge_color147614255.tres"
},
"edge_color148148148255": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/edge_color148148148255.tres"
},
"edge_color198198198255": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/edge_color198198198255.tres"
},
"edge_color20400255": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/edge_color20400255.tres"
},
"edge_color214214214255": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/edge_color214214214255.tres"
},
"edge_color222209193255": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/edge_color222209193255.tres"
},
"edge_color22610140255": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/edge_color22610140255.tres"
},
"edge_color239239239255": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/edge_color239239239255.tres"
},
"edge_color241242246255": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/edge_color241242246255.tres"
},
"edge_color255255255255": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/edge_color255255255255.tres"
},
"edge_color402720255": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/edge_color402720255.tres"
},
"edge_color7110240255": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/edge_color7110240255.tres"
},
"material": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/material.tres"
},
"material_1": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/material_1.tres"
},
"material_2": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/material_2.tres"
},
"material_5": {
"use_external/enabled": true,
"use_external/path": "res://assets/living_room/materials/material_5.tres"
}
}
}
gltf/embedded_image_handling=1

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:838edd9d7c6125293b60366d823cdfd32d3eb79996f42e197709ebafc1cd7aa5
size 33961

View File

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bdjlc24yn5she"
path.s3tc="res://.godot/imported/Grass_Light_Green_baseColor.jpeg-11ca1d423d1a927f29ffd5f267ac4ac4.s3tc.ctex"
path.etc2="res://.godot/imported/Grass_Light_Green_baseColor.jpeg-11ca1d423d1a927f29ffd5f267ac4ac4.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/living_room/textures/Grass_Light_Green_baseColor.jpeg"
dest_files=["res://.godot/imported/Grass_Light_Green_baseColor.jpeg-11ca1d423d1a927f29ffd5f267ac4ac4.s3tc.ctex", "res://.godot/imported/Grass_Light_Green_baseColor.jpeg-11ca1d423d1a927f29ffd5f267ac4ac4.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:686b002ce4a15af42ab3538fdb10730c6e295f7c68f6a3c9d1a0d0a356fb94f0
size 396636

View File

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://de45vjmo0kfiw"
path.s3tc="res://.godot/imported/MOLDURA_0_baseColor.jpeg-40912bdcfd21e27d43637e4e53efc606.s3tc.ctex"
path.etc2="res://.godot/imported/MOLDURA_0_baseColor.jpeg-40912bdcfd21e27d43637e4e53efc606.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/living_room/textures/MOLDURA_0_baseColor.jpeg"
dest_files=["res://.godot/imported/MOLDURA_0_baseColor.jpeg-40912bdcfd21e27d43637e4e53efc606.s3tc.ctex", "res://.godot/imported/MOLDURA_0_baseColor.jpeg-40912bdcfd21e27d43637e4e53efc606.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e1fc5715e52178ba1f60a5815c3c7628b177929bd39c56321f709e4618701546
size 418560

View File

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bk3vn3fw0d3wo"
path.s3tc="res://.godot/imported/MOLDURA_0_metallicRoughness.png-b927d5d4ebcc32198b9f0a5351e1a0ef.s3tc.ctex"
path.etc2="res://.godot/imported/MOLDURA_0_metallicRoughness.png-b927d5d4ebcc32198b9f0a5351e1a0ef.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/living_room/textures/MOLDURA_0_metallicRoughness.png"
dest_files=["res://.godot/imported/MOLDURA_0_metallicRoughness.png-b927d5d4ebcc32198b9f0a5351e1a0ef.s3tc.ctex", "res://.godot/imported/MOLDURA_0_metallicRoughness.png-b927d5d4ebcc32198b9f0a5351e1a0ef.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:20e82467587dd532c8cd016dc328770732ab108cc40dbc132dcfafba6bd6f7b9
size 118404

View File

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ufh8jhikxwh5"
path.s3tc="res://.godot/imported/PARQUET_baseColor.jpeg-68d93403df5754e747e29a1e2b701cc9.s3tc.ctex"
path.etc2="res://.godot/imported/PARQUET_baseColor.jpeg-68d93403df5754e747e29a1e2b701cc9.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/living_room/textures/PARQUET_baseColor.jpeg"
dest_files=["res://.godot/imported/PARQUET_baseColor.jpeg-68d93403df5754e747e29a1e2b701cc9.s3tc.ctex", "res://.godot/imported/PARQUET_baseColor.jpeg-68d93403df5754e747e29a1e2b701cc9.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:265ce4cbe882c7a7c1830a930ef87258353a4fb981707470e2c2f2f0d56bba66
size 110223

View File

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cu063jar47pof"
path.s3tc="res://.godot/imported/PARQUET_metallicRoughness.png-8d8bf7f91cecfbd91c049adb2bc533a6.s3tc.ctex"
path.etc2="res://.godot/imported/PARQUET_metallicRoughness.png-8d8bf7f91cecfbd91c049adb2bc533a6.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/living_room/textures/PARQUET_metallicRoughness.png"
dest_files=["res://.godot/imported/PARQUET_metallicRoughness.png-8d8bf7f91cecfbd91c049adb2bc533a6.s3tc.ctex", "res://.godot/imported/PARQUET_metallicRoughness.png-8d8bf7f91cecfbd91c049adb2bc533a6.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bee035f484ebc2a80f8178fd138f32e2fce301d212ae0b8be738da331f1da75b
size 81550

View File

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cidaccuym6j27"
path.s3tc="res://.godot/imported/TECIDO_SOFA_baseColor.jpeg-1758c46433fc600e2e04869f81f51816.s3tc.ctex"
path.etc2="res://.godot/imported/TECIDO_SOFA_baseColor.jpeg-1758c46433fc600e2e04869f81f51816.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/living_room/textures/TECIDO_SOFA_baseColor.jpeg"
dest_files=["res://.godot/imported/TECIDO_SOFA_baseColor.jpeg-1758c46433fc600e2e04869f81f51816.s3tc.ctex", "res://.godot/imported/TECIDO_SOFA_baseColor.jpeg-1758c46433fc600e2e04869f81f51816.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a14689b7980d426df3def98a79c4fc791ac8b23dc77752f6a51516761aedab66
size 172882

View File

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dxuejltt51gad"
path.s3tc="res://.godot/imported/TIJOLEIRA_baseColor.jpeg-3210b6484e9b403d8c78a757ecdd2b56.s3tc.ctex"
path.etc2="res://.godot/imported/TIJOLEIRA_baseColor.jpeg-3210b6484e9b403d8c78a757ecdd2b56.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/living_room/textures/TIJOLEIRA_baseColor.jpeg"
dest_files=["res://.godot/imported/TIJOLEIRA_baseColor.jpeg-3210b6484e9b403d8c78a757ecdd2b56.s3tc.ctex", "res://.godot/imported/TIJOLEIRA_baseColor.jpeg-3210b6484e9b403d8c78a757ecdd2b56.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:41336fe4b437bafde326627e0dd30c89ef2b08adfd50411369502d31fc1034e7
size 139790

View File

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://crai1mfrciwer"
path.s3tc="res://.godot/imported/TIJOLEIRA_metallicRoughness.png-a85189ea7a60296c80fa2c8b29362965.s3tc.ctex"
path.etc2="res://.godot/imported/TIJOLEIRA_metallicRoughness.png-a85189ea7a60296c80fa2c8b29362965.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/living_room/textures/TIJOLEIRA_metallicRoughness.png"
dest_files=["res://.godot/imported/TIJOLEIRA_metallicRoughness.png-a85189ea7a60296c80fa2c8b29362965.s3tc.ctex", "res://.godot/imported/TIJOLEIRA_metallicRoughness.png-a85189ea7a60296c80fa2c8b29362965.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
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

View File

@ -1,4 +1,3 @@
[gd_resource type="StandardMaterial3D" format=3 uid="uid://bertj8bp8b5l1"] version https://git-lfs.github.com/spec/v1
oid sha256:55d5f30db336a8f8f7633743c23e41077d5c1a1b900c475a6d3811746eba3d1b
[resource] size 141
albedo_color = Color(0.286275, 0.309804, 0.439216, 1)

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:eead3733b7242e93c1739fcebd649efd1ce56ad1a3934e69d850c6ef3df66b9c oid sha256:97ebf636b842f381a15cecbfbbf8128e5ffb7171b2b3dd24e6bef7ab036a67a7
size 351 size 361

View File

@ -2,22 +2,53 @@ extends StaticBody3D
@export var entity_id = "switch.plug_printer_2" @export var entity_id = "switch.plug_printer_2"
@onready var sprite: AnimatedSprite3D = $Icon @onready var sprite: AnimatedSprite3D = $Icon
@onready var animation: AnimationPlayer = $AnimationPlayer
@onready var shape = $CSGCombiner3D
@onready var rod_top = $RodTop
@onready var rod_bottom = $RodBottom
@onready var slider_knob = $Knob
var state = false
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():
var stateInfo = await HomeAdapters.adapter.get_state(entity_id) var stateInfo = await HomeAdapters.adapter.get_state(entity_id)
if stateInfo["state"] == "on": set_state(stateInfo["state"] == "on")
sprite.set_frame(0)
else:
sprite.set_frame(1)
await HomeAdapters.adapter.watch_state(entity_id, func(new_state):
if (new_state["state"] == "on") == state:
return
set_state(new_state["state"] == "on")
)
func set_state(state: bool):
self.state = state
if state:
animation.play_backwards("light")
else:
animation.play("light")
func _on_click(event): func _on_click(event):
HomeAdapters.adapter.set_state(entity_id, "off" if sprite.get_frame() == 0 else "on") if event.target == self:
if sprite.get_frame() == 0: HomeAdapters.adapter.set_state(entity_id, "on" if !state else "off")
sprite.set_frame(1) set_state(!state)
else: else:
sprite.set_frame(0) _on_clickable_on_click(event)
func _on_request_completed(): func _on_request_completed():
pass pass
func _on_clickable_on_click(event):
var click_pos: Vector3 = to_local(event.ray.get_collision_point())
var vec_bottom_to_top = rod_top.position - rod_bottom.position
var length_click = click_pos.y - rod_bottom.position.y
var length_total = vec_bottom_to_top.y
var ratio = length_click / length_total
var new_pos = rod_bottom.position.lerp(rod_top.position, ratio)
slider_knob.position = new_pos
HomeAdapters.adapter.set_state(entity_id, "on" if state else "off", {"brightness_pct": int(ratio * 100)})

View File

@ -1,12 +1,13 @@
[gd_scene load_steps=7 format=3 uid="uid://cw86rc42dv2d8"] [gd_scene load_steps=14 format=3 uid="uid://cw86rc42dv2d8"]
[ext_resource type="Script" path="res://content/entities/light/light.gd" id="1_ykxy3"] [ext_resource type="Script" path="res://content/entities/light/light.gd" id="1_ykxy3"]
[ext_resource type="Texture2D" uid="uid://b72vsbcvqqxg7" path="res://assets/materials/swich_on.png" id="2_6gn2e"] [ext_resource type="Texture2D" uid="uid://b72vsbcvqqxg7" path="res://assets/materials/swich_on.png" id="2_6gn2e"]
[ext_resource type="Texture2D" uid="uid://cvc0o6dsktnvl" path="res://assets/materials/switch_off.png" id="3_qlm62"] [ext_resource type="Texture2D" uid="uid://cvc0o6dsktnvl" path="res://assets/materials/switch_off.png" id="3_qlm62"]
[ext_resource type="Script" path="res://content/functions/movable.gd" id="4_4sfxb"] [ext_resource type="Script" path="res://content/functions/movable.gd" id="4_4sfxb"]
[ext_resource type="Material" uid="uid://vce66e7sbc3n" path="res://content/entities/light/light_on.tres" id="5_50gph"]
[sub_resource type="SphereShape3D" id="SphereShape3D_ukj14"] [sub_resource type="SphereShape3D" id="SphereShape3D_ukj14"]
radius = 0.1 radius = 0.06
[sub_resource type="SpriteFrames" id="SpriteFrames_ldpuo"] [sub_resource type="SpriteFrames" id="SpriteFrames_ldpuo"]
animations = [{ animations = [{
@ -22,6 +23,69 @@ animations = [{
"speed": 5.0 "speed": 5.0
}] }]
[sub_resource type="Animation" id="Animation_7o31s"]
resource_name = "light"
length = 0.3
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("CSGCombiner3D:material_override:albedo_color")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.3),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [Color(1, 0.85098, 0, 1), Color(0.231373, 0.231373, 0.231373, 1)]
}
[sub_resource type="Animation" id="Animation_afofi"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("CSGCombiner3D:material_override:albedo_color")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Color(1, 0.85098, 0, 1)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Knob:position")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0, 0.0492394, -0.0903599)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_8a76q"]
_data = {
"RESET": SubResource("Animation_afofi"),
"light": SubResource("Animation_7o31s")
}
[sub_resource type="CylinderMesh" id="CylinderMesh_j3pn3"]
top_radius = 0.002
bottom_radius = 0.002
height = 0.1
[sub_resource type="CylinderShape3D" id="CylinderShape3D_tysib"]
height = 0.1
radius = 0.006
[sub_resource type="CylinderMesh" id="CylinderMesh_s8215"]
top_radius = 0.004
bottom_radius = 0.004
height = 0.002
[node name="Light" type="StaticBody3D"] [node name="Light" type="StaticBody3D"]
script = ExtResource("1_ykxy3") script = ExtResource("1_ykxy3")
@ -29,9 +93,50 @@ script = ExtResource("1_ykxy3")
shape = SubResource("SphereShape3D_ukj14") shape = SubResource("SphereShape3D_ukj14")
[node name="Icon" type="AnimatedSprite3D" parent="."] [node name="Icon" type="AnimatedSprite3D" parent="."]
visible = false
pixel_size = 0.0005 pixel_size = 0.0005
billboard = 1 billboard = 1
sprite_frames = SubResource("SpriteFrames_ldpuo") sprite_frames = SubResource("SpriteFrames_ldpuo")
[node name="Movable" type="Node" parent="."] [node name="Movable" type="Node" parent="."]
script = ExtResource("4_4sfxb") script = ExtResource("4_4sfxb")
[node name="CSGCombiner3D" type="CSGCombiner3D" parent="."]
transform = Transform3D(1, 9.69949e-05, 0.000589194, -9.77749e-05, 0.999999, 0.00135802, -0.000589065, -0.00135808, 0.999999, 0, 0, 0)
material_override = ExtResource("5_50gph")
[node name="CSGSphere3D" type="CSGSphere3D" parent="CSGCombiner3D"]
radius = 0.05
radial_segments = 36
rings = 12
[node name="CSGCylinder3D" type="CSGCylinder3D" parent="CSGCombiner3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0485739, 0)
radius = 0.02
height = 0.03
sides = 36
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
"": SubResource("AnimationLibrary_8a76q")
}
[node name="Rod" type="StaticBody3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.0903599)
[node name="MeshInstance3D" type="MeshInstance3D" parent="Rod"]
mesh = SubResource("CylinderMesh_j3pn3")
skeleton = NodePath("../..")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Rod"]
shape = SubResource("CylinderShape3D_tysib")
[node name="Knob" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0492394, -0.0903599)
mesh = SubResource("CylinderMesh_s8215")
[node name="RodBottom" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0501399, -0.090675)
[node name="RodTop" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0498752, -0.090942)

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a91a5382c57467807e4afe3a1d52a1ce762977812c0ed7822b73bf440f32b35
size 263

View File

@ -4,8 +4,54 @@ var sky = preload("res://assets/materials/sky.material")
var sky_passthrough = preload("res://assets/materials/sky_passthrough.material") var sky_passthrough = preload("res://assets/materials/sky_passthrough.material")
@onready var environment: WorldEnvironment = $WorldEnvironment @onready var environment: WorldEnvironment = $WorldEnvironment
@onready var camera: XRCamera3D = $XROrigin3D/XRCamera3D
@onready var controller_left = $XROrigin3D/XRControllerLeft
@onready var controller_right = $XROrigin3D/XRControllerRight
@onready var house = $House
func _ready(): func _ready():
# In case we're running on the headset, use the passthrough sky # In case we're running on the headset, use the passthrough sky
if OS.get_name() == "Android": if OS.get_name() == "Android":
environment.environment.sky.set_material(sky_passthrough) environment.environment.sky.set_material(sky_passthrough)
house.visible = false
else:
house.visible = true
func _process(delta):
if OS.get_name() != "Android":
var camera_basis = camera.get_global_transform().basis
camera_basis.x.y = 0
camera_basis.z.y = 0
camera_basis.y = Vector3(0, 1, 0)
camera_basis.x = camera_basis.x.normalized()
camera_basis.z = camera_basis.z.normalized()
var movement = camera_basis * vector_key_mapping(KEY_D, KEY_A, KEY_S, KEY_W) * delta
camera.position += movement
controller_left.position += movement
controller_right.position += movement
func vector_key_mapping(key_positive_x: int, key_negative_x: int, key_positive_y: int, key_negative_y: int):
var x = 0
var y = 0
if Input.is_physical_key_pressed(key_positive_y):
y = 1
elif Input.is_physical_key_pressed(key_negative_y):
y = -1
if Input.is_physical_key_pressed(key_positive_x):
x = 1
elif Input.is_physical_key_pressed(key_negative_x):
x = -1
var vec = Vector3(x, 0 , y)
if vec:
vec = vec.normalized()
return vec

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=12 format=3 uid="uid://eecv28y6jxk4"] [gd_scene load_steps=13 format=3 uid="uid://eecv28y6jxk4"]
[ext_resource type="PackedScene" uid="uid://clc5dre31iskm" path="res://addons/godot-xr-tools/xr/start_xr.tscn" id="1_i4c04"] [ext_resource type="PackedScene" uid="uid://clc5dre31iskm" path="res://addons/godot-xr-tools/xr/start_xr.tscn" id="1_i4c04"]
[ext_resource type="Script" path="res://content/raycast.gd" id="1_tsqxc"] [ext_resource type="Script" path="res://content/raycast.gd" id="1_tsqxc"]
@ -7,6 +7,7 @@
[ext_resource type="Texture2D" uid="uid://bo55nohs0wsgf" path="res://assets/materials/pointer.png" id="4_wcfej"] [ext_resource type="Texture2D" uid="uid://bo55nohs0wsgf" path="res://assets/materials/pointer.png" id="4_wcfej"]
[ext_resource type="PackedScene" uid="uid://ctltchlf2j2r4" path="res://addons/xr-simulator/XRSimulator.tscn" id="5_3qc8g"] [ext_resource type="PackedScene" uid="uid://ctltchlf2j2r4" path="res://addons/xr-simulator/XRSimulator.tscn" id="5_3qc8g"]
[ext_resource type="Material" uid="uid://bf5ina366dwm6" path="res://assets/materials/sky.material" id="5_wgwf8"] [ext_resource type="Material" uid="uid://bf5ina366dwm6" path="res://assets/materials/sky.material" id="5_wgwf8"]
[ext_resource type="PackedScene" uid="uid://83lb5p4e0qk0" path="res://content/scenes/house.tscn" id="8_qkrg7"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_m58yb"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_m58yb"]
ao_enabled = true ao_enabled = true
@ -63,7 +64,7 @@ target_position = Vector3(0, -5, 0)
[node name="Decal" type="Decal" parent="XROrigin3D/XRControllerRight/Raycast"] [node name="Decal" type="Decal" parent="XROrigin3D/XRControllerRight/Raycast"]
transform = Transform3D(0.999999, -0.000567105, -2.5179e-05, -2.51789e-05, 4.39886e-08, -0.999999, 0.000567105, 1, 2.97064e-08, -0.000775784, -1.09076e-05, -2.46767) transform = Transform3D(0.999999, -0.000567105, -2.5179e-05, -2.51789e-05, 4.39886e-08, -0.999999, 0.000567105, 1, 2.97064e-08, -0.000775784, -1.09076e-05, -2.46767)
size = Vector3(0.01, 5, 0.01) size = Vector3(0.02, 5, 0.02)
texture_albedo = ExtResource("4_wcfej") texture_albedo = ExtResource("4_wcfej")
[node name="StartXR" parent="." instance=ExtResource("1_i4c04")] [node name="StartXR" parent="." instance=ExtResource("1_i4c04")]
@ -78,3 +79,6 @@ shadow_enabled = true
[node name="XRSimulator" parent="." instance=ExtResource("5_3qc8g")] [node name="XRSimulator" parent="." instance=ExtResource("5_3qc8g")]
xr_origin = NodePath("../XROrigin3D") xr_origin = NodePath("../XROrigin3D")
[node name="House" parent="." instance=ExtResource("8_qkrg7")]
transform = Transform3D(0.404247, 0.000180645, 0.914648, 0.00017221, 0.999999, -0.000273614, -0.914648, 0.00026812, 0.404247, -0.343479, 0.000110551, 1.91547)

16
content/scenes/house.tscn Normal file
View File

@ -0,0 +1,16 @@
[gd_scene load_steps=3 format=3 uid="uid://83lb5p4e0qk0"]
[ext_resource type="PackedScene" uid="uid://c0pyxkvyd8uca" path="res://assets/living_room/scene.gltf" id="1_mu2l0"]
[sub_resource type="PlaneMesh" id="PlaneMesh_b3o5e"]
size = Vector2(5, 2)
[node name="House" type="Node3D"]
transform = Transform3D(1, -1.39637e-11, 0, 9.47975e-12, 1, 0, 0, 0, 1, 0, 0, 0)
[node name="scene" parent="." instance=ExtResource("1_mu2l0")]
transform = Transform3D(0.01, 7.86411e-14, 0, -2.05335e-13, 0.01, 7.10543e-15, 0, 0, 0.01, 0, 0, 0)
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
transform = Transform3D(0.999999, -0.000592284, 0.000541925, -0.000592284, -1, -7.3062e-08, 0.000541926, -2.47913e-07, -0.999999, 2.38683, 1.18178, -1.05161)
mesh = SubResource("PlaneMesh_b3o5e")

View File

@ -113,7 +113,7 @@ func start_subscriptions():
if packet.event.c[entity]["+"].has("s"): if packet.event.c[entity]["+"].has("s"):
entities[entity]["state"] = packet.event.c[entity]["+"]["s"] entities[entity]["state"] = packet.event.c[entity]["+"]["s"]
if packet.event.c[entity]["+"].has("a"): if packet.event.c[entity]["+"].has("a"):
entities[entity]["attributes"].merge(packet.event.c[entity]["+"]["a"]) entities[entity]["attributes"].merge(packet.event.c[entity]["+"]["a"], true)
entitiy_callbacks.call_key(entity, [entities[entity]]) entitiy_callbacks.call_key(entity, [entities[entity]])
) )