Merge pull request #29 from ericmueller/integration

Integration

68 files changed, 2317 insertions, 512 deletions

diff --git a/assets/shaders/plasma.frag.glsl b/assets/shaders/plasma.frag.glsl
index 2ab8f49c..248288a6 100644
--- a/assets/shaders/plasma.frag.glsl
+++ b/assets/shaders/plasma.frag.glsl
@@ -22,11 +22,9 @@ void main(void)
 {
         float x = v_uv.x ;
         float y = v_uv.y ;
-        float time = color.x;
+        float time = u_time;
         float wave =    (cos(time + y / 0.2  + cos(x / 0.3 + cos((y / 0.1)))));
         float wave1 =   (sin(abs(wave + y/0.6)));
         float wave2 =   (sin(abs(wave1 + y/0.8)));
-        float tmp = u_time * 0.1;
         gl_FragColor = vec4( abs(vec3(wave2,wave1,wave)),1.0);
-        //gl_FragColor = color;
 }       
diff --git a/js/document/html-document.js b/js/document/html-document.js
index b9b68972..05c7d6c0 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -8,7 +8,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 //
 var Montage =           require("montage/core/core").Montage,
     TextDocument =      require("js/document/text-document").TextDocument,
-    NJUtils =           require("js/lib/NJUtils").NJUtils;
+    NJUtils =           require("js/lib/NJUtils").NJUtils,
+        CanvasDataManager =     require("js/lib/rdge/runtime/CanvasDataManager").CanvasDataManager,
+        GLWorld =                       require("js/lib/drawing/world").World;
 ////////////////////////////////////////////////////////////////////////
 //
 exports.HTMLDocument = Montage.create(TextDocument, {
@@ -206,13 +208,113 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         var elt = this.documentRoot;
                         if (elt)
                         {
-                                console.log( "load canvas data: " , value );
-                                var cdm = new CanvasDataManager();
-                                cdm.loadGLData(elt,  value);
+// FOR JOSE:   The following commented out lines are what the runtime
+// version should execute.
+//                              var loadForRuntime = true;
+//                              if (loadForRuntime)
+//                              {
+//                                      var cdm = new CanvasDataManager();
+//                                      cdm.loadGLData(elt,  value );
+//                              }
+//                              else
+                                {
+                                        var nWorlds= value.length;
+                                        for (var i=0;  i<nWorlds;  i++)
+                                        {
+                                                var importStr = value[i];
+                                                var startIndex = importStr.indexOf( "id: " );
+                                                if (startIndex >= 0)
+                                                {
+                                                        var endIndex = importStr.indexOf( "\n", startIndex );
+                                                        if (endIndex > 0)
+                                                        {
+                                                                var id = importStr.substring( startIndex+4, endIndex );
+                                                                if (id)
+                                                                {
+                                                                        var canvas = this.findCanvasWithID( id, elt );
+                                                                        if (canvas)
+                                                                        {
+                                                                                if (!canvas.elementModel)
+                                                                                {
+                                                                                        NJUtils.makeElementModel(canvas, "Canvas", "shape", true);
+                                                                                }
+                                                                
+                                                                                if (canvas.elementModel)
+                                                                                {
+                                                                                        if (canvas.elementModel.shapeModel.GLWorld)
+                                                                                                canvas.elementModel.shapeModel.GLWorld.clearTree();
+
+                                                                                        var index = importStr.indexOf( "webGL: " );
+                                                                                        var useWebGL = (index >= 0)
+                                                                                        var world = new GLWorld( canvas, useWebGL );
+                                                                                        world.import( importStr );
+
+                                                                                        this.buildShapeModel( canvas.elementModel, world );
+                                                                                }
+                                                                        }
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                }
                         }
                 }
     },
 
+        buildShapeModel:
+        {
+                value: function( elementModel, world )
+                {
+            var shapeModel = elementModel.shapeModel;
+                        shapeModel.shapeCount   = 1;    // for now...