From fb0a659c9ca3479fd6799325498b11f074689936 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Mon, 2 Apr 2012 14:57:31 -0700
Subject: -Namespaced all RDGE javascript.

-Removed the following unused files from the build script
	/core/script/fx/blur.js
	/core/script/fx/ssao.js
	/core/script/animation.js
- Fully removed the following from the build and from source control as they are unused or no longer needed
	/core/script/util/dbgpanel.js
	/core/script/util/fpsTracker.js
	/core/script/util/statTracker.js
	/core/script/input.js
	/core/script/TextureManager.js
	/core/script/ubershader.js
---
 js/lib/rdge/materials/twist-material.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'js/lib/rdge/materials/twist-material.js')

diff --git a/js/lib/rdge/materials/twist-material.js b/js/lib/rdge/materials/twist-material.js
index eb562e99..8648d60b 100644
--- a/js/lib/rdge/materials/twist-material.js
+++ b/js/lib/rdge/materials/twist-material.js
@@ -51,12 +51,12 @@ var TwistMaterial = function TwistMaterial() {
 		if (world)  this.setWorld( world );
 
 		// set up the shader
-		this._shader = new jshader();
+		this._shader = new RDGE.jshader();
 		this._shader.def = twistMaterialDef;
 		this._shader.init();
 
 		// set up the material node
-		this._materialNode = createMaterialNode("twistMaterial");
+		this._materialNode = RDGE.createMaterialNode("twistMaterial");
 		this._materialNode.setShader(this._shader);
 
 		this._time = 0;
@@ -75,7 +75,7 @@ var TwistMaterial = function TwistMaterial() {
 		if (material)
 		{
 			var technique = material.shaderProgram['default'];
-			var renderer = g_Engine.getContext().renderer;
+			var renderer = RDGE.globals.engine.getContext().renderer;
 			if (renderer && technique) {
 				if (this._shader && this._shader['default'])
 					this._shader['default'].u_time.set( [this._time] );
-- 
cgit v1.2.3


From 8d1cc709340da845d76f84220fe92c11e6217ff3 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Tue, 3 Apr 2012 09:36:14 -0700
Subject: Made use of semicolons consistent and updated new files to use the
 new RDGE namespace

---
 js/lib/rdge/materials/twist-material.js | 161 ++++++++++++++++----------------
 1 file changed, 80 insertions(+), 81 deletions(-)

(limited to 'js/lib/rdge/materials/twist-material.js')

diff --git a/js/lib/rdge/materials/twist-material.js b/js/lib/rdge/materials/twist-material.js
index 445a81da..7fcca081 100644
--- a/js/lib/rdge/materials/twist-material.js
+++ b/js/lib/rdge/materials/twist-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 PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
@@ -12,116 +12,115 @@ var TwistMaterial = function TwistMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-	this._name = "TwistMaterial";
-	this._shaderName = "twist";
+    this._name = "TwistMaterial";
+    this._shaderName = "twist";
 
-	this._texMap = 'assets/images/rocky-normal.jpg';
+    this._texMap = 'assets/images/rocky-normal.jpg';
 
-	this._time = 0.0;
-	this._dTime = 0.01;
+    this._time = 0.0;
+    this._dTime = 0.01;
 
     ///////////////////////////////////////////////////////////////////////
     // Properties
     ///////////////////////////////////////////////////////////////////////
-	// all defined in parent PulseMaterial.js
-	// load the local default value
-	this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
+    // all defined in parent PulseMaterial.js
+    // load the local default value
+    this._propValues[this._propNames[0]] = this._texMap.slice(0);
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-	// duplcate method requirde
-	this.dup = function( world ) {
-		// allocate a new uber material
-		var newMat = new TwistMaterial();
-
-		// copy over the current values;
-		var propNames = [],  propValues = [],  propTypes = [],  propLabels = [];
-		this.getAllProperties( propNames,  propValues,  propTypes,  propLabels);
-		var n = propNames.length;
-		for (var i=0;  i<n;  i++) {
-			newMat.setProperty( propNames[i], propValues[i] );
+    // duplcate method requirde
+    this.dup = function (world) {
+        // allocate a new uber material
+        var newMat = new TwistMaterial();
+
+        // copy over the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        var n = propNames.length;
+        for (var i = 0; i < n; i++) {
+            newMat.setProperty(propNames[i], propValues[i]);
         }
 
-		return newMat;
-	};
+        return newMat;
+    };
 
-	this.init = function( world ) {
-		// save the world
-		if (world)  this.setWorld( world );
+    this.init = function (world) {
+        // save the world
+        if (world) this.setWorld(world);
 
-		// set up the shader
-		this._shader = new RDGE.jshader();
-		this._shader.def = twistMaterialDef;
-		this._shader.init();
+        // set up the shader
+        this._shader = new RDGE.jshader();
+        this._shader.def = twistMaterialDef;
+        this._shader.init();
 
-		// set up the material node
-		this._materialNode = RDGE.createMaterialNode("twistMaterial" + "_" + world.generateUniqueNodeID());
-		this._materialNode.setShader(this._shader);
+        // set up the material node
+        this._materialNode = RDGE.createMaterialNode("twistMaterial" + "_" + world.generateUniqueNodeID());
+        this._materialNode.setShader(this._shader);
 
-		this._time = 0;
-		if (this._shader && this._shader['default']) {
-			this._shader['default'].u_time.set( [this._time] );
+        this._time = 0;
+        if (this._shader && this._shader['default']) {
+            this._shader['default'].u_time.set([this._time]);
         }
 
-		// set the shader values in the shader
-		this.updateTexture();
-		this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
-		this.update( 0 );
-	};
-
-	this.update = function( time ) {
-		var material = this._materialNode;
-		if (material)
-		{
-			var technique = material.shaderProgram['default'];
-			var renderer = RDGE.globals.engine.getContext().renderer;
-			if (renderer && technique) {
-				if (this._shader && this._shader['default'])
-					this._shader['default'].u_time.set( [this._time] );
-				this._time = time;
-			}
-		}
-	}
-}
+        // set the shader values in the shader
+        this.updateTexture();
+        this.setResolution([world.getViewportWidth(), world.getViewportHeight()]);
+        this.update(0);
+    };
+
+    this.update = function (time) {
+        var material = this._materialNode;
+        if (material) {
+            var technique = material.shaderProgram['default'];
+            var renderer = RDGE.globals.engine.getContext().renderer;
+            if (renderer && technique) {
+                if (this._shader && this._shader['default'])
+                    this._shader['default'].u_time.set([this._time]);
+                this._time = time;
+            }
+        }
+    };
+};
 
 ///////////////////////////////////////////////////////////////////////////////////////
 // RDGE shader
- 
+
 // shader spec (can also be loaded from a .JSON file, or constructed at runtime)
 var twistMaterialDef =
-{'shaders': 
+{ 'shaders':
 	{
-		'defaultVShader':"assets/shaders/Basic.vert.glsl",
-		'defaultFShader':"assets/shaders/Twist.frag.glsl"
+	    'defaultVShader': "assets/shaders/Basic.vert.glsl",
+	    'defaultFShader': "assets/shaders/Twist.frag.glsl"
 	},
-	'techniques':
-	{ 
-		'default':
+    'techniques':
+	{
+	    'default':
 		[
 			{
-				'vshader' : 'defaultVShader',
-				'fshader' : 'defaultFShader',
-				// attributes
-				'attributes' :
+			    'vshader': 'defaultVShader',
+			    'fshader': 'defaultFShader',
+			    // attributes
+			    'attributes':
 				{
-					'vert'  :   { 'type' : 'vec3' },
-					'normal' :  { 'type' : 'vec3' },
-					'texcoord'  :   { 'type' : 'vec2' }
+				    'vert': { 'type': 'vec3' },
+				    'normal': { 'type': 'vec3' },
+				    'texcoord': { 'type': 'vec2' }
 				},
-				// parameters
-				'params' : 
+			    // parameters
+			    'params':
 				{
-					'u_tex0': { 'type' : 'tex2d' },
-					'u_time' : { 'type' : 'float' },
-					'u_resolution'  :   { 'type' : 'vec2' }
+				    'u_tex0': { 'type': 'tex2d' },
+				    'u_time': { 'type': 'float' },
+				    'u_resolution': { 'type': 'vec2' }
 				},
 
-				// render states
-				'states' : 
+			    // render states
+			    'states':
 				{
-					'depthEnable' : true,
-					'offset':[1.0, 0.1]
+				    'depthEnable': true,
+				    'offset': [1.0, 0.1]
 				}
 			}
 		]
-- 
cgit v1.2.3