npm - @team-geospan/struct3d - Versions diffs - 1.0.4 → 1.0.5 - Mend

@team-geospan/struct3d 1.0.4 → 1.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/lib/defaults.js +5 -0
package/lib/draw.js +2 -2
package/lib/index.js +16 -3
package/package.json +1 -1
package/team-geospan-struct3d-1.0.5.tgz +0 -0
package/docs/public/planar.json +0 -465
package/team-geospan-struct3d-1.0.3.tgz +0 -0
package/team-geospan-struct3d-1.0.4.tgz +0 -0

package/lib/defaults.js CHANGED Viewed

@@ -20,3 +20,8 @@ export const DEFAULT_EDGE_COLORS = {
   fance: "#a97bc2",
   chimney: "#5b517d",
 };
+export const DEFAULT_SCENE_THEME = {
+  sky: "#CDEBF7",
+  ground: 0x315d0a,
+};

package/lib/draw.js CHANGED Viewed

@@ -195,10 +195,10 @@ export function createFacets(structureCollection, baseElevation, facetColors) {
   return meshes;
 }
-export function createReferences(scene) {
+export function createReferences(scene, groundColor = 0x315d0a) {
   const floorGeom = new THREE.PlaneGeometry(1000, 1000);
   const floorMaterial = new THREE.MeshPhongMaterial({
-    color: 0x315d0a,
+    color: groundColor,
     side: THREE.DoubleSide,
   });
   const floorMesh = new THREE.Mesh(floorGeom, floorMaterial);

package/lib/index.js CHANGED Viewed

@@ -21,6 +21,7 @@ import { toMercator } from "@turf/projection";
 import PropTypes from "prop-types";
 import * as THREE from "three";
 import { OrbitControls } from "three/addons/controls/OrbitControls";
+import { DEFAULT_SCENE_THEME } from "./defaults";
 import {
   addLights,
@@ -39,6 +40,7 @@ const setupScene = (
   rendererRef,
   orbitRef,
   fieldOfView,
+  skyColor = THREED_SKY_COLOR,
 ) => {
   const [width, height] = [
     divRef.current.offsetWidth,
@@ -49,7 +51,7 @@ const setupScene = (
   const scene = new THREE.Scene();
   sceneRef.current = scene;
-  scene.background = new THREE.Color(THREED_SKY_COLOR);
+  scene.background = new THREE.Color(skyColor);
   scene.fog = new THREE.Fog(scene.background, 1, 5000);
   const camera = new THREE.PerspectiveCamera(
@@ -89,6 +91,7 @@ const renderModel = (
   cameraRef,
   orbitRef,
   fieldOfView,
+  groundColor = 0x315d0a,
 ) => {
   // calculate the spatial extents of the meshes
   const boundingBox = new THREE.Box3();
@@ -127,7 +130,7 @@ const renderModel = (
   const bounds = new THREE.Vector3();
   boundingBox.getSize(bounds);
-  createReferences(scene, center, bounds);
+  createReferences(scene, groundColor);
   addLights(scene, center, bounds);
@@ -150,6 +153,7 @@ export default function StructureThreeD({
   selectionColor = "#d4af38",
   facetColors = DEFAULT_FACET_COLORS,
   edgeColors = DEFAULT_EDGE_COLORS,
+  sceneTheme = DEFAULT_SCENE_THEME,
 }) {
   const baseElevation = 10;
   const fieldOfView = 70;
@@ -158,6 +162,8 @@ export default function StructureThreeD({
   const cameraRef = useRef(null);
   const orbitRef = useRef(null);
   const rendererRef = useRef(null);
+  const skyColor = sceneTheme.sky;
+  const groundColor = sceneTheme.ground;
   const collection = useMemo(() => {
     // check the projection of the structures and put them into webmerc
@@ -205,7 +211,12 @@ export default function StructureThreeD({
           rendererRef,
           orbitRef,
           fieldOfView,
+          skyColor,
         );
+      } else {
+        // update colors
+        sceneRef.current.background = new THREE.Color(skyColor);
+        sceneRef.current.fog = new THREE.Fog(skyColor, 1, 5000);
       }
       clearScene(sceneRef.current);
@@ -219,9 +230,10 @@ export default function StructureThreeD({
         cameraRef,
         orbitRef,
         fieldOfView,
+        groundColor,
       );
     }
-  }, [collection, selectionColor]);
+  }, [collection, selectionColor, skyColor, groundColor, sceneTheme]);
   const handleClick = useCallback(
     (evt) => {
@@ -311,4 +323,5 @@ StructureThreeD.propTypes = {
   selectionColor: PropTypes.string,
   facetColors: PropTypes.object,
   edgeColors: PropTypes.object,
+  sceneTheme: PropTypes.object,
 };

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@team-geospan/struct3d",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "The 3D Viewer component for StructuresJSON models.",
   "license": "Apache-2.0",
   "author": "GEOSPAN Corp and Contributors",

package/team-geospan-struct3d-1.0.5.tgz ADDED Viewed

Binary file

package/docs/public/planar.json DELETED Viewed

@@ -1,465 +0,0 @@
-{
-  "kind": "structurecollection",
-  "structures": [
-    {
-      "kind": "structure",
-      "projection": "planar",
-      "points": {
-        "c101": {
-          "kind": "corner",
-          "coordinates": [
-            -0.0,
-            0.101,
-            3.370403808593778
-          ]
-        },
-        "c102": {
-          "kind": "corner",
-          "coordinates": [
-            0.129,
-            11.677,
-            3.370403808593778
-          ]
-        },
-        "c103": {
-          "kind": "corner",
-          "coordinates": [
-            4.579,
-            7.122,
-            5.351403808593773
-          ]
-        },
-        "c104": {
-          "kind": "corner",
-          "coordinates": [
-            4.55,
-            4.546,
-            5.351403808593773
-          ]
-        },
-        "c105": {
-          "kind": "corner",
-          "coordinates": [
-            9.129,
-            11.576,
-            3.370403808593778
-          ]
-        },
-        "c106": {
-          "kind": "corner",
-          "coordinates": [
-            9.0,
-            0.0,
-            3.370403808593778
-          ]
-        },
-        "ground": {
-          "kind": "ground",
-          "coordinates": [
-            -0.0,
-            0.0,
-            0.00040380859377364686
-          ]
-        }
-      },
-      "edges": {
-        "e101": {
-          "kind": "eave",
-          "points": [
-            "c101",
-            "c102"
-          ],
-          "properties": {
-            "attachments": [
-              "gutter"
-            ],
-            "length": 11.577
-          }
-        },
-        "e102": {
-          "kind": "hip",
-          "points": [
-            "c102",
-            "c103"
-          ],
-          "properties": {
-            "length": 6.669
-          }
-        },
-        "e108": {
-          "kind": "eave",
-          "points": [
-            "c102",
-            "c105"
-          ],
-          "properties": {
-            "attachments": [
-              "gutter"
-            ],
-            "length": 9.001
-          }
-        },
-        "e103": {
-          "kind": "hip",
-          "points": [
-            "c104",
-            "c101"
-          ],
-          "properties": {
-            "length": 6.663
-          }
-        },
-        "e107": {
-          "kind": "hip",
-          "points": [
-            "c104",
-            "c106"
-          ],
-          "properties": {
-            "length": 6.663
-          }
-        },
-        "e104": {
-          "kind": "ridge",
-          "points": [
-            "c103",
-            "c104"
-          ],
-          "properties": {
-            "length": 2.576
-          }
-        },
-        "e105": {
-          "kind": "eave",
-          "points": [
-            "c105",
-            "c106"
-          ],
-          "properties": {
-            "attachments": [
-              "gutter"
-            ],
-            "length": 11.577
-          }
-        },
-        "e106": {
-          "kind": "hip",
-          "points": [
-            "c105",
-            "c103"
-          ],
-          "properties": {
-            "length": 6.669
-          }
-        },
-        "e109": {
-          "kind": "eave",
-          "points": [
-            "c106",
-            "c101"
-          ],
-          "properties": {
-            "attachments": [
-              "gutter"
-            ],
-            "length": 9.001
-          }
-        }
-      },
-      "surfaces": {
-        "surface1": {
-          "kind": "roof",
-          "edges": [
-            [
-              "e101",
-              "e102",
-              "e103",
-              "e104"
-            ]
-          ],
-          "properties": {
-            "material": "asphalt",
-            "pitch": 5,
-            "area": 34.799
-          }
-        },
-        "surface2": {
-          "kind": "roof",
-          "edges": [
-            [
-              "e105",
-              "e106",
-              "e107",
-              "e104"
-            ]
-          ],
-          "properties": {
-            "material": "asphalt",
-            "pitch": 5,
-            "area": 34.799
-          }
-        },
-        "surface3": {
-          "kind": "roof",
-          "edges": [
-            [
-              "e108",
-              "e106",
-              "e102"
-            ]
-          ],
-          "properties": {
-            "material": "asphalt",
-            "pitch": 5,
-            "area": 22.149
-          }
-        },
-        "surface4": {
-          "kind": "roof",
-          "edges": [
-            [
-              "e109",
-              "e107",
-              "e103"
-            ]
-          ],
-          "properties": {
-            "material": "asphalt",
-            "pitch": 5,
-            "area": 22.112
-          }
-        }
-      },
-      "components": {
-        "roof": {
-          "surfaces": [
-            "surface1",
-            "surface2",
-            "surface3",
-            "surface4"
-          ]
-        }
-      }
-    },
-    {
-      "kind": "structure",
-      "projection": "planar",
-      "points": {
-        "c107": {
-          "kind": "corner",
-          "coordinates": [
-            15.606,
-            4.39,
-            4.419403808593756
-          ]
-        },
-        "c108": {
-          "kind": "corner",
-          "coordinates": [
-            19.581,
-            0.44,
-            2.5904038085937486
-          ]
-        },
-        "c109": {
-          "kind": "corner",
-          "coordinates": [
-            11.656,
-            0.415,
-            2.5904038085937486
-          ]
-        },
-        "c110": {
-          "kind": "corner",
-          "coordinates": [
-            19.556,
-            8.365,
-            2.5904038085937486
-          ]
-        },
-        "c111": {
-          "kind": "corner",
-          "coordinates": [
-            11.631,
-            8.34,
-            2.5904038085937486
-          ]
-        },
-        "ground": {
-          "kind": "ground",
-          "coordinates": [
-            11.631,
-            0.415,
-            0.00040380859377364686
-          ]
-        }
-      },
-      "edges": {
-        "e110": {
-          "kind": "eave",
-          "points": [
-            "c108",
-            "c109"
-          ],
-          "properties": {
-            "attachments": [
-              "gutter"
-            ],
-            "length": 7.926
-          }
-        },
-        "e112": {
-          "kind": "hip",
-          "points": [
-            "c108",
-            "c107"
-          ],
-          "properties": {
-            "length": 5.895
-          }
-        },
-        "e111": {
-          "kind": "hip",
-          "points": [
-            "c107",
-            "c109"
-          ],
-          "properties": {
-            "length": 5.895
-          }
-        },
-        "e113": {
-          "kind": "eave",
-          "points": [
-            "c110",
-            "c108"
-          ],
-          "properties": {
-            "attachments": [
-              "gutter"
-            ],
-            "length": 7.926
-          }
-        },
-        "e114": {
-          "kind": "hip",
-          "points": [
-            "c110",
-            "c107"
-          ],
-          "properties": {
-            "length": 5.895
-          }
-        },
-        "e115": {
-          "kind": "eave",
-          "points": [
-            "c110",
-            "c111"
-          ],
-          "properties": {
-            "attachments": [
-              "gutter"
-            ],
-            "length": 7.926
-          }
-        },
-        "e116": {
-          "kind": "hip",
-          "points": [
-            "c111",
-            "c107"
-          ],
-          "properties": {
-            "length": 5.895
-          }
-        },
-        "e117": {
-          "kind": "eave",
-          "points": [
-            "c111",
-            "c109"
-          ],
-          "properties": {
-            "attachments": [
-              "gutter"
-            ],
-            "length": 7.926
-          }
-        }
-      },
-      "surfaces": {
-        "surface5": {
-          "kind": "roof",
-          "edges": [
-            [
-              "e110",
-              "e111",
-              "e112"
-            ]
-          ],
-          "properties": {
-            "material": "asphalt",
-            "pitch": 6,
-            "area": 17.296
-          }
-        },
-        "surface6": {
-          "kind": "roof",
-          "edges": [
-            [
-              "e113",
-              "e112",
-              "e114"
-            ]
-          ],
-          "properties": {
-            "material": "asphalt",
-            "pitch": 6,
-            "area": 17.296
-          }
-        },
-        "surface7": {
-          "kind": "roof",
-          "edges": [
-            [
-              "e115",
-              "e116",
-              "e114"
-            ]
-          ],
-          "properties": {
-            "material": "asphalt",
-            "pitch": 6,
-            "area": 17.295
-          }
-        },
-        "surface8": {
-          "kind": "roof",
-          "edges": [
-            [
-              "e117",
-              "e111",
-              "e116"
-            ]
-          ],
-          "properties": {
-            "material": "asphalt",
-            "pitch": 6,
-            "area": 17.295
-          }
-        }
-      },
-      "components": {
-        "roof": {
-          "surfaces": [
-            "surface5",
-            "surface6",
-            "surface7",
-            "surface8"
-          ]
-        }
-      }
-    }
-  ]
-}

package/team-geospan-struct3d-1.0.3.tgz DELETED Viewed

Binary file

package/team-geospan-struct3d-1.0.4.tgz DELETED Viewed

Binary file