Snapshot build, bump version for development

tsherif · Jun 17, 2015 · 54671db · 54671db
1 parent 405dee9
commit 54671db
Show file tree

Hide file tree

Showing 5 changed files with 18,486 additions and 17 deletions.
diff --git a/api/latest/scenejs.js b/api/latest/scenejs.js
@@ -1,10 +1,10 @@
 /*
- * SceneJS V4.2.0
+ * SceneJS V4.2.1
  *
  * A WebGL-based 3D scene graph from xeoLabs
  * http://scenejs.org/
  *
- * Built on 2015-06-12
+ * Built on 2015-06-17
  *
  * MIT License
  * Copyright 2015, Lindsay Kay
@@ -7958,7 +7958,13 @@ SceneJS_NodeFactory.prototype.putNode = function (node) {
                 far: 10000.0
             };
         } else {
-            var type = optics.type || core.optics.type || "perspective";
+            var type = optics.type;
+            if (!type) {
+                if (core.optics) {
+                    type = core.optics.type;
+                }
+            }
+            type = type || "perspective";
             if (type == "ortho") {
                 core.optics = SceneJS._applyIf(SceneJS_math_ORTHO_OBJ, {
                     type: type,
@@ -7990,13 +7996,13 @@ SceneJS_NodeFactory.prototype.putNode = function (node) {
             } else if (!optics.type) {
                 throw SceneJS_error.fatalError(
                     SceneJS.errors.ILLEGAL_NODE_CONFIG,
-                        "SceneJS.Camera configuration invalid: optics type not specified - " +
-                        "supported types are 'perspective', 'frustum' and 'ortho'");
+                    "SceneJS.Camera configuration invalid: optics type not specified - " +
+                    "supported types are 'perspective', 'frustum' and 'ortho'");
             } else {
                 throw SceneJS_error.fatalError(
                     SceneJS.errors.ILLEGAL_NODE_CONFIG,
-                        "SceneJS.Camera configuration invalid: optics type not supported - " +
-                        "supported types are 'perspective', 'frustum' and 'ortho'");
+                    "SceneJS.Camera configuration invalid: optics type not supported - " +
+                    "supported types are 'perspective', 'frustum' and 'ortho'");
             }
         }
         this._core.optics.pan = optics.pan;
@@ -8034,7 +8040,7 @@ SceneJS_NodeFactory.prototype.putNode = function (node) {
 
         } else if (optics.type == "perspective") {
             core.matrix = SceneJS_math_perspectiveMatrix4(
-                    optics.fovy * Math.PI / 180.0,
+                optics.fovy * Math.PI / 180.0,
                 optics.aspect,
                 optics.near,
                 optics.far);
@@ -17505,6 +17511,7 @@ SceneJS_ChunkFactory.createChunkType({
 
                     gl.enable(gl.BLEND);
                     gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
+                    //gl.blendFunc(gl.SRC_ALPHA, gl.ONE);
                     frameCtx.blendEnabled = true;
 
                 } else {
@@ -17667,7 +17674,7 @@ SceneJS_ChunkFactory.createChunkType({
     setDrawMorphFactor:function () {
 
         if (this._uMorphFactorDraw) {
-            this._uMorphFactorDraw.setValue*(this.core.factor); // Bind LERP factor
+            this._uMorphFactorDraw.setValue(this.core.factor); // Bind LERP factor
         }
 
     },

diff --git a/api/latest/scenejs.min.js b/api/latest/scenejs.min.js