Merge branch 'refs/heads/master' into DataBinding

43 files changed, 79 insertions, 12187 deletions

diff --git a/js/helper-classes/3D/vec-utils.js b/js/helper-classes/3D/vec-utils.js
index 3db95ab7..e6db4a8d 100755
--- a/js/helper-classes/3D/vec-utils.js
+++ b/js/helper-classes/3D/vec-utils.js
@@ -191,5 +191,74 @@ var VecUtils = exports.VecUtils = Object.create(Object.prototype,
 
             return vec;
         }
-    }
+    },
+
+        matI :
+        {
+                value: function(dimen)
+                {
+                        var mat = [];
+                        for (var i=0;  i<dimen*dimen;  i++)  mat.push(0);
+
+                        var index = 0;
+                        for (var i=0;  i<dimen;  i++)
+                        {
+                                mat[index] = 1.0;
+                                index += dimen + 1;
+                        }
+        
+                        return mat;     
+                }
+        },
+
+        matTranslation:
+        {
+                value: function (vec)
+                {
+                        var mat = Matrix.I(4);
+                        glmat4.translate(mat, vec);
+                        return mat;
+                }
+        },
+
+        matRotationX:
+        {
+                value: function( angle )
+                {
+                        var mat = Matrix.I(4);
+                        glmat4.rotateX(mat, angle);
+                        return mat;
+                }
+        },
+
+        matRotationY:
+        {
+                value: function( angle )
+                {
+                        var mat = Matrix.I(4);
+                        glmat4.rotateY(mat, angle);
+                        return mat;
+                }
+        },
+
+        matRotationZ:
+        {
+                value: function( angle )
+                {
+                        var mat = Matrix.I(4);
+                        glmat4.rotateZ(mat, angle);
+                        return mat;
+                }
+        },
+
+        matRotation:
+        {
+                value: function(angle, axis)
+                {
+                        var mat = Matrix.I(4);
+                        glmat4.rotate(mat, angle, axis);
+                        return mat;
+                }
+        },
+
 });
\ No newline at end of file
diff --git a/js/helper-classes/RDGE/src/core/script/MeshManager.js b/js/helper-classes/RDGE/src/core/script/MeshManager.js
index 43813078..7dfc79d4 100755
--- a/js/helper-classes/RDGE/src/core/script/MeshManager.js
+++ b/js/helper-classes/RDGE/src/core/script/MeshManager.js
@@ -69,7 +69,7 @@ MeshManager.prototype.deleteMesh = function (name)
         if (model)

         {

                 g_Engine.ctxMan.forEach(function(context)

-                {
+                {

                         context.renderer.deletePrimitive(model.primitive);

                 });

 

diff --git a/js/helper-classes/RDGE/src/core/script/run_state.js b/js/helper-classes/RDGE/src/core/script/run_state.js
index acdb6797..a5981caa 100755
--- a/js/helper-classes/RDGE/src/core/script/run_state.js
+++ b/js/helper-classes/RDGE/src/core/script/run_state.js
@@ -30,9 +30,9 @@ RunState.prototype.Init = function()
                 this.userRunState.init();

         }

 

-        if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
-                this.userRunState.onRunState();
-
+        if (this.hasUserState && this.userRunState && this.userRunState.onRunState)

+                this.userRunState.onRunState();

+

 

         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

 

@@ -97,11 +97,11 @@ RunState.prototype.ReInit = function()
         if(!this.initialized)

         {

                 this.Init();

-        }
-        else
-        {
-                if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
-                        this.userRunState.onRunState();
+        }

+        else

+        {

+                if (this.hasUserState && this.userRunState && this.userRunState.onRunState)

+                        this.userRunState.onRunState();

         }

 }

 

diff --git a/js/helper-classes/RDGE/src/tools/compile-rdge-core.bat b/js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
deleted file mode 100644
index b2933fa9..00000000
--- a/js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-java -jar ./compiler.jar --compilation_level SIMPLE_OPTIMIZATIONS --manage_closure_dependencies --js ../core/script/math/vec2.js --js ../core/script/math/vec3.js --js ../core/script/math/vec4.js --js ../core/script/math/mat4.js --js ../core/script/math/quat.js --js ../core/script/util/statTracker.js --js ../core/script/util/fpsTracker.js --js ../core/script/objectManager.js --js ../core/script/precompiled.js --js ../core/script/renderer.js --js ../core/script/renderUtils.js --js ../core/script/jshader.js --js ../core/script/jpass.js --js ../core/script/RenderProcs.js --js ../core/script/RenderInitProcs.js --js ../core/script/MeshManager.js --js ../core/script/TextureManager.js --js ../core/script/ShaderManager.js --js ../core/script/fx/blur.js --js ../core/script/fx/ssao.js --js ../core/script/ScreenQuad.js --js ../core/script/box.js --js ../core/script/camera.js --js ../core/script/shadowLight.js --js ../core/script/utilities.js --js ../core/script/input.js --js ../core/script/engine.js --js ../core/script/scenegraphNodes.js --js ../core/script/scenegraph.js --js ../core/script/lightmanager.js --js ../core/script/rendercontext.js --js ../core/script/animation.js --js ../core/script/particle.js --js ../core/script/run_state.js --js ../core/script/init_state.js --js ../core/script/runtime.js --js ../core/script/util/dbgpanel.js --js_output_file rdge-compiled.js
-cd ../core/script
-type precompiled.js >> ../../tools/rdge-compiled.js
-pause
diff --git a/js/helper-classes/RDGE/src/tools/compile-rdge-core.sh b/js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
deleted file mode 100644
index 1a2c4676..00000000
--- a/js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-java -jar ./compiler.jar --compilation_level SIMPLE_OPTIMIZATIONS --manage_closure_dependencies --js ../core/script/math/vec2.js --js ../core/script/math/vec3.js --js ../core/script/math/vec4.js --js ../core/script/math/mat4.js --js ../core/script/math/quat.js --js ../core/script/util/statTracker.js --js ../core/script/util/fpsTracker.js --js ../core/script/objectManager.js --js ../core/script/precompiled.js --js ../core/script/renderer.js --js ../core/script/renderUtils.js --js ../core/script/jshader.js --js ../core/script/jpass.js --js ../core/script/RenderProcs.js --js ../core/script/RenderInitProcs.js --js ../core/script/MeshManager.js --js ../core/script/TextureManager.js --js ../core/script/ShaderManager.js --js ../core/script/fx/blur.js --js ../core/script/fx/ssao.js --js ../core/script/ScreenQuad.js --js ../core/script/box.js --js ../core/script/camera.js --js ../core/script/shadowLight.js --js ../core/script/utilities.js --js ../core/script/input.js --js ../core/script/engine.js --js ../core/script/scenegraphNodes.js --js ../core/script/scenegraph.js --js ../core/script/lightmanager.js --js ../core/script/rendercontext.js --js ../core/script/animation.js --js ../core/script/particle.js --js ../core/script/run_state.js --js ../core/script/init_state.js --js ../core/script/runtime.js --js ../core/script/util/dbgpanel.js --js ../core/script/ubershader.js --js_output_file rdge-compiled.js