Merge pull request #60 from mqg734/WebGLMaterials

Integrating WebGL and canvas-2d drawing fixes. Fixed Materials Editor Popup to work with latest Montage framework. Also adding back WebGL materials.

1 files changed, 307 insertions, 287 deletions

diff --git a/js/helper-classes/RDGE/GLLine.js b/js/helper-classes/RDGE/GLLine.js
index 5ec51230..0d815145 100755
--- a/js/helper-classes/RDGE/GLLine.js
+++ b/js/helper-classes/RDGE/GLLine.js
@@ -11,74 +11,74 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ///////////////////////////////////////////////////////////////////////
 function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj)
 {
-    ///////////////////////////////////////////////////////////////////////
-    // Instance variables
-    ///////////////////////////////////////////////////////////////////////
-    this._width = 2.0;
-    this._height = 2.0;
-    this._xOffset = 0;
-    this._yOffset = 0;
-
-    // If line doesn't fit in canvas world, we had to grow the canvas by this much on either side
-    this._xAdj = 0;
-    this._yAdj = 0;
-    
-    this._slope = 0;
+        ///////////////////////////////////////////////////////////////////////
+        // Instance variables
+        ///////////////////////////////////////////////////////////////////////
+        this._width = 2.0;
+        this._height = 2.0;
+        this._xOffset = 0;
+        this._yOffset = 0;
+
+        // If line doesn't fit in canvas world, we had to grow the canvas by this much on either side
+        this._xAdj = 0;
+        this._yAdj = 0;
+        
+        this._slope = 0;
 
-    this._strokeWidth = 0.25;
+        this._strokeWidth = 0.25;
 
-    this._strokeStyle = "Solid";
-    this._scaleX = 1.0;
-    this._scaleY = 1.0;
+        this._strokeStyle = "Solid";
+        this._scaleX = 1.0;
+        this._scaleY = 1.0;
 
-    if (arguments.length > 0)
-    {
-        this._width = width;
-        this._height = height;
-        this._xOffset = xOffset;
-        this._yOffset = yOffset;
+        if (arguments.length > 0)
+        {
+                this._width = width;
+                this._height = height;
+                this._xOffset = xOffset;
+                this._yOffset = yOffset;
 
-        this._xAdj = xAdj;
-        this._yAdj = yAdj;
+                this._xAdj = xAdj;
+                this._yAdj = yAdj;
 
-        this._slope = slope;
-        this._strokeWidth = strokeSize;
-        this._strokeColor = strokeColor;
+                this._slope = slope;
+                this._strokeWidth = strokeSize;
+                this._strokeColor = strokeColor;
 
-        this._strokeStyle = strokeStyle;
-        this._scaleX = (world.getViewportWidth())/(world.getViewportHeight());
-    }
+                this._strokeStyle = strokeStyle;
+                this._scaleX = (world.getViewportWidth())/(world.getViewportHeight());
+        }
 
-    this._strokeVerticesLen = 0;
+        this._strokeVerticesLen = 0;
 
-    this.m_world = world;
+        this.m_world = world;
 
         this._materialAmbient  = [0.2, 0.2, 0.2,  1.0];
         this._materialDiffuse  = [0.4, 0.4, 0.4,  1.0];
         this._materialSpecular = [0.4, 0.4, 0.4,  1.0];
 
-    // initialize the inherited members
-    this.inheritedFrom = GLGeomObj;
-    this.inheritedFrom();
+        // initialize the inherited members
+        this.inheritedFrom = GLGeomObj;
+        this.inheritedFrom();
 
-    if(strokeMaterial)
-    {
-        this._strokeMaterial = strokeMaterial;
-    }
+        if(strokeMaterial)
+        {
+                this._strokeMaterial = strokeMaterial;
+        }
 
-    ///////////////////////////////////////////////////////////////////////
-    // Property Accessors
-    ///////////////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////////////////////////////////
+        // Property Accessors
+        ///////////////////////////////////////////////////////////////////////
         this.getStrokeWidth             = function()            {  return this._strokeWidth;    }
         this.setStrokeWidth             = function(w)           {  this._strokeWidth = w;               }
 
         this.getStrokeMaterial  = function()            {  return this._strokeMaterial; }
         this.setStrokeMaterial  = function(m)           {  this._strokeMaterial = m;    }
 
-    this.getStrokeColor         = function()            {  return this._strokeColor;    }
+        this.getStrokeColor             = function()            {  return this._strokeColor;    }
         //this.setStrokeColor   = function(c)           {  this._strokeColor = c;               }
 
-    this.getStrokeStyle         = function()            {  return this._strokeStyle;    }
+        this.getStrokeStyle             = function()            {  return this._strokeStyle;    }
         this.setStrokeStyle             = function(s)           {  this._strokeStyle = s;               }
 
         this.getFillMaterial    = function()            {  return null;         }
@@ -86,24 +86,24 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
         this.setStrokeMaterial  = function(m)            {  this._strokeMaterial = m;            }
         this.getStrokeMaterial  = function()            {  return this._strokeMaterial;         }
 
-    this.getWidth                       = function()            {  return this._width;                          }
+        this.getWidth                   = function()            {  return this._width;                          }
         this.setWidth                   = function(w)           {  this._width = w;                                     }
 
         this.getHeight                  = function()            {  return this._height;                         }
         this.setHeight                  = function(h)           {  this._height = h;                            }
 
-    this.getXAdj                        = function()            {  return this._xAdj;                   }
+        this.getXAdj                    = function()            {  return this._xAdj;                   }
         this.setXAdj            = function(x)           {  this._xAdj = x;                              }
 
-    this.getYAdj                        = function()            {  return this._yAdj;                   }
+        this.getYAdj                    = function()            {  return this._yAdj;                   }
         this.setYAdj            = function(y)           {  this._yAdj = y;                              }
 
-    this.getSlope                       = function()            {  return this._slope;                  }
+        this.getSlope                   = function()            {  return this._slope;                  }
         this.setSlope            = function(m)          {  this._slope = m;                             }
 
-    this.geomType       = function()                            {  return this.GEOM_TYPE_LINE;  }
+        this.geomType   = function()                            {  return this.GEOM_TYPE_LINE;  }
 
-        ///////////////////////////////////////////////////////////////////////
+                ///////////////////////////////////////////////////////////////////////
         // Methods
         ///////////////////////////////////////////////////////////////////////
         this.export = function()
@@ -137,14 +137,14 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
                 this._yOffset                   = Number( this.getPropertyFromString( "yoff: ",                 importStr )  );
                 this._width                             = Number( this.getPropertyFromString( "width: ",                importStr )  );
                 this._height                    = Number( this.getPropertyFromString( "height: ",               importStr )  );
-        this._xAdj                          = Number( this.getPropertyFromString( "xAdj: ",                     importStr )  );
-        this._yAdj                          = Number( this.getPropertyFromString( "yAdj: ",                     importStr )  );
+                this._xAdj                          = Number( this.getPropertyFromString( "xAdj: ",                     importStr )  );
+                this._yAdj                          = Number( this.getPropertyFromString( "yAdj: ",                     importStr )  );
                 this._strokeWidth               = Number( this.getPropertyFromString( "strokeWidth: ",  importStr )  );
                 var slope                       = this.getPropertyFromString( "slope: ",        importStr );
-        if(isNaN(Number(slope)))
-            this._slope             = slope;
-        else
-            this._slope         = Number(slope);
+                if(isNaN(Number(slope)))
+                        this._slope                 = slope;
+                else
+                        this._slope         = Number(slope);
 
                 var strokeMaterialName  = this.getPropertyFromString( "strokeMat: ",    importStr );
                 this._strokeStyle               = this.getPropertyFromString( "strokeStyle: ",  importStr );
@@ -160,28 +160,28 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
 
         }
 
-    ///////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////
-    this.buildBuffers = function()
-    {
-        // get the world
-        var world = this.getWorld();
-        if (!world)  throw( "null world in buildBuffers" );
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+        ///////////////////////////////////////////////////////////////////////
+        this.buildBuffers = function()
+        {
+                // get the world
+                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();
+                 // create the gl buffer
+                var gl = world.getGLContext();