10 files changed, 365 insertions, 54 deletions

diff --git a/js/helper-classes/RDGE/GLAnchorPoint.js b/js/helper-classes/RDGE/GLAnchorPoint.js
index 716f59d4..c3e95b34 100755
--- a/js/helper-classes/RDGE/GLAnchorPoint.js
+++ b/js/helper-classes/RDGE/GLAnchorPoint.js
@@ -133,6 +133,13 @@ GLAnchorPoint.prototype.translateAll = function (x, y, z) {
 }
 
 
+GLAnchorPoint.prototype.scaleAll = function(sx,sy,sz){
+    this._x *= sx;this._prevX *= sx;this._nextX *= sx;
+    this._y *= sy;this._prevY *= sy;this._nextY *= sy;
+    this._z *= sz;this._prevZ *= sz;this._nextZ *= sz;
+}
+
+
 // ********* getters **********
 GLAnchorPoint.prototype.getPosX = function () { return this._x; }
 GLAnchorPoint.prototype.getPosY = function () { return this._y; }
diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index 5b32547e..712544c0 100755
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -135,7 +135,7 @@ function GLCircle()
                 if (!world._useWebGL)  return;
                 
                 // make sure RDGE has the correct context
-                g_Engine.setContext( world.getCanvas().uuid );
+                g_Engine.setContext( world.getCanvas().rdgeid );
 
          // 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 0d815145..f715a43c 100755
--- a/js/helper-classes/RDGE/GLLine.js
+++ b/js/helper-classes/RDGE/GLLine.js
@@ -171,7 +171,7 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
                 if (!world._useWebGL)  return;
                 
                 // make sure RDGE has the correct context
-                g_Engine.setContext( world.getCanvas().uuid );
+                g_Engine.setContext( world.getCanvas().rdgeid );
 
                  // 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 5b6ff94f..3c1cb7dc 100755
--- a/js/helper-classes/RDGE/GLRectangle.js
+++ b/js/helper-classes/RDGE/GLRectangle.js
@@ -214,7 +214,7 @@ function GLRectangle()
                 if (!world._useWebGL)  return;
                 
                 // make sure RDGE has the correct context
-                g_Engine.setContext( world.getCanvas().uuid );
+                g_Engine.setContext( world.getCanvas().rdgeid );
 
                 // create the gl buffer
                 var gl = world.getGLContext();
diff --git a/js/helper-classes/RDGE/GLSubpath.js b/js/helper-classes/RDGE/GLSubpath.js
index 3200cf59..f3d8ad36 100755
--- a/js/helper-classes/RDGE/GLSubpath.js
+++ b/js/helper-classes/RDGE/GLSubpath.js
@@ -178,6 +178,67 @@ function GLSubpath() {
     } //render()
 
     this.geomType = function () { return this.GEOM_TYPE_CUBIC_BEZIER; }
+
+
+    this.setWidth = function (newW) {
+        if (newW<1)
+            newW=1; //clamp minimum width to 1
+        //scale the contents of this subpath to lie within this width
+        //determine the scale factor by comparing with the old width
+        var oldWidth = this._BBoxMax[0]-this._BBoxMin[0];
+        if (oldWidth<1){
+            oldWidth=1;
+        }
+        var scaleX = newW/oldWidth;
+        if (scaleX===1){
+            return; //no need to do anything
+        }
+
+        //scale the anchor point positions such that the width of the bbox is the newW
+        var origX = this._BBoxMin[0];
+        var numAnchors = this._Anchors.length;
+        for (var i=0;i<numAnchors;i++){
+            //compute the distance from the bboxMin
+            var oldW = this._Anchors[i].getPosX() - origX;
+            var prevW = this._Anchors[i].getPrevX() - origX;
+            var nextW = this._Anchors[i].getNextX() - origX;
+
+            this._Anchors[i].setPos(origX + oldW*scaleX,this._Anchors[i].getPosY(),this._Anchors[i].getPosZ());
+            this._Anchors[i].setPrevPos(origX + prevW*scaleX,this._Anchors[i].getPrevY(),this._Anchors[i].getPrevZ());
+            this._Anchors[i].setNextPos(origX + nextW*scaleX,this._Anchors[i].getNextY(),this._Anchors[i].getNextZ());
+        }
+        this.makeDirty();
+    }
+    this.setHeight = function (newH) {
+        if (newH<1)
+            newH=1; //clamp minimum width to 1
+        //scale the contents of this subpath to lie within this height
+        //determine the scale factor by comparing with the old height
+        var oldHeight = this._BBoxMax[1]-this._BBoxMin[1];
+        if (oldHeight<1){
+            oldHeight=1;
+        }
+        var scaleY = newH/oldHeight;
+        if (scaleY===1){
+            return; //no need to do anything
+        }
+
+        //scale the anchor point positions such that the height of the bbox is the newH
+        var origY = this._BBoxMin[1];
+        var numAnchors = this._Anchors.length;
+        for (var i=0;i<numAnchors;i++){
+            //compute the distance from the bboxMin
+            var oldW = this._Anchors[i].getPosY() - origY;
+            var prevW = this._Anchors[i].getPrevY() - origY;
+            var nextW = this._Anchors[i].getNextY() - origY;
+
+            this._Anchors[i].setPos(this._Anchors[i].getPosX(), origY + oldW*scaleY,this._Anchors[i].getPosZ());
+            this._Anchors[i].setPrevPos(this._Anchors[i].getPrevX(), origY + prevW*scaleY,this._Anchors[i].getPrevZ());
+            this._Anchors[i].setNextPos(this._Anchors[i].getNextX(), origY + nextW*scaleY,this._Anchors[i].getNextZ());
+        }
+        this.makeDirty();
+    }
+
 } //function GLSubpath ...class definition
 
 
