@jdultra/threedtiles 5.1.2 → 5.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jdultra/threedtiles",
-    "version": "5.1.2",
+    "version": "5.1.4",
     "description": "An OGC 3DTiles viewer for Three.js",
     "main": "tileset.js",
     "scripts": {

package/src/decoder/B3DMDecoder.js

@@ -8,10 +8,15 @@ const dracoLoader = new DRACOLoader();
 const tempMatrix = new THREE.Matrix4();
 dracoLoader.setDecoderPath('https://www.gstatic.com/draco/versioned/decoders/1.4.3/');
 gltfLoader.setDRACOLoader(dracoLoader);
+const zUpToYUpMatrix = new THREE.Matrix4();
+zUpToYUpMatrix.set(1,0,0,0,
+			0,0,-1,0,
+			0,1,0,0,
+			0,0,0,1);
 
 //const legacyGLTFLoader = new LegacyGLTFLoader();
 
-function parseB3DM(arrayBuffer, meshCallback) {
+function parseB3DM(arrayBuffer, meshCallback, zUpToYUp) {
 	const dataView = new DataView(arrayBuffer);
 
 	const magic =
@@ -68,7 +73,11 @@ function parseB3DM(arrayBuffer, meshCallback) {
 			}
 			
 			model.scene.traverse((o) => {
+				
 				if (o.isMesh) {
+					if(zUpToYUp){
+						o.applyMatrix4(zUpToYUpMatrix);
+					}
 					if (!!meshCallback) {
 						meshCallback(o);
 					}
@@ -84,9 +93,9 @@ function parseB3DM(arrayBuffer, meshCallback) {
 
 const B3DMDecoder = {
 	parseB3DM: parseB3DM,
-	parseB3DMInstanced: (arrayBuffer, meshCallback, maxCount) => { // expects GLTF with one node level
+	parseB3DMInstanced: (arrayBuffer, meshCallback, maxCount, zUpToYUp) => { // expects GLTF with one node level
 
-		return parseB3DM(arrayBuffer, meshCallback).then(mesh => {
+		return parseB3DM(arrayBuffer, meshCallback, zUpToYUp).then(mesh => {
 			let instancedMesh;
 			mesh.updateWorldMatrix(false, true)
 			mesh.traverse(child => {

package/src/index.js

@@ -51,7 +51,7 @@ function initScene() {
     //scene.matrixWorldAutoUpdate = false;
     scene.background = new THREE.Color(0xffffff);
     scene.add(new THREE.AmbientLight(0xFFFFFF, 1.0));
-
+    
     /* const light = new THREE.PointLight(0xbbbbff, 2, 5000);
     const sphere = new THREE.SphereGeometry(2, 16, 8);
     light.add(new THREE.Mesh(sphere, new THREE.MeshBasicMaterial({ color: 0xbbbbff })));
@@ -113,7 +113,7 @@ function initStats(dom) {
 
 function initCamera(width, height) {
     const camera = new THREE.PerspectiveCamera(60, width / height, 1, 100000);
-    camera.position.set(10000,0,0);
+    camera.position.set(15,0,0);
     camera.lookAt(0,0,0);
 
     camera.matrixAutoUpdate = true;
@@ -130,9 +130,7 @@ function initTileset(scene, gem) {
     }, 100);
 
     const ogc3DTile = new OGC3DTile({
-        //url: "https://sampledata.luciad.com/data/ogc3dtiles/LucerneAirborneMesh/tileset.json",
-        url: "https://sampleservices.luciad.com/ogc/3dtiles/marseille-mesh/tileset.json",
-        //url: "https://storage.googleapis.com/ogc-3d-tiles/baltimore/tileset.json",
+        url: "https://storage.googleapis.com/ogc-3d-tiles/baltimore/tileset.json",
         //url: "https://storage.googleapis.com/ogc-3d-tiles/berlinTileset/tileset.json",
         geometricErrorMultiplier: gem,
         loadOutsideView: false,
@@ -141,13 +139,12 @@ function initTileset(scene, gem) {
         static: false,
         centerModel:true,
         renderer: renderer,
-        /* onLoadCallback: (tile)=>{
+         onLoadCallback: (tile)=>{ // move tileset base to origin
             if (!!tile.json.boundingVolume.region) {
                 const halfHeight = (tile.json.boundingVolume.region[5] - tile.json.boundingVolume.region[4]) * 0.5;
                 ogc3DTile.translateOnAxis(new THREE.Vector3(0, 1, 0), halfHeight);
-                //ogc3DTile.updateWorldMatrix(true, true);
             }
-        } */
+        } 
 
     });
     setIntervalAsync(function () {
@@ -185,10 +182,7 @@ function initInstancedTilesets(instancedTileLoader) {
 
 
     const tileset = new InstancedOGC3DTile({
-        //url: "https://storage.googleapis.com/ogc-3d-tiles/berlinTileset/tileset.json",
-        url: "https://sampleservices.luciad.com/ogc/3dtiles/marseille-mesh/tileset.json",
-        //url: "https://s3.eu-central-2.wasabisys.com/construkted-assets-eu/ab13lasdc9i/tileset.json",
-        //url: "http://localhost:8081/tileset.json",
+        url: "https://storage.googleapis.com/ogc-3d-tiles/berlinTileset/tileset.json",
         geometricErrorMultiplier: 1.0,
         loadOutsideView: true,
         tileLoader: instancedTileLoader,
@@ -236,8 +230,8 @@ function initLODMultiplierSlider(instancedTilesets) {
 function initController(camera, dom) {
     const controller = new OrbitControls(camera, dom);
 
+    //controller.target.set(4629210.73133627, 435359.7901640832, 4351492.357788198);
     controller.target.set(0,0,0);
-//controller.target.set(0,0,0);
 
 
     controller.minDistance = 0.1;

package/src/tileset/OGC3DTile.js

@@ -11,11 +11,7 @@ const tempVec2 = new THREE.Vector3(0, 0, 0);
 const upVector = new THREE.Vector3(0, 1, 0);
 const rendererSize = new THREE.Vector2();
 const tempQuaternion = new THREE.Quaternion();
-const zUpToYUp = new THREE.Matrix4();
-zUpToYUp.set(1,0,0,0,
-			0,0,-1,0,
-			0,1,0,0,
-			0,0,0,1);
+
 
 class OGC3DTile extends THREE.Object3D {
 
@@ -220,14 +216,14 @@ class OGC3DTile extends THREE.Object3D {
             if (!!url) {
                 if (url.includes(".b3dm")) {
                     self.contentURL = url;
-                    const rotateToYUp = !!self.json.boundingVolume.region;
+                    if(!!self.json.boundingVolume.region){
+                        //self.applyMatrix4(zUpToYUp);
+                    }
                     self.tileLoader.get(self.abortController, this.uuid, url, mesh => {
                         if (!!self.deleted) return;
                         mesh.traverse((o) => {
                             if (o.isMesh) {
-                                if(rotateToYUp){
-                                    o.applyMatrix4(zUpToYUp);
-                                }
+                                
                                 o.layers.disable(0);
                                 if (self.occlusionCullingService) {
                                     const position = o.geometry.attributes.position;
@@ -250,7 +246,10 @@ class OGC3DTile extends THREE.Object3D {
                         self.meshContent = mesh;
                     }, !self.cameraOnLoad ? () => 0 : () => {
                         return self.calculateDistanceToCamera(self.cameraOnLoad);
-                    }, () => self.getSiblings(), self.level);
+                    }, () => self.getSiblings(), 
+                    self.level,
+                    !!this.json.boundingVolume.region
+                    );
                 } else if (url.includes(".json")) {
                     self.tileLoader.get(self.abortController, this.uuid, url, json => {
                         if (!!self.deleted) return;

package/src/tileset/TileLoader.js

@@ -142,7 +142,7 @@ class TileLoader {
     }
 
 
-    get(abortController, tileIdentifier, path, callback, distanceFunction, getSiblings, level) {
+    get(abortController, tileIdentifier, path, callback, distanceFunction, getSiblings, level, zUpToYUp) {
         const self = this;
         const key = simplifyPath(path);
 
@@ -183,7 +183,7 @@ class TileLoader {
 
                     })
                     .then(resultArrayBuffer=>{
-                        return B3DMDecoder.parseB3DM(resultArrayBuffer, self.meshCallback);
+                        return B3DMDecoder.parseB3DM(resultArrayBuffer, self.meshCallback, zUpToYUp);
                     })
                     .then(mesh=>{
                         self.cache.put(key, mesh);
@@ -228,7 +228,9 @@ class TileLoader {
 
     invalidate(path, tileIdentifier) {
         const key = simplifyPath(path);
-        delete this.register[key][tileIdentifier];
+        if(!!this.register[key]){
+            delete this.register[key][tileIdentifier];
+        }
     }
 
     checkSize() {

package/src/tileset/instanced/InstancedTile.js

@@ -217,7 +217,9 @@ class InstancedTile extends THREE.Object3D {
                     
                     self.tileLoader.get(self.abortController, url, self.uuid, self, !self.cameraOnLoad ? () => 0 : () => {
                         return self.calculateDistanceToCamera(self.cameraOnLoad);
-                    }, () => self.getSiblings(), self.level);
+                    }, () => self.getSiblings(), 
+                    self.level,
+                    !!self.json.boundingVolume.region);
                 } else if (url.includes(".json")) {
                     self.tileLoader.get(self.abortController, url, self.uuid, self);
 

package/src/tileset/instanced/InstancedTileLoader.js

@@ -68,7 +68,7 @@ class InstancedTileLoader {
 
                     })
                     .then(resultArrayBuffer=>{
-                        return B3DMDecoder.parseB3DMInstanced(resultArrayBuffer, self.meshCallback, self.maxInstances);
+                        return B3DMDecoder.parseB3DMInstanced(resultArrayBuffer, self.meshCallback, self.maxInstances, nextDownload.zUpToYUp);
                     })
                     .then(mesh=>{
                         nextDownload.tile.setObject(mesh);
@@ -138,7 +138,7 @@ class InstancedTileLoader {
         }
     }
 
-    get(abortController, path, uuid, instancedOGC3DTile, distanceFunction, getSiblings, level) {
+    get(abortController, path, uuid, instancedOGC3DTile, distanceFunction, getSiblings, level, zUpToYUp) {
         const self = this;
         const key = simplifyPath(path);
 
@@ -156,9 +156,7 @@ class InstancedTileLoader {
             if (path.includes(".b3dm")) {
                 const tile = new MeshTile(self.scene);
                 tile.addInstance(instancedOGC3DTile);
-                if(self.cache.has(key)){
-                    console.log("élkbhj")
-                }
+                
                 self.cache.put(key, tile);
 
                 const realAbortController = new AbortController();
@@ -176,6 +174,7 @@ class InstancedTileLoader {
                     getSiblings: getSiblings,
                     level: level,
                     uuid: uuid,
+                    zUpToYUp: zUpToYUp,
                     shouldDoDownload: () => {
                         return true;
                     },