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/mandel-material.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'js/lib/rdge/materials/mandel-material.js')
diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js
index 07e009a2..c4d5bf6f 100644
--- a/js/lib/rdge/materials/mandel-material.js
+++ b/js/lib/rdge/materials/mandel-material.js
@@ -61,12 +61,12 @@ var MandelMaterial = function MandelMaterial() {
if (world) this.setWorld( world );
// set up the shader
- this._shader = new jshader();
+ this._shader = new RDGE.jshader();
this._shader.def = MandelMaterialDef;
this._shader.init();
// set up the material node
- this._materialNode = createMaterialNode("mandelMaterial");
+ this._materialNode = RDGE.createMaterialNode("mandelMaterial");
this._materialNode.setShader(this._shader);
this._time = 0;
@@ -83,7 +83,7 @@ var MandelMaterial = function MandelMaterial() {
var material = this._materialNode;
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/mandel-material.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/lib/rdge/materials/mandel-material.js')
diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js
index 8ba5f790..a82a4bfc 100644
--- a/js/lib/rdge/materials/mandel-material.js
+++ b/js/lib/rdge/materials/mandel-material.js
@@ -86,7 +86,7 @@ var MandelMaterial = function MandelMaterial() {
this._time = time;
}
}
- }
+ };
};
///////////////////////////////////////////////////////////////////////////////////////
--
cgit v1.2.3