Merge branch 'master' into brushtool

Conflicts:
	js/controllers/elements/shapes-controller.js

20 files changed, 1349 insertions, 92 deletions

diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index 4f1082f9..904aa41e 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -96,15 +96,45 @@ exports.NJUtils = Object.create(Object.prototype, {
         value: function(el, selection, controller, isShape) {
             var p3d = Montage.create(Properties3D).init(el);
             var shapeProps = null;
+            var pi = controller + "Pi";
+
             if(isShape) {
                 shapeProps = Montage.create(ShapeModel);
             }
 
+            if(el.controller) {
+
+                var componentInfo = Montage.getInfoForObject(el.controller);
+                var componentName = componentInfo.objectName.toLowerCase();
+
+                controller  = "component";
+                isShape = false;
+
+                switch(componentName) {
+                    case "feedreader":
+                        selection = "Feed Reader";
+                        pi = "FeedReaderPi";
+                        break;
+                    case "map":
+                        selection = "Map";
+                        pi = "MapPi";
+                        break;
+                    case "youtubechannel":
+                        selection = "Youtube Channel";
+                        pi = "YoutubeChannelPi";
+                        break;
+                    case "picasacarousel":
+                        selection = "Picasa Carousel";
+                        pi = "PicasaCarouselPi";
+                        break;
+                }
+            }
+
             el.elementModel = Montage.create(ElementModel, {
                     type:       { value: el.nodeName},
                     selection:  { value: selection},
                     controller: { value: ControllerFactory.getController(controller)},
-                    pi:         { value: controller + "Pi"},
+                    pi:         { value: pi},
                     props3D:    { value: p3d},
                     shapeModel: { value: shapeProps}
             });
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 049145ce..781695b6 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -117,6 +117,8 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 
         this.getRenderer                        = function()            {  return this.renderer;                        };
 
+    // Flag to play/pause animation at authortime
+    this._previewAnimation = true;
   ////////////////////////////////////////////////////////////////////////////////////
   // RDGE
   // local variables
@@ -236,7 +238,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
                                         if (this._canvas.task) {
                                                 this._firstRender = false;
 
-                                                if (!this.hasAnimatedMaterials()) {
+                                                if (!this.hasAnimatedMaterials() || !this._previewAnimation) {
                                                         this._canvas.task.stop();
                                                         //this._renderCount = 10;
                                                 }
@@ -363,6 +365,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         if (this._useWebGL) {
                 rdgeStarted = true;
                 this._canvas.rdgeid = this._canvas.getAttribute( "data-RDGE-id" );
+                g_Engine.unregisterCanvas( this._canvas )
                 g_Engine.registerCanvas(this._canvas, this);
                 RDGEStart( this._canvas );
                 this._canvas.task.stop()
@@ -729,6 +732,74 @@ World.prototype.getShapeFromPoint = function( offsetX, offsetY ) {
         }
 };
 
+
+
+World.prototype.exportJSON = function()
+{
+        // world properties
+        var worldObj = 
+        {
+                'version'       : 1.1,
+                'id'            : this.getCanvas().getAttribute( "data-RDGE-id" ),
+                'fov'           : this._fov,
+                'zNear'         : this._zNear,
+                'zFar'          : this._zFar,
+                'viewDist'      : this._viewDist,
+                'webGL'         : this._useWebGL
+        };
+
+        // RDGE scenegraph
+        if (this._useWebGL)
+                worldObj.scenedata = this.myScene.exportJSON();
+
+        // object data
+        var strArray = [];
+        this.exportObjectsJSON( this._geomRoot, worldObj );
+
+        // You would think that the RDGE export function
+        // would not be destructive of the data.  You would be wrong...
+        // We need to rebuild everything
+        if (this._useWebGL)
+        {
+                var root = this._rootNode;
+                root.children = new Array();
+                if (worldObj.children && (worldObj.children.length === 1))
+                {
+                        this.init();
+                        this._geomRoot = undefined;
+                        this.importObjectsJSON( worldObj.children[0] );
+                }
+        }
+
+        // convert the object to a string
+        var jStr = JSON.stringify( worldObj );
+
+        // prepend some version information to the string.
+        // this string is also used to differentiate between JSON
+        // and pre-JSON versions of fileIO.
+        // the ending ';' in the version string is necessary
+        jStr = "v1.0;" + jStr;
+        
+        return jStr;
+}
+
+World.prototype.exportObjectsJSON = function( obj,  parentObj )
+{
+        if (!obj)  return;
+
+        var jObj = obj.exportJSON();
+        if (!parentObj.children)  parentObj.children = [];
+        parentObj.children.push( jObj );
+
+        if (obj.getChild()) {
+                 this.exportObjectsJSON( obj.getChild (), jObj  );
+    }
+
+        if (obj.getNext())
+                this.exportObjectsJSON( obj.getNext(), parentObj );
+}
+
+/*
 World.prototype.export = function()
 {
         var exportStr = "GLWorld 1.0\n";
@@ -791,6 +862,7 @@ World.prototype.exportObjects = function( obj ) {
         
         return rtnStr;
 };
+*/
 
 World.prototype.findTransformNodeByMaterial = function( materialNode,  trNode ) {
         //if (trNode == null)  trNode = this._ctrNode;
@@ -810,6 +882,85 @@ World.prototype.findTransformNodeByMaterial = function( materialNode,  trNode )
         return rtnNode;
 };
 
+World.prototype.importJSON = function( jObj )
+{
+        if (jObj.webGL)
+        {
+                // start RDGE
+                rdgeStarted = true;
+                var id = this._canvas.getAttribute( "data-RDGE-id" ); 
+                this._canvas.rdgeid = id;
+                g_Engine.registerCanvas(this._canvas, this);
+                RDGEStart( this._canvas );
+                this._canvas.task.stop()
+        }
+
+        // import the objects
+        // there should be exactly one child of the parent object
+        if (jObj.children && (jObj.children.length === 1))
+                this.importObjectsJSON( jObj.children[0] );
+        else
+                throw new Error ("unrecoverable canvas import error - inconsistent root object: " + jObj.children );
+
+        if (!this._useWebGL)