From 22cdfdd27aaa885ac5b7b450c8fb82b87853250d Mon Sep 17 00:00:00 2001 From: Andrew O'Doherty Date: Fri, 27 Apr 2018 12:37:48 +0200 Subject: add 3d alexa knx demo The knx-demo directory needs to be divided into two sub-directories containing the alexa 3D demo and the 2d demo. Very large files used by the 3d demo are stored in https://git-lfs.qt.io/Gerrit/boot2qt-demos.git Change-Id: I55e4210e93fc9e017d85e163f13c0b04de96cff0 Reviewed-by: Karsten Heimrich --- .../uip/models/HeatAreas/HeatAreas.import | 76 ++++++++++++++++++++++ .../HeatAreas/meshes/HeatAreas Heat_BathRoom.mesh | 3 + .../HeatAreas/meshes/HeatAreas Heat_BedRoom.mesh | 3 + .../HeatAreas/meshes/HeatAreas Heat_DressRoom.mesh | 3 + .../meshes/HeatAreas Heat_LivingRoom.mesh | 3 + .../meshes/HeatAreas Heat_MasterBedroom.mesh | 3 + .../HeatAreas/meshes/HeatAreas Heat_Sauna.mesh | 3 + .../HeatAreas/meshes/HeatAreas Heat_StoreRoom.mesh | 3 + .../HeatAreas/meshes/HeatAreas Heat_Toilet.mesh | 3 + .../HeatAreas/meshes/Heat_Entrance HeatAreas.mesh | 3 + .../uip/models/House/House.import | 39 +++++++++++ .../uip/models/House/meshes/Ground.mesh | 3 + .../uip/models/House/meshes/House.mesh | 3 + .../uip/models/House/meshes/Roof.mesh | 3 + .../uip/models/House/meshes/Windows.mesh | 3 + .../uip/models/Light/Light.import | 9 +++ .../uip/models/RoomLights/RoomLights.import | 46 +++++++++++++ .../models/RoomLights/meshes/BathroomLightmap.mesh | 3 + .../models/RoomLights/meshes/BedroomLightmap.mesh | 3 + .../models/RoomLights/meshes/EntranceLightmap.mesh | 3 + .../RoomLights/meshes/LivingroomLightMap.mesh | 3 + .../RoomLights/meshes/MasterbedroomLightmap.mesh | 3 + 22 files changed, 224 insertions(+) create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/HeatAreas.import create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_BathRoom.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_BedRoom.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_DressRoom.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_LivingRoom.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_MasterBedroom.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_Sauna.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_StoreRoom.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_Toilet.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/Heat_Entrance HeatAreas.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/House.import create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/Ground.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/House.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/Roof.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/Windows.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/Light/Light.import create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/RoomLights.import create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/BathroomLightmap.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/BedroomLightmap.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/EntranceLightmap.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/LivingroomLightMap.mesh create mode 100644 tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/MasterbedroomLightmap.mesh (limited to 'tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models') diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/HeatAreas.import b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/HeatAreas.import new file mode 100644 index 0000000..72ddff0 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/HeatAreas.import @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HeatAreas Heat_LivingRoom + meshes\HeatAreas Heat_LivingRoom.mesh + + + Heat_Entrance HeatAreas + meshes\Heat_Entrance HeatAreas.mesh + + + HeatAreas Heat_Sauna + meshes\HeatAreas Heat_Sauna.mesh + + + HeatAreas Heat_Toilet + meshes\HeatAreas Heat_Toilet.mesh + + + HeatAreas Heat_StoreRoom + meshes\HeatAreas Heat_StoreRoom.mesh + + + HeatAreas Heat_BedRoom + meshes\HeatAreas Heat_BedRoom.mesh + + + HeatAreas Heat_MasterBedroom + meshes\HeatAreas Heat_MasterBedroom.mesh + + + HeatAreas Heat_DressRoom + meshes\HeatAreas Heat_DressRoom.mesh + + + HeatAreas Heat_BathRoom + meshes\HeatAreas Heat_BathRoom.mesh + + + + diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_BathRoom.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_BathRoom.mesh new file mode 100644 index 0000000..df02c6f --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_BathRoom.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e18aead7ab11e9be5eb9558a7547a901ba1e058e849e7c67267cde84673c3332 +size 1072 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_BedRoom.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_BedRoom.mesh new file mode 100644 index 0000000..c1dbfb4 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_BedRoom.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51cdbbe7e30f4e45754c9d3341063fb2cb8b4bd219a036496ca979274516143e +size 596 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_DressRoom.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_DressRoom.mesh new file mode 100644 index 0000000..d4a85f8 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_DressRoom.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:222446510da9bcbeb6c742d25d17ad86db760439d43981aca9aa387e91ba3d51 +size 600 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_LivingRoom.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_LivingRoom.mesh new file mode 100644 index 0000000..99b0236 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_LivingRoom.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5021ff6b3834d26ba635bec3a38444d2db5a9a341d9047b95870c4a3d3d83df0 +size 3064 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_MasterBedroom.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_MasterBedroom.mesh new file mode 100644 index 0000000..d20100b --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_MasterBedroom.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a695743b3441e9eaa444503c5e353b7ad5ad24217ed70aa7ffc383e35533b471 +size 1080 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_Sauna.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_Sauna.mesh new file mode 100644 index 0000000..e77e3e7 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_Sauna.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6afa17f05c26b53bee94c92a54c32a9090d9f0f0374fa8e3d855ba55d54b8373 +size 592 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_StoreRoom.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_StoreRoom.mesh new file mode 100644 index 0000000..4c88238 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_StoreRoom.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7bfb1f10bb45230c58895d941adbc044dd89436d2c486bc9ba38fdb5a0c58a4 +size 600 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_Toilet.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_Toilet.mesh new file mode 100644 index 0000000..aeb9ee2 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/HeatAreas Heat_Toilet.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbcd0d0c561a1f73188a3378339e81343ce77b2c9113ce063c5e555daecd4dea +size 596 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/Heat_Entrance HeatAreas.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/Heat_Entrance HeatAreas.mesh new file mode 100644 index 0000000..68af64c --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/HeatAreas/meshes/Heat_Entrance HeatAreas.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f391836bea853a31f21d460242f89028a6955f9bfa7466ab06961d780bfcbb27 +size 600 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/House.import b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/House.import new file mode 100644 index 0000000..4c87625 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/House.import @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + Roof + meshes\Roof.mesh + + + Ground + meshes\Ground.mesh + + + Windows + meshes\Windows.mesh + + + House + meshes\House.mesh + + + + diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/Ground.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/Ground.mesh new file mode 100644 index 0000000..36ac289 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/Ground.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b25be4c0cded582c9aa0fc06fd53e0a5d70fb448f7f6a87fdc3982b20ea5cf6 +size 692 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/House.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/House.mesh new file mode 100644 index 0000000..2568ef3 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/House.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:080b2e1cadc82771c0e114ca75ea5340cce164d2b49f54cfaf251cb298052f01 +size 375532 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/Roof.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/Roof.mesh new file mode 100644 index 0000000..59a1889 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/Roof.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d464763d1ad262ee9ec37c0e7649a2c0736db39b963fc16f909ab1b8b77fe059 +size 33324 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/Windows.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/Windows.mesh new file mode 100644 index 0000000..1c7cf65 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/House/meshes/Windows.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84defa65be6e62eb0ae63a42f33eb9982a3e741d71b72a775502e368252a57df +size 5048 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/Light/Light.import b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/Light/Light.import new file mode 100644 index 0000000..9deb049 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/Light/Light.import @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/RoomLights.import b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/RoomLights.import new file mode 100644 index 0000000..e39b9d5 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/RoomLights.import @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + BedroomLightmap + .\meshes\BedroomLightmap.mesh + + + EntranceLightmap + .\meshes\EntranceLightmap.mesh + + + BathroomLightmap + .\meshes\BathroomLightmap.mesh + + + LivingroomLightMap + .\meshes\LivingroomLightMap.mesh + + + MasterbedroomLightmap + .\meshes\MasterbedroomLightmap.mesh + + + + diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/BathroomLightmap.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/BathroomLightmap.mesh new file mode 100644 index 0000000..f850d88 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/BathroomLightmap.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:645b3f16c5f782da28944cfb45251fe23dd96080ae86c0c1c5801e898eae52fc +size 16344 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/BedroomLightmap.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/BedroomLightmap.mesh new file mode 100644 index 0000000..61ce5d4 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/BedroomLightmap.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60f5a2c3f079add7486699a9712f2eca374a5bcd054be1386393f64bc7c28009 +size 16472 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/EntranceLightmap.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/EntranceLightmap.mesh new file mode 100644 index 0000000..13734ba --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/EntranceLightmap.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:762e6c6890b7162f0a7cb4f46d3d6f097595a2555412373460f9eb858ed38aa0 +size 12072 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/LivingroomLightMap.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/LivingroomLightMap.mesh new file mode 100644 index 0000000..2e9aed0 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/LivingroomLightMap.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f1727480055d9de07f96b7ee4b92fbceff3109b450c03612ab75180f83d772e +size 108380 diff --git a/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/MasterbedroomLightmap.mesh b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/MasterbedroomLightmap.mesh new file mode 100644 index 0000000..e6dfd73 --- /dev/null +++ b/tradeshow/knx-demo/3d-Alexa-knx-demo/uip/models/RoomLights/meshes/MasterbedroomLightmap.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:463612a790952c9c2ea9f6389ace48d31432db5e1bf3cd0936e034b632fba5b1 +size 18852 -- cgit v1.2.3