@xeokit/xeokit-sdk 2.4.0-alpha-42 → 2.4.0-alpha-44

package/dist/xeokit-sdk.cjs.js

@@ -16550,9 +16550,18 @@ class RenderBuffer {
         const canvas = imageDataCache.canvas;
         const imageData = imageDataCache.imageData;
         const context = imageDataCache.context;
-        gl.readPixels(0, 0, this.buffer.width, this.buffer.height, gl.RGBA, gl.UNSIGNED_BYTE, pixelData);
+        const { width, height } = this.buffer;
+        gl.readPixels(0, 0, width, height, gl.RGBA, gl.UNSIGNED_BYTE, pixelData);
         imageData.data.set(pixelData);
         context.putImageData(imageData, 0, 0);
+
+        // flip Y
+        context.save();
+        context.globalCompositeOperation = 'copy';
+        context.scale(1, -1);
+        context.drawImage(canvas, 0, -height, width, height);
+        context.restore();
+
         let format = params.format || "png";
         if (format !== "jpeg" && format !== "png" && format !== "bmp") {
             console.error("Unsupported image format: '" + format + "' - supported types are 'jpeg', 'bmp' and 'png' - defaulting to 'png'");
@@ -103273,7 +103282,7 @@ class PropertySet {
     /**
      * @private
      */
-    constructor(id, originalSystemId, name, type, properties) {
+    constructor(params) {
 
         /**
          * Globally-unique ID for this PropertySet.
@@ -103283,7 +103292,7 @@ class PropertySet {
          * @property id
          * @type {String}
          */
-        this.id = id;
+        this.id = params.id;
 
         /**
          * ID of the corresponding object within the originating system, if any.
@@ -103291,7 +103300,7 @@ class PropertySet {
          * @type {String}
          * @abstract
          */
-        this.originalSystemId = originalSystemId;
+        this.originalSystemId = params.originalSystemId;
 
         /**
          * The MetaModels that share this PropertySet.
@@ -103305,7 +103314,7 @@ class PropertySet {
          * @property name
          * @type {String}
          */
-        this.name = name;
+        this.name = params.name;
 
         /**
          * Type of this PropertySet.
@@ -103313,7 +103322,7 @@ class PropertySet {
          * @property type
          * @type {String}
          */
-        this.type = type;
+        this.type = params.type;
 
         /**
          * Properties within this PropertySet.
@@ -103323,7 +103332,8 @@ class PropertySet {
          */
         this.properties = [];
 
-        if (properties) {
+        if (params.properties) {
+            const properties = params.properties;
             for (let i = 0, len = properties.length; i < len; i++) {
                 const property = properties[i];
                 this.properties.push(new Property(property.name,  property.value, property.type, property.valueType, property.description));

package/dist/xeokit-sdk.es.js

@@ -16546,9 +16546,18 @@ class RenderBuffer {
         const canvas = imageDataCache.canvas;
         const imageData = imageDataCache.imageData;
         const context = imageDataCache.context;
-        gl.readPixels(0, 0, this.buffer.width, this.buffer.height, gl.RGBA, gl.UNSIGNED_BYTE, pixelData);
+        const { width, height } = this.buffer;
+        gl.readPixels(0, 0, width, height, gl.RGBA, gl.UNSIGNED_BYTE, pixelData);
         imageData.data.set(pixelData);
         context.putImageData(imageData, 0, 0);
+
+        // flip Y
+        context.save();
+        context.globalCompositeOperation = 'copy';
+        context.scale(1, -1);
+        context.drawImage(canvas, 0, -height, width, height);
+        context.restore();
+
         let format = params.format || "png";
         if (format !== "jpeg" && format !== "png" && format !== "bmp") {
             console.error("Unsupported image format: '" + format + "' - supported types are 'jpeg', 'bmp' and 'png' - defaulting to 'png'");
@@ -103269,7 +103278,7 @@ class PropertySet {
     /**
      * @private
      */
-    constructor(id, originalSystemId, name, type, properties) {
+    constructor(params) {
 
         /**
          * Globally-unique ID for this PropertySet.
@@ -103279,7 +103288,7 @@ class PropertySet {
          * @property id
          * @type {String}
          */
-        this.id = id;
+        this.id = params.id;
 
         /**
          * ID of the corresponding object within the originating system, if any.
@@ -103287,7 +103296,7 @@ class PropertySet {
          * @type {String}
          * @abstract
          */
-        this.originalSystemId = originalSystemId;
+        this.originalSystemId = params.originalSystemId;
 
         /**
          * The MetaModels that share this PropertySet.
@@ -103301,7 +103310,7 @@ class PropertySet {
          * @property name
          * @type {String}
          */
-        this.name = name;
+        this.name = params.name;
 
         /**
          * Type of this PropertySet.
@@ -103309,7 +103318,7 @@ class PropertySet {
          * @property type
          * @type {String}
          */
-        this.type = type;
+        this.type = params.type;
 
         /**
          * Properties within this PropertySet.
@@ -103319,7 +103328,8 @@ class PropertySet {
          */
         this.properties = [];
 
-        if (properties) {
+        if (params.properties) {
+            const properties = params.properties;
             for (let i = 0, len = properties.length; i < len; i++) {
                 const property = properties[i];
                 this.properties.push(new Property(property.name,  property.value, property.type, property.valueType, property.description));

package/dist/xeokit-sdk.es5.js

@@ -4383,7 +4383,8 @@ gl.bindFramebuffer(gl.FRAMEBUFFER,framebuf);if(!gl.isFramebuffer(framebuf)){thro
      *
      * @returns {HTMLCanvasElement}
      */},{key:"readImageAsCanvas",value:function readImageAsCanvas(){var gl=this.gl;var imageDataCache=this._getImageDataCache();var pixelData=imageDataCache.pixelData;var canvas=imageDataCache.canvas;var imageData=imageDataCache.imageData;var context=imageDataCache.context;gl.readPixels(0,0,this.buffer.width,this.buffer.height,gl.RGBA,gl.UNSIGNED_BYTE,pixelData);var width=this.buffer.width;var height=this.buffer.height;var halfHeight=height/2|0;// the | 0 keeps the result an int
-var bytesPerRow=width*4;var temp=new Uint8Array(width*4);for(var y=0;y<halfHeight;++y){var topOffset=y*bytesPerRow;var bottomOffset=(height-y-1)*bytesPerRow;temp.set(pixelData.subarray(topOffset,topOffset+bytesPerRow));pixelData.copyWithin(topOffset,bottomOffset,bottomOffset+bytesPerRow);pixelData.set(temp,bottomOffset);}imageData.data.set(pixelData);context.putImageData(imageData,0,0);return canvas;}},{key:"readImage",value:function readImage(params){var gl=this.gl;var imageDataCache=this._getImageDataCache();var pixelData=imageDataCache.pixelData;var canvas=imageDataCache.canvas;var imageData=imageDataCache.imageData;var context=imageDataCache.context;gl.readPixels(0,0,this.buffer.width,this.buffer.height,gl.RGBA,gl.UNSIGNED_BYTE,pixelData);imageData.data.set(pixelData);context.putImageData(imageData,0,0);var format=params.format||"png";if(format!=="jpeg"&&format!=="png"&&format!=="bmp"){console.error("Unsupported image format: '"+format+"' - supported types are 'jpeg', 'bmp' and 'png' - defaulting to 'png'");format="png";}return canvas.toDataURL("image/".concat(format));}},{key:"_getImageDataCache",value:function _getImageDataCache(){var type=arguments.length>0&&arguments[0]!==undefined?arguments[0]:Uint8Array;var multiplier=arguments.length>1&&arguments[1]!==undefined?arguments[1]:4;var bufferWidth=this.buffer.width;var bufferHeight=this.buffer.height;var imageDataCache=this._imageDataCache;if(imageDataCache){if(imageDataCache.width!==bufferWidth||imageDataCache.height!==bufferHeight){this._imageDataCache=null;imageDataCache=null;}}if(!imageDataCache){var _canvas=document.createElement('canvas');var context=_canvas.getContext('2d');_canvas.width=bufferWidth;_canvas.height=bufferHeight;imageDataCache={pixelData:new type(bufferWidth*bufferHeight*multiplier),canvas:_canvas,context:context,imageData:context.createImageData(bufferWidth,bufferHeight),width:bufferWidth,height:bufferHeight};this._imageDataCache=imageDataCache;}imageDataCache.context.resetTransform();// Prevents strange scale-accumulation effect with html2canvas
+var bytesPerRow=width*4;var temp=new Uint8Array(width*4);for(var y=0;y<halfHeight;++y){var topOffset=y*bytesPerRow;var bottomOffset=(height-y-1)*bytesPerRow;temp.set(pixelData.subarray(topOffset,topOffset+bytesPerRow));pixelData.copyWithin(topOffset,bottomOffset,bottomOffset+bytesPerRow);pixelData.set(temp,bottomOffset);}imageData.data.set(pixelData);context.putImageData(imageData,0,0);return canvas;}},{key:"readImage",value:function readImage(params){var gl=this.gl;var imageDataCache=this._getImageDataCache();var pixelData=imageDataCache.pixelData;var canvas=imageDataCache.canvas;var imageData=imageDataCache.imageData;var context=imageDataCache.context;var _this$buffer=this.buffer,width=_this$buffer.width,height=_this$buffer.height;gl.readPixels(0,0,width,height,gl.RGBA,gl.UNSIGNED_BYTE,pixelData);imageData.data.set(pixelData);context.putImageData(imageData,0,0);// flip Y
+context.save();context.globalCompositeOperation='copy';context.scale(1,-1);context.drawImage(canvas,0,-height,width,height);context.restore();var format=params.format||"png";if(format!=="jpeg"&&format!=="png"&&format!=="bmp"){console.error("Unsupported image format: '"+format+"' - supported types are 'jpeg', 'bmp' and 'png' - defaulting to 'png'");format="png";}return canvas.toDataURL("image/".concat(format));}},{key:"_getImageDataCache",value:function _getImageDataCache(){var type=arguments.length>0&&arguments[0]!==undefined?arguments[0]:Uint8Array;var multiplier=arguments.length>1&&arguments[1]!==undefined?arguments[1]:4;var bufferWidth=this.buffer.width;var bufferHeight=this.buffer.height;var imageDataCache=this._imageDataCache;if(imageDataCache){if(imageDataCache.width!==bufferWidth||imageDataCache.height!==bufferHeight){this._imageDataCache=null;imageDataCache=null;}}if(!imageDataCache){var _canvas=document.createElement('canvas');var context=_canvas.getContext('2d');_canvas.width=bufferWidth;_canvas.height=bufferHeight;imageDataCache={pixelData:new type(bufferWidth*bufferHeight*multiplier),canvas:_canvas,context:context,imageData:context.createImageData(bufferWidth,bufferHeight),width:bufferWidth,height:bufferHeight};this._imageDataCache=imageDataCache;}imageDataCache.context.resetTransform();// Prevents strange scale-accumulation effect with html2canvas
 return imageDataCache;}},{key:"unbind",value:function unbind(){var gl=this.gl;gl.bindFramebuffer(gl.FRAMEBUFFER,null);this.bound=false;}},{key:"getTexture",value:function getTexture(){var self=this;return this._texture||(this._texture={renderBuffer:this,bind:function bind(unit){if(self.buffer&&self.buffer.texture){self.gl.activeTexture(self.gl["TEXTURE"+unit]);self.gl.bindTexture(self.gl.TEXTURE_2D,self.buffer.texture);return true;}return false;},unbind:function unbind(unit){if(self.buffer&&self.buffer.texture){self.gl.activeTexture(self.gl["TEXTURE"+unit]);self.gl.bindTexture(self.gl.TEXTURE_2D,null);}}});}},{key:"hasDepthTexture",value:function hasDepthTexture(){return this._hasDepthTexture;}},{key:"getDepthTexture",value:function getDepthTexture(){if(!this._hasDepthTexture){return null;}var self=this;return this._depthTexture||(this._dethTexture={renderBuffer:this,bind:function bind(unit){if(self.buffer&&self.buffer.depthTexture){self.gl.activeTexture(self.gl["TEXTURE"+unit]);self.gl.bindTexture(self.gl.TEXTURE_2D,self.buffer.depthTexture);return true;}return false;},unbind:function unbind(unit){if(self.buffer&&self.buffer.depthTexture){self.gl.activeTexture(self.gl["TEXTURE"+unit]);self.gl.bindTexture(self.gl.TEXTURE_2D,null);}}});}},{key:"destroy",value:function destroy(){if(this.allocated){var _gl2=this.gl;_gl2.deleteTexture(this.buffer.texture);_gl2.deleteTexture(this.buffer.depthTexture);_gl2.deleteFramebuffer(this.buffer.framebuf);_gl2.deleteRenderbuffer(this.buffer.renderbuf);this.allocated=false;this.buffer=null;this.bound=false;}this._imageDataCache=null;this._texture=null;this._depthTexture=null;}}]);return RenderBuffer;}();/**
  * @private
  */var RenderBufferManager=/*#__PURE__*/function(){function RenderBufferManager(scene){_classCallCheck(this,RenderBufferManager);this.scene=scene;this._renderBuffersBasic={};this._renderBuffersScaled={};}_createClass(RenderBufferManager,[{key:"getRenderBuffer",value:function getRenderBuffer(id,options){var renderBuffers=this.scene.canvas.resolutionScale===1.0?this._renderBuffersBasic:this._renderBuffersScaled;var renderBuffer=renderBuffers[id];if(!renderBuffer){renderBuffer=new RenderBuffer(this.scene.canvas.canvas,this.scene.canvas.gl,options);renderBuffers[id]=renderBuffer;}return renderBuffer;}},{key:"destroy",value:function destroy(){for(var id in this._renderBuffersBasic){this._renderBuffersBasic[id].destroy();}for(var _id in this._renderBuffersScaled){this._renderBuffersScaled[_id].destroy();}}}]);return RenderBufferManager;}();/**
@@ -23344,19 +23345,19 @@ value=value||"qwerty";if(value!=="qwerty"&&value!=="azerty"){this.error("Unsuppo
  * @class PropertySet
  */var PropertySet=/*#__PURE__*/_createClass(/**
      * @private
-     */function PropertySet(id,originalSystemId,name,type,properties){_classCallCheck(this,PropertySet);/**
+     */function PropertySet(params){_classCallCheck(this,PropertySet);/**
          * Globally-unique ID for this PropertySet.
          *
          * PropertySet instances are registered by this ID in {@link MetaScene#propertySets} and {@link MetaModel#propertySets}.
          *
          * @property id
          * @type {String}
-         */this.id=id;/**
+         */this.id=params.id;/**
          * ID of the corresponding object within the originating system, if any.
          *
          * @type {String}
          * @abstract
-         */this.originalSystemId=originalSystemId;/**
+         */this.originalSystemId=params.originalSystemId;/**
          * The MetaModels that share this PropertySet.
          * @type {MetaModel[]}
          */this.metaModels=[];/**
@@ -23364,17 +23365,17 @@ value=value||"qwerty";if(value!=="qwerty"&&value!=="azerty"){this.error("Unsuppo
          *
          * @property name
          * @type {String}
-         */this.name=name;/**
+         */this.name=params.name;/**
          * Type of this PropertySet.
          *
          * @property type
          * @type {String}
-         */this.type=type;/**
+         */this.type=params.type;/**
          * Properties within this PropertySet.
          *
          * @property properties
          * @type {Property[]}
-         */this.properties=[];if(properties){for(var _i540=0,len=properties.length;_i540<len;_i540++){var property=properties[_i540];this.properties.push(new Property(property.name,property.value,property.type,property.valueType,property.description));}}});/**
+         */this.properties=[];if(params.properties){var properties=params.properties;for(var _i540=0,len=properties.length;_i540<len;_i540++){var property=properties[_i540];this.properties.push(new Property(property.name,property.value,property.type,property.valueType,property.description));}}});/**
  * @desc Metadata corresponding to a {@link Scene}.
  *
  * * Located in {@link Viewer#metaScene}.