Merge pull request #213 from davidmtech/master

Support for super mesh and new metatiles

demos/switching-surfaces/demo.js

@@ -47,7 +47,7 @@ function onSwitchView() {
                 surfaces: {
                     'melown-viewfinder-world': [
                         'bmng08-world',
-                        'bing-world'
+                        'sentinel2-cloudless-eox'
                     ]
                 },
                 freeLayers: {}
@@ -58,7 +58,7 @@ function onSwitchView() {
                 surfaces: {
                     'melown-viewfinder-world': [
                         'bmng08-world',
-                        'bing-world'
+                        'sentinel2-cloudless-eox'
                     ],
                     'melown-benatky-nad-jizerou': []
                 },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vts-browser-js",
-  "version": "2.23.6",
+  "version": "2.23.11",
   "description": "JavaScript WebGL 3D maps rendering engine",
   "main": "src/browser/index.js",
   "scripts": {
@@ -59,6 +59,7 @@
   "dependencies": {
     "earcut": "^2.2.2",
     "geographiclib": "^1.50.0",
-    "melowntech-proj4": "^2.4.5"
+    "melowntech-proj4": "^2.4.5",
+    "npm": "^6.14.9"
   }
 }

src/browser/browser.js

@@ -148,6 +148,13 @@ Browser.prototype.onMapLoaded = function(event) {
         }
     }
 
+    var map = this.getMap();
+
+    if (this.config.tiles3d && map) {
+        this.tiles3d = map.createGeodata();
+        this.tiles3d.load3DTiles(this.config.tiles3d, {}, this.on3DTilesLoaded.bind(this));
+    }
+
     if (this.autopilot) {
         this.autopilot.setAutorotate(this.config.autoRotate);
         this.autopilot.setAutopan(this.config.autoPan[0], this.config.autoPan[1]);
@@ -268,6 +275,16 @@ Browser.prototype.onGeoJsonLoaded = function(data) {
 };
 
 
+Browser.prototype.on3DTilesLoaded = function() {
+    var map = this.getMap();
+    var freeLayer = this.tiles3d.makeFreeLayer({});
+    map.addFreeLayer('tiles3d', freeLayer);
+    var view = map.getView();
+    view.freeLayers.tiles3d = { options: { fastParse: true }};
+    map.setView(view);
+}
+
+
 Browser.prototype.onTick = function() {
     if (this.killed) {
         return;
@@ -416,6 +433,7 @@ Browser.prototype.setConfigParam = function(key, value, ignoreCore) {
     case 'walkMode':               this.config.walkMode = utils.validateBool(value, false); break;
     case 'fixedHeight':            this.config.fixedHeight = utils.validateNumber(value, -Number.MAXINTEGER, Number.MAXINTEGER, 0); break;
     case 'geodata':                this.config.geodata = value; break;
+    case 'tiles3d':                this.config.tiles3d = value; break;
     case 'geojson':                this.config.geojson = value; break;
     case 'geojsonStyle':           this.config.geojsonStyle =  JSON.parse(value); break;
     case 'rotate':             

src/core/core.js

@@ -78,6 +78,8 @@ var Core = function(element, config, coreInterface) {
         mapParseMeshInWorker : true,
         mapPackGeodataEvents : true,
         mapCheckTextureSize : false,
+        mapTraverseToMeshNode : true,
+        mapNormalizeOctantTexelSize : true,
 
         mapFeatureStickMode : [1,1],
 
@@ -586,7 +588,7 @@ string getCoreVersion()
 */
 
 function getCoreVersion(full) {
-    return (full ? 'Core: ' : '') + '2.23.6';
+    return (full ? 'Core: ' : '') + '2.23.11';
 }
 
 

src/core/inspector/input.js

@@ -337,6 +337,10 @@ InspectorInput.prototype.onKeyUp = function(event, press) {
             case 112:
                 debug.drawPositions = !debug.drawPositions; break; //key P pressed
 
+            case 85:
+            case 117:
+                debug.drawOctants = !debug.drawOctants; break;  //key U pressed
+
             case 84:
             case 116:
                 debug.drawTextureSize = !debug.drawTextureSize; break; //key T pressed
@@ -462,6 +466,7 @@ InspectorInput.prototype.setParameter = function(key, value) {
             if (has('V')) debug.drawSpaceBBox = true;
             if (has('M')) debug.drawMeshBBox = true;
             if (has('I')) debug.drawIndices = true;
+            if (has('U')) debug.drawOctants = true;
             if (has('B')) debug.drawBoundLayers = true;
             if (has('S')) debug.drawSurfaces = true;
             if (has('Z')) debug.drawSurfaces2 = true;

src/core/inspector/stats.js

@@ -109,7 +109,7 @@ InspectorStats.prototype.updateStatsPanel = function(stats) {
             ' - meshes: ' + Math.round(stats.gpuMeshes/(1024*1024)) + 'MB<br/>' +
             ' - geodata: ' + Math.round(stats.gpuGeodata/(1024*1024)) + 'MB<br/>' +
             'CPU Cache: ' + Math.round(stats.resourcesUsed/(1024*1024)) + 'MB<br/>' +
-            'Metaile Cache: ' + Math.round(stats.metaUsed/(1024*1024)) + 'MB<br/>' +
+            'Metatile Cache: ' + Math.round(stats.metaUsed/(1024*1024)) + 'MB<br/>' +
 //            "FOV: " + Math.round(this.core.getOption("fov")) + " deg<br/>" +
 //            "viewHeight: " + Math.round(this.core.getOption("viewHeight")) + " m<br/>" +
 //            "distance: " + Math.round(this.core.renderer.cameraDistance) + " m<br/>" +
@@ -153,7 +153,14 @@ InspectorStats.prototype.updateStatsPanel = function(stats) {
 
     text3 += 'Metatiles: ' + (stats.processedMetatiles) +'<br/>'+
              'Metanodes: ' + (stats.processedNodes) + ' / ' + (stats.usedNodes) + '<br/>'+
-             'GeodataTiles: ' + (stats.drawnGeodataTiles) + '<br/><br/>';
+             'GeodataTiles: ' + (stats.drawnGeodataTiles) + '<br/>';
+
+    if (stats.octoNodes) {
+        text3 += 'OctoNodes: ' + (stats.octoNodes) +'<br/>'+
+                 'OctoNodesMem: ' + Math.round(stats.octoNodesMemSize/(1024*1024)) + 'MB<br/>';
+    }
+
+    text3 += '<br/>';
 
     if (renderer) {
         text3 += 'Nodes: ' + (renderer.drawnNodes) +'<br/><br/>';

src/core/map/draw.js

@@ -49,6 +49,7 @@ var MapDraw = function(map) {
         drawSurfaces : false,
         drawCredits : false,
         drawOrder : false,
+        drawOctants : false,
         drawLabelBoxes : false,
         drawAllLabels : false,
         drawHiddenLabels : false,
@@ -798,7 +799,7 @@ MapDraw.prototype.drawMonoliticGeodata = function(surface) {
         surface.monoGeodataCounter = surface.geodataCounter;
     }
 
-    if (surface.monoGeodata.isReady()) {
+    if (surface.monoGeodata.isReady(null, null, null, surface.options.fastParse)) {
 
         if (!surface.monoGeodataView) {
             surface.monoGeodataView = new MapGeodataView(this.map, surface.monoGeodata, {tile:null, surface:surface});

src/core/map/geodata-builder.js

@@ -3,7 +3,7 @@
 import MapGeodataGeometry_ from './geodata-geometry';
 import MapGeodataImportGeoJSON_ from './geodata-import/geojson';
 import MapGeodataImportVTSGeodata_ from './geodata-import/vts-geodata';
-import MapGeodataImport3DTiles_ from './geodata-import/3dtiles';
+//import MapGeodataImport3DTiles_ from './geodata-import/3dtiles';
 //import GeographicLib_ from 'geographiclib';
 import {vec3 as vec3_, mat4 as mat4_,} from '../utils/matrix';
 
@@ -12,7 +12,7 @@ import {vec3 as vec3_, mat4 as mat4_,} from '../utils/matrix';
 var MapGeodataGeometry = MapGeodataGeometry_;
 var MapGeodataImportGeoJSON = MapGeodataImportGeoJSON_;
 var MapGeodataImportVTSGeodata = MapGeodataImportVTSGeodata_;
-var MapGeodataImport3DTiles = MapGeodataImport3DTiles_;
+//var MapGeodataImport3DTiles = MapGeodataImport3DTiles_;
 
 //var GeographicLib = GeographicLib_;
 var vec3 = vec3_;
@@ -138,6 +138,17 @@ MapGeodataBuilder.prototype.addMesh = function(node, path) {
 };
 
 
+MapGeodataBuilder.prototype.addLoadNode = function(node, path) {
+    if (node) {
+        if (!node.loadNodes) {
+            node.loadNodes = [];
+        }
+
+        node.loadNodes.push(path);
+    }
+};
+
+
 MapGeodataBuilder.prototype.addPoint = function(point, heightMode, properties, id, srs, directCopy) {
     if (!this.currentGroup) {
         this.addGroup('some-group');
@@ -1426,7 +1437,7 @@ MapGeodataBuilder.prototype.addPolygonRAW = function(vertices, surface, borders,
                     featureVertices[j++] = [vertices[i], vertices[i+1], vertices[i+2]];
                 }
             } else {
-                featureVertices[j++] = this.physSrs.convertCoordsFrom(coords, srs);
+                featureVertices[j++] = this.physSrs.convertCoordsFrom([vertices[i], vertices[i+1], vertices[i+2]], srs);
             }
         }
     }
@@ -1464,11 +1475,21 @@ MapGeodataBuilder.prototype.import3DTiles = function(json, options) {
     return importer.processJSON(json);
 };
 
+
 MapGeodataBuilder.prototype.load3DTiles = function(path, options, onLoaded) {
     var importer = new MapGeodataImport3DTiles(this, options);
     importer.loadJSON(path, options, onLoaded);
 };
 
+
+MapGeodataBuilder.prototype.load3DTiles2 = function(path, options, onLoaded) {
+    this.binPath = path;
+    if (onMapLoaded) {
+        onMapLoaded();
+    }
+};
+
+
 MapGeodataBuilder.prototype.processHeights = function(heightsSource, precision, onProcessed) {
     if (this.heightsToProcess <= 0) {
         if (onProcessed) {
@@ -1916,6 +1937,10 @@ MapGeodataBuilder.prototype.makeGeodata = function(resolution) {
         "version" : 1,
         "groups" : [],
     }
+
+    if (this.binPath) {
+        geodata["binPath"] = this.binPath;
+    }
 
     for (var i = 0, li = this.groups.length; i < li; i++) {
         geodata["groups"].push(this.compileGroup(this.groups[i], resolution));

src/core/map/geodata-import/3dtiles.js

@@ -21,9 +21,10 @@ var MapGeodataImport3DTiles = function(builder, options) {
     this.srs = this.navSrs;
     this.rootPath = '';
     this.filesToLoad = 0;
-    options = options || {};
+    //this.options = options || {};
 };
 
+
 MapGeodataImport3DTiles.prototype.processNode = function(builderNode, node, onlyChildren) {
     var boundingVolume = node['boundingVolume'], volume;
 
@@ -86,7 +87,11 @@ MapGeodataImport3DTiles.prototype.processNode = function(builderNode, node, only
         path = utilsUrl.getProcessUrl(path, this.rootPath);
 
         if (path.indexOf('.json') != -1) {
-            this.loadJSON(path, { internal: true, node: builderNode } );
+            if (this.baseOptions.gradualJSONLoader) {
+                this.builder.addLoadNode(builderNode, path);
+            } else {
+                this.loadJSON(path, { internal: true, node: builderNode } );
+            }
         }
 
         else if (path.indexOf('.mesh') != -1) {