Merge branch 'hotfix-5.0.2'

Author: csvurt

package.json

@@ -2,7 +2,7 @@
   "name": "xml3d.js",
   "description": "XML3D implementation based on JS and WebGL",
   "homepage": "http://ww.xml3d.org",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/xml3d/xml3d.js"

spec/index.html

@@ -1671,6 +1671,7 @@ <h4>The <code>assetmesh</code> element</h4>
             <dl class='element'>
                 <dt>Categories:</dt>
                 <dd><a href="#data-elements">Data element</a></dd>
+                <dd><a href="#transformable-elements">Transformable element</a></dd>
             </dl>
 
             <p>An <dfn>assetmesh element</dfn> represents a single drawable mesh in the asset and works similar to the
@@ -3432,7 +3433,8 @@ <h3>AxisAngle</h3>
         <h3>Quat</h3>
         <dl class='element'>
         </dl>
-        <p>Quat represents a rotation as a quaternion of the form [x, y, z, w]. </p>
+        <p>Quat represents a rotation as a quaternion of the form [x, y, z, w]. The provided functions and accessors
+            do not automatically normalize the quaternion unless otherwise stated.</p>
 
         <dl title='interface Quat' class='idl'>
             <dt>attribute Float32Array data</dt>
@@ -3501,15 +3503,15 @@ <h3>Quat</h3>
             <dt>Quat scale(float scale)</dt>
             <dd>Returns the scaled quaternion as a new Quat. This is identical to <a>Vec4</a>.scale.</dd>
             <dt>static Quat fromAxisAngle(AxisAngle a)</dt>
-            <dd>Generates a quaternion representation of the given AxisAngle.</dd>
+            <dd>Generates a normalized quaternion representation of the given AxisAngle.</dd>
             <dt>static Quat fromBasis(Vec3 x, Vec3 y, Vec3 z)</dt>
-            <dd>Generates a quaternion from the given basis vectors, defined as the rotation between the coordinate
+            <dd>Generates a normalized quaternion from the given basis vectors, defined as the rotation between the coordinate
                 space defined by these vectors and the standard space.
             </dd>
             <dt>static Quat fromMat3(Mat3 mat)</dt>
-            <dd>Generates a quaternion from the given rotation matrix.</dd>
+            <dd>Generates a normalized quaternion from the given rotation matrix.</dd>
             <dt>static Quat fromRotationTo(Vec3 from, Vec3 to)</dt>
-            <dd>Generates a quaternion representing the shortest rotation from one vector to another.</dd>
+            <dd>Generates a normalized quaternion representing the shortest rotation from one vector to another.</dd>
             <dt>Quat slerp()</dt>
             <dd>Returns a spherical linear interpolation between the two quaternions as a new Quat.
                 <dl class='parameters'>
@@ -3566,7 +3568,7 @@ <h3>Mat2</h3>
             <dd>Returns the multiplication of this matrix with the other as a new Mat2.</dd>
             <dt>Mat2 rotate(float angleInRadians)</dt>
             <dd>Returns the rotation of this matrix by the given angle in radians as a new Mat2.</dd>
-            <dt>Mat2 scale(float scale)</dt>
+            <dt>Mat2 scale(Vec2 scale)</dt>
             <dd>Returns the scaled matrix as a new Mat2.</dd>
             <dt>Mat2 transpose()</dt>
             <dd>Returns the transpose of this matrix as a new Mat2.</dd>
@@ -3631,7 +3633,7 @@ <h3>Mat3</h3>
             <dd>Returns the multiplication of this matrix with the other as a new Mat3.</dd>
             <dt>Mat3 rotate(float angleInRadians)</dt>
             <dd>Returns the rotation of this matrix by the given angle in radians as a new Mat3.</dd>
-            <dt>Mat3 scale(float scale)</dt>
+            <dt>Mat3 scale(Vec3 scale)</dt>
             <dd>Returns the scaled matrix as a new Mat3.</dd>
             <dt>Mat3 translate(Vec3 translation)</dt>
             <dd>Returns the translated matrix as a new Mat3.</dd>
