fix b3dm logical bug

Author: PrincessGod

lib/obj23dtiles.js

@@ -13,20 +13,21 @@ obj23dtiles.combine = combine;
 function obj23dtiles(objPath, outputPath, options) {
     console.time('Total');
 
+    if(typeof options.tilesetOptions === 'string') {
+        options.tilesetOptions = fsExtra.readJsonSync(options.tilesetOptions);
+    }
+    if(typeof options.customBatchTable === 'string') {
+        options.customBatchTable = fsExtra.readJsonSync(options.customBatchTable);
+    }
+    if (typeof options.customFeatureTable === 'string') {
+        options.customFeatureTable = fsExtra.readJsonSync(options.customFeatureTable);
+    }
+
     if (options && options.tileset) {
         if(!options.i3dm) {
             options.binary = true;
             options.batchId = true;
             options.b3dm = true;
-            if(typeof options.tilesetOptions === 'string') {
-                options.tilesetOptions = fsExtra.readJsonSync(options.tilesetOptions);
-            }
-            if(typeof options.customBatchTable === 'string') {
-                options.customBatchTable = fsExtra.readJsonSync(options.customBatchTable);
-            }
-            if (typeof options.customFeatureTable === 'string') {
-                options.customFeatureTable = fsExtra.readJsonSync(options.customFeatureTable);
-            }
 
             obj2Tileset(objPath, outputPath, options)
                 .then(function(result) {

lib/obj2b3dm.js

@@ -17,24 +17,25 @@ function obj2B3dm(objPath, options) {
             var glb = result.gltf;
             var batchTableJson = result.batchTableJson;
             var customBatchTable = batchTableJson;
+            var length = batchTableJson.maxPoint.length; // maxPoint always be there
             return new Promise(function (resolve, reject) {
                 if (options.customBatchTable) {
-                    var length = options.customBatchTable[Object.keys(options.customBatchTable)[0]].length;
-                    if (length !== batchTableJson.batchId.length ) {
+                    length = options.customBatchTable[Object.keys(options.customBatchTable)[0]].length;
+                    if (length !== batchTableJson.maxPoint.length ) {
                         reject('Custom BatchTable properties\'s length should be equals to default BatchTable \'batchId\' length.');
                     }
                     customBatchTable = options.customBatchTable;
-                    resolve({
-                        b3dm : createB3dm({
-                            glb: glb,
-                            featureTableJson: {
-                                BATCH_LENGTH: length
-                            },
-                            batchTableJson: customBatchTable
-                        }),
-                        batchTableJson : batchTableJson
-                    });
                 }
+                resolve({
+                    b3dm : createB3dm({
+                        glb: glb,
+                        featureTableJson: {
+                            BATCH_LENGTH: length
+                        },
+                        batchTableJson: customBatchTable
+                    }),
+                    batchTableJson : batchTableJson
+                });
             });
         });
 }