Merge pull request #242 from andyross/vis-defaults

Update visual defaults

Author: yeicor

.generatelicensefile.json

@@ -1,6 +1,7 @@
 {
   "append": [
     "assets/fox.glb.license",
+    "assets/qwantani_afternoon_1k.hdr.license",
     "LICENSE"
   ],
   "replace": {

assets/licenses.txt

@@ -3,7 +3,7 @@ https://www.npmjs.com/package/generate-license-file
 
 The following npm package may be included in this product:
 
- - @google/model-viewer@4.0.0
+ - @google/model-viewer@4.1.0
 
 This package contains the following license:
 
@@ -522,7 +522,7 @@ Apache License
 
 The following npm package may be included in this product:
 
- - detect-libc@2.0.3
+ - detect-libc@2.0.4
 
 This package contains the following license:
 
@@ -1045,9 +1045,9 @@ END OF TERMS AND CONDITIONS
 
 The following npm packages may be included in this product:
 
- - @lit/reactive-element@1.6.3
- - lit-element@3.3.3
- - lit@2.8.0
+ - @lit/reactive-element@2.1.1
+ - lit-element@4.2.1
+ - lit@3.3.1
 
 These packages each contain the following license:
 
@@ -1084,7 +1084,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 The following npm package may be included in this product:
 
- - lit-html@2.8.0
+ - lit-html@3.3.1
 
 This package contains the following license:
 
@@ -1121,7 +1121,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 The following npm package may be included in this product:
 
- - @lit-labs/ssr-dom-shim@1.3.0
+ - @lit-labs/ssr-dom-shim@1.4.0
 
 This package contains the following license:
 
@@ -1247,7 +1247,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 The following npm package may be included in this product:
 
- - @babel/parser@7.27.0
+ - @babel/parser@7.28.0
 
 This package contains the following license:
 
@@ -1381,6 +1381,34 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 -----------
 
+The following npm package may be included in this product:
+
+ - @jridgewell/sourcemap-codec@1.5.4
+
+This package contains the following license:
+
+Copyright 2024 Justin Ridgewell <justin@ridgewell.name>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+-----------
+
 The following npm package may be included in this product:
 
  - picocolors@1.1.1
@@ -1418,9 +1446,9 @@ LGPL-3.0-or-later
 
 The following npm packages may be included in this product:
 
- - @babel/helper-string-parser@7.25.9
- - @babel/helper-validator-identifier@7.25.9
- - @babel/types@7.27.0
+ - @babel/helper-string-parser@7.27.1
+ - @babel/helper-validator-identifier@7.27.1
+ - @babel/types@7.28.1
 
 These packages each contain the following license:
 
@@ -1451,7 +1479,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 The following npm package may be included in this product:
 
- - three-mesh-bvh@0.9.0
+ - three-mesh-bvh@0.9.1
 
 This package contains the following license:
 
@@ -1601,7 +1629,7 @@ The MIT license applies to all non-font and non-icon files.
 
 The following npm package may be included in this product:
 
- - semver@7.7.1
+ - semver@7.7.2
 
 This package contains the following license:
 
@@ -1623,36 +1651,6 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 -----------
 
-The following npm package may be included in this product:
-
- - @jridgewell/sourcemap-codec@1.5.0
-
-This package contains the following license:
-
-The MIT License
-
-Copyright (c) 2015 Rich Harris
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
------------
-
 The following npm package may be included in this product:
 
  - three@0.125.2
@@ -1685,7 +1683,7 @@ THE SOFTWARE.
 
 The following npm package may be included in this product:
 
- - three@0.175.0
+ - three@0.178.0
 
 This package contains the following license:
 
@@ -1775,13 +1773,13 @@ THE SOFTWARE.
 
 The following npm package may be included in this product:
 
- - vuetify@3.8.0
+ - vuetify@3.9.0
 
 This package contains the following license:
 
 The MIT License (MIT)
 
-Copyright (c) 2016-2023 John Jeremy Leider
+Copyright (c) 2016-now Vuetify, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1805,16 +1803,16 @@ THE SOFTWARE.
 
 The following npm packages may be included in this product:
 
- - @vue/compiler-core@3.5.13
- - @vue/compiler-dom@3.5.13
- - @vue/compiler-sfc@3.5.13
- - @vue/compiler-ssr@3.5.13
- - @vue/reactivity@3.5.13
- - @vue/runtime-core@3.5.13
- - @vue/runtime-dom@3.5.13
- - @vue/server-renderer@3.5.13
- - @vue/shared@3.5.13
- - vue@3.5.13
+ - @vue/compiler-core@3.5.17
+ - @vue/compiler-dom@3.5.17
+ - @vue/compiler-sfc@3.5.17
+ - @vue/compiler-ssr@3.5.17
+ - @vue/reactivity@3.5.17
+ - @vue/runtime-core@3.5.17
+ - @vue/runtime-dom@3.5.17
+ - @vue/server-renderer@3.5.17
+ - @vue/shared@3.5.17
+ - vue@3.5.17
 
 These packages each contain the following license:
 
@@ -1844,7 +1842,7 @@ THE SOFTWARE.
 
 The following npm package may be included in this product:
 
- - ktx-parse@1.0.0
+ - ktx-parse@1.0.1
 
 This package contains the following license:
 
@@ -1906,9 +1904,9 @@ SOFTWARE.
 
 The following npm packages may be included in this product:
 
- - @gltf-transform/core@4.1.3
- - @gltf-transform/extensions@4.1.3
- - @gltf-transform/functions@4.1.3
+ - @gltf-transform/core@4.2.0
+ - @gltf-transform/extensions@4.2.0
+ - @gltf-transform/functions@4.2.0
 
 These packages each contain the following license:
 
@@ -1968,7 +1966,7 @@ THE SOFTWARE.
 
 The following npm package may be included in this product:
 
- - postcss@8.5.3
+ - postcss@8.5.6
 
 This package contains the following license:
 
@@ -2049,6 +2047,11 @@ glTF conversion by @AsoboStudio and @scurest
 
 -----------
 
+CC0: Qwantani Afternoon by Greg Zaal (Photography) and Jarod Guest (Processing)
+https://polyhaven.com/a/qwantani_afternoon
+
+-----------
+
 MIT License
 
 Copyright (c) 2024 Yeicor

assets/qwantani_afternoon_1k.hdr

@@ -0,0 +1,2 @@
+CC0: Qwantani Afternoon by Greg Zaal (Photography) and Jarod Guest (Processing)
+https://polyhaven.com/a/qwantani_afternoon

assets/qwantani_afternoon_1k.hdr.license

@@ -29,7 +29,14 @@ export async function settings() {
         panSensitivity: 1,
         exposure: 1,
         shadowIntensity: 0,
-        background: '',
+        // Nice low-res outdoor/high-contrast HDRI image (CC0 licensed) for lighting
+        background: new URL('../../assets/qwantani_afternoon_1k.hdr', import.meta.url).href,
+        // Uniform (1x1 pixel) medium gray background for visibility (following dark/light mode)
+        skybox: (window.matchMedia("(prefers-color-scheme: dark)").matches ?
+            "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEU4ODiyn42XAAAACklEQVQI" +
+            "12NgAAAAAgAB4iG8MwAAAABJRU5ErkJggg==" :
+            "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEW6urpaLVq8AAAACklEQVQI" +
+            "12NgAAAAAgAB4iG8MwAAAABJRU5ErkJggg=="),
     };
 
     // Auto-override any settings from the URL

frontend/misc/settings.ts

@@ -215,7 +215,7 @@ watch(disableTap, (newDisableTap) => {
   <model-viewer ref="elem" v-if="sett != null" :ar="sett.arModes.length > 0" :ar-modes="sett.arModes"
                 :environment-image="sett.background" :exposure="sett.exposure" :autoplay="sett.autoplay"
                 :orbit-sensitivity="sett.orbitSensitivity" :pan-sensitivity="sett.panSensitivity"
-                :poster="poster" :shadow-intensity="sett.shadowIntensity" :skybox-image="sett.background"
+                :poster="poster" :shadow-intensity="sett.shadowIntensity" :skybox-image="sett.skybox"
                 :src="props.src" :zoom-sensitivity="sett.zoomSensitivity" alt="The 3D model(s)" camera-controls
                 camera-orbit="30deg 75deg auto" interaction-prompt="none" max-camera-orbit="Infinity 180deg auto"
                 min-camera-orbit="-Infinity 0deg 5%" style="width: 100%; height: 100%">
@@ -302,4 +302,4 @@ watch(disableTap, (newDisableTap) => {
   float: left;
   transition: width 0.3s;
 }
-</style>
+</style>

frontend/viewer/ModelViewerWrapper.vue

@@ -28,7 +28,7 @@ export default defineConfig({
     build: {
         assetsDir: '.', // Support deploying to a subdirectory using relative URLs
         cssCodeSplit: false, // Small enough to inline
-        chunkSizeWarningLimit: 550, // Three.js is big. Draco is even bigger but not likely to be used.
+        chunkSizeWarningLimit: 1024, // Three.js is big. Draco is even bigger but not likely to be used.
         sourcemap: true, // For debugging production
     },
     define: {

vite.config.ts

@@ -78,7 +78,8 @@ def get_shape(obj: CADLike, error: bool = True) -> Optional[CADCoreLike]:
                 # Sorting is required to improve hashcode consistency
                 shapes_raw_filtered_sorted = sorted(shapes_raw_filtered, key=lambda x: _hashcode(x))
                 # Build a single compound shape (skip locations/axes here, they can't be in a Compound)
-                shapes_bd = [Compound(shape) for shape in shapes_raw_filtered_sorted if shape is not None and not isinstance(shape, TopLoc_Location)]
+                shapes_bd = [Compound(shape) for shape in shapes_raw_filtered_sorted if
+                             shape is not None and not isinstance(shape, TopLoc_Location)]
                 return get_shape(Compound(shapes_bd), error)
         except TypeError:
             pass
@@ -168,7 +169,7 @@ def vert(v: Vector) -> Vector:
         vert(plane.origin + plane.x_dir * width / 2 + plane.y_dir * height / 2),
         vert(plane.origin + plane.x_dir * width / 2 - plane.y_dir * height / 2),
         vert(plane.origin - plane.x_dir * width / 2 - plane.y_dir * height / 2),
-    ], [
+    ], [vert(plane.z_dir)] * 4, [
         (0, 2, 1),
         (0, 3, 2),
     ], [