@@ -3721,7 +3723,7 @@ <h3>Mat4</h3>
             <dd>Returns the rotation of this matrix by the given angle around the Y axis as a new Mat4.</dd>
             <dt>Mat4 rotateZ(float angleInRadians)</dt>
             <dd>Returns the rotation of this matrix by the given angle around the Z axis as a new Mat4.</dd>
-            <dt>Mat4 scale(float scale)</dt>
+            <dt>Mat4 scale(Vec3 scale)</dt>
             <dd>Returns the scaled matrix as a new Mat4.</dd>
             <dt>Mat4 translate(Vec3 translation)</dt>
             <dd>Returns the translated matrix as a new Mat4.</dd>

src/base/resourcemanager.js

@@ -321,7 +321,7 @@ function setDocumentData(httpRequest, url, mimetype) {
         else{
             invalidateDocumentHandles(url);
         }
-    } );
+    }, url );
 
 }
 

src/global.js

@@ -48,10 +48,14 @@ XML3D.util = require("./utils/misc.js");
 XML3D.options = require("./utils/options.js");
 XML3D.materials = require("./renderer/webgl/materials/urn/registery.js");
 XML3D.resource = require("./base/resourcemanager.js").Resource; //Required for the test library because the RM needs to "belong" to the same document as the XML3D element in order to resolve references correctly
+
 XML3D.resource.registerFormat = require("./base/resourcemanager.js").registerFormat;
+XML3D.resource.Asset = require("./asset/asset.js").Asset;
+XML3D.resource.SubData = require("./asset/asset.js").SubData;
 //XML3D.resource.FormatHandler
 //XML3D.resource.JSONFormatHandler
 //XML3D.resource.AdapterFactory
+
 XML3D.webcl = require("./utils/webcl.js").webcl;
 XML3D.math = require("gl-matrix");
 require("./math/math.js")(XML3D.math);

src/interface/configuration.js

