Squashed commit of the following:

commit ce81a3f4387d80f9ac406e73b843fb5dbe9cf432
Merge: e78f431 fba39db
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Thu Feb 9 11:57:35 2012 -0800

    Merge pull request #26 from pushkarjoshi/pentool

    Pentool

commit e78f4312c194d9e8188075cf1fe87e4be22b24e4
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Thu Feb 9 11:56:40 2012 -0800

    adding oneway to the 3d bindings to fix a bug where the stage was getting selected.

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit fba39dbb3bd64eddf6162fbf57232089e446fb06
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Thu Feb 9 10:50:05 2012 -0800

    removing shaders

commit fa700027b541ec8f37c55f4fe17da5f78759ebd5
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Wed Feb 8 16:06:37 2012 -0800

    fill all paths even if they are open

commit 18243deb66ab14a014756bfb0be1a52648c7771a
Merge: 802e92e 0537f8f
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Wed Feb 8 15:42:40 2012 -0800

    Merge branch 'master' into pentool

    Conflicts:
    	js/helper-classes/RDGE/GLWorld.js
    	js/helper-classes/RDGE/MaterialsLibrary.js

commit 802e92eb70b00849dadacf2c6590d27edbe65d99
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Wed Feb 8 15:39:47 2012 -0800

    bug fixes for better anchor point rotation and removing snapping on hover and mouse down

commit 9b6b228524f14bf65ba60aaf3d0993c8ec5bff2d
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Tue Feb 7 15:22:11 2012 -0800

    some minor bug fixes and code cleanup

commit 4bbe42e6d01fd0f81d13357a75b40eae9925dda3
Merge: e7aa17a 8950b34
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Tue Feb 7 07:21:27 2012 -0800

    Merge branch 'master' into pentool

commit e7aa17a9b472640355e95c54841399f6203050d4
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Tue Feb 7 07:20:28 2012 -0800

    don't use colorToHex function because it only works for 3D color (needs a fix to colorToHex)

commit acc500d1f1c76f4e7c93ae1cfea8d925ca95e7b9
Merge: 4d4de64 4222db9
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Thu Feb 2 11:28:45 2012 -0800

    Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentool

commit 4d4de64472603426a73b26cc98ba8206190949b8
Merge: 0e87c02 5233508
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Thu Feb 2 11:19:30 2012 -0800

    Merge branch 'master' into pentool

commit 4222db97e353fb65fab787ba5927d16d9fa4e1f7
Author: hwc487 <hwc487@motorola.com>
Date:   Wed Feb 1 16:18:26 2012 -0800

    Removed a console log and set the Plasma material to animating.

commit 30bc466a0ac80f8303e223c19704b90457293cdc
Author: hwc487 <hwc487@motorola.com>
Date:   Wed Feb 1 15:57:20 2012 -0800

    Fixed plane orientations for view orientations other than front.

commit 11db5a63bda57c630eaf1d8baded9b79ca7ac1f2
Author: hwc487 <hwc487@motorola.com>
Date:   Wed Feb 1 15:11:21 2012 -0800

    listen for the appMouseUp event in the Pan tool

commit 823945a2bcb42bbf9c6a1cd0ef723b8f415e557f
Author: hwc487 <hwc487@motorola.com>
Date:   Wed Feb 1 14:39:46 2012 -0800

    factor in the zoom factor when drawing the stage compass.

commit 0e87c02e74e08c7bf156373b0d2459563e17ecd6
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Wed Feb 1 14:38:15 2012 -0800

    make GLAnchorPoint functions as part of its prototype

commit 5a288b9d3f8e6690149978d9d0e7bea98cc81312
Author: hwc487 <hwc487@motorola.com>
Date:   Wed Feb 1 14:09:24 2012 -0800

    Fix for a marquee zoom bug.

commit 715f95cacead0025a57823e4cefa22e618f15df0
Author: hwc487 <hwc487@motorola.com>
Date:   Wed Feb 1 14:00:06 2012 -0800

    mouse wheel for zoom tool

commit 62d38a080b2918a0284c854e9bf882bfeeea1e0b
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Wed Feb 1 13:21:11 2012 -0800

    avoid overriding GlGeomObj translate method

commit 799369e153baf92eb10f26e91a1ab664900da8ed
Merge: b2ce8b8 c0f4374
Author: hwc487 <hwc487@motorola.com>
Date:   Wed Feb 1 13:06:17 2012 -0800

    Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working

commit b2ce8b819cc85a558d862c04965b7e65a6ce8640
Author: hwc487 <hwc487@motorola.com>
Date:   Wed Feb 1 13:05:32 2012 -0800

    changes to allow minimal rendering ofnon-animated materials.

commit ada488781ff815a827e7f5903f2c55773e3be0f3
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Wed Feb 1 12:16:11 2012 -0800

    when selecting anchor points, first check if the selected anchor position is close enough

