Merge branch 'hotfix-5.1.2'

csvurt · csvurt · commit 5339216e2dcb · 2016-01-15T14:20:03.000+01:00
diff --git a/package.json b/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.1",
+  "version": "5.1.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/xml3d/xml3d.js"
diff --git a/src/init.js b/src/init.js
@@ -92,6 +92,15 @@ function initXML3DElement(xml3dElement) {
     if(curXML3DInitElements.indexOf(xml3dElement) > -1)
         return;
 
+    // Make sure the xml3d element is still in the DOM
+    var parent = xml3dElement.parentNode;
+    while (parent && !Util.elementIs(parent, "body")) {
+        parent = parent.parentNode;
+    }
+    if (!parent || !Util.elementIs(parent, "body")) {
+        return;
+    }
+
     curXML3DInitElements.push(xml3dElement);
 
     var debug = XML3D.debug.setup();
diff --git a/src/renderer/renderer/scene/constants.js b/src/renderer/renderer/scene/constants.js
@@ -9,7 +9,8 @@ module.exports = {
         LIGHT_VALUE_CHANGED: "light_value_changed",
         SCENE_SHAPE_CHANGED: "scene_shape_changed",
         SCENE_STRUCTURE_CHANGED: "scene_structure_changed",
-        DRAWABLE_STATE_CHANGED: "drawable_state_changed"
+        DRAWABLE_STATE_CHANGED: "drawable_state_changed",
+        OPACITY_STATE_CHANGED: "opacity_state_changed"
 
     }
 };
diff --git a/src/renderer/renderer/scene/renderobject.js b/src/renderer/renderer/scene/renderobject.js
@@ -108,8 +108,12 @@ XML3D.createClass(RenderObject, RenderNode, {
             result.updateTypeRequest();
             result.calculateBoundingBox();
             result.on(C.EVENT_TYPE.SCENE_SHAPE_CHANGED, function (evt) {
-                that.scene.emit(C.EVENT_TYPE.SCENE_SHAPE_CHANGED)
-            })
+                that.scene.emit(C.EVENT_TYPE.SCENE_SHAPE_CHANGED);
+            });
+            result.on(C.EVENT_TYPE.OPACITY_STATE_CHANGED, function(oldValue, newValue) {
+                that.override = that.override || {};
+                that.override.opacity = newValue;
+            });
         }
         return result;
     },
