Merge branch 'refs/heads/master' into components

25 files changed, 2443 insertions, 3168 deletions

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 2ef83227..27d5793c 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -107,16 +107,18 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
         this.init = function( world )
         {
                 // save the world
-                if (world)  this.setWorld( world );
+                if (world) {
+                     this.setWorld( world );
+                }
 
                 // set up the shader
-                this._shader = new jshader();
+                this._shader = new RDGE.jshader();
                 this._shader.def = bumpMetalMaterialDef;
                 this._shader.init();
                 this._shader['default'].u_light0Diff.set( this.getLightDiff() );
 
                 // set up the material node
-                this._materialNode = createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
+                this._materialNode = RDGE.createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
                 this._materialNode.setShader(this._shader);
 
                 // set some image maps
@@ -131,7 +133,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                 if (material)
                 {
                         var technique = material.shaderProgram['default'];
-                        var renderer = g_Engine.getContext().renderer;
+                        var renderer = RDGE.globals.engine.getContext().renderer;
                         if (renderer && technique)
                         {
                                 var texMapName = this._propValues[this._propNames[index]];
@@ -191,60 +193,6 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                 
                 return;
         };
-
-        this.export = function()
-        {
-                // every material needs the base type and instance name
-                var exportStr = "material: " + this.getShaderName() + "\n";
-                exportStr += "name: " + this.getName() + "\n";
-
-                var world = this.getWorld();
-                if (!world)
-                        throw new Error( "no world in material.export, " + this.getName() );
-
-                exportStr += "lightDiff: "                      + this.getLightDiff()           + "\n";
-                exportStr += "diffuseTexture: "         + this.getDiffuseTexture()      + "\n";
-                exportStr += "specularTexture: "        + this.getSpecularTexture()     + "\n";
-                exportStr += "normalMap: "                      + this.getNormalTexture()       + "\n";
-
-                // every material needs to terminate like this
-                exportStr += "endMaterial\n";
-
-                return exportStr;
-        };
-
-        this.import = function( importStr )
-        {
-                var pu = new MaterialParser( importStr );
-                var material = pu.nextValue( "material: " );
-                if (material != this.getShaderName())  throw new Error( "ill-formed material" );
-                this.setName(  pu.nextValue( "name: ") );
-
-                var rtnStr;
-                try
-                {
-                        var lightDiff  = eval( "[" + pu.nextValue( "lightDiff: " ) + "]" ),
-                                dt = pu.nextValue( "diffuseTexture: " ),
-                                st = pu.nextValue( "specularTexture: " ),
-                                nt = pu.nextValue( "normalMap: " );
-                
-                        this.setProperty( "lightDiff",  lightDiff);
-                        this.setProperty( "diffuseTexture", dt );
-                        this.setProperty( "specularTexture", st );
-                        this.setProperty( "normalMap", nt );
-
-                        var endKey = "endMaterial\n";
-                        var index = importStr.indexOf( endKey );
-                        index += endKey.length;
-                        rtnStr = importStr.substr( index );
-                }
-                catch (e)
-                {
-                        throw new Error( "could not import material: " + importStr );
-                }
-                
-                return rtnStr;
-        };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/cloud-material.js b/js/lib/rdge/materials/cloud-material.js
index 85088f91..bde42ac3 100644
--- a/js/lib/rdge/materials/cloud-material.js
+++ b/js/lib/rdge/materials/cloud-material.js
@@ -1,8 +1,8 @@
 /* <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> */
+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> */
 
 var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
@@ -14,275 +14,222 @@ var CloudMaterial = function CloudMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-        this._name = "CloudMaterial";
-        this._shaderName = "cloud";
+    this._name = "CloudMaterial";
+    this._shaderName = "cloud";
 
-        this._texMap = 'assets/images/cloud2.jpg';
-        this._diffuseColor = [0.5, 0.5, 0.5, 0.5];
+    this._texMap = 'assets/images/cloud2.jpg';
+    this._diffuseColor = [0.5, 0.5, 0.5, 0.5];
 
-        this._time = 0.0;
-        this._dTime = 0.01;
+    this._time = 0.0;
+    this._dTime = 0.01;
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this.getName            = function()    { return this._name;                    };
-        this.getShaderName      = function()    {  return this._shaderName;             };
+    this.getName = function () { return this._name; };
+    this.getShaderName = function () { return this._shaderName; };
 
-        this.getTextureMap                      = function()            {  return this._propValues[this._propNames[0]] ? this._propValues[this._propNames[0]].slice() : null    };
-        this.setTextureMap                      = function(m)           {  this._propValues[this._propNames[0]] = m ? m.slice(0) : null;  this.updateTexture();         };
+    this.getTextureMap = function () { return this._propValues[this._propNames[0]] ? this._propValues[this._propNames[0]].slice() : null };
+    this.setTextureMap = function (m) { this._propValues[this._propNames[0]] = m ? m.slice(0) : null; this.updateTexture(); };
 
-        this.setDiffuseColor            = function(c)           {  this._propValues[this._propNames[1]] = c.slice(0);  this.updateColor();      };
-        this.getDiffuseColor            = function()            {  return this._propValues[this._propNames[1]] ? this._propValues[this._propNames[1]].slice() : null;   };
+    this.setDiffuseColor = function (c) { this._propValues[this._propNames[1]] = c.slice(0); this.updateColor(); };
+    this.getDiffuseColor = function () { return this._propValues[this._propNames[1]] ? this._propValues[this._propNames[1]].slice() : null; };
 
-        this.isAnimated                 = function()                    {  return true;                                 };
+    this.isAnimated = function () { return true; };
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this._propNames                 = ["texmap",            "diffusecolor"];
-        this._propLabels                = ["Texture map",       "Diffuse Color"];
-        this._propTypes                 = ["file",                      "color"];
+    this._propNames = ["texmap", "diffusecolor"];
+    this._propLabels = ["Texture map", "Diffuse Color"];
+    this._propTypes = ["file", "color"];