@@ -179,7 +179,7 @@ classInfo['group'] = {
     onkeydown: {a: handlers.EventAttributeHandler},
     onkeyup: {a: handlers.EventAttributeHandler},
     getWorldMatrix: {m: methods.XML3DGraphTypeGetWorldMatrix},
-    getLocalMatrix: {m: methods.groupGetLocalMatrix},
+    getLocalMatrix: {m: methods.XML3DGraphTypeGetLocalMatrix},
     getWorldBoundingBox : {m: methods.getWorldBoundingBox},
     getLocalBoundingBox : {m: methods.getLocalBoundingBox},
     transform: {a: handlers.StringAttributeHandler},
@@ -209,6 +209,7 @@ classInfo['mesh'] = {
     transform: {a: handlers.StringAttributeHandler},
     material: {a: handlers.StringAttributeHandler},
     getWorldMatrix: {m: methods.XML3DGraphTypeGetWorldMatrix},
+    getLocalMatrix: {m: methods.XML3DGraphTypeGetLocalMatrix},
     getWorldBoundingBox : {m: methods.getWorldBoundingBox},
     getLocalBoundingBox : {m: methods.getLocalBoundingBox},
     getOutputNames: {m: methods.meshGetOutputNames},
@@ -237,6 +238,7 @@ classInfo['model'] = {
     complete: {p: properties.AssetComplete},
     progressLevel: {p: properties.AssetProgressLevel},
     getWorldMatrix: {m: methods.XML3DGraphTypeGetWorldMatrix},
+    getLocalMatrix: {m: methods.XML3DGraphTypeGetLocalMatrix},
     getWorldBoundingBox : {m: methods.getWorldBoundingBox},
     getLocalBoundingBox : {m: methods.getLocalBoundingBox},
     src: {a: handlers.StringAttributeHandler},
@@ -290,6 +292,7 @@ classInfo['light'] = {
     onkeyup: {a: handlers.EventAttributeHandler},
     global: {a: handlers.BoolAttributeHandler, params: false},
     getWorldMatrix: {m: methods.XML3DGraphTypeGetWorldMatrix},
+    getLocalMatrix: {m: methods.XML3DGraphTypeGetLocalMatrix},
     onload: {a: handlers.EventAttributeHandler},
     onprogress: {a: handlers.EventAttributeHandler},
     complete: {p: properties.XML3DNestedDataContainerTypeComplete},
@@ -525,6 +528,7 @@ classInfo['view'] = {
     onkeydown: {a: handlers.EventAttributeHandler},
     onkeyup: {a: handlers.EventAttributeHandler},
     getWorldMatrix: {m: methods.XML3DGraphTypeGetWorldMatrix},
+    getLocalMatrix: {m: methods.XML3DGraphTypeGetLocalMatrix},
     getProjectionMatrix:{m: methods.viewGetProjectionMatrix},
     getViewMatrix: {m: methods.viewGetViewMatrix}
     };

src/interface/methods.js

@@ -71,17 +71,6 @@ methods.xml3dGenerateRay = function(x, y) {
     return new XML3D.Ray();
 };
 
-methods.groupGetLocalMatrix = function() {
-    XML3D.flushDOMChanges();
-    var adapters = this._configured.adapters || {};
-    for ( var adapter in adapters) {
-        if (adapters[adapter].getLocalMatrix) {
-            return adapters[adapter].getLocalMatrix();
-        }
-    }
-    return new Mat4();
-};
-
 /**
  * return the bounding box of the owning space in world space
  */
@@ -137,6 +126,17 @@ methods.XML3DGraphTypeGetWorldMatrix = function() {
     return new Mat4();
 };
 
+methods.XML3DGraphTypeGetLocalMatrix = function() {
+    XML3D.flushDOMChanges();
+    var adapters = this._configured.adapters || {};
+    for ( var adapter in adapters) {
+        if (adapters[adapter].getLocalMatrix) {
+            return adapters[adapter].getLocalMatrix();
+        }
+    }
+    return new Mat4();
+};
+
 methods.videoPlay = function() {
     sendAdapterEvent(this, {play: []});
 };

src/renderer/webgl/base/texture.js

@@ -3,6 +3,10 @@ var StateMachine = require("../../../contrib/state-machine.js");
 var SamplerConfig = require("../../../xflow/interface/data.js").SamplerConfig;
 var XC = require("../../../xflow/interface/constants.js");
 var uniqueObjectId = utils.getUniqueCounter();
+
+/**
+ * @type {WebGLRenderingContext}
+ */
 var GL = require("../constants.js");
 
 //noinspection JSValidateJSDoc
@@ -210,6 +214,7 @@ XML3D.extend(GLTexture.prototype, {
         var gl = this.context.gl;
         this._bind();
 
+        gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, this.flipY);
         gl.texParameteri(this.textureType, gl.TEXTURE_WRAP_S, this.wrapS);
         gl.texParameteri(this.textureType, gl.TEXTURE_WRAP_T, this.wrapT);
         gl.texParameteri(this.textureType, gl.TEXTURE_MIN_FILTER, this.minFilter);
@@ -266,7 +271,7 @@ XML3D.extend(GLTexture.prototype, {
         this.handle = gl.createTexture();
         this._bind();
 
-        // gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true);
+        gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, opt.flipY);
         gl.texParameteri(this.textureType, gl.TEXTURE_WRAP_S, opt.wrapS);
         gl.texParameteri(this.textureType, gl.TEXTURE_WRAP_T, opt.wrapT);
         gl.texParameteri(this.textureType, gl.TEXTURE_MIN_FILTER, opt.minFilter);

src/types/axisangle.js

@@ -1,5 +1,6 @@
 var vec4 = require("gl-matrix").vec4;
 var Vec3 = require("./vec3.js");
+var Quat = require("./quat.js");
 
 var AxisAngle = function(vec, y, z, angle) {
     if (this instanceof AxisAngle) {

src/types/quat.js

@@ -127,24 +127,28 @@ Quat.fromAxisAngle = function(axis, rad) {
     } else {
         quat.setAxisAngle(out.data, axis.data ? axis.data : axis, rad);
     }
+    quat.normalize(out.data, out.data);
     return out;
 };
 
 Quat.fromBasis = function(x, y, z) {
     var out = new Quat();
     XML3D.math.quat.setFromBasis(out.data, x.data ? x.data : x, y.data ? y.data : y, z.data ? z.data : z);
+    quat.normalize(out.data, out.data);
     return out;
 };
 
 Quat.fromMat3 = function(m) {
     var out = new Quat();
     quat.fromMat3(out.data, m.data ? m.data : m);
+    quat.normalize(out.data, out.data);
     return out;
 };
 
 Quat.fromRotationTo = function(from, to) {
     var out = new Quat();
     quat.rotationTo(out.data, from.data ? from.data : from, to.data ? to.data : to);
+    quat.normalize(out.data, out.data);
     return out;
 };
 

src/xflow/interface/data.js

@@ -1,5 +1,6 @@
 var Base = require("../base.js");
 var C = require("./constants.js");
+var assign = require('lodash.assign');
 require("../../utils/array.js");
 
 /**
@@ -15,53 +16,31 @@ require("../../utils/array.js");
 // SamplerConfig
 //----------------------------------------------------------------------------------------------------------------------
 
+var SAMPLER_DEFAULTS = {
+    minFilter : C.TEX_FILTER_TYPE.LINEAR,
+    magFilter : C.TEX_FILTER_TYPE.LINEAR,
+    wrapS : C.TEX_WRAP_TYPE.CLAMP,
+    wrapT : C.TEX_WRAP_TYPE.CLAMP,
+    textureType : C.TEX_TYPE.TEXTURE_2D,
+    flipY: true,
+    anisotropy : 1, // number of max samples for anisotropic filtering
+    generateMipMap : 0
+};
 
 /**
  * SamplerConfig is used to define sampler properties of a TextureEntry or ImageDataTextureEntry
  * @constructor
  */
 var SamplerConfig = function(){
-    this.minFilter = 0;
-    this.magFilter = 0;
-    this.mipFilter = 0;
-    this.wrapS = 0;
-    this.wrapT = 0;
-    this.wrapU = 0;
-    this.textureType = 0;
-    this.colorR = 0;
-    this.colorG = 0;
-    this.colorB = 0;
-    this.anisotropy = 0; // number of max samples for anisotropic filtering
-    this.generateMipMap = 0;
+    this.setDefaults();
 };
 
 SamplerConfig.prototype.setDefaults = function() {
-    this.minFilter = C.TEX_FILTER_TYPE.LINEAR;
-    this.magFilter = C.TEX_FILTER_TYPE.LINEAR;
-    this.mipFilter = C.TEX_FILTER_TYPE.NEAREST;
-    this.wrapS = C.TEX_WRAP_TYPE.CLAMP;
-    this.wrapT = C.TEX_WRAP_TYPE.CLAMP;
-    this.wrapU = C.TEX_WRAP_TYPE.CLAMP;
-    this.textureType = C.TEX_TYPE.TEXTURE_2D;
-    this.colorR = 0;
-    this.colorG = 0;
-    this.colorB = 0;
-    this.anisotropy = 1; // number of max samples for anisotropic filtering
-    this.generateMipMap = 0;
+    assign(this, SAMPLER_DEFAULTS);
 };
 
 SamplerConfig.prototype.set = function(other) {
-    this.minFilter = other.minFilter;
-    this.magFilter = other.magFilter;
-    this.mipFilter = other.mipFilter;
-    this.wrapS = other.wrapS;
-    this.wrapT = other.wrapT;
-    this.wrapU = other.wrapU;
-    this.textureType = other.textureType;
-    this.colorR = other.colorR;
-    this.colorG = other.colorG;
-    this.colorB = other.colorB;
-    this.generateMipMap = other.generateMipMap;
+    assign(this, other);
 };