Merge branch 'hotfix-5.0.4'

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

src/asset/asset.js

@@ -237,6 +237,7 @@ var SubData = function(xflowNodeOut, xflowNodeIn, refNode){
     this.material = null;
     this.transform = null;
     this.meshType = null;
+    this.visible = true;
     this.assetParent = null;
     this.loading = false;
     this.loadLevel = 0;
@@ -343,6 +344,10 @@ SubData.prototype.setMeshType = function(meshType){
     invalidateParent(this);
 };
 
+SubData.prototype.setVisibility = function(isVisible) {
+    this.visible = isVisible;
+    invalidateParent(this);
+};
 function invalidateParent(subData){
     if(subData.assetParent){
         invalidateAsset(subData.assetParent);
@@ -544,6 +549,7 @@ function rec_getDataTree(table){
                 type: entry.meshType,
                 material: entry.material,
                 transform: entry.transform,
+                visible: entry.visible,
                 refNode: entry.refNode
             });
         }
@@ -649,6 +655,7 @@ function AssetTableEntry (subData){
     this.postQueue = [];
     this.material = null;
     this.transform = null;
+    this.visible = true;
 
     this.accumulatedXflowNode = null;
     this.outOfSync = true;
@@ -695,6 +702,7 @@ AssetTableEntry.prototype.pushTableEntry = function(srcEntry){
     this.name = srcEntry.name;
     Set.add(this.classNames, srcEntry.classNames);
     if(srcEntry.meshType) this.meshType = srcEntry.meshType;
+    if(srcEntry.visible !== undefined) this.visible = srcEntry.visible;
 
     if(srcEntry.transform) this.transform = combineTransform(this.transform, srcEntry.transform);
     if(srcEntry.material) this.material = srcEntry.material;
@@ -718,6 +726,7 @@ AssetTableEntry.prototype.pushPostEntry = function(subData){
     Set.add(this.classNames, subData.classNames);
     if(subData.meshType) this.meshType = subData.meshType;
     if(subData.material) this.material = subData.material;
+    if(subData.visible !== undefined) this.visible = subData.visible;
     if(subData.transform) this.transform = combineTransform(this.transform, subData.transform);
 };
 

src/data/adapter/asset.js

@@ -271,6 +271,7 @@ createClass(AssetMeshAdapter, AssetDataAdapter, {
         this.assetEntry.setMeshType(this.node.getAttribute("type") || "triangles");
         this.assetEntry.setMatchFilter(this.node.getAttribute("match"));
         this.transformFetcher.update();
+        this.updateVisibility();
     },
 
     attributeChangedCallback: function (name, oldValue, newValue) {
@@ -285,6 +286,7 @@ createClass(AssetMeshAdapter, AssetDataAdapter, {
             case "style":
             case "transform":
                 this.transformFetcher.update();
+                this.updateVisibility();
                 break;
             case "type":
                 this.assetEntry.setMeshType(newValue || "triangles")
@@ -293,6 +295,14 @@ createClass(AssetMeshAdapter, AssetDataAdapter, {
 
     notifyChanged: function (evt) {
         AssetDataAdapter.prototype.notifyChanged.call(this, evt);
+    },
+
+    updateVisibility: function () {
+        if (!this.node.style) {
+            this.node.style = window.getComputedStyle(this.node);
+        }
+        var none = this.node.style.display == "none";
+        this.assetEntry && this.assetEntry.setVisibility(!none);
     }
 });
 

src/renderer/renderer/adapter/model.js

@@ -212,7 +212,7 @@ function rec_createRenderNodes(adapter, parentNode, dataTreeNode) {
                 data: meshSets[i].xflowNode, type: meshSets[i].type
             },
             name: adapter.node.id,
-            visible: true
+            visible: meshSets[i].visible
         });
         renderNode.setLocalMatrix(meshSets[i].transform || c_IDENTITY);
         renderNode.setMaterial(adapter.getMaterialConfiguration(meshSets[i].material, adapter._subRenderNodes.length));

src/renderer/renderer/scene/rendernode.js

@@ -23,7 +23,7 @@ var RenderNode = function (type, scene, pageEntry, opt) {
 
     this.setParent(opt.parent || scene.rootNode);
 
-    this.localVisible = true;
+    this.localVisible = opt.visible !== undefined ? opt.visible : true;
     // The global visibility depends on visibility of parents
     this.visible = true;
     this.evaluateVisibility();

tests/all.html

@@ -66,5 +66,9 @@
   <div id="overall">
     <div id="qunit"></div>
   </div>
+
+  <div id="pointerPosElement" style="position:absolute; top: 25px; left: 30vw; color: white;">
+    GLCoords:
+  </div>
 </body>
 </html>

tests/asset-and-model.js

@@ -38,6 +38,49 @@ test("Modify material assignment", 5, function () {
 
 });
 
+test("Modify visibility", function () {
+    stop();
+    var frameLoaded = Q.fcall(promiseIFrameLoaded, "scenes/asset-basic.html");
+
+    var test = frameLoaded.then(function (doc) {
+        var xTest = doc.getElementById("xml3dTest");
+        var mm1 = doc.getElementById("mm1");
+        var override = doc.createElement("assetmesh");
+        override.setAttribute("name", "mesh1");
+        override.setAttribute("id", "mesh1Override");
+        override.setAttribute("style", "display: none");
+        mm1.appendChild(override);
+        return xTest;
+    }).then(promiseSceneRendered).then(function (s) {
+        QUnit.closePixel(XML3DUnit.getPixelValue(getContextForXml3DElement(s), 248, 151), [0,0,0,0], PIXEL_EPSILON, "Assetmesh visibility was overridden");
+        s.querySelector("#mesh1Override").setAttribute("style", "display: notnone");
+        return s;
+    }).then(promiseSceneRendered).then(function(s) {
+        QUnit.closePixel(XML3DUnit.getPixelValue(getContextForXml3DElement(s), 248, 151), [255, 127, 127, 255], PIXEL_EPSILON, "Assetmesh responded to change in visibility");
+        return s;
+    });
+    test.fin(QUnit.start).done();
+});
+
+test("Modify CSS transform on assetmesh", function () {
+    stop();
+    var frameLoaded = Q.fcall(promiseIFrameLoaded, "scenes/asset-basic.html");
+
+    var test = frameLoaded.then(function (doc) {
+        var xTest = doc.getElementById("xml3dTest");
+        var mesh2 = doc.getElementById("outerSubData");
+        mesh2.setAttribute("style", "transform: translateX(2px)");
+        return xTest;
+    }).then(promiseSceneRendered).then(function (s) {
+        QUnit.closePixel(XML3DUnit.getPixelValue(getContextForXml3DElement(s), 192, 137), [0,255,0, 255], PIXEL_EPSILON, "Assetmesh transform was overridden");
+        s.querySelector("#outerSubData").setAttribute("style", "");
+        return s;
+    }).then(promiseSceneRendered).then(function(s) {
+        QUnit.closePixel(XML3DUnit.getPixelValue(getContextForXml3DElement(s), 130, 137), [0, 255, 0, 255], PIXEL_EPSILON, "Assetmesh returned to original position");
+        return s;
+    });
+    test.fin(QUnit.start).done();
+});
 
 test("Modify asset pick", 5, function () {
     stop();

tests/qunit/xml3d-config.js

@@ -257,13 +257,25 @@ function promiseIFrameLoaded(url) {
     var f = function(e) {
         deferred.resolve(v.contentDocument);
         v.removeEventListener("load", f, true);
+        var xml3ds = v.contentDocument.querySelectorAll("xml3d");
+        for (var i=0; i<xml3ds.length; i++) {
+            xml3ds[i].addEventListener("mousemove", displayMousePosition);
+        }
     };
     // TODO: Loading failed
     v.addEventListener("load", f, true);
     v.src = url +window.location.search;
     return deferred.promise;
 };
 
+function displayMousePosition(e) {
+    console.log(e.clientX + ", " + e.clientY);
+    var pointerPosElement = document.getElementById("pointerPosElement");
+    if (pointerPosElement) {
+        pointerPosElement.textContent = "GLCoords: "+ e.clientX+", "+ (this.height - e.clientY);
+    }
+}
+
 function promiseOneSceneCompleteAndRendered(xml3dElement) {
     if(xml3dElement.complete) {
         return Q(xml3dElement);

tests/scenes/asset-basic.html

@@ -52,6 +52,15 @@
             </float4x4>
         </data>
 
+        <data id="t2">
+            <float4x4 name="transform">
+                1.5 0 0 0
+                0 1.5 0 0
+                0 0 1 0
+                0 0 0 1
+            </float4x4>
+        </data>
+
 
         <asset id="asset1">
             <assetmesh name="mesh1" type="triangles" material="#redmaterial">