diff --git a/locenice2/MANIFEST.json b/locenice/MANIFEST.json similarity index 100% rename from locenice2/MANIFEST.json rename to locenice/MANIFEST.json diff --git a/locenice2/README_CZ.md b/locenice/README_CZ.md similarity index 100% rename from locenice2/README_CZ.md rename to locenice/README_CZ.md diff --git a/locenice2/TEST_REPORT.json b/locenice/TEST_REPORT.json similarity index 100% rename from locenice2/TEST_REPORT.json rename to locenice/TEST_REPORT.json diff --git a/locenice2/THIRD_PARTY.txt b/locenice/THIRD_PARTY.txt similarity index 100% rename from locenice2/THIRD_PARTY.txt rename to locenice/THIRD_PARTY.txt diff --git a/locenice2/app.html b/locenice/app.html similarity index 99% rename from locenice2/app.html rename to locenice/app.html index d59f561..af659c3 100644 --- a/locenice2/app.html +++ b/locenice/app.html @@ -5,7 +5,7 @@ - Ločenice | Model domu / web + Ločenice | Slunečný vrch @@ -20,7 +20,7 @@
RODINNÝ DŮM - Ločenice
-

Model domu / web – Ločenice (Novohradské podhůří)

+

Slunečný vrch – Ločenice (Novohradské podhůří)

