changes to allow minimal rendering ofnon-animated materials.

9 files changed, 146 insertions, 52 deletions

diff --git a/assets/shaders/Basic.frag.glsl b/assets/shaders/Basic.frag.glsl
new file mode 100644
index 00000000..a2c21afa
--- /dev/null
+++ b/assets/shaders/Basic.frag.glsl
@@ -0,0 +1,17 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+
+#ifdef GL_ES
+precision highp float;
+#endif
+
+
+uniform vec4 color;
+
+void main() {
+    gl_FragColor = color;
+}
diff --git a/assets/shaders/Taper.vert.glsl b/assets/shaders/Taper.vert.glsl
new file mode 100644
index 00000000..46f04fb3
--- /dev/null
+++ b/assets/shaders/Taper.vert.glsl
@@ -0,0 +1,61 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+
+#ifdef GL_ES
+precision highp float;
+#endif
+
+
+// attributes
+attribute vec3 vert;
+attribute vec3 normal;
+attribute vec2 texcoord;
+
+// scalar uniforms
+uniform float u_limit1;
+uniform float u_limit2;
+uniform float u_limit3;
+uniform float u_taperAmount;
+
+uniform vec4 color;
+
+
+// matrix uniforms
+uniform mat4 u_mvMatrix;
+uniform mat4 u_projMatrix;
+uniform mat4 u_worldMatrix;
+
+varying vec4 v_color;
+
+
+void main(void)
+{
+        vec3 pos = vert;
+        vec2 uv = texcoord;
+
+        v_color = vec4(0, 1, 0, 1);
+        if (uv.x > u_limit1)
+        {
+                if (uv.x < u_limit2)
+                {
+                        float t = (uv.x - u_limit1)/(u_limit2 - u_limit1);
+                        pos.y = pos.y - t*u_taperAmount;
+                        v_color = vec4( 1, 1, 0, 1 );
+                }
+                else if (uv.x < u_limit3)
+                {
+                        float t = 1.0 - (uv.x - u_limit2)/(u_limit3 - u_limit2);
+                        pos.y = pos.y - t*u_taperAmount;
+                        v_color = vec4( 0, 1, 1, 1 );
+                }
+                else
+                        v_color = vec4(0,0,1,1);
+        }
+
+
+        gl_Position = u_projMatrix * u_mvMatrix * vec4(pos,1.0) ;
+}
\ No newline at end of file
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 3ed96082..8819f637 100644
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -1780,7 +1780,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         var mergedSnap = this.mergeHitRecords( hitRecs );
                         if (mergedSnap)
                         {
-                                while (hitRecs.length > 0)  hitRecs.pop();
+                                while (hitRecs.length > 0) hitRecs.pop();
                                 hitRecs.push( mergedSnap );
                                 //console.log( "merged snaps" );
                         }
@@ -1836,6 +1836,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                 hSnap.setLocalPoint( localPt );
                                                 hSnap.setScreenPoint( scrPt );
                                                 hSnap.setType( hSnap.SNAP_TYPE_ALIGN_MERGED );
+                                                hSnap.setElement( stage );
+                                                hSnap.setPlane( [0,0,1,0] );
+                                                hSnap.setPlaneMatrix( Matrix.I(4) );
                                                 if (vSnap.hasAssociatedScreenPoint() )
                                                         hSnap.setAssociatedScreenPoint( vSnap.getAssociatedScreenPoint() );
                                                 if (vSnap.hasAssociatedScreenPoint2() )
@@ -1882,6 +1885,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                 hSnap.setLocalPoint( localPt );
                                                 hSnap.setScreenPoint( scrPt );
                                                 hSnap.setType( hSnap.SNAP_TYPE_ALIGN_MERGED );