@@ -312,6 +316,9 @@ XML3D.createClass(RenderObject, RenderNode, {
     },
 
     hasTransparency: function () {
+        if (this.override && this.override.opacity !== undefined) {
+            return this.override.opacity[0] < 1;
+        }
         var program = this.getProgram();
         return program ? program.hasTransparency() : false;
     },
diff --git a/src/renderer/webgl/base/mesh.js b/src/renderer/webgl/base/mesh.js
@@ -61,6 +61,10 @@ XML3D.extend(GLMesh.prototype, {
         this.minAttributeCount = -1;
     },
 
+    getUniformOverride: function(name) {
+        return this.uniformOverride[name];
+    },
+
     setUniformOverride: function (name, value) {
         if (value === undefined)
             delete this.uniformOverride[name];
diff --git a/src/renderer/webgl/render-passes/pick-object.js b/src/renderer/webgl/render-passes/pick-object.js
@@ -5,68 +5,76 @@ var ObjectSorter = require("../../renderer/tools/objectsorter.js");
 var PickObjectRenderPass = function (renderInterface, output, opt) {
     BaseRenderPass.call(this, renderInterface, output, opt);
     this.sorter = new ObjectSorter();
+    this.objCount = 0;
 };
 XML3D.createClass(PickObjectRenderPass, BaseRenderPass);
 
 XML3D.extend(PickObjectRenderPass.prototype, {
-    render: (function () {
+    render: function (objects, viewMatrix, projMatrix) {
+        var gl = this.renderInterface.context.gl, target = this.output;
+        target.bind();
+        var sortedObjects = this.sorter.sortObjects(objects, viewMatrix);
+        this.objCount = 0;
+
+        gl.enable(gl.DEPTH_TEST);
+        gl.disable(gl.CULL_FACE);
+        gl.disable(gl.BLEND);
+        gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
+
+        var program = this.renderInterface.context.programFactory.getPickingObjectIdProgram();
+        program.bind();
+        for (var j = 0, n = sortedObjects.zLayers.length; j < n; j++) {
+            var zLayer = sortedObjects.zLayers[j];
+            gl.clear(gl.DEPTH_BUFFER_BIT);
+            if (sortedObjects.opaque[zLayer]) {
+                for (var prg in sortedObjects.opaque[zLayer]) {
+                    this.renderObjects(sortedObjects.opaque[zLayer][prg], program, viewMatrix, projMatrix);
+                }
+            }
+            if (sortedObjects.transparent[zLayer]) {
+                this.renderObjects(sortedObjects.transparent[zLayer], program, viewMatrix, projMatrix);
+            }
+        }
+        program.unbind();
+        target.unbind();
+    },
+
+    renderObjects: (function () {
         var c_mvp = mat4.create(), c_uniformCollection = {
-                envBase: {},
-                envOverride: null,
-                sysBase: {}
-            }, c_systemUniformNames = ["id", "modelViewProjectionMatrix"];
-
-        return function (objects, viewMatrix, projMatrix) {
-            var gl = this.renderInterface.context.gl, target = this.output;
-            target.bind();
-            var sortedObjects = this.sorter.sortObjects(objects, viewMatrix);
-
-            gl.enable(gl.DEPTH_TEST);
-            gl.disable(gl.CULL_FACE);
-            gl.disable(gl.BLEND);
-            gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
-
-            var program = this.renderInterface.context.programFactory.getPickingObjectIdProgram();
-            program.bind();
-            var objCount = 0;
-            for (var j = 0, n = sortedObjects.zLayers.length; j < n; j++) {
-                var zLayer = sortedObjects.zLayers[j];
-                gl.clear(gl.DEPTH_BUFFER_BIT);
-                for (var ind in sortedObjects.opaque[zLayer]) {
-                    var objs = sortedObjects.opaque[zLayer][ind];
-                    for (var i=0; i < objs.length; i++) {
-                        var obj = objs[i];
-                        var mesh = obj.mesh;
-
-                        if (!obj.visible)
-                            continue;
-
-                        if (viewMatrix && projMatrix) {
-                            obj.updateModelViewMatrix(viewMatrix);
-                            obj.updateModelViewProjectionMatrix(projMatrix);
-                        }
-
-                        obj.getModelViewProjectionMatrix(c_mvp);
-
-                        var objId = ++objCount;
-                        obj.pickId = objId;
-                        var c1 = objId & 255;
-                        objId = objId >> 8;
-                        var c2 = objId & 255;
-                        objId = objId >> 8;
-                        var c3 = objId & 255;
-
-                        c_uniformCollection.sysBase["id"] = [c3 / 255.0, c2 / 255.0, c1 / 255.0];
-                        c_uniformCollection.sysBase["modelViewProjectionMatrix"] = c_mvp;
-
-                        program.setUniformVariables(null, c_systemUniformNames, c_uniformCollection);
-                        mesh.draw(program);
-                    }
+            envBase: {},
+            envOverride: null,
+            sysBase: {}
+        }, c_systemUniformNames = ["id", "modelViewProjectionMatrix"];
+
+        return function (objects, program, viewMatrix, projMatrix) {
+            for (var i=0; i < objects.length; i++) {
+                var obj = objects[i];
+                var mesh = obj.mesh;
+
+                if (!obj.visible)
+                    continue;
+
+                if (viewMatrix && projMatrix) {
+                    obj.updateModelViewMatrix(viewMatrix);
+                    obj.updateModelViewProjectionMatrix(projMatrix);
                 }
 
+                obj.getModelViewProjectionMatrix(c_mvp);
+
+                var objId = ++this.objCount;
+                obj.pickId = objId;
+                var c1 = objId & 255;
+                objId = objId >> 8;
+                var c2 = objId & 255;
+                objId = objId >> 8;
+                var c3 = objId & 255;
+
+                c_uniformCollection.sysBase["id"] = [c3 / 255.0, c2 / 255.0, c1 / 255.0];
+                c_uniformCollection.sysBase["modelViewProjectionMatrix"] = c_mvp;
+
+                program.setUniformVariables(null, c_systemUniformNames, c_uniformCollection);
+                mesh.draw(program);
             }
-            program.unbind();
-            target.unbind();
         };
     }()),
 
diff --git a/src/renderer/webgl/xflow/xflow-mesh.js b/src/renderer/webgl/xflow/xflow-mesh.js
@@ -338,21 +338,14 @@ XML3D.createClass(XflowMesh, DrawableClosure, {
         this.mesh.setIndexRange(webglData.minIndex, webglData.maxIndex);
     },
 
-    /*checkBufferSize: function(name, xflowDataEntry){
-     if(xflowDataEntry.getIterateCount){
-     var cnt = xflowDataEntry.getIterateCount();
-     if(cnt >= this.mesh.maxIndex)
-     throw new Error("Index range of [" + this.mesh.minIndex + ", " + this.mesh.maxIndex + "] " +
-     " goes beyond element count " + cnt + " of attribute '" + name + "'");
-     }
-     },*/
-
     handleUniform: function (name, xflowDataEntry) {
         var value = XflowUtils.getGLUniformValueFromXflowDataEntry(xflowDataEntry, this.context);
+        if (name === 'opacity') {
+            this.emit(EVENT_TYPE.OPACITY_STATE_CHANGED, this.mesh.getUniformOverride(name), value);
+        }
         this.mesh.setUniformOverride(name, value);
-    }, /**
-     *
-     */
+    },
+
     updateTypeRequest: function () {
         var requestNames = this.getTypeRequestNames(MESH_PARAMETERS);
 
diff --git a/tests/qunit/xml3d-config.js b/tests/qunit/xml3d-config.js
@@ -275,14 +275,6 @@ function displayMousePosition(e) {
     }
 }
 
-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);
diff --git a/tests/scenes/webgl-picking.html b/tests/scenes/webgl-picking.html
@@ -22,7 +22,13 @@
                <transform id="t9" translation="-1 0 -10" rotation="0 1 0 1.57"></transform>
                <transform id="t10" translation="-4.5 0 -9"></transform>
                <transform id="t11" translation="0 0 -1"></transform>
+               <transform id="t12" translation="2.5 0 -10"></transform>
 
+                <material id="material_transparent" model="urn:xml3d:material:diffuse">
+                    <float3 name="diffuseColor">1 0.2 0.3</float3>
+                    <float name="ambientIntensity">0.8</float>
+                    <float name="opacity">0.1</float>
+                </material>
                <material id="material_diffuse" model="urn:xml3d:material:diffuse">
                   <float3 name="diffuseColor">1 0.2 0.3</float3>
                   <float name="ambientIntensity">0.8</float>
@@ -114,6 +120,9 @@
                 <group material="#material_phong_texture" transform="#t5">
                    <mesh id="pickingMesh5" src="#mySimpleMesh"></mesh>
                 </group>
+                <group material="#material_transparent" transform="#t12">
+                    <mesh id="pickingMesh12" src="#mySimpleMesh"></mesh>
+                </group>
             </group>
 			<group id="many" material="#material_diffuse">
                 <mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh><mesh src="#mySimpleMesh"></mesh>
diff --git a/tests/scenes/webgl-rendering02.html b/tests/scenes/webgl-rendering02.html
diff --git a/tests/webgl-picking.js b/tests/webgl-picking.js
diff --git a/tests/webgl-shading.js b/tests/webgl-shading.js
diff --git a/tests/webgl-transparency.js b/tests/webgl-transparency.js

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@ module.exports = {`
`9`	`9`	`LIGHT_VALUE_CHANGED: "light_value_changed",`
`10`	`10`	`SCENE_SHAPE_CHANGED: "scene_shape_changed",`
`11`	`11`	`SCENE_STRUCTURE_CHANGED: "scene_structure_changed",`
`12`		`- DRAWABLE_STATE_CHANGED: "drawable_state_changed"`
	`12`	`+ DRAWABLE_STATE_CHANGED: "drawable_state_changed",`
	`13`	`+ OPACITY_STATE_CHANGED: "opacity_state_changed"`
`13`	`14`
`14`	`15`	`}`
`15`	`16`	`};`
Original file line number	Diff line number	Diff line change
`@@ -275,14 +275,6 @@ function displayMousePosition(e) {`
`275`	`275`	`}`
`276`	`276`	`}`
`277`	`277`
`278`		`-function displayMousePosition(e) {`
`279`		`- console.log(e.clientX + ", " + e.clientY);`
`280`		`- var pointerPosElement = document.getElementById("pointerPosElement");`
`281`		`- if (pointerPosElement) {`
`282`		`- pointerPosElement.textContent = "GLCoords: "+ e.clientX+", "+ (this.height - e.clientY);`
`283`		`- }`
`284`		`-}`
`285`		`-`
`286`	`278`	`function promiseOneSceneCompleteAndRendered(xml3dElement) {`
`287`	`279`	`if(xml3dElement.complete) {`
`288`	`280`	`return Q(xml3dElement);`