@jdultra/threedtiles 3.0.1 → 3.0.5

package/README.md

@@ -93,6 +93,6 @@ I'll soon add a layer for 3DTiles.
 # Mesh to 3DTiles Converter
 
 I also have code to convert meshes to 3DTiles with no limit to the size of the dataset relative to faces or textures.
-It works for all types of meshes.
+It works for all types of meshes: photogrametry, BIM, colored or textured meshes with a single texture atlas or many individual textures. 
 I'm keeping the code private for now but I'll convert any dataset you have for free.
 Contact: emericbeaufays@gmail.com

package/index.html

@@ -51,9 +51,9 @@
     <input type="range" min="0.1" max="4" value="1.0", step="0.1" class="slider" id="lodMultiplier" >
     <p style="color: #0439aa;">LOD multiplier: <span id="multiplierValue"></span></p>
   </div>
-  <div style="position: absolute; bottom: 1%; z-index: 100;"> model converted to 3DTiles from <a
-      href="https://sketchfab.com/3d-models/momoyama-castle-rawscan-244171a3822f4f83bd7c65b432fa93b2">sketchfab</a> <a
-      href="https://creativecommons.org/licenses/by/4.0/">(CC)</a></div>
+  <div style="position: absolute; bottom: 1%; z-index: 100;"> 
+    <a href="https://openheritage3d.org/project.php?id=taz6-n215">ORIGINAL MODEL</a>
+  </div>
 </body>
 
 </html>

package/package.json

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

package/src/decoder/B3DMDecoder.js

@@ -1,9 +1,14 @@
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
+import * as THREE from 'three';
+import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader.js';
 import { LegacyGLTFLoader } from './LegacyGLTFLoader.js';
 import { Color, DoubleSide, BufferAttribute, Mesh } from "three";
 import { BufferGeometryUtils } from 'three/examples/jsm/utils/BufferGeometryUtils.js';
 
 const gltfLoader = new GLTFLoader();
+const dracoLoader = new DRACOLoader();
+dracoLoader.setDecoderPath( '/src/draco/' );
+gltfLoader.setDRACOLoader( dracoLoader );
 const legacyGLTFLoader = new LegacyGLTFLoader();
 const B3DMDecoder = {
 	parseB3DM: (arrayBuffer, meshCallback) => {
@@ -51,8 +56,8 @@ const B3DMDecoder = {
 				//model.scene.batchTable = b3dm.batchTable;
 				//model.scene.featureTable = b3dm.featureTable;
 
-				const scene = mergeColoredObject(model.scene);
-				scene.traverse((o) => {
+				//const scene = mergeColoredObject(model.scene);
+				model.scene.traverse((o) => {
 					if (o.isMesh) {
 						if (!!meshCallback) {
 							meshCallback(o);
@@ -60,23 +65,43 @@ const B3DMDecoder = {
 
 					}
 				});
-				resolve(scene);
+				resolve(model.scene);
 			}, error=>{
-				console.error(error);
-				reject();
+				legacyGLTFLoader.parse(gltfBuffer, model => {
+
+					////TODO
+					//model.batchTable = b3dm.batchTable;
+					//model.featureTable = b3dm.featureTable;
+	
+					//model.scene.batchTable = b3dm.batchTable;
+					//model.scene.featureTable = b3dm.featureTable;
+	
+					//const scene = mergeColoredObject(model.scene);
+					model.scene.traverse((o) => {
+						if (o.isMesh) {
+							if (!!meshCallback) {
+								meshCallback(o);
+							}
+	
+						}
+					});
+					resolve(model.scene);
+				}, null);
 			});
 		});
 	}
 }
 
 /**
+ * //TODO find something else than this workaround
+ * 
  * Because B3DM doesn't support colored faces, they are usually encoded as separate meshes each one with a global color.
  * However, when a mesh has many different face colors, this becomes very inneficient.
  * This method doesn't fix the slow decoding of the GLTFLoader but at least merges meshes together and transfers the face color to vertex color 
  * which is much more efficient at render time. 
  * Textured meshes with the same texture are also merged and color is discarded
  * 
- * A better fix would be to do this within the GLTFLoader itself.
+ * Big assumption! all the meshes are assumed to have the same transformation matrix
  * 
  * @param {*} scene 
  * @returns 
@@ -141,6 +166,7 @@ function mergeColoredObject(scene) {
 	if(fullColoredGeometriesToMerge.length>0){
 		let mergedColoredGeometry = BufferGeometryUtils.mergeBufferGeometries(fullColoredGeometriesToMerge, false);
 		mergedColoredMesh = new Mesh(mergedColoredGeometry, coloredMeshMaterial);
+		//mergedColoredMesh.matrix = matrix;
 		for (const color in coloredMeshes) {
 			if (coloredMeshes.hasOwnProperty(color)) {
 				coloredMeshes[color].forEach(mesh => {
@@ -171,7 +197,9 @@ function mergeColoredObject(scene) {
 			});
 			
 			const mergedGeometry = BufferGeometryUtils.mergeBufferGeometries(geometries, false);
-			mergedTexturedMeshes.push(new Mesh(mergedGeometry, material));
+			const mesh = new Mesh(mergedGeometry, material);
+			//mesh.matrix = matrix;
+			mergedTexturedMeshes.push(mesh);
 			texturedMeshes[map].forEach(mesh => {
 				mesh.material.dispose();
 				mesh.geometry.dispose();
@@ -183,7 +211,7 @@ function mergeColoredObject(scene) {
 	if(!!mergedColoredMesh) scene.add(mergedColoredMesh);
 	mergedTexturedMeshes.forEach(mesh=>scene.add(mesh));
 	console.log();
-
+	scene.matrix = new THREE.Matrix4();
 	return scene;
 }
 

package/src/decoder/LegacyGLTFLoader.js

@@ -431,6 +431,7 @@ const LegacyGLTFLoader = ( function () {
 	var WEBGL_TYPE = {
 		5126: Number,
 		//35674: THREE.Matrix2,
+		35670: Boolean,
 		35675: THREE.Matrix3,
 		35676: THREE.Matrix4,
 		35664: THREE.Vector2,
@@ -1099,7 +1100,8 @@ const LegacyGLTFLoader = ( function () {
 
 						}
 
-						var textureLoader = THREE.Loader.Handlers.get( sourceUri );
+						//var textureLoader = THREE.Loader.Handlers.get( sourceUri );
+						var textureLoader = THREE.DefaultLoadingManager.getHandler( sourceUri);
 
 						if ( textureLoader === null ) {