Merge branch 'hotfix-5.2.1'

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

src/interface/configuration.js

@@ -98,7 +98,7 @@ classInfo['xml3d'] = {
     getWorldBoundingBox : {m: methods.getWorldBoundingBox},
     getLocalBoundingBox : {m: methods.getLocalBoundingBox},
     getRenderInterface : {m: methods.xml3dGetRenderInterface},
-    view : {a: handlers.StringAttributeHandler, params: {defaultValue: "view"}}
+    view : {a: handlers.StringAttributeHandler}
     };
 
 classInfo['compute'] = {

src/interface/elements.js

@@ -102,8 +102,10 @@ function handleNodeRemoved(node, mutation) {
 function removeRecursive(element, evt) {
     if(element._configured) {
         Resource.notifyNodeIdChange(element, element.id, null);
-        element._configured.notify(evt);
+        //Deleting _configured early ensures the adapters are not re-used accidentally during any getAdapter calls from here on
+        var conf = element._configured;
         delete element._configured;
+        conf.notify(evt);
     }
     var child = element.firstElementChild;
     while(child) {

src/renderer/renderer/adapter/view.js

@@ -56,6 +56,20 @@ XML3D.createClass(ViewRenderAdapter, SceneElementAdapter, {
         return m;
     },
 
+    getRootAdapter: function() {
+        var parent = this.getParentRenderAdapter();
+        var nextParent;
+        while ((nextParent = parent.getParentRenderAdapter()) !== null) {
+            parent = nextParent;
+        }
+        return parent;
+    },
+    
+    dispose: function() {
+        this.getRootAdapter().activeViewChanged();
+        SceneElementAdapter.prototype.dispose.call(this);
+    },
+
     attributeChangedCallback: function (name, oldValue, newValue) {
         SceneElementAdapter.prototype.attributeChangedCallback.call(this, name, oldValue, newValue);
         switch (name) {

src/renderer/renderer/adapter/xml3d.js

@@ -178,17 +178,31 @@ XML3DRenderAdapter.prototype.getElementByRay = (function () {
  * @param {!Object} xml3d
  * @return {Object} the active view element
  */
+var c_viewCounter = 0;
 function getOrCreateActiveView(xml3d) {
     // try to resolve reference
-    var view = xml3d.querySelector(xml3d.view) || xml3d.querySelector("view");
-    if (!view) {
-        // didn't find any: create new one
-        XML3D.debug.logWarning("xml3d element has no view defined: creating one.");
-
-        view = xml3d.ownerDocument.createElement("view");
-        xml3d.appendChild(view);
-        xml3d.removeAttribute("view");
+    var viewId = xml3d.view;
+    if (viewId) {
+        return xml3d.querySelector(viewId);
     }
+
+    var view = xml3d.querySelector("view");
+    if (view) {
+        if (!view.hasAttribute("id")) {
+            view.setAttribute("id", "Generated_View_"+c_viewCounter++);
+        }
+        xml3d.setAttribute("view", "#"+view.getAttribute("id"));
+        return view;
+    }
+
+    // didn't find any: create new one
+    XML3D.debug.logWarning("xml3d element has no view defined: creating one.");
+
+    view = xml3d.ownerDocument.createElement("view");
+    view.setAttribute("id", "Generated_View_"+c_viewCounter++);
+    xml3d.appendChild(view);
+    xml3d.setAttribute("view", "#"+view.getAttribute("id"));
+
     return view;
 };
 

src/renderer/renderer/scene/renderobject.js

@@ -309,16 +309,16 @@ XML3D.createClass(RenderObject, RenderNode, {
         this.setBoundingBoxDirty();
     },
 
-    getProgram: function () {
-        return this.drawable.getProgram();
+    getShaderClosure: function () {
+        return this.drawable.getShaderClosure();
     },
 
     hasTransparency: function () {
         if (this.override && this.override.opacity !== undefined) {
             return this.override.opacity[0] < 1;
         }
-        var program = this.getProgram();
-        return program ? program.hasTransparency() : false;
+        var shader = this.getShaderClosure();
+        return shader ? shader.hasTransparency() : false;
     },
 
     updateForRendering: function () {

src/renderer/renderer/tools/objectsorter.js

@@ -1,5 +1,13 @@
 var vec3 = require("gl-matrix").vec3;
 
+var SORT_BY_DEPTH = "renderer-sort-opaque-objects";
+
+var c_depthSortEnabled = true;
+XML3D.options.register(SORT_BY_DEPTH, false);
+XML3D.options.addObserver(SORT_BY_DEPTH, function() {
+    c_depthSortEnabled = XML3D.options.getValue(SORT_BY_DEPTH);
+});
+
 /**
  *
  * @constructor
@@ -51,37 +59,42 @@ XML3D.extend(ObjectSorter.prototype, {
 
         // Sort opaque z-buckets by shader
         var opaque = {};
+        var ozl;
         for (i=0; i<zLayers.length; i++) {
             zLayer = zLayers[i];
             opaque[zLayer] = {};
-            for (n in presortOpaque[zLayer]) {
-                obj = presortOpaque[zLayer][n];
-                var program = obj.getProgram();
+            ozl = presortOpaque[zLayer];
+            for (var n in ozl) {
+                obj = ozl[n];
+                var program = obj.getShaderClosure().program;
                 opaque[zLayer][program.id] = opaque[zLayer][program.id] || [];
                 opaque[zLayer][program.id].push(obj);
             }
         }
 
-        // Sort opaque shader buckets by depth for early z fails
-        for (zLayer in zLayers) {
-            for (var progId in opaque[zLayer]) {
-                var withinShader = opaque[zLayer][progId];
-                var sortedArray = new Array(withinShader.length);
-                for (i = 0; i < withinShader.length; i++) {
-                    obj = withinShader[i];
-                    obj.getWorldSpaceBoundingBox(c_bbox);
-                    c_bbox.center(c_center);
-                    viewMatrix && vec3.transformMat4(c_center, c_center, viewMatrix);
-                    sortedArray[i] = {
-                        obj: obj, depth: c_center.z
-                    };
+
+        if (c_depthSortEnabled) {
+            // Sort opaque shader buckets by depth for early z fails
+            for (zLayer in zLayers) {
+                for (var progId in opaque[zLayer]) {
+                    var withinShader = opaque[zLayer][progId];
+                    var sortedArray = new Array(withinShader.length);
+                    for (i = 0; i < withinShader.length; i++) {
+                        obj = withinShader[i];
+                        obj.getWorldSpaceBoundingBox(c_bbox);
+                        c_bbox.center(c_center);
+                        viewMatrix && vec3.transformMat4(c_center, c_center, viewMatrix);
+                        sortedArray[i] = {
+                            obj: obj, depth: c_center.z
+                        };
+                    }
+                    sortedArray.sort(function (a, b) {
+                        return b.depth - a.depth;
+                    });
+                    opaque[zLayer][progId] = sortedArray.map(function (e) {
+                        return e.obj;
+                    });
                 }
-                sortedArray.sort(function (a, b) {
-                    return b.depth - a.depth;
-                });
-                opaque[zLayer][progId] = sortedArray.map(function (e) {
-                    return e.obj;
-                });
             }
         }
 

src/renderer/webgl/base/mesh.js

@@ -83,22 +83,12 @@ XML3D.extend(GLMesh.prototype, {
      * @returns {number}
      */
     getElementCount: function () {
-        try {
-            return this.buffers.index.length;
-        } catch (e) {
-            //XML3D.debug.logError("Could not calculate element count.", e);
-            return 0;
-        }
+        return this.buffers.index.length;
     }, /**
      * @returns {number}
      */
     getVertexCount: function () {
-        try {
-            return (this.vertexCount != null ? this.vertexCount : this.minAttributeCount );
-        } catch (e) {
-            //XML3D.debug.logError("Could not calculate vertex count.", e);
-            return 0;
-        }
+        return (this.vertexCount != null ? this.vertexCount : this.minAttributeCount );
     },
 
     /**