commit 107f79288ed87a282dd52075640297cc02bdf318
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Wed Feb 1 12:00:44 2012 -0800

    performance improvement: add most of the GLSubpath functions to its prototype

commit c00d5d3072e487be200559f692ce4399222d5fa5
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Tue Jan 31 14:25:05 2012 -0800

    handle the case of proper redraw when the alt key is held down even after mouse up

commit c006b3e75d5e23da63687a04cd30bf56a3a8a80d
Merge: f0e3fa6 1d8af9f
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Tue Jan 31 12:07:43 2012 -0800

    Merge branch 'master' into pentool

commit f0e3fa691b3c042c9fc49a7a0cde8ddf8100c195
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Tue Jan 31 12:05:15 2012 -0800

    display the anchor point to be selected on mouse hover

commit aa1b4b78d9e1b9cc15529dbf7196b7ac8a88e260
Merge: 0b8d8b2 6066b9b
Author: hwc487 <hwc487@motorola.com>
Date:   Tue Jan 31 10:46:48 2012 -0800

    Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working

    Conflicts:
    	js/stage/stage.reel/stage.js

commit 0b8d8b2eb595b64ef53440b949f3c5ec891daf8a
Merge: 8e43a46 e4837ed
Author: hwc487 <hwc487@motorola.com>
Date:   Tue Jan 31 09:22:56 2012 -0800

    Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into working

commit 8e43a46e3d79323fe06dc7771bc611a2c3c85c5c
Author: hwc487 <hwc487@motorola.com>
Date:   Mon Jan 30 16:15:12 2012 -0800

    Renderer startup handling of non-animated materials.

    Changed zoom from the document bar to keep the location center of the viewable portion of the document fixed.

commit c41d2c2b749b67921f243fb7594ce0cdb1ccce36
Merge: 86a801c f129a23
Author: hwc487 <hwc487@motorola.com>
Date:   Mon Jan 30 16:09:00 2012 -0800

    Merge branch 'staging' of github.com:Motorola-Mobility/ninja-internal into working

commit 972e0ce4df7b332601ad006ca8b7dd9e189a59ef
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Mon Jan 30 14:38:48 2012 -0800

    do the fill before the stroke for the path, so the stroke width renders acc. to user specification

commit da7ad067b146200847b543faf288844221dff928
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Mon Jan 30 14:30:31 2012 -0800

    missed a couple of pen tool property files on last checkin

commit 76abbaafb0d90bb1dc9c63a5a5a78ab95bb00420
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Mon Jan 30 13:56:33 2012 -0800

    Merge pushkar branch on gerritt with github version

commit 86a801c057fc3b0580d6130be5740c2ee503444f
Author: hwc487 <hwc487@motorola.com>
Date:   Fri Jan 27 15:52:36 2012 -0800

    updated from old repo

Signed-off-by: Jonathan Duran <jduran@motorola.com>

6 files changed, 39 insertions, 18 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/engine.js b/js/helper-classes/RDGE/src/core/script/engine.js
index 6fe964c7..5bc9305c 100644
--- a/js/helper-classes/RDGE/src/core/script/engine.js
+++ b/js/helper-classes/RDGE/src/core/script/engine.js
@@ -377,13 +377,13 @@ Engine.prototype.getRDGEPanel=function(panelID)
         return panelObjectManager.handleToObject(panelID);

 }

 

