Merge branch 'hotfix-5.0.3'

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.2",
+  "version": "5.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/xml3d/xml3d.js"

spec/index.html

@@ -3810,6 +3810,8 @@ <h3>Box</h3>
 
                 Returns true if the given ray intersects this box.
             </dd>
+            <dt>boolean contains(Vec3 point)</dt>
+            <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>
         </dl>

src/global.js

@@ -22,7 +22,8 @@ XML3D._parallel = XML3D._parallel != undefined ? XML3D._parallel : false;
 XML3D.xhtml = !!(document.doctype && new XMLSerializer().serializeToString(document.doctype).match(/xhtml/i));
 
 XML3D.createElement = function(tagName) {
-    return document.createElementNS(XML3D.xml3dNS, tagName);
+    XML3D.debug.logWarning("This function is deprecated and will be removed in the next major release. Use document.createElement instead.");
+    return document.createElement(tagName);
 };
 
 XML3D.extend = assign;

src/init.js

@@ -27,13 +27,13 @@ function displayWebGLNotSupportedInfo(xml3dElement){
     var doDefault = XML3D.util.dispatchCustomEvent(xml3dElement, 'unsupported', false, true, null);
     if(doDefault){
         // Place xml3dElement inside an invisible div
-        var hideDiv = document.createElementNS(XML3D.xhtmlNS, 'div');
+        var hideDiv = document.createElement('div');
 
         xml3dElement.parentNode.insertBefore(hideDiv, xml3dElement);
         hideDiv.appendChild(xml3dElement);
         //hideDiv.style.display = "none";
 
-        var infoDiv = document.createElementNS(XML3D.xhtmlNS, 'div');
+        var infoDiv = document.createElement('div');
         if(xml3dElement.hasAttribute("class")){
             infoDiv.setAttribute("class", xml3dElement.getAttribute("class"));
         }
@@ -229,8 +229,12 @@ function resolveMutations(mutations){
 
         } else if (mutation.type == 'attributes') {
             var mutationTarget = mutation.target;
-            if (mutation.attributeName === "id" || mutation.attributeName === "class")
-                mutationTarget = mutation.target.parentNode;
+            if (mutation.attributeName === "id" || mutation.attributeName === "class") {
+                mutationTarget = mutation.target.parentNode; // Start CSS re-eval at parent to honor sibling selectors
+                if (!mutationTarget) {
+                    continue; // Target was removed from the DOM before this event was processed
+                }
+            }
             var cssTarget = mutationTarget._configured ? mutationTarget : mutationTarget.querySelector("xml3d");
             if(cssTarget && cssTarget._configured) { // xml3d is a child node
                 var adaptersNames = Object.keys(cssTarget._configured.adapters).filter(function(a) {

src/types/box.js

@@ -187,6 +187,13 @@ Box.prototype.intersects = function(ray, opt) {
     return true;
 };
 
+Box.prototype.contains = function(point) {
+    var p = point.data ? point.data : point;
+    return this.data[0] <= p[0] && p[0] <= this.data[3] &&
+           this.data[1] <= p[1] && p[1] <= this.data[4] &&
+           this.data[2] <= p[2] && p[2] <= this.data[5];
+};
+
 Box.prototype.toString = function() {
     return 'XML3D.Box(' + this.data[0] + ', ' + this.data[1] + ', ' + this.data[2] + ', ' + this.data[3] + ', ' +
         this.data[4] + ', ' + this.data[5] + ')';

src/utils/cssMatrix.js

@@ -778,17 +778,15 @@ FirminCSSMatrix.prototype.setMatrixValue = function(domstr) {
         XML3D.debug.logError("Invalid CSS Matrix: ", domstr);
         return;
     }
-
-    for (i = 0; i < len; i++) {
-        chunk = chunks[i];
-        if (chunk.match(/^-?\d+(\.\d+)?$/)) {
+    try {
+        for (i = 0; i < len; i++) {
+            chunk = chunks[i];
             points[i] = parseFloat(chunk);
-        } else {
-            XML3D.debug.logError("Invalid CSS Matrix: ", domstr);
-            return;
         }
+    } catch(e) {
+        XML3D.debug.logError("Invalid CSS Matrix: ", domstr);
+        return;
     }
-
     for (i = 0; i < len; i++) {
         var point = is3d ?
         ("m" + (Math.floor(i / 4) + 1)) + (i % 4 + 1) :

tests/css-transforms.js

@@ -39,3 +39,21 @@ test("Change transform", 4, function () {
     test.fin(QUnit.start).done();
 
 });
+
+test("matrix3d with e notation", function() {
+    stop();
+    var frameLoaded = Q.fcall(promiseIFrameLoaded, "scenes/css-transforms.html");
+    var group;
+
+    var test = frameLoaded.then(function(doc) {
+        group = doc.getElementById("rootGroup");
+        console.log(group.getLocalMatrix());
+        group.setAttribute("style", "transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 20e-1, 0, -0.1e2, 1)");
+        console.log(group.getLocalMatrix());
+        return doc.getElementById("xml3dTest");
+    }).then(promiseSceneRendered).then(function(s) {
+        var actual = XML3DUnit.getPixelValue(getContextForXml3DElement(s), 300, 100);
+        deepEqual(actual, [255, 0, 0, 255], "Group was moved to the right");
+    });
+    test.fin(QUnit.start).done();
+});