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

Conflicts:
	js/preloader/Preloader.js

34 files changed, 10721 insertions, 0 deletions

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
new file mode 100755
index 00000000..3d6c6fc4
--- /dev/null
+++ b/js/lib/drawing/world.js
@@ -0,0 +1,917 @@
+/* <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> */
+
+// Useless Global variables.
+// TODO: Remove this as soon as QE test pass
+/*
+var shaderProgramArray = new Array;
+var glContextArray = new Array;
+var vertexShaderSource = "";
+var fragmentShaderSource = "";
+var rdgeStarted = false;
+*/
+
+var nodeCounter = 0;
+
+var GeomObj = require("js/lib/geom/geom-obj").GeomObj;
+var Line = require("js/lib/geom/line").Line;
+var Rectangle = require("js/lib/geom/rectangle").Rectangle;
+var Circle = require("js/lib/geom/circle").Circle;
+var MaterialsModel = require("js/models/materials-model").MaterialsModel;
+
+///////////////////////////////////////////////////////////////////////
+// Class GLWorld
+//      Manages display in a canvas
+///////////////////////////////////////////////////////////////////////
+var World = function GLWorld( canvas, use3D ) {
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
+
+        // flag to do the drawing with WebGL
+    this._useWebGL = false;
+    if(use3D) {
+        this._useWebGL = use3D;
+    }
+
+    this._canvas = canvas;
+        if (this._useWebGL) {
+                this._glContext = canvas.getContext("experimental-webgl");
+    } else {
+                this._2DContext = canvas.getContext( "2d" );
+    }
+    
+        this._viewportWidth = canvas.width;
+    this._viewportHeight = canvas.height;
+
+        // view parameters
+        this._fov = 45.0;
+        this._zNear = 0.1;
+        this._zFar = 100.0;
+        this._viewDist = 5.0;
+
+        // default light parameters
+        this._ambientLightColor  = [0.1, 0.1, 0.1,  1.0];
+        this._diffuseLightColor  = [0.1, 0.1, 0.1,  1.0];
+        this._specularLightColor = [0.6, 0.6, 0.6,  1.0];
+        this._pointLightLoc = [0.0, 0.0, 0.05];
+
+        // default material properties.  Material properties should be overridden
+        // by the materials used by the objects
+        this._materialShininess = 20.0;
+
+    this._geomRoot = undefined;
+
+        this._cameraMat = Matrix.I(4);
+        this._cameraMat[14] = 5.0;
+        this._cameraMatInv = Matrix.I(4);
+        this._cameraMatInv[14] = -5.0;
+
+    this._camera = null;
+        // keep a flag indicating whether a render has been completed.
+        // this allows us to turn off automatic updating if there are
+        // no animated materials
+        this._firstRender = true;
+
+    ///////////////////////////////////////////////////////////////////////
+    // Property accessors
+    ///////////////////////////////////////////////////////////////////////
+    this.getGLContext           = function()            {  return this._glContext;                      };
+    this.setGLContext           = function(gl)          {  this._glContext = gl;                        };
+
+    this.get2DContext           = function()            {  return this._2DContext;                      };
+    this.set2DContext           = function(c)           {  this._2DContext = c;                         };
+
+    this.getCanvas                      = function()            {  return this._canvas;                         };
+    this.setCanvas                      = function(c)           {  this._canvas = c;                            };
+
+    this.getShaderProgram       = function()            {  return this._shaderProgram;          };
+
+        this.getViewportWidth   = function()            {  return this._viewportWidth;          };
+        this.getViewportHeight  = function()            {  return this._viewportHeight;         };
+
+        this.getAspect                  = function()            {  return this._viewportWidth/this._viewportHeight;  };
+
+        this.getGeomRoot                        = function()            {  return this._geomRoot;                       };
+        this.getZNear                           = function()            {  return this._zNear;                          };
+        this.getZFar                            = function()            {  return this._zFar;                           };
+        this.getFOV                                     = function()            {  return this._fov;                            };
+
+        this.getCamera                          = function()            {  return this._camera;                         };
+
+        this.getCameraMat                       = function()            {  return this._cameraMat.slice(0);     };
+        this.setCameraMat                       = function(c)           {  this._cameraMat = c.slice(0);  this._cameraMatInv = glmat4.inverse(c, []);  };
+
+        this.getCameraMatInverse  = function()          {  return this._cameraMatInv.slice(0); };
+
+        this.getViewDistance            = function()            {  return this._viewDist;                       };
+
+        this.getRootNode                        = function()            {  return this._rootNode;                       };
+        this.setRootNode                        = function(r)           {  this._rootNode = r;                          };
+
+        this.isWebGL                            = function()            {  return this._useWebGL;                       };
+
+        this.getRenderer                        = function()            {  return this.renderer;                        };
+
+  ////////////////////////////////////////////////////////////////////////////////////
+  // RDGE
+  // local variables
+    this.myScene = null;
+    this.elapsed = 0;
+    this.light = null;
+    this.light2 = null;
+    this.fillShader = null;
+    this.strokeShader = null;
+    this.renderer = null;
+
+        // keep an array of texture maps that need to be loaded
+        this._texMapsToLoad = [];
+        this._allMapsLoaded = true;
+
+        // this is the node to which objects get hung
+        this._rootNode = null;
+
+        // set up the camera matrix
+        var camMat = Matrix.I(4);
+        camMat[14] = this.getViewDistance();
+        this.setCameraMat( camMat );
+    
+    // post-load processing of the scene
+    this.init = function() {
+                var ctx1 = g_Engine.ctxMan.handleToObject(this._canvas.rdgeCtxHandle),
+                        ctx2 = g_Engine.getContext();
+                if (ctx1 != ctx2)  console.log( "***** different contexts *****" );
+                this.renderer = ctx1.renderer;
+                this.renderer._world = this;
+      
+                // create a camera, set its perspective, and then point it at the origin
+                var cam = new camera();
+                this._camera = cam;
+                cam.setPerspective(this.getFOV(), this.getAspect(), this.getZNear(), this.getZFar());
+                cam.setLookAt([0, 0, this.getViewDistance()], [0, 0, 0], vec3.up());
+        
+                // make this camera the active camera
+                this.renderer.cameraManager().setActiveCamera(cam);
+
+                // change clear color
+                //this.renderer.setClearFlags(g_Engine.getContext().DEPTH_BUFFER_BIT);
+                this.renderer.setClearColor([0.0, 0.0, 0.0, 0.0]);
+                //this.renderer.NinjaWorld = this;
+        
+                // create an empty scene graph
+                this.myScene = new SceneGraph();
+        
+                // create some lights
+                // light 1
+                this.light = createLightNode("myLight");
+                this.light.setPosition([0,0,1.2]);
+                this.light.setDiffuseColor([0.75,0.9,1.0,1.0]);
+        
+                // light 2