Merge branch 'hotfix-5.1.3'

Author: csvurt

README.md

@@ -9,7 +9,7 @@ xml3d.js is a [XML3D](http://www.xml3d.org) implementation based on WebGL and Ja
 as developing web pages. Every web developer who knows how to use the DOM (or jQuery) should also be able to use XML3D.
 
 XML3D is also an evaluation platform of the W3C Community Group [Declarative 3D for the Web](http://www.w3.org/community/declarative3d/) and 
-a [FI-WARE Generic Enabler](http://catalogue.fiware.org/enablers/3d-ui-xml3d).
+a [FIWARE Generic Enabler](http://catalogue.fiware.org/enablers/3d-ui-xml3d).
 
 #### Examples ####
 Here you can find [small examples](https://github.com/xml3d/xml3d-examples) of individual features. Below are some more complete demos:

package.json

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

spec/index.html

@@ -3219,8 +3219,8 @@ <h3>Vec2</h3>
             <dd>Creates a new Vec2 object from the space-separated string representation as used in XML3D element
                 attributes.
             </dd>
-            <dt>DOMString toDOMString(Vec2 vec)</dt>
-            <dd>Converts a Vec2 into the space-seperated string representation used in XML3D element attributes.</dd>
+            <dt>DOMString toDOMString()</dt>
+            <dd>Returns a space-seperated string representation for use in XML3D element attributes or value elements.</dd>
 
             <dt>Constructor ()</dt>
             <dd>Creates a new identity Vec2 <code>[0,0]</code></dd>
@@ -3304,8 +3304,8 @@ <h3>Vec3</h3>
             <dd>Creates a new Vec3 object from the space-separated string representation as used in XML3D element
                 attributes.
             </dd>
-            <dt>DOMString toDOMString(Vec3 vec)</dt>
-            <dd>Converts a Vec3 into the space-seperated string representation used in XML3D element attributes.</dd>
+            <dt>DOMString toDOMString()</dt>
+            <dd>Returns a space-seperated string representation for use in XML3D element attributes or value elements.</dd>
 
             <dt>Constructor ()</dt>
             <dd>Creates a new identity Vec3 <code>[0,0,0]</code></dd>
@@ -3399,8 +3399,8 @@ <h3>Vec4</h3>
             <dd>Creates a new Vec4 object from the space-separated string representation as used in XML3D element
                 attributes.
             </dd>
-            <dt>DOMString toDOMString(Vec4 vec)</dt>
-            <dd>Converts a Vec4 into the space-seperated string representation used in XML3D element attributes.</dd>
+            <dt>DOMString toDOMString()</dt>
+            <dd>Returns a space-seperated string representation for use in XML3D element attributes or value elements.</dd>
 
             <dt>Constructor ()</dt>
             <dd>Creates a new identity Vec4 <code>[0,0,0,0]</code></dd>
@@ -3480,8 +3480,8 @@ <h3>AxisAngle</h3>
             <dd>Creates a new AxisAngle object from the space-separated string representation as used in XML3D element
                 attributes.
             </dd>
-            <dt>DOMString toDOMString(AxisAngle vec)</dt>
-            <dd>Converts a AxisAngle into the space-seperated string representation used in XML3D element attributes.
+            <dt>DOMString toDOMString()</dt>
+            <dd>Returns a space-seperated string representation for use in XML3D element attributes or value elements.
             </dd>
 
             <dt>Constructor ()</dt>
@@ -3526,8 +3526,8 @@ <h3>Quat</h3>
             <dd>Provides mutable access to the fourth component of this quaternion.</dd>
             <dt>static Quat fromDOMString(DOMString str)</dt>
             <dd>Creates a new Quat object from a space-separated string representation.</dd>
-            <dt>DOMString toDOMString(Quat vec)</dt>
-            <dd>Converts a Quat into a space-seperated string representation.</dd>
+            <dt>DOMString toDOMString()</dt>
+            <dd>Returns a space-seperated string representation for use in XML3D element attributes or value elements.</dd>
 
             <dt>Constructor ()</dt>
             <dd>Creates a new identity Quat <code>[0,0,0,1]</code></dd>
@@ -3891,6 +3891,8 @@ <h3>Box</h3>
             <dd>Returns true if the given point is inside the box.</dd>
             <dt>DOMString toString()</dt>
             <dd>A human readable string representation of this box.</dd>
+            <dt>DOMString toDOMString()</dt>
+            <dd>Returns a space-seperated string representation for use in XML3D element attributes or value elements.</dd>
         </dl>
     </section>
     <section>

src/renderer/renderer/adapter/light.js

@@ -27,6 +27,7 @@ XML3D.createClass(LightRenderAdapter, SceneElementAdapter, {
             parent: parentNode
         });
         this.updateVisibility();
+        this.updateLocalMatrix();
     },
 
     attributeChangedCallback: function (name, oldValue, newValue) {
@@ -79,6 +80,15 @@ XML3D.createClass(LightRenderAdapter, SceneElementAdapter, {
         var m = new XML3D.Mat4();
         this.renderNode.getWorldMatrix(m.data);
         return m;
+    },
+
+    /**
+     * @return {XML3D.Mat4}
+     */
+    getLocalMatrix: function () {
+        var m = new XML3D.Mat4();
+        this.renderNode.getLocalMatrix(m.data);
+        return m;
     }
 });
 

src/renderer/renderer/scene/renderlight.js

@@ -7,13 +7,12 @@ var EVENT_TYPE = Constants.EVENT_TYPE;
 
 var tmp_worldMatrix = XML3D.math.mat4.create();
 
-var SHADOWMAP_OFFSET_MATRIX = new Float32Array([0.5, 0.0, 0.0, 0.0, 0.0, 0.5, 0.0, 0.0, 0.0, 0.0, 0.5, 0.0, 0.5, 0.5, 0.5, 1.0]);
-
 /** @const */
-var CLIPPLANE_NEAR_MIN = 1.0;
-
+var WORLD_MATRIX_OFFSET = 0;
+/** @const */
+var LOCAL_MATRIX_OFFSET = WORLD_MATRIX_OFFSET + 16;
 /** @const */
-var ENTRY_SIZE = 16;
+var ENTRY_SIZE = LOCAL_MATRIX_OFFSET;
 
 var c_BoundingBox = new XML3D.Box();
 
@@ -63,10 +62,20 @@ XML3D.extend(RenderLight.prototype, {
         this.lightStructureChanged(false);
     },
 
-    setLocalMatrix: function (source) {
-        XML3D.debug.logError("RenderLight::setLocalMatrix not implemented");
+    getLocalMatrix: function (dest) {
+        var o = this.offset + LOCAL_MATRIX_OFFSET;
+        for (var i = 0; i < 16; i++, o++) {
+            dest[i] = this.page[o];
+        }
     },
 
+    setLocalMatrix: function (source) {
+        var o = this.offset + LOCAL_MATRIX_OFFSET;
+        for (var i = 0; i < 16; i++, o++) {
+            this.page[o] = source[i];
+        }
+        this.setTransformDirty();
+    },
 
     getFrustum: function (aspect) {
         this.scene.getBoundingBox(c_BoundingBox);
@@ -83,13 +92,13 @@ XML3D.extend(RenderLight.prototype, {
         this.scene.emit(EVENT_TYPE.LIGHT_STRUCTURE_CHANGED, this, removed);
     },
 
-    updateWorldMatrix: function () {
-        if (this.parent) {
-            this.parent.getWorldMatrix(tmp_worldMatrix);
-            this.setWorldMatrix(tmp_worldMatrix);
-            // We change position / direction of the light
-            this.lightValueChanged();
-        }
+    updateWorldMatrix: function (sourceMat4) {
+        var page = this.page;
+        var offset = this.offset;
+        XML3D.math.mat4.multiplyOffset(page, offset + WORLD_MATRIX_OFFSET, page, offset + LOCAL_MATRIX_OFFSET, sourceMat4, 0);
+        // We change position / direction of the light
+        this.lightValueChanged();
+        this.transformDirty = false;
     },
 
     visibilityChanged: function (newVal) {
@@ -98,17 +107,16 @@ XML3D.extend(RenderLight.prototype, {
     },
 
     setTransformDirty: function () {
-        this.updateWorldMatrix();
+        this.parent.getWorldMatrix(tmp_worldMatrix);
+        this.updateWorldMatrix(tmp_worldMatrix);
     },
 
-
     remove: function () {
         this.parent.removeChild(this);
         this.scene.lights.remove(this);
         this.lightStructureChanged(true);
     },
 
-
     getWorldSpaceBoundingBox: function (bbox) {
         bbox.setEmpty();
     }

src/resource/coordinator.js

@@ -222,16 +222,17 @@ function invalidateHandles(uri) {
  * @param {URI} uri The URI of the document
  */
 function invalidateDocumentHandles(uri) {
+    invalidateHandles(uri);
     var url = uri.toStringWithoutFragment();
     var docCache = getDocumentCache(url);
     if (!docCache) {
         // The document was never loaded
-        invalidateHandles(uri);
         return;
     }
     var fragments = docCache.fragments;
     docCache.fragments = [];
     for (var i = 0; i < fragments.length; ++i) {
+        uri.fragment = fragments[i];
         invalidateHandles(uri);
     }
 }

src/resource/fetcher.js

@@ -70,7 +70,7 @@ Resource.getDocument = function(urlString, opt) {
     if (opt.allowCaching) {
         if (cache = c_cachedDocuments.get(urlString)) {
             // We can skip the fetch phase and piggy back on the result of the previous fetch, this avoids unnecessary Requests
-            return cache.pending ? cache.pending : Promise.resolve(cache.document);
+            return cache.pending ? Promise.race([cache.pending]) : Promise.resolve(cache.document);
         }
 
         // There is no pending or complete Request for this url so lets create a cache entry and start one

src/types/box.js

@@ -199,6 +199,11 @@ Box.prototype.toString = function() {
         this.data[4] + ', ' + this.data[5] + ')';
 };
 
+Box.prototype.toDOMString = function() {
+   return this.data[0] + ' ' + this.data[1] + ' ' + this.data[2] + ' ' + this.data[3] + ' ' +
+       this.data[4] + ' ' + this.data[5];
+};
+
 Box.EMPTY_BOX = new Box();
 
 module.exports = Box;

tests/lights.js

@@ -279,6 +279,64 @@ test("Change light shader", 4, function() {
 
 });
 
+test("Change light transformation", function() {
+    stop();
+    var frameLoaded = Q.fcall(promiseIFrameLoaded, "scenes/webgl-rendering03.html");
+
+    var test = frameLoaded.then(function (doc) {
+        var s = doc.querySelector("#xml3DElem");
+        doc.getElementById("pointlight").style.display = 'inherit';
+        doc.getElementById("dirlight").style.display = 'none';
+        doc.getElementById("phongShadedGroup").style.display = 'inherit';
+
+        return s;
+    }).then(promiseSceneRendered).then(function (s) {
+        var actual = XML3DUnit.getPixelValue(getContextForXml3DElement(s), 90, 90);
+        deepEqual(actual, [255,0,0,255], "Phong object is lit by red point light shader");
+
+        var light = s.ownerDocument.querySelector("#pointlightLight");
+        QUnit.closeMatrix(light.getLocalMatrix(), new XML3D.Mat4(), EPSILON, "Light has a local transform matrix that is identity");
+
+        light.setAttribute("style", "transform: translate3d(0, 0, -10px)");
+
+        return s;
+    }).then(promiseSceneRendered).then(function (s) {
+        var light = s.ownerDocument.querySelector("#pointlightLight");
+        QUnit.closeMatrix(light.getLocalMatrix(), new XML3D.Mat4().translate(new XML3D.Vec3(0,0,-10)), EPSILON, "Light's local matrix was updated with new style transform");
+        var parentWorld = light.parentElement.getWorldMatrix();
+        QUnit.closeMatrix(light.getWorldMatrix(), parentWorld.translate(new XML3D.Vec3(0,0,-10)), EPSILON, "Light's world matrix matches parent * local");
+
+        var actual = XML3DUnit.getPixelValue(getContextForXml3DElement(s), 90, 90);
+        deepEqual(actual, [0,0,0,255], "Light is properly positioned behind the square");
+
+        light.removeAttribute("style");
+
+        return s;
+    }).then(promiseSceneRendered).then(function(s) {
+        var actual = XML3DUnit.getPixelValue(getContextForXml3DElement(s), 90, 90);
+        deepEqual(actual, [255,0,0,255], "Light position was reset once local transform was removed");
+
+        var transform = s.ownerDocument.createElement("transform");
+        transform.setAttribute("id", "test_light_transform");
+        transform.setAttribute("translation", "0 0 -10");
+        s.appendChild(transform);
+
+        s.ownerDocument.querySelector("#pointlightLight").setAttribute("transform", "#test_light_transform");
+        return s;
+    }).then(promiseSceneRendered).then(function(s) {
+        var light = s.ownerDocument.querySelector("#pointlightLight");
+        QUnit.closeMatrix(light.getLocalMatrix(), new XML3D.Mat4().translate(new XML3D.Vec3(0,0,-10)), EPSILON, "Light's local matrix was updated with new transform element");
+        var parentWorld = light.parentElement.getWorldMatrix();
+        QUnit.closeMatrix(light.getWorldMatrix(), parentWorld.translate(new XML3D.Vec3(0,0,-10)), EPSILON, "Light's world matrix matches parent * local");
+
+        var actual = XML3DUnit.getPixelValue(getContextForXml3DElement(s), 90, 90);
+        deepEqual(actual, [0,0,0,255], "Light is properly positioned behind the square");
+    });
+
+    test.fin(QUnit.start).done();
+
+});
+
 
 module("Lights", {
     setup : function() {

tools/camera.js

@@ -115,8 +115,12 @@
             return;
         }
         var bb = element.getWorldBoundingBox();
+        if (bb.isEmpty()) {
+            XML3D.debug.logError("The given element has an empty bounding box, ensure it has finished loading before trying to examine it!", element);
+            return;
+        }
         var center = bb.center();
-        var r = center.len();
+        var r = center.sub(bb.min).len();
         var newPos = center.clone();
         newPos.z += r / Math.tan(this.transformInterface.fieldOfView / 2);
         this.transformInterface.position = newPos;