+                                                hSnap.setElement( stage );
+                                                hSnap.setPlane( [0,0,1,0] );
+                                                hSnap.setPlaneMatrix( Matrix.I(4) );
                                                 if (vSnap.hasAssociatedScreenPoint() )
                                                         hSnap.setAssociatedScreenPoint( vSnap.getAssociatedScreenPoint() );
                                                 if (vSnap.hasAssociatedScreenPoint2() )
@@ -1934,6 +1940,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                         hSnap.setLocalPoint( localPt );
                                                         hSnap.setScreenPoint( scrPt );
                                                         hSnap.setType( hSnap.SNAP_TYPE_ALIGN_MERGED );
+                                                        hSnap.setElement( stage );
+                                                        hSnap.setPlane( [0,0,1,0] );
+                                                        hSnap.setPlaneMatrix( Matrix.I(4) );
                                                         if (vSnap.hasAssociatedScreenPoint() )
                                                                 hSnap.setAssociatedScreenPoint( vSnap.getAssociatedScreenPoint() );
                                                         if (vSnap.hasAssociatedScreenPoint2() )
diff --git a/js/helper-classes/RDGE/GLRectangle.js b/js/helper-classes/RDGE/GLRectangle.js
index bc3b1478..1bb4bcac 100644
--- a/js/helper-classes/RDGE/GLRectangle.js
+++ b/js/helper-classes/RDGE/GLRectangle.js
@@ -279,10 +279,10 @@ function GLRectangle()
                 brRadius = -z*(r-l)/(2.0*zn)*brRadiusNDC;
 
                 // stroke
-//              var strokeMaterial = this.makeStrokeMaterial();
-//              prim = this.createStroke([x,y],  2*xFill,  2*yFill,  strokeSize,  tlRadius, blRadius, brRadius, trRadius, strokeMaterial)
-//        this._primArray.push( prim );
-//              this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
+                var strokeMaterial = this.makeStrokeMaterial();
+                prim = this.createStroke([x,y],  2*xFill,  2*yFill,  strokeSize,  tlRadius, blRadius, brRadius, trRadius, strokeMaterial)
+        this._primArray.push( prim );
+                this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
 
                 // fill
                 tlRadius -= strokeSize;  if (tlRadius < 0)  tlRadius = 0.0;
diff --git a/js/helper-classes/RDGE/GLWorld.js b/js/helper-classes/RDGE/GLWorld.js
index b84bb585..0dc34034 100644
--- a/js/helper-classes/RDGE/GLWorld.js
+++ b/js/helper-classes/RDGE/GLWorld.js
@@ -240,6 +240,7 @@ function GLWorld( canvas, use3D )
                                 if (renderer != aRenderer)  console.log( "***** DIFFERENT RENDERERS *****" );
                                 renderer.disableCulling();
                                 this.myScene.render();
+                                console.log( "render" );
 
                                 if (this._firstRender)
                                 {
@@ -247,15 +248,15 @@ function GLWorld( canvas, use3D )
 
                                         if (!this.hasAnimatedMaterials())
                                         {
-                                                this.myScene.render();
+                                                //this.myScene.render();
                                                 //this._canvas.task.stop();
-                                                this._renderCount = 3;
+                                                this._renderCount = 10;
                                         }
                                 }
                                 else if (this._renderCount >= 0)
                                 {
                                         this._renderCount--;
-                                        if (this._renderCount == 0)
+                                        if (this._renderCount <= 0)
                                                 this._canvas.task.stop();
                                 }
 
@@ -270,6 +271,7 @@ function GLWorld( canvas, use3D )
     this.onRunState = function()
         {
                 console.log( "GLWorld.onRunState" );
+                this.restartRenderLoop();
         }
         
     this.onLoadState = function()
@@ -387,16 +389,13 @@ function GLWorld( canvas, use3D )
         {
                 rdgeStarted = true;
 
-        // TODO - temporary fix for RDGE id's
-        this._canvas.id = this._canvas.uuid;
-
+        this._canvas.rdgeid = this._canvas.uuid;
                 g_Engine.registerCanvas(this._canvas, this);