diff --git a/app/data/projects/Duplex/index.json b/app/data/projects/Duplex/index.json index f1c6e300..6177a69c 100644 --- a/app/data/projects/Duplex/index.json +++ b/app/data/projects/Duplex/index.json @@ -11,10 +11,7 @@ "cameraNear": "0.05", "cameraFar": "3000.0", "saoEnabled": "true", - "saoBias": "0.5", - "saoIntensity": "0.5", - "saoScale": "1200.0", - "saoKernelRadius": "100" + "objectColorSource": "model" }, "viewerContent": { "modelsLoaded": [ diff --git a/app/data/projects/HolterTower/index.json b/app/data/projects/HolterTower/index.json index 732d2a85..c6595eff 100644 --- a/app/data/projects/HolterTower/index.json +++ b/app/data/projects/HolterTower/index.json @@ -1,21 +1,34 @@ { - "id": "holterTower", - "name": "HolterTower", - "models": [ - { - "id": "design", - "name": "Holter Tower" + "id": "holterTower", + "name": "HolterTower", + "models": [ + { + "id": "design", + "name": "Holter Tower", + "backfaces": false + } + ], + "viewerConfigs": { + "backgroundColor": [ + 0.9, + 0.9, + 1.0 + ], + "saoNumSamples": 60, + "saoKernelRadius": 200, + "objectColorSource": "model" + }, + "viewerContent": { + "modelsLoaded": [ + "design" + ] + }, + "viewerState": { + "tabOpen": "classes", + "expandObjectsTree": 3, + "expandClassesTree": 1, + "expandStoreysTree": 1, + "saoEnabled": "true", + "objectColorSource": "viewer" } - ], - "viewerContent": { - "modelsLoaded": [ - "design" - ] - }, - "viewerState": { - "tabOpen": "classes", - "expandObjectsTree": 3, - "expandClassesTree": 1, - "expandStoreysTree": 1 - } } \ No newline at end of file diff --git a/app/data/projects/MAP/index.json b/app/data/projects/MAP/index.json index 0bc365a3..77662a82 100644 --- a/app/data/projects/MAP/index.json +++ b/app/data/projects/MAP/index.json @@ -4,8 +4,7 @@ "models": [ { "id": "MAPFullPrecision", - "name": "Full-Precision Model", - "saoEnabled": false + "name": "Double-Precision Model" }, { "id": "MAPJitter", @@ -14,8 +13,16 @@ } ], "viewerConfigs": { + "backgroundColor": [ + 0.9, + 0.9, + 1.0 + ], "cameraNear": "0.05", - "cameraFar": "3000.0" + "cameraFar": "3000.0", + "saoNumSamples": 50, + "saoKernelRadius": 100, + "objectColorSource": "model" }, "viewerContent": { "modelsLoaded": [ @@ -29,20 +36,21 @@ "expandStoreysTree": 1, "setCamera": { "eye": [ - 1842072.0004422595, - 36.787413105361736, - -5173313.014714716 + 1841982.5187600704, + 19.207790938410042, + -5173303.042326414 ], "look": [ - 1842022.2889441466, - 10.494778407372536, - -5173301.847852232 + 1842011.793756829, + 9.913817421536704, + -5173299.841616623 ], "up": [ - -0.4474339881582741, - 0.8886511377283971, - 0.10050861482881593 + 0.2991762376746394, + 0.9536370664170352, + 0.0327096983532173 ] } } -} \ No newline at end of file +} + diff --git a/app/data/projects/MAP/models/MAPFullPrecision/geometry.xkt b/app/data/projects/MAP/models/MAPFullPrecision/geometry.xkt index 09691d64..574786e4 100644 Binary files a/app/data/projects/MAP/models/MAPFullPrecision/geometry.xkt and b/app/data/projects/MAP/models/MAPFullPrecision/geometry.xkt differ diff --git a/app/data/projects/ManyModels/index.json b/app/data/projects/ManyModels/index.json index 81ac5b91..fd0bc86f 100644 --- a/app/data/projects/ManyModels/index.json +++ b/app/data/projects/ManyModels/index.json @@ -46,16 +46,7 @@ "viewerConfigs": { "cameraNear": "0.05", "cameraFar": "3000.0", - "saoEnabled": "true", - "saoBias": "0.5", - "saoIntensity": "0.5", - "saoScale": "1200.0", - "saoKernelRadius": "100", - "saoInteractive": false, - "saoInteractiveDelay": 500, - "edgesEnabled": "true", - "edgesInteractive": false, - "edgesInteractiveDelay": 500 + "saoEnabled": "true" }, "viewerContent": { "modelsLoaded": [ diff --git a/app/data/projects/OTCConferenceCenter/index.json b/app/data/projects/OTCConferenceCenter/index.json index a6e91448..e446e24d 100644 --- a/app/data/projects/OTCConferenceCenter/index.json +++ b/app/data/projects/OTCConferenceCenter/index.json @@ -11,12 +11,9 @@ "cameraNear": "0.05", "cameraFar": "3000.0", "saoEnabled": "true", - "saoBias": "0.5", - "saoIntensity": "0.7", - "saoScale": "1200.0", - "saoKernelRadius": "100", - "saoInteractive": false, - "saoInteractiveDelay": 500 + "saoNumSamples": 50, + "saoKernelRadius": 200, + "objectColorSource": "model" }, "viewerContent": { "modelsLoaded": [ diff --git a/app/data/projects/Schependomlaan/index.json b/app/data/projects/Schependomlaan/index.json index 82e51ae8..c792aa79 100644 --- a/app/data/projects/Schependomlaan/index.json +++ b/app/data/projects/Schependomlaan/index.json @@ -11,17 +11,11 @@ "cameraNear": 0.05, "cameraFar": 3000.0, "saoEnabled": true, - "saoBias": 0.5, - "saoIntensity": 0.7, - "saoScale": 1200.0, "saoKernelRadius": 100, - "saoBlur": true, - "saoInteractive": true, - "saoInteractiveDelay": 200, "viewFitDuration": 0.5, "viewFitFOV": 45, "perspectiveFOV": 55, - "objectColorSource": "viewer" + "objectColorSource": "model" }, "viewerContent": { "modelsLoaded": [ diff --git a/app/data/projects/Schependomlaan_invalid/index.json b/app/data/projects/Schependomlaan_invalid/index.json index bb794c2b..97be4bcc 100644 --- a/app/data/projects/Schependomlaan_invalid/index.json +++ b/app/data/projects/Schependomlaan_invalid/index.json @@ -11,13 +11,6 @@ "cameraNear": 0.05, "cameraFar": 3000.0, "saoEnabled": true, - "saoBias": 0.5, - "saoIntensity": 0.7, - "saoScale": 1200.0, - "saoKernelRadius": 100, - "saoBlur": true, - "saoInteractive": true, - "saoInteractiveDelay": 200, "viewFitDuration": 0.5, "viewFitFOV": 45, "perspectiveFOV": 55, diff --git a/app/data/projects/Schependomlaan_selectedStorey/index.json b/app/data/projects/Schependomlaan_selectedStorey/index.json index c1b2dc46..afa19854 100644 --- a/app/data/projects/Schependomlaan_selectedStorey/index.json +++ b/app/data/projects/Schependomlaan_selectedStorey/index.json @@ -12,11 +12,6 @@ "cameraNear": 0.05, "cameraFar": 3000.0, "saoEnabled": true, - "saoBias": 0.5, - "saoIntensity": 0.7, - "saoScale": 1200.0, - "saoKernelRadius": 100, - "saoBlur": true, "viewFitDuration": 0.5, "viewFitFOV": 45, "perspectiveFOV": 55 diff --git a/app/data/projects/Systhema/index.json b/app/data/projects/Systhema/index.json index 556dbbe5..69bb97a9 100644 --- a/app/data/projects/Systhema/index.json +++ b/app/data/projects/Systhema/index.json @@ -1,61 +1,60 @@ { - "id": "Systhema", - "name": "Systhema", - "models": [ - { - "id": "170133_Asvest_20200131", - "name": "170133_Asvest_20200131" + "id": "Systhema", + "name": "Systhema", + "models": [ + { + "id": "170133_Asvest_20200131", + "name": "170133_Asvest_20200131", + "objectColorSource": "model" + }, + { + "id": "2013022_IAA_BWK_R2019-BLOK_recht_2020-01-30", + "name": "2013022_IAA_BWK_R2019-BLOK_recht_2020-01-30", + "objectColorSource": "model" + }, + { + "id": "2013022_IAA_BWK_R2019-BLOK_recht_2020-02-06", + "name": "2013022_IAA_BWK_R2019-BLOK_recht_2020-02-06", + "objectColorSource": "model" + }, + { + "id": "20191011_11293-20174268_Oostenburgereiland_K2B_UO", + "name": "20191011_11293-20174268_Oostenburgereiland_K2B_UO", + "objectColorSource": "model" + }, + { + "id": "Campus_Vianen_LOD300_2017_Architecture", + "name": "Campus_Vianen_LOD300_2017_Architecture", + "objectColorSource": "model" + }, + { + "id": "Kabu-model-voors-bestek", + "name": "Kabu-model-voors-bestek", + "objectColorSource": "model" + }, + { + "id": "vakantiewoning_original", + "name": "vakantiewoning_original", + "objectColorSource": "model" + }, + { + "id": "2017058AA_Sparrenlaan_Ermelo_BWK_2020-02-17_EXCL-A_optimized", + "name": "Sparrenlaan_Ermelo", + "objectColorSource": "model" + } + ], + "viewerConfigs": { + "cameraNear": "0.05", + "cameraFar": "3000.0", + "saoEnabled": "true", + "saoNumSamples": 40, + "xrayContext": true }, - { - "id": "2013022_IAA_BWK_R2019-BLOK_recht_2020-01-30", - "name": "2013022_IAA_BWK_R2019-BLOK_recht_2020-01-30" + "viewerContent": { + "modelsLoaded": [ + ] }, - { - "id": "2013022_IAA_BWK_R2019-BLOK_recht_2020-02-06", - "name": "2013022_IAA_BWK_R2019-BLOK_recht_2020-02-06" - }, - { - "id": "20191011_11293-20174268_Oostenburgereiland_K2B_UO", - "name": "20191011_11293-20174268_Oostenburgereiland_K2B_UO" - }, - { - "id": "Campus_Vianen_LOD300_2017_Architecture", - "name": "Campus_Vianen_LOD300_2017_Architecture" - }, - { - "id": "Kabu-model-voors-bestek", - "name": "Kabu-model-voors-bestek" - }, - { - "id": "vakantiewoning_original", - "name": "vakantiewoning_original" - }, - { - "id": "2017058AA_Sparrenlaan_Ermelo_BWK_2020-02-17_EXCL-A_optimized", - "name": "Sparrenlaan_Ermelo", - "objectColorSource": "viewer" + "viewerState": { + "tabOpen": "models" } - ], - "viewerConfigs": { - "cameraNear": "0.05", - "cameraFar": "3000.0", - "saoEnabled": "true", - "saoBias": "0.5", - "saoIntensity": "0.5", - "saoScale": "1200.0", - "saoKernelRadius": "100", - "xrayContext": true, - "saoInteractive": false, - "saoInteractiveDelay": 500, - "edgesEnabled": "true", - "edgesInteractive": false, - "edgesInteractiveDelay": 500 - }, - "viewerContent": { - "modelsLoaded": [ - ] - }, - "viewerState": { - "tabOpen": "models" - } } \ No newline at end of file diff --git a/app/data/projects/WaterLock/index.json b/app/data/projects/WaterLock/index.json index f8907dbb..db8baf69 100644 --- a/app/data/projects/WaterLock/index.json +++ b/app/data/projects/WaterLock/index.json @@ -4,20 +4,16 @@ "models": [ { "id": "design", - "name": "WaterLock Design" + "name": "WaterLock Design", + "saoEnabled": true, + "pbrEnabled": true, + "edges": true } ], "viewerConfigs": { "cameraNear": 0.05, "cameraFar": 3000.0, "saoEnabled": true, - "saoBias": 0.5, - "saoIntensity": 0.7, - "saoScale": 1200.0, - "saoKernelRadius": 100, - "saoBlur": true, - "saoInteractive": true, - "saoInteractiveDelay": 200, "viewFitDuration": 0.5, "viewFitFOV": 45, "perspectiveFOV": 55, diff --git a/app/data/projects/WestRiversideHospital/index.json b/app/data/projects/WestRiversideHospital/index.json index 6334221f..f7615890 100644 --- a/app/data/projects/WestRiversideHospital/index.json +++ b/app/data/projects/WestRiversideHospital/index.json @@ -13,28 +13,23 @@ }, { "id": "electrical", - "name": "Hospital Electrical", - "saoEnabled": false + "name": "Hospital Electrical" }, { "id": "sprinklers", - "name": "Hospital Sprinklers", - "saoEnabled": false + "name": "Hospital Sprinklers" }, { "id": "plumbing", - "name": "Hospital Plumbing", - "saoEnabled": false + "name": "Hospital Plumbing" }, { "id": "fireAlarms", - "name": "Hospital Fire Alarms", - "saoEnabled": false + "name": "Hospital Fire Alarms" }, { "id": "mechanical", - "name": "Hospital Mechanical", - "saoEnabled": false + "name": "Hospital Mechanical" } ], "viewerConfigs": { @@ -42,16 +37,9 @@ "cameraNear": 0.05, "cameraFar": 3000.0, "saoEnabled": true, - "saoBias": 0.5, - "saoIntensity": 0.7, - "saoScale": 1200.0, - "saoKernelRadius": 100, - "saoBlur": true, - "saoInteractive": false, - "saoInteractiveDelay": 500, + "saoNumSamples": 60, "edgesEnabled": "true", - "edgesInteractive": false, - "edgesInteractiveDelay": 500 + "objectColorSource": "model" }, "viewerContent": { "modelsLoaded": [ diff --git a/app/data/projects/WestRiversideHospital/models/architectural/geometry.xkt b/app/data/projects/WestRiversideHospital/models/architectural/geometry.xkt deleted file mode 100644 index 610cf75b..00000000 Binary files a/app/data/projects/WestRiversideHospital/models/architectural/geometry.xkt and /dev/null differ diff --git a/app/data/projects/WestRiversideHospital/models/mechanical/geometry.xkt b/app/data/projects/WestRiversideHospital/models/mechanical/geometry.xkt index 50bf9e7c..b6eb28a0 100644 Binary files a/app/data/projects/WestRiversideHospital/models/mechanical/geometry.xkt and b/app/data/projects/WestRiversideHospital/models/mechanical/geometry.xkt differ diff --git a/app/data/projects/WestRiversideHospital/models/structure/geometry.xkt b/app/data/projects/WestRiversideHospital/models/structure/geometry.xkt index dcb7ba41..f3798b06 100644 Binary files a/app/data/projects/WestRiversideHospital/models/structure/geometry.xkt and b/app/data/projects/WestRiversideHospital/models/structure/geometry.xkt differ