Ločenice · 3D model + simulace slunce
15,340 mDélka
@@ -324,7 +324,7 @@ - +
Načítání modelu…
diff --git a/locenice2/assets/catalog/door0.jpg b/locenice/assets/catalog/door0.jpg similarity index 100% rename from locenice2/assets/catalog/door0.jpg rename to locenice/assets/catalog/door0.jpg diff --git a/locenice2/assets/catalog/door1.jpg b/locenice/assets/catalog/door1.jpg similarity index 100% rename from locenice2/assets/catalog/door1.jpg rename to locenice/assets/catalog/door1.jpg diff --git a/locenice2/assets/catalog/door2.jpg b/locenice/assets/catalog/door2.jpg similarity index 100% rename from locenice2/assets/catalog/door2.jpg rename to locenice/assets/catalog/door2.jpg diff --git a/locenice2/assets/catalog/door3.jpg b/locenice/assets/catalog/door3.jpg similarity index 100% rename from locenice2/assets/catalog/door3.jpg rename to locenice/assets/catalog/door3.jpg diff --git a/locenice2/assets/catalog/door4.jpg b/locenice/assets/catalog/door4.jpg similarity index 100% rename from locenice2/assets/catalog/door4.jpg rename to locenice/assets/catalog/door4.jpg diff --git a/locenice2/assets/catalog/door5.jpg b/locenice/assets/catalog/door5.jpg similarity index 100% rename from locenice2/assets/catalog/door5.jpg rename to locenice/assets/catalog/door5.jpg diff --git a/locenice2/assets/catalog/door6.jpg b/locenice/assets/catalog/door6.jpg similarity index 100% rename from locenice2/assets/catalog/door6.jpg rename to locenice/assets/catalog/door6.jpg diff --git a/locenice2/assets/catalog/door7.jpg b/locenice/assets/catalog/door7.jpg similarity index 100% rename from locenice2/assets/catalog/door7.jpg rename to locenice/assets/catalog/door7.jpg diff --git a/locenice2/assets/catalog/intsill0.jpg b/locenice/assets/catalog/intsill0.jpg similarity index 100% rename from locenice2/assets/catalog/intsill0.jpg rename to locenice/assets/catalog/intsill0.jpg diff --git a/locenice2/assets/catalog/intsill1.jpg b/locenice/assets/catalog/intsill1.jpg similarity index 100% rename from locenice2/assets/catalog/intsill1.jpg rename to locenice/assets/catalog/intsill1.jpg diff --git a/locenice2/assets/catalog/intsill2.jpg b/locenice/assets/catalog/intsill2.jpg similarity index 100% rename from locenice2/assets/catalog/intsill2.jpg rename to locenice/assets/catalog/intsill2.jpg diff --git a/locenice2/assets/catalog/lam1.jpg b/locenice/assets/catalog/lam1.jpg similarity index 100% rename from locenice2/assets/catalog/lam1.jpg rename to locenice/assets/catalog/lam1.jpg diff --git a/locenice2/assets/catalog/lam2.jpg b/locenice/assets/catalog/lam2.jpg similarity index 100% rename from locenice2/assets/catalog/lam2.jpg rename to locenice/assets/catalog/lam2.jpg diff --git a/locenice2/assets/catalog/lam3.jpg b/locenice/assets/catalog/lam3.jpg similarity index 100% rename from locenice2/assets/catalog/lam3.jpg rename to locenice/assets/catalog/lam3.jpg diff --git a/locenice2/assets/catalog/lam4.jpg b/locenice/assets/catalog/lam4.jpg similarity index 100% rename from locenice2/assets/catalog/lam4.jpg rename to locenice/assets/catalog/lam4.jpg diff --git a/locenice2/assets/catalog/lam5.jpg b/locenice/assets/catalog/lam5.jpg similarity index 100% rename from locenice2/assets/catalog/lam5.jpg rename to locenice/assets/catalog/lam5.jpg diff --git a/locenice2/assets/catalog/lam6.jpg b/locenice/assets/catalog/lam6.jpg similarity index 100% rename from locenice2/assets/catalog/lam6.jpg rename to locenice/assets/catalog/lam6.jpg diff --git a/locenice2/assets/catalog/lam7.jpg b/locenice/assets/catalog/lam7.jpg similarity index 100% rename from locenice2/assets/catalog/lam7.jpg rename to locenice/assets/catalog/lam7.jpg diff --git a/locenice2/assets/catalog/lam8.jpg b/locenice/assets/catalog/lam8.jpg similarity index 100% rename from locenice2/assets/catalog/lam8.jpg rename to locenice/assets/catalog/lam8.jpg diff --git a/locenice2/assets/catalog/lam9.jpg b/locenice/assets/catalog/lam9.jpg similarity index 100% rename from locenice2/assets/catalog/lam9.jpg rename to locenice/assets/catalog/lam9.jpg diff --git a/locenice2/assets/catalog/page12.jpg b/locenice/assets/catalog/page12.jpg similarity index 100% rename from locenice2/assets/catalog/page12.jpg rename to locenice/assets/catalog/page12.jpg diff --git a/locenice2/assets/catalog/page13.jpg b/locenice/assets/catalog/page13.jpg similarity index 100% rename from locenice2/assets/catalog/page13.jpg rename to locenice/assets/catalog/page13.jpg diff --git a/locenice2/assets/catalog/page14.jpg b/locenice/assets/catalog/page14.jpg similarity index 100% rename from locenice2/assets/catalog/page14.jpg rename to locenice/assets/catalog/page14.jpg diff --git a/locenice2/assets/catalog/page15.jpg b/locenice/assets/catalog/page15.jpg similarity index 100% rename from locenice2/assets/catalog/page15.jpg rename to locenice/assets/catalog/page15.jpg diff --git a/locenice2/assets/catalog/page16.jpg b/locenice/assets/catalog/page16.jpg similarity index 100% rename from locenice2/assets/catalog/page16.jpg rename to locenice/assets/catalog/page16.jpg diff --git a/locenice2/assets/catalog/page17.jpg b/locenice/assets/catalog/page17.jpg similarity index 100% rename from locenice2/assets/catalog/page17.jpg rename to locenice/assets/catalog/page17.jpg diff --git a/locenice2/assets/catalog/page18.jpg b/locenice/assets/catalog/page18.jpg similarity index 100% rename from locenice2/assets/catalog/page18.jpg rename to locenice/assets/catalog/page18.jpg diff --git a/locenice2/assets/catalog/page19.jpg b/locenice/assets/catalog/page19.jpg similarity index 100% rename from locenice2/assets/catalog/page19.jpg rename to locenice/assets/catalog/page19.jpg diff --git a/locenice2/assets/catalog/page20.jpg b/locenice/assets/catalog/page20.jpg similarity index 100% rename from locenice2/assets/catalog/page20.jpg rename to locenice/assets/catalog/page20.jpg diff --git a/locenice2/assets/catalog/page21.jpg b/locenice/assets/catalog/page21.jpg similarity index 100% rename from locenice2/assets/catalog/page21.jpg rename to locenice/assets/catalog/page21.jpg diff --git a/locenice2/assets/catalog/page22.jpg b/locenice/assets/catalog/page22.jpg similarity index 100% rename from locenice2/assets/catalog/page22.jpg rename to locenice/assets/catalog/page22.jpg diff --git a/locenice2/assets/catalog/page23.jpg b/locenice/assets/catalog/page23.jpg similarity index 100% rename from locenice2/assets/catalog/page23.jpg rename to locenice/assets/catalog/page23.jpg diff --git a/locenice2/assets/catalog/page24.jpg b/locenice/assets/catalog/page24.jpg similarity index 100% rename from locenice2/assets/catalog/page24.jpg rename to locenice/assets/catalog/page24.jpg diff --git a/locenice2/assets/catalog/page25.jpg b/locenice/assets/catalog/page25.jpg similarity index 100% rename from locenice2/assets/catalog/page25.jpg rename to locenice/assets/catalog/page25.jpg diff --git a/locenice2/assets/catalog/prum.jpg b/locenice/assets/catalog/prum.jpg similarity index 100% rename from locenice2/assets/catalog/prum.jpg rename to locenice/assets/catalog/prum.jpg diff --git a/locenice2/assets/catalog/requestedDoor.jpg b/locenice/assets/catalog/requestedDoor.jpg similarity index 100% rename from locenice2/assets/catalog/requestedDoor.jpg rename to locenice/assets/catalog/requestedDoor.jpg diff --git a/locenice2/assets/catalog/roof0.jpg b/locenice/assets/catalog/roof0.jpg similarity index 100% rename from locenice2/assets/catalog/roof0.jpg rename to locenice/assets/catalog/roof0.jpg diff --git a/locenice2/assets/catalog/roof1.jpg b/locenice/assets/catalog/roof1.jpg similarity index 100% rename from locenice2/assets/catalog/roof1.jpg rename to locenice/assets/catalog/roof1.jpg diff --git a/locenice2/assets/catalog/roof2.jpg b/locenice/assets/catalog/roof2.jpg similarity index 100% rename from locenice2/assets/catalog/roof2.jpg rename to locenice/assets/catalog/roof2.jpg diff --git a/locenice2/assets/catalog/roof3.jpg b/locenice/assets/catalog/roof3.jpg similarity index 100% rename from locenice2/assets/catalog/roof3.jpg rename to locenice/assets/catalog/roof3.jpg diff --git a/locenice2/assets/catalog/roof4.jpg b/locenice/assets/catalog/roof4.jpg similarity index 100% rename from locenice2/assets/catalog/roof4.jpg rename to locenice/assets/catalog/roof4.jpg diff --git a/locenice2/assets/catalog/tile1.jpg b/locenice/assets/catalog/tile1.jpg similarity index 100% rename from locenice2/assets/catalog/tile1.jpg rename to locenice/assets/catalog/tile1.jpg diff --git a/locenice2/assets/catalog/tile2.jpg b/locenice/assets/catalog/tile2.jpg similarity index 100% rename from locenice2/assets/catalog/tile2.jpg rename to locenice/assets/catalog/tile2.jpg diff --git a/locenice2/assets/catalog/tile3.jpg b/locenice/assets/catalog/tile3.jpg similarity index 100% rename from locenice2/assets/catalog/tile3.jpg rename to locenice/assets/catalog/tile3.jpg diff --git a/locenice2/assets/catalog/tile4.jpg b/locenice/assets/catalog/tile4.jpg similarity index 100% rename from locenice2/assets/catalog/tile4.jpg rename to locenice/assets/catalog/tile4.jpg diff --git a/locenice2/assets/catalog/tile5.jpg b/locenice/assets/catalog/tile5.jpg similarity index 100% rename from locenice2/assets/catalog/tile5.jpg rename to locenice/assets/catalog/tile5.jpg diff --git a/locenice2/assets/catalog/tile6.jpg b/locenice/assets/catalog/tile6.jpg similarity index 100% rename from locenice2/assets/catalog/tile6.jpg rename to locenice/assets/catalog/tile6.jpg diff --git a/locenice2/assets/catalog/tile7.jpg b/locenice/assets/catalog/tile7.jpg similarity index 100% rename from locenice2/assets/catalog/tile7.jpg rename to locenice/assets/catalog/tile7.jpg diff --git a/locenice2/assets/catalog/tile8.jpg b/locenice/assets/catalog/tile8.jpg similarity index 100% rename from locenice2/assets/catalog/tile8.jpg rename to locenice/assets/catalog/tile8.jpg diff --git a/locenice2/assets/catalog/tile9.jpg b/locenice/assets/catalog/tile9.jpg similarity index 100% rename from locenice2/assets/catalog/tile9.jpg rename to locenice/assets/catalog/tile9.jpg diff --git a/locenice2/assets/references/kitchen1.jpg b/locenice/assets/references/kitchen1.jpg similarity index 100% rename from locenice2/assets/references/kitchen1.jpg rename to locenice/assets/references/kitchen1.jpg diff --git a/locenice2/assets/references/kitchen2.jpg b/locenice/assets/references/kitchen2.jpg similarity index 100% rename from locenice2/assets/references/kitchen2.jpg rename to locenice/assets/references/kitchen2.jpg diff --git a/locenice2/assets/references/plan.jpg b/locenice/assets/references/plan.jpg similarity index 100% rename from locenice2/assets/references/plan.jpg rename to locenice/assets/references/plan.jpg diff --git a/locenice2/assets/references/survey.png b/locenice/assets/references/survey.png similarity index 100% rename from locenice2/assets/references/survey.png rename to locenice/assets/references/survey.png diff --git a/locenice2/assets/references/view1.jpg b/locenice/assets/references/view1.jpg similarity index 100% rename from locenice2/assets/references/view1.jpg rename to locenice/assets/references/view1.jpg diff --git a/locenice2/assets/references/view2.jpg b/locenice/assets/references/view2.jpg similarity index 100% rename from locenice2/assets/references/view2.jpg rename to locenice/assets/references/view2.jpg diff --git a/locenice2/assets/ui/image-1.jpg b/locenice/assets/ui/image-1.jpg similarity index 100% rename from locenice2/assets/ui/image-1.jpg rename to locenice/assets/ui/image-1.jpg diff --git a/locenice2/blender/prepare_model.py b/locenice/blender/prepare_model.py similarity index 100% rename from locenice2/blender/prepare_model.py rename to locenice/blender/prepare_model.py diff --git a/locenice2/css/app.css b/locenice/css/app.css similarity index 100% rename from locenice2/css/app.css rename to locenice/css/app.css diff --git a/locenice2/css/web.css b/locenice/css/web.css similarity index 100% rename from locenice2/css/web.css rename to locenice/css/web.css diff --git a/locenice2/data/app-config.json b/locenice/data/app-config.json similarity index 89% rename from locenice2/data/app-config.json rename to locenice/data/app-config.json index 5642b4c..5bf794c 100644 --- a/locenice2/data/app-config.json +++ b/locenice/data/app-config.json @@ -6,7 +6,8 @@ "threeLoader": "https://cdn.jsdelivr.net/npm/three@0.180.0/examples/jsm/loaders/GLTFLoader.js", "cdnTimeoutMs": 6500, "maxPixelRatio": 1.5, - "startAutoRotate": false, + "startAutoRotate": true, + "startStandardsOpen": false, "catalog": "./data/catalog.json", "assets": "./data/assets.json", "references": "./data/references.json", diff --git a/locenice2/data/assets.json b/locenice/data/assets.json similarity index 100% rename from locenice2/data/assets.json rename to locenice/data/assets.json diff --git a/locenice2/data/catalog.json b/locenice/data/catalog.json similarity index 100% rename from locenice2/data/catalog.json rename to locenice/data/catalog.json diff --git a/locenice2/data/references.json b/locenice/data/references.json similarity index 100% rename from locenice2/data/references.json rename to locenice/data/references.json diff --git a/locenice2/data/scene.json b/locenice/data/scene.json similarity index 100% rename from locenice2/data/scene.json rename to locenice/data/scene.json diff --git a/locenice2/data/site.json b/locenice/data/site.json similarity index 100% rename from locenice2/data/site.json rename to locenice/data/site.json diff --git a/locenice/index.php b/locenice/index.php index 013a633..b9a2a8c 100644 --- a/locenice/index.php +++ b/locenice/index.php @@ -1,3 +1,10 @@ stdClone(stdState),defaults:()=>stdClone(STD_DEFAULTS),set:(patch)=>{stdState=stdNormalize({...stdClone(stdState),...patch});stdApply();return stdClone(stdState);},open:stdOpen,close:stdClose,view:stdView,summary:stdSummary,exportData:stdExportData,normalize:stdNormalize,visibleWindows:()=>[...new Set(meshes.filter(m=>m.std?.stdBlind&&visible(m)).map(m=>m.std.windowNode))],sourcePage:stdShowCatalog,saveHtml:stdSaveHtml,validate:()=>({windowCount:gltf.extras.allstavStandards.windows.length,triangleExcluded:!meshes.some(m=>m.std?.stdBlind&&m.std.windowNode===gltf.extras.allstavStandards.triangleExcludedNode),rooms:STD_ROOMS.length,materials:gltf.extras.allstavStandards.materials})}; if(loaded)$('#stdSaved').textContent='Na\u010dten v\u00e1\u0161 ulo\u017een\u00fd v\u00fdb\u011br';else $('#stdSaved').textContent='V\u00fdchoz\u00ed v\u00fdb\u011br \u00b7 zm\u011bny se ukl\u00e1daj\u00ed automaticky'; window.addEventListener('pagehide',()=>{if(stdSaveTimer){clearTimeout(stdSaveTimer);stdPersist();}}); - stdOpen('exterior');stdView('terrace'); + if(config.startStandardsOpen){stdOpen('exterior');stdView('terrace');} } start(); \ No newline at end of file diff --git a/locenice2/js/bootstrap.js b/locenice/js/bootstrap.js similarity index 98% rename from locenice2/js/bootstrap.js rename to locenice/js/bootstrap.js index fe25ba7..e5cf34f 100644 --- a/locenice2/js/bootstrap.js +++ b/locenice/js/bootstrap.js @@ -16,7 +16,7 @@ try{ document.getElementById('stdSavedState').textContent=JSON.stringify({selection:payload.selection}); }catch(error){console.warn('Invalid shared selection:',error);} window.LOCENICE_RESOURCES={config,catalog,assets,references,scene,site,modelBytes}; - await import('./app.js'); + await import('./app.js?v=20261022'); }catch(error){ console.error(error);const box=document.getElementById('loading');box.className='error';box.innerHTML='

Nahrajte celou slozku vcetne js, css, data, models a assets. Otevrete ji pres HTTP(S), nikoli dvojklikem na HTML.

Stahnout model GLB'; box.querySelector('.errorDetail').textContent=error.message;document.getElementById('webStatus').textContent='Chyba nacitani'; diff --git a/locenice2/js/legacy-renderer.js b/locenice/js/legacy-renderer.js similarity index 100% rename from locenice2/js/legacy-renderer.js rename to locenice/js/legacy-renderer.js diff --git a/locenice2/js/legacy-shaders.js b/locenice/js/legacy-shaders.js similarity index 100% rename from locenice2/js/legacy-shaders.js rename to locenice/js/legacy-shaders.js diff --git a/locenice2/js/model-io.js b/locenice/js/model-io.js similarity index 100% rename from locenice2/js/model-io.js rename to locenice/js/model-io.js diff --git a/locenice2/js/project-panel.js b/locenice/js/project-panel.js similarity index 100% rename from locenice2/js/project-panel.js rename to locenice/js/project-panel.js diff --git a/locenice2/js/solar.js b/locenice/js/solar.js similarity index 100% rename from locenice2/js/solar.js rename to locenice/js/solar.js diff --git a/locenice2/js/three-renderer.js b/locenice/js/three-renderer.js similarity index 100% rename from locenice2/js/three-renderer.js rename to locenice/js/three-renderer.js diff --git a/locenice2/models/dum.glb b/locenice/models/dum.glb similarity index 100% rename from locenice2/models/dum.glb rename to locenice/models/dum.glb diff --git a/locenice2/tests/data_checks.mjs b/locenice/tests/data_checks.mjs similarity index 100% rename from locenice2/tests/data_checks.mjs rename to locenice/tests/data_checks.mjs diff --git a/locenice2/tools/prepare_export.py b/locenice/tools/prepare_export.py similarity index 100% rename from locenice2/tools/prepare_export.py rename to locenice/tools/prepare_export.py diff --git a/locenice2/tools/vendor_three.py b/locenice/tools/vendor_three.py similarity index 96% rename from locenice2/tools/vendor_three.py rename to locenice/tools/vendor_three.py index 7b8e677..9b54070 100644 --- a/locenice2/tools/vendor_three.py +++ b/locenice/tools/vendor_three.py @@ -1,6 +1,6 @@ """Optional: download pinned Three.js r180 locally, on a computer with internet. python tools/vendor_three.py -Then upload the generated locenice2/vendor folder AND data/app-config.json. +Then upload the generated locenice/vendor folder AND data/app-config.json. Does not upload anything. No credentials or server-side installer required. """ from pathlib import Path diff --git a/locenice/dum_3D_slunce.html b/locenice2/dum_3D_slunce.html similarity index 100% rename from locenice/dum_3D_slunce.html rename to locenice2/dum_3D_slunce.html diff --git a/locenice/dum_3D_slunce_OLD.html b/locenice2/dum_3D_slunce_OLD.html similarity index 100% rename from locenice/dum_3D_slunce_OLD.html rename to locenice2/dum_3D_slunce_OLD.html diff --git a/locenice2/index.php b/locenice2/index.php index baceffb..013a633 100644 --- a/locenice2/index.php +++ b/locenice2/index.php @@ -1,10 +1,3 @@