@@ -573,11 +634,6 @@ GLSubpath.prototype.setFillMaterial = function(m){ this._fillMaterial = m;}
 GLSubpath.prototype.getFillColor = function() {return this._fillColor;}
 GLSubpath.prototype.setFillColor = function(c){this._fillColor = c;}
 
-GLSubpath.prototype.setWidth = function () {//NO-OP for now
-}
-GLSubpath.prototype.setHeight = function () {//NO-OP for now
-}
-
 GLSubpath.prototype.copyFromSubpath = function (subpath) {
     this.clearAllAnchors();
     for (var i = 0; i < subpath.getNumAnchors(); i++) {
diff --git a/js/helper-classes/RDGE/GLWorld.js b/js/helper-classes/RDGE/GLWorld.js
index 1edd5cff..64086bee 100755
--- a/js/helper-classes/RDGE/GLWorld.js
+++ b/js/helper-classes/RDGE/GLWorld.js
@@ -136,13 +136,6 @@ function GLWorld( canvas, use3D )
         var camMat = Matrix.I(4);
         camMat[14] = this.getViewDistance();
         this.setCameraMat( camMat );
-
-        //////////////////////////////////////////
-        // test call to SVG importer
-//      console.log( "***** SVG TEST *****" );
-//      var svgImporter = new SVGParse( this );
-//      svgImporter.importSVG();
-        //////////////////////////////////////////
     
     // post-load processing of the scene
     this.init = function()
@@ -198,7 +191,9 @@ function GLWorld( canvas, use3D )
                 this.myScene.addNode(lightTr);
         
                 // Add the scene to the engine - necessary if you want the engine to draw for you
-                g_Engine.AddScene("myScene" + this._canvas.id, this.myScene);
+                //g_Engine.AddScene("myScene" + this._canvas.id, this.myScene);
+                var name = this._canvas.getAttribute( "data-RDGE-id" ); 
+                g_Engine.AddScene("myScene" + name, this.myScene);
         }
     
         // main code for handling user interaction and updating the scene   
@@ -227,11 +222,11 @@ function GLWorld( canvas, use3D )
     }
 
     // defining the draw function to control how the scene is rendered      
-    this.draw = function()
+        this.draw = function()
     {
                 if (this._useWebGL)
                 {
-                        g_Engine.setContext( this._canvas.uuid );
+                        g_Engine.setContext( this._canvas.rdgeid );
                         var ctx = g_Engine.getContext();
                         var renderer = ctx.renderer;
                         if (renderer.unloadedTextureCount <= 0)
@@ -391,12 +386,10 @@ function GLWorld( canvas, use3D )
         if (this._useWebGL)
         {
                 rdgeStarted = true;
-                this._canvas.rdgeid = this._canvas.uuid;
+                var id = this._canvas.getAttribute( "data-RDGE-id" ); 
+                this._canvas.rdgeid = id;
                 g_Engine.registerCanvas(this._canvas, this);
                 RDGEStart( this._canvas );
-
-                //this._canvas.fpsTracker = new fpsTracker( '0' );
-                //this._canvas.task = new RDGETask(this._canvas, false);
                 this._canvas.task.stop()
         }
 }
@@ -765,7 +758,7 @@ GLWorld.prototype.render = function()