-Engine.prototype.registerCanvas = function(canvas, runState) {
-    if (canvas && this.getContext(canvas.id))
-            return;
- 
+Engine.prototype.registerCanvas = function(canvas, runState) {

+    if (canvas && this.getContext(canvas.rdgeid))

+            return;

+ 

     canvas.renderer = new _renderer(canvas);    // create the renderer for the context

-    this.canvasToRendererMap[canvas.id] = canvas; // store the canvas in the context map

-    canvas.renderer.id = canvas.id;

+    this.canvasToRendererMap[canvas.rdgeid] = canvas; // store the canvas in the context map

+    canvas.renderer.id = canvas.rdgeid;

 

     // configure the state manager for this context

     var stateMan = new stateManager();

@@ -391,11 +391,11 @@ Engine.prototype.registerCanvas = function(canvas, runState) {
     // add this context to the contextManager and attach the handle to DOM canvas for user retrieval

     var context = new contextDef();

 

-    context.id = canvas.id;

+    context.id = canvas.rdgeid;

     context.renderer = canvas.renderer;

     context.ctxStateManager = stateMan;

     context.startUpState;

-    context.fpsTracker = new fpsTracker(canvas.id);

+    context.fpsTracker = new fpsTracker(canvas.rdgeid);

 

     context.renderer.mvMatrix = mat4.identity();

     context.renderer.invMvMatrix = mat4.identity();

@@ -471,7 +471,7 @@ Engine.prototype.registerCanvas = function(canvas, runState) {
 }

 

 Engine.prototype.unregisterCanvas = function(canvas) {

-    stat.closePage(canvas.id + "_fps");

+    stat.closePage(canvas.rdgeid + "_fps");

     contextManager.removeObject(canvas.rdgeCtxHandle);

 

 }

diff --git a/js/helper-classes/RDGE/src/core/script/init_state.js b/js/helper-classes/RDGE/src/core/script/init_state.js
index 8c69d218..4b97a4f4 100644
--- a/js/helper-classes/RDGE/src/core/script/init_state.js
+++ b/js/helper-classes/RDGE/src/core/script/init_state.js
@@ -42,11 +42,16 @@ LoadState.prototype.Init = function()
         if(this.sceneName)

         {

                 this.loadScene("assets_web/mesh/" + this.sceneName + ".json", this.sceneName);

-        }

+        }
+
+        if (this.hasUserState && this.userRunState && this.userRunState.onLoadState)
+                this.userRunState.onLoadState();
 }

 

 LoadState.prototype.ReInit = function() 

 {

+        if (this.hasUserState && this.userRunState && this.userRunState.onLoadState)
+                this.userRunState.onLoadState();
 }

 

 LoadState.prototype.Resize = function() 

diff --git a/js/helper-classes/RDGE/src/core/script/jshader.js b/js/helper-classes/RDGE/src/core/script/jshader.js
index f28219cf..36c5939e 100644
--- a/js/helper-classes/RDGE/src/core/script/jshader.js
+++ b/js/helper-classes/RDGE/src/core/script/jshader.js
@@ -173,7 +173,7 @@ jshader = function(addr) {
 

         // if the parameter does not exist in the shader cull it from the pass

         if (this.loc == null) {

-            window.console.log("ctx:" + ctx.canvas.id + ", technique: " + technique + ", uniform: " + name + " was not found, jshader param will have no affect");

+            window.console.log("ctx:" + ctx.canvas.rdgeid + ", technique: " + technique + ", uniform: " + name + " was not found, jshader param will have no affect");

             //return;

         }

 

@@ -308,7 +308,7 @@ jshader = function(addr) {
                     }

                 }

 

-                program.ctxId = this.ctx.canvas.id;

+                program.ctxId = this.ctx.canvas.rdgeid;

                 if (!program) {

                     this.renderer.console.log("Build errors found in technique: " + t);

                     this.def[t] = null; // remove bad technique

@@ -322,7 +322,7 @@ jshader = function(addr) {
                     var gp = new globalParam(this.ctx, p, rdgeGlobalParameters[p], program);

 

                     if (gp.loc != null) {

-                        gp.loc.ctxID = this.ctx.canvas.id;

+                        gp.loc.ctxID = this.ctx.canvas.rdgeid;

                         this[t].passes[i].defParams[p] = gp;

                         this.global[p] = gp;

                     }

diff --git a/js/helper-classes/RDGE/src/core/script/renderer.js b/js/helper-classes/RDGE/src/core/script/renderer.js
index 0c51d2cb..517947df 100644
--- a/js/helper-classes/RDGE/src/core/script/renderer.js
+++ b/js/helper-classes/RDGE/src/core/script/renderer.js
@@ -335,14 +335,19 @@ _renderer = function(canvas) {
 

         var tex = this.textureMap[name];

 

-        if (tex === undefined) {

-

-

+        if (tex === undefined)

+                {

             // load the texture

             tex = this.createTexture(name + ext, wrap, mips);

             this.textureMap[name] = tex;

             tex.lookUpName = name;

+                        tex.previouslyReferenced = false;

         }

+                else

+                {

+                        //console.log( "texture already loaded: " + name );

+                        tex.previouslyReferenced = true;

+                }

 

         return tex;

 

@@ -364,6 +369,7 @@ _renderer = function(canvas) {
             mips = true;

 

         if (texture) {

+                        //console.log( "createTexture: " + url );

             texture.image = new Image();

             texture.image.src = url;

             texture.image.context = g_Engine.getContext();

@@ -371,6 +377,8 @@ _renderer = function(canvas) {
             texture.image.onload = function() {

                 var stateMan = this.context.ctxStateManager;

                 stateMan.RDGEInitState.loadTexture(texture);

+                                //console.log( "loaded texture: " + texture.lookUpName );

+                                if (texture.callback)  texture.callback( texture );

             };

         }

         return texture;

diff --git a/js/helper-classes/RDGE/src/core/script/run_state.js b/js/helper-classes/RDGE/src/core/script/run_state.js
index ad56d9ea..acdb6797 100644
--- a/js/helper-classes/RDGE/src/core/script/run_state.js
+++ b/js/helper-classes/RDGE/src/core/script/run_state.js
@@ -30,6 +30,9 @@ RunState.prototype.Init = function()
                 this.userRunState.init();

         }

 

+        if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
+                this.userRunState.onRunState();