Fixed context switching problems in rdge

10 files changed, 507 insertions, 14 deletions

diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index 942eb528..08057778 100644
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -133,6 +133,9 @@ function GLCircle()
         if (!world)  throw( "null world in buildBuffers" );
 
                 if (!world._useWebGL)  return;
+                
+                // make sure RDGE has the correct context
+                g_Engine.setContext( world.getCanvas().uuid );
 
          // create the gl buffer
         var gl = world.getGLContext();
diff --git a/js/helper-classes/RDGE/GLLine.js b/js/helper-classes/RDGE/GLLine.js
index bd3cbc26..f01e1610 100644
--- a/js/helper-classes/RDGE/GLLine.js
+++ b/js/helper-classes/RDGE/GLLine.js
@@ -109,6 +109,9 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
         var world = this.getWorld();
         if (!world)  throw( "null world in buildBuffers" );
                 if (!world._useWebGL)  return;
+                
+                // make sure RDGE has the correct context
+                g_Engine.setContext( world.getCanvas().uuid );
 
          // create the gl buffer
         var gl = world.getGLContext();
diff --git a/js/helper-classes/RDGE/GLRectangle.js b/js/helper-classes/RDGE/GLRectangle.js
index f6f5a899..595a5b48 100644
--- a/js/helper-classes/RDGE/GLRectangle.js
+++ b/js/helper-classes/RDGE/GLRectangle.js
@@ -210,8 +210,11 @@ function GLRectangle()
                 // get the world
                 var world = this.getWorld();
                 if (!world)  throw( "null world in buildBuffers" );
-
+                //console.log( "GLRectangle.buildBuffers " + world._worldCount );
                 if (!world._useWebGL)  return;
+                
+                // make sure RDGE has the correct context
+                g_Engine.setContext( world.getCanvas().uuid );
 
                 // create the gl buffer
                 var gl = world.getGLContext();
@@ -284,6 +287,7 @@ function GLRectangle()
                 xFill -= strokeSize;
                 yFill -= strokeSize;
                 var fillMaterial = this.makeFillMaterial();
+                //console.log( "fillMaterial: " + fillMaterial.getName() );
                 var fillPrim = this.createFill([x,y],  2*xFill,  2*yFill,  tlRadius, blRadius, brRadius, trRadius, fillMaterial);
         this._primArray.push( fillPrim );
                 this._materialNodeArray.push( fillMaterial.getMaterialNode() );
diff --git a/js/helper-classes/RDGE/GLWorld.js b/js/helper-classes/RDGE/GLWorld.js
index afd61c8a..e6e7f466 100644
--- a/js/helper-classes/RDGE/GLWorld.js
+++ b/js/helper-classes/RDGE/GLWorld.js
@@ -151,6 +151,7 @@ function GLWorld( canvas, use3D )
                         ctx2 = g_Engine.getContext();
                 if (ctx1 != ctx2)  console.log( "***** different contexts *****" );
                 this.renderer = ctx1.renderer;
+                this.renderer._world = this;
       
                 // create a camera, set its perspective, and then point it at the origin
                 var cam = new camera();
@@ -229,18 +230,24 @@ function GLWorld( canvas, use3D )
     {
                 if (this._useWebGL)
                 {
+                        g_Engine.setContext( this._canvas.uuid );
                         var ctx = g_Engine.getContext();
                         var ctx1 = g_Engine.ctxMan.handleToObject(this._canvas.rdgeCtxHandle);
-                        if (ctx1 != ctx)  console.log( "***** different contexts (2) *****" );
+                        if (ctx1 != ctx)
+                                console.log( "***** different contexts (2) *****" );
                         var aRenderer = ctx1.renderer;
                         var renderer = ctx.renderer;
-                        if (renderer != aRenderer)  console.log( "***** DIFFERENT RENDERERS *****" );
+                        if (renderer != aRenderer)
+                        {
+                                console.log( "***** DIFFERENT RENDERERS *****" );
+                                renderer = aRenderer;
+                        }
                                 
                         if (renderer.unloadedTextureCount <= 0)
                         {
                                 renderer.disableCulling();
+                                //console.log( "GLWorld.draw " + renderer._world._worldCount );
                                 this.myScene.render();
-                                console.log( "render" );
 
                                 if (this._firstRender)
                                 {
@@ -389,7 +396,6 @@ function GLWorld( canvas, use3D )
                 rdgeStarted = true;
 
         this._canvas.rdgeid = this._canvas.uuid;
-            this._canvas.id = this._canvas.uuid;
 
                         g_Engine.registerCanvas(this._canvas, this);
                         RDGEStart( this._canvas );
@@ -508,16 +514,22 @@ GLWorld.prototype.addObject = function( obj )
 
 GLWorld.prototype.restartRenderLoop = function()
 {
-        console.log( "restartRenderLoop" );
+        //console.log( "restartRenderLoop" );
 
         this._firstRender = true;
         this._renderCount  = -1;
         if (this._canvas.task)
         {
                 if (this._allMapsLoaded)
+                {
+                        //console.log( "starting task" );
                         this._canvas.task.start();
+                }
                 else
+                {
+                        //console.log( "stopping task" );
                         this._canvas.task.stop();
+                }
         }
 }
 
@@ -757,7 +769,10 @@ GLWorld.prototype.render = function()
         }
         else
         {
-                this.draw();
+                console.log( "GLWorld.render, " + this._worldCount );
+                g_Engine.setContext( this._canvas.uuid );
+                //this.draw();
+                this.restartRenderLoop();
         }
 }
 
diff --git a/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js b/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js
index cf91f1aa..50833f4f 100644
--- a/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js
+++ b/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js
@@ -264,7 +264,6 @@ var radialGradientMaterialDef =
                                                 'u_colorStop2':         { 'type' : 'float' },                                                                   
                                                 'u_colorStop3':         { 'type' : 'float' },                                                                   
                                                 'u_colorStop4':         { 'type' : 'float' },                                                                   
-                                                'u_cos_sin_angle' : { 'type' : 'vec2' }
                                                 //'u_colorCount':               {'type' : 'int' }
                                 },
 
diff --git a/js/helper-classes/RDGE/src/core/script/renderer.js b/js/helper-classes/RDGE/src/core/script/renderer.js
index 04cb36a7..a50b8a68 100644
--- a/js/helper-classes/RDGE/src/core/script/renderer.js
+++ b/js/helper-classes/RDGE/src/core/script/renderer.js
@@ -371,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();

@@ -379,16 +378,16 @@ _renderer = function(canvas) {
             texture.image.onload = function() {

                 var stateMan = this.context.ctxStateManager;

                 stateMan.RDGEInitState.loadTexture(texture);

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

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

                                 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)