@xeokit/xeokit-sdk 2.5.2-beta-8 → 2.5.2-beta-9

package/dist/xeokit-sdk.cjs.js

@@ -7474,8 +7474,28 @@ function Core() {
  */
 const core = new Core();
 
-
 const frame = function () {
+    let time = Date.now();
+    elapsedTime = time - lastTime;
+    if (lastTime > 0 && elapsedTime > 0) { // Log FPS stats
+        var newFPS = 1000 / elapsedTime; // Moving average of FPS
+        totalFPS += newFPS;
+        fpsSamples.push(newFPS);
+        if (fpsSamples.length >= numFPSSamples) {
+            totalFPS -= fpsSamples.shift();
+        }
+        stats.frame.fps = Math.round(totalFPS / fpsSamples.length);
+    }
+    for (let id in core.scenes) {
+        core.scenes[id].compile();
+    }
+    runTasks(time);
+    lastTime = time;
+};
+
+window.setInterval(frame, 1000 / 30);
+
+const renderFrame = function () {
     let time = Date.now();
     elapsedTime = time - lastTime;
     if (lastTime > 0 && elapsedTime > 0) { // Log FPS stats
@@ -7490,10 +7510,11 @@ const frame = function () {
     runTasks(time);
     fireTickEvents(time);
     renderScenes();
-    lastTime = time;
-    (window.requestPostAnimationFrame !== undefined) ? window.requestPostAnimationFrame(frame) : requestAnimationFrame(frame);
+    (window.requestPostAnimationFrame !== undefined) ? window.requestPostAnimationFrame(frame) : requestAnimationFrame(renderFrame);
 };
 
+renderFrame();
+
 function runTasks(time) { // Process as many enqueued tasks as we can within the per-frame task budget
     const tasksRun = core.runTasks(time + taskBudget);
     const tasksScheduled = core.getNumTasks();
@@ -7567,17 +7588,6 @@ function renderScenes() {
     }
 }
 
-(window.requestPostAnimationFrame !== undefined) ? window.requestPostAnimationFrame(frame) : requestAnimationFrame(frame);
-
-function compileScenes() {
-
-    for (let id in core.scenes) {
-        core.scenes[id].compile();
-    }
-}
-
-window.setInterval(compileScenes, 1000 / 60);
-
 /**
  * @desc Base class for all xeokit components.
  *
@@ -12922,7 +12932,7 @@ class Annotation extends Marker {
             if (utils.isArray(markerHTML)) {
                 markerHTML = markerHTML.join("");
             }
-            markerHTML = this._renderTemplate(markerHTML);
+            markerHTML = this._renderTemplate(markerHTML.trim());
             const markerFragment = document.createRange().createContextualFragment(markerHTML);
             this._marker = markerFragment.firstChild;
             this._container.appendChild(this._marker);
@@ -12949,7 +12959,7 @@ class Annotation extends Marker {
             if (utils.isArray(labelHTML)) {
                 labelHTML = labelHTML.join("");
             }
-            labelHTML = this._renderTemplate(labelHTML);
+            labelHTML = this._renderTemplate(labelHTML.trim());
             const labelFragment = document.createRange().createContextualFragment(labelHTML);
             this._label = labelFragment.firstChild;
             this._container.appendChild(this._label);

package/dist/xeokit-sdk.es.js

@@ -7470,8 +7470,28 @@ function Core() {
  */
 const core = new Core();
 
-
 const frame = function () {
+    let time = Date.now();
+    elapsedTime = time - lastTime;
+    if (lastTime > 0 && elapsedTime > 0) { // Log FPS stats
+        var newFPS = 1000 / elapsedTime; // Moving average of FPS
+        totalFPS += newFPS;
+        fpsSamples.push(newFPS);
+        if (fpsSamples.length >= numFPSSamples) {
+            totalFPS -= fpsSamples.shift();
+        }
+        stats.frame.fps = Math.round(totalFPS / fpsSamples.length);
+    }
+    for (let id in core.scenes) {
+        core.scenes[id].compile();
+    }
+    runTasks(time);
+    lastTime = time;
+};
+
+window.setInterval(frame, 1000 / 30);
+
+const renderFrame = function () {
     let time = Date.now();
     elapsedTime = time - lastTime;
     if (lastTime > 0 && elapsedTime > 0) { // Log FPS stats
@@ -7486,10 +7506,11 @@ const frame = function () {
     runTasks(time);
     fireTickEvents(time);
     renderScenes();
-    lastTime = time;
-    (window.requestPostAnimationFrame !== undefined) ? window.requestPostAnimationFrame(frame) : requestAnimationFrame(frame);
+    (window.requestPostAnimationFrame !== undefined) ? window.requestPostAnimationFrame(frame) : requestAnimationFrame(renderFrame);
 };
 
+renderFrame();
+
 function runTasks(time) { // Process as many enqueued tasks as we can within the per-frame task budget
     const tasksRun = core.runTasks(time + taskBudget);
     const tasksScheduled = core.getNumTasks();
@@ -7563,17 +7584,6 @@ function renderScenes() {
     }
 }
 
-(window.requestPostAnimationFrame !== undefined) ? window.requestPostAnimationFrame(frame) : requestAnimationFrame(frame);
-
-function compileScenes() {
-
-    for (let id in core.scenes) {
-        core.scenes[id].compile();
-    }
-}
-
-window.setInterval(compileScenes, 1000 / 60);
-
 /**
  * @desc Base class for all xeokit components.
  *
@@ -12918,7 +12928,7 @@ class Annotation extends Marker {
             if (utils.isArray(markerHTML)) {
                 markerHTML = markerHTML.join("");
             }
-            markerHTML = this._renderTemplate(markerHTML);
+            markerHTML = this._renderTemplate(markerHTML.trim());
             const markerFragment = document.createRange().createContextualFragment(markerHTML);
             this._marker = markerFragment.firstChild;
             this._container.appendChild(this._marker);
@@ -12945,7 +12955,7 @@ class Annotation extends Marker {
             if (utils.isArray(labelHTML)) {
                 labelHTML = labelHTML.join("");
             }
-            labelHTML = this._renderTemplate(labelHTML);
+            labelHTML = this._renderTemplate(labelHTML.trim());
             const labelFragment = document.createRange().createContextualFragment(labelHTML);
             this._label = labelFragment.firstChild;
             this._container.appendChild(this._label);

package/dist/xeokit-sdk.es5.js

@@ -1627,7 +1627,9 @@ var time=new Date().getTime();var callback;var scope;var tasksRun=0;while(taskQu
  * @type {Core}
  */var core=new Core();var frame=function frame(){var time=Date.now();elapsedTime=time-lastTime;if(lastTime>0&&elapsedTime>0){// Log FPS stats
 var newFPS=1000/elapsedTime;// Moving average of FPS
-totalFPS+=newFPS;fpsSamples.push(newFPS);if(fpsSamples.length>=numFPSSamples){totalFPS-=fpsSamples.shift();}stats.frame.fps=Math.round(totalFPS/fpsSamples.length);}runTasks(time);fireTickEvents(time);renderScenes();lastTime=time;window.requestPostAnimationFrame!==undefined?window.requestPostAnimationFrame(frame):requestAnimationFrame(frame);};function runTasks(time){// Process as many enqueued tasks as we can within the per-frame task budget
+totalFPS+=newFPS;fpsSamples.push(newFPS);if(fpsSamples.length>=numFPSSamples){totalFPS-=fpsSamples.shift();}stats.frame.fps=Math.round(totalFPS/fpsSamples.length);}for(var id in core.scenes){core.scenes[id].compile();}runTasks(time);lastTime=time;};window.setInterval(frame,1000/30);var renderFrame=function renderFrame(){var time=Date.now();elapsedTime=time-lastTime;if(lastTime>0&&elapsedTime>0){// Log FPS stats
+var newFPS=1000/elapsedTime;// Moving average of FPS
+totalFPS+=newFPS;fpsSamples.push(newFPS);if(fpsSamples.length>=numFPSSamples){totalFPS-=fpsSamples.shift();}stats.frame.fps=Math.round(totalFPS/fpsSamples.length);}runTasks(time);fireTickEvents(time);renderScenes();window.requestPostAnimationFrame!==undefined?window.requestPostAnimationFrame(frame):requestAnimationFrame(renderFrame);};renderFrame();function runTasks(time){// Process as many enqueued tasks as we can within the per-frame task budget
 var tasksRun=core.runTasks(time+taskBudget);var tasksScheduled=core.getNumTasks();stats.frame.tasksRun=tasksRun;stats.frame.tasksScheduled=tasksScheduled;stats.frame.tasksBudget=taskBudget;}function fireTickEvents(time){// Fire tick event on each Scene
 tickEvent.time=time;for(var id in core.scenes){if(core.scenes.hasOwnProperty(id)){var scene=core.scenes[id];tickEvent.sceneId=id;tickEvent.startTime=scene.startTime;tickEvent.deltaTime=tickEvent.prevTime!=null?tickEvent.time-tickEvent.prevTime:0;/**
              * Fired on each game loop iteration.
@@ -1639,7 +1641,7 @@ tickEvent.time=time;for(var id in core.scenes){if(core.scenes.hasOwnProperty(id)
              * @param {Number} prevTime The time of the previous "tick" event from this Scene.
              * @param {Number} deltaTime The time in seconds since the previous "tick" event from this Scene.
              */scene.fire("tick",tickEvent,true);}}tickEvent.prevTime=time;}function renderScenes(){var scenes=core.scenes;var forceRender=false;var scene;var renderInfo;var ticksPerOcclusionTest;var ticksPerRender;var id;for(id in scenes){if(scenes.hasOwnProperty(id)){scene=scenes[id];renderInfo=scenesRenderInfo[id];if(!renderInfo){renderInfo=scenesRenderInfo[id]={};// FIXME
-}ticksPerOcclusionTest=scene.ticksPerOcclusionTest;if(renderInfo.ticksPerOcclusionTest!==ticksPerOcclusionTest){renderInfo.ticksPerOcclusionTest=ticksPerOcclusionTest;renderInfo.renderCountdown=ticksPerOcclusionTest;}if(--scene.occlusionTestCountdown<=0){scene.doOcclusionTest();scene.occlusionTestCountdown=ticksPerOcclusionTest;}ticksPerRender=scene.ticksPerRender;if(renderInfo.ticksPerRender!==ticksPerRender){renderInfo.ticksPerRender=ticksPerRender;renderInfo.renderCountdown=ticksPerRender;}if(--renderInfo.renderCountdown===0){scene.render(forceRender);renderInfo.renderCountdown=ticksPerRender;}}}}window.requestPostAnimationFrame!==undefined?window.requestPostAnimationFrame(frame):requestAnimationFrame(frame);function compileScenes(){for(var id in core.scenes){core.scenes[id].compile();}}window.setInterval(compileScenes,1000/60);/**
+}ticksPerOcclusionTest=scene.ticksPerOcclusionTest;if(renderInfo.ticksPerOcclusionTest!==ticksPerOcclusionTest){renderInfo.ticksPerOcclusionTest=ticksPerOcclusionTest;renderInfo.renderCountdown=ticksPerOcclusionTest;}if(--scene.occlusionTestCountdown<=0){scene.doOcclusionTest();scene.occlusionTestCountdown=ticksPerOcclusionTest;}ticksPerRender=scene.ticksPerRender;if(renderInfo.ticksPerRender!==ticksPerRender){renderInfo.ticksPerRender=ticksPerRender;renderInfo.renderCountdown=ticksPerRender;}if(--renderInfo.renderCountdown===0){scene.render(forceRender);renderInfo.renderCountdown=ticksPerRender;}}}}/**
  * @desc Base class for all xeokit components.
  *
  * ## Component IDs
@@ -3283,8 +3285,8 @@ _this18._initMarkerDiv();_this18._onMouseHoverSurface=null;_this18._onHoverNothi
          */_this22.projection=cfg.projection;return _this22;}/**
      * @private
      */_createClass(Annotation,[{key:"_buildHTML",value:function _buildHTML(){var _this23=this;if(!this._markerExternal){if(this._marker){this._container.removeChild(this._marker);this._marker=null;}var markerHTML=this._markerHTML||"<p></p>";// Make marker
-if(utils.isArray(markerHTML)){markerHTML=markerHTML.join("");}markerHTML=this._renderTemplate(markerHTML);var markerFragment=document.createRange().createContextualFragment(markerHTML);this._marker=markerFragment.firstChild;this._container.appendChild(this._marker);this._marker.style.visibility=this._markerShown?"visible":"hidden";this._marker.addEventListener("click",function(){_this23.plugin.fire("markerClicked",_this23);});this._marker.addEventListener("mouseenter",function(){_this23.plugin.fire("markerMouseEnter",_this23);});this._marker.addEventListener("mouseleave",function(){_this23.plugin.fire("markerMouseLeave",_this23);});this._marker.addEventListener('wheel',function(event){_this23.plugin.viewer.scene.canvas.canvas.dispatchEvent(new WheelEvent('wheel',event));});}if(!this._labelExternal){if(this._label){this._container.removeChild(this._label);this._label=null;}var labelHTML=this._labelHTML||"<p></p>";// Make label
-if(utils.isArray(labelHTML)){labelHTML=labelHTML.join("");}labelHTML=this._renderTemplate(labelHTML);var labelFragment=document.createRange().createContextualFragment(labelHTML);this._label=labelFragment.firstChild;this._container.appendChild(this._label);this._label.style.visibility=this._markerShown&&this._labelShown?"visible":"hidden";this._label.addEventListener('wheel',function(event){_this23.plugin.viewer.scene.canvas.canvas.dispatchEvent(new WheelEvent('wheel',event));});}}/**
+if(utils.isArray(markerHTML)){markerHTML=markerHTML.join("");}markerHTML=this._renderTemplate(markerHTML.trim());var markerFragment=document.createRange().createContextualFragment(markerHTML);this._marker=markerFragment.firstChild;this._container.appendChild(this._marker);this._marker.style.visibility=this._markerShown?"visible":"hidden";this._marker.addEventListener("click",function(){_this23.plugin.fire("markerClicked",_this23);});this._marker.addEventListener("mouseenter",function(){_this23.plugin.fire("markerMouseEnter",_this23);});this._marker.addEventListener("mouseleave",function(){_this23.plugin.fire("markerMouseLeave",_this23);});this._marker.addEventListener('wheel',function(event){_this23.plugin.viewer.scene.canvas.canvas.dispatchEvent(new WheelEvent('wheel',event));});}if(!this._labelExternal){if(this._label){this._container.removeChild(this._label);this._label=null;}var labelHTML=this._labelHTML||"<p></p>";// Make label
+if(utils.isArray(labelHTML)){labelHTML=labelHTML.join("");}labelHTML=this._renderTemplate(labelHTML.trim());var labelFragment=document.createRange().createContextualFragment(labelHTML);this._label=labelFragment.firstChild;this._container.appendChild(this._label);this._label.style.visibility=this._markerShown&&this._labelShown?"visible":"hidden";this._label.addEventListener('wheel',function(event){_this23.plugin.viewer.scene.canvas.canvas.dispatchEvent(new WheelEvent('wheel',event));});}}/**
      * @private
      */},{key:"_updatePosition",value:function _updatePosition(){var boundary=this.scene.canvas.boundary;var left=boundary[0];var top=boundary[1];var canvasPos=this.canvasPos;this._marker.style.left=Math.floor(left+canvasPos[0])-12+"px";this._marker.style.top=Math.floor(top+canvasPos[1])-12+"px";this._marker.style["z-index"]=90005+Math.floor(this._viewPos[2])+1;var offsetX=20;var offsetY=-17;this._label.style.left=20+Math.floor(left+canvasPos[0]+offsetX)+"px";this._label.style.top=Math.floor(top+canvasPos[1]+offsetY)+"px";this._label.style["z-index"]=90005+Math.floor(this._viewPos[2])+1;}/**
      * @private