Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

39 files changed, 36 insertions, 18 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/MeshManager.js b/js/helper-classes/RDGE/src/core/script/MeshManager.js
index 43813078..43813078 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/MeshManager.js
+++ b/js/helper-classes/RDGE/src/core/script/MeshManager.js
diff --git a/js/helper-classes/RDGE/src/core/script/RenderInitProcs.js b/js/helper-classes/RDGE/src/core/script/RenderInitProcs.js
index 9d4e0d63..9d4e0d63 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/RenderInitProcs.js
+++ b/js/helper-classes/RDGE/src/core/script/RenderInitProcs.js
diff --git a/js/helper-classes/RDGE/src/core/script/RenderProcs.js b/js/helper-classes/RDGE/src/core/script/RenderProcs.js
index 6d3b02df..6d3b02df 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/RenderProcs.js
+++ b/js/helper-classes/RDGE/src/core/script/RenderProcs.js
diff --git a/js/helper-classes/RDGE/src/core/script/ScreenQuad.js b/js/helper-classes/RDGE/src/core/script/ScreenQuad.js
index 2368d97a..2368d97a 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/ScreenQuad.js
+++ b/js/helper-classes/RDGE/src/core/script/ScreenQuad.js
diff --git a/js/helper-classes/RDGE/src/core/script/ShaderManager.js b/js/helper-classes/RDGE/src/core/script/ShaderManager.js
index f253d3c7..f253d3c7 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/ShaderManager.js
+++ b/js/helper-classes/RDGE/src/core/script/ShaderManager.js
diff --git a/js/helper-classes/RDGE/src/core/script/TextureManager.js b/js/helper-classes/RDGE/src/core/script/TextureManager.js
index cb674ddf..cb674ddf 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/TextureManager.js
+++ b/js/helper-classes/RDGE/src/core/script/TextureManager.js
diff --git a/js/helper-classes/RDGE/src/core/script/animation.js b/js/helper-classes/RDGE/src/core/script/animation.js
index 63eca0a2..63eca0a2 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/animation.js
+++ b/js/helper-classes/RDGE/src/core/script/animation.js
diff --git a/js/helper-classes/RDGE/src/core/script/box.js b/js/helper-classes/RDGE/src/core/script/box.js
index 8272d952..8272d952 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/box.js
+++ b/js/helper-classes/RDGE/src/core/script/box.js
diff --git a/js/helper-classes/RDGE/src/core/script/camera.js b/js/helper-classes/RDGE/src/core/script/camera.js
index caff232b..caff232b 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/camera.js
+++ b/js/helper-classes/RDGE/src/core/script/camera.js
diff --git a/js/helper-classes/RDGE/src/core/script/engine.js b/js/helper-classes/RDGE/src/core/script/engine.js
index 5bc9305c..5bc9305c 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/engine.js
+++ b/js/helper-classes/RDGE/src/core/script/engine.js
diff --git a/js/helper-classes/RDGE/src/core/script/fx/blur.js b/js/helper-classes/RDGE/src/core/script/fx/blur.js
index 7fa24712..7fa24712 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/fx/blur.js
+++ b/js/helper-classes/RDGE/src/core/script/fx/blur.js
diff --git a/js/helper-classes/RDGE/src/core/script/fx/ssao.js b/js/helper-classes/RDGE/src/core/script/fx/ssao.js
index 05793594..05793594 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/fx/ssao.js
+++ b/js/helper-classes/RDGE/src/core/script/fx/ssao.js
diff --git a/js/helper-classes/RDGE/src/core/script/init_state.js b/js/helper-classes/RDGE/src/core/script/init_state.js
index 4b97a4f4..4b97a4f4 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/init_state.js
+++ b/js/helper-classes/RDGE/src/core/script/init_state.js
diff --git a/js/helper-classes/RDGE/src/core/script/input.js b/js/helper-classes/RDGE/src/core/script/input.js
index 7622c5ab..7622c5ab 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/input.js
+++ b/js/helper-classes/RDGE/src/core/script/input.js
diff --git a/js/helper-classes/RDGE/src/core/script/jpass.js b/js/helper-classes/RDGE/src/core/script/jpass.js
index 326394dc..326394dc 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/jpass.js
+++ b/js/helper-classes/RDGE/src/core/script/jpass.js
diff --git a/js/helper-classes/RDGE/src/core/script/jshader.js b/js/helper-classes/RDGE/src/core/script/jshader.js
index 36c5939e..36c5939e 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/jshader.js
+++ b/js/helper-classes/RDGE/src/core/script/jshader.js
diff --git a/js/helper-classes/RDGE/src/core/script/lightmanager.js b/js/helper-classes/RDGE/src/core/script/lightmanager.js
index 7d76ef90..7d76ef90 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/lightmanager.js
+++ b/js/helper-classes/RDGE/src/core/script/lightmanager.js
diff --git a/js/helper-classes/RDGE/src/core/script/math/mat4.js b/js/helper-classes/RDGE/src/core/script/math/mat4.js
index fab57732..fab57732 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/math/mat4.js
+++ b/js/helper-classes/RDGE/src/core/script/math/mat4.js
diff --git a/js/helper-classes/RDGE/src/core/script/math/quat.js b/js/helper-classes/RDGE/src/core/script/math/quat.js
index 5c2c8bb6..5c2c8bb6 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/math/quat.js
+++ b/js/helper-classes/RDGE/src/core/script/math/quat.js
diff --git a/js/helper-classes/RDGE/src/core/script/math/vec2.js b/js/helper-classes/RDGE/src/core/script/math/vec2.js
index 5f1b07e3..5f1b07e3 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/math/vec2.js
+++ b/js/helper-classes/RDGE/src/core/script/math/vec2.js
diff --git a/js/helper-classes/RDGE/src/core/script/math/vec3.js b/js/helper-classes/RDGE/src/core/script/math/vec3.js
index 143fc352..143fc352 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/math/vec3.js
+++ b/js/helper-classes/RDGE/src/core/script/math/vec3.js
diff --git a/js/helper-classes/RDGE/src/core/script/math/vec4.js b/js/helper-classes/RDGE/src/core/script/math/vec4.js
index 3a0de375..3a0de375 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/math/vec4.js
+++ b/js/helper-classes/RDGE/src/core/script/math/vec4.js
diff --git a/js/helper-classes/RDGE/src/core/script/objectManager.js b/js/helper-classes/RDGE/src/core/script/objectManager.js
index 0bb8b91b..0bb8b91b 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/objectManager.js
+++ b/js/helper-classes/RDGE/src/core/script/objectManager.js
diff --git a/js/helper-classes/RDGE/src/core/script/particle.js b/js/helper-classes/RDGE/src/core/script/particle.js
index dd83433e..dd83433e 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/particle.js
+++ b/js/helper-classes/RDGE/src/core/script/particle.js
diff --git a/js/helper-classes/RDGE/src/core/script/precompiled.js b/js/helper-classes/RDGE/src/core/script/precompiled.js
index 7fd1a425..bed94e4e 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/precompiled.js
+++ b/js/helper-classes/RDGE/src/core/script/precompiled.js
@@ -48,11 +48,11 @@ rdgeGlobalParameters =
         "u_light3Amb":                  {'type': 'vec4',  'data': [0.5, 0.5, 0.5, 1.0]},

         "u_light3Spec":                 {'type': 'vec4',  'data': [1.0, 1.0, 1.0, 1.0]}},               

         "colMap":                               {'type': 'tex2d', 'data': "assets/images/white.png"},   

-        "envMap":                               {'type': 'tex2d', 'data': null},        

-        "normalMap":                    {'type': 'tex2d', 'data': null},        

-        "glowMap":                              {'type': 'tex2d', 'data': "assets/images/black.png"},   

-        "u_shadowDepthMap":             {'type': 'tex2d', 'data': null},        

-        "u_depthMap":                   {'type': 'tex2d', 'data': null},        

+        //"envMap":                             {'type': 'tex2d', 'data': null},        

+        //"normalMap":                  {'type': 'tex2d', 'data': null},        

+        //"glowMap":                            {'type': 'tex2d', 'data': "assets/images/black.png"},   

+        //"u_shadowDepthMap":           {'type': 'tex2d', 'data': null},        

+        //"u_depthMap":                 {'type': 'tex2d', 'data': null},        

         "u_matAmbient":                 {'type': 'vec4',  'data': [1.00,1.00,1.00, 1]},         

         "u_matDiffuse":                 {'type': 'vec4',  'data': [1.0, 1.0, 1.0, 1.0]},                

         "u_matSpecular":                {'type': 'vec4',  'data': [1.0, 1.0, 1.0, 1.0]},                

diff --git a/js/helper-classes/RDGE/src/core/script/renderUtils.js b/js/helper-classes/RDGE/src/core/script/renderUtils.js
index baa38560..baa38560 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/renderUtils.js
+++ b/js/helper-classes/RDGE/src/core/script/renderUtils.js
diff --git a/js/helper-classes/RDGE/src/core/script/rendercontext.js b/js/helper-classes/RDGE/src/core/script/rendercontext.js
index 6bc8665b..6bc8665b 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/rendercontext.js
+++ b/js/helper-classes/RDGE/src/core/script/rendercontext.js
diff --git a/js/helper-classes/RDGE/src/core/script/renderer.js b/js/helper-classes/RDGE/src/core/script/renderer.js
index 517947df..a50b8a68 100644..100755
--- a/js/helper-classes/RDGE/src/core/script/renderer.js
+++ b/js/helper-classes/RDGE/src/core/script/renderer.js
@@ -359,9 +359,11 @@ _renderer = function(canvas) {
     *   @param wrap - optional "CLAMP or "REPEAT", default is clamp

     *   @param mips - optional true/false value to create mipmaps, the default is true

     */

+        this.unloadedTextureCount = 0;

     _texparams = function(wrap, mips) { this.wrap = wrap, this.mips = mips };

     this.createTexture = function(url, wrap, mips) {

         var texture = this.ctx.createTexture();

+                this.unloadedTextureCount++;

 

         if (wrap === undefined)

             wrap = "CLAMP";

@@ -369,7 +371,6 @@ _renderer = function(canvas) {
             mips = true;

 

         if (texture) {

-                        //console.log( "createTexture: " + url );

             texture.image = new Image();

             texture.image.src = url;

             texture.image.context = g_Engine.getContext();

@@ -377,9 +378,20 @@ _renderer = function(canvas) {
             texture.image.onload = function() {

                 var stateMan = this.context.ctxStateManager;

                 stateMan.RDGEInitState.loadTexture(texture);

-                                //console.log( "loaded texture: " + texture.lookUpName );

+                                this.context.renderer.unloadedTextureCount--;

+                                //console.log( "loaded texture: " + texture.lookUpName + ",to: " + this.context.renderer._world._worldCount + ", textures remaining to load: " + this.context.renderer.unloadedTextureCount );

                                 if (texture.callback)  texture.callback( texture );

+                                if (this.context.renderer.unloadedTextureCount < 0)

+                                        console.log( "more textures loaded then created..." );

             };

+                        texture.image.onerror = function() {

+                                this.context.renderer.unloadedTextureCount--;

+                                if (texture.callback)  texture.callback( texture );

+                                //console.log( "Error loading texture: " + texture.image.src );

+