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/fly-material.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/lib/rdge/materials/fly-material.js') diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js index 8eadb3ab..09dae536 100644 --- a/js/lib/rdge/materials/fly-material.js +++ b/js/lib/rdge/materials/fly-material.js @@ -48,12 +48,12 @@ var FlyMaterial = function FlyMaterial() { if (world) this.setWorld( world ); // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = flyMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode("flyMaterial"); + this._materialNode = RDGE.createMaterialNode("flyMaterial"); this._materialNode.setShader(this._shader); this._time = 0; -- 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/fly-material.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'js/lib/rdge/materials/fly-material.js') diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js index a28fcaee..37bef66a 100644 --- a/js/lib/rdge/materials/fly-material.js +++ b/js/lib/rdge/materials/fly-material.js @@ -65,7 +65,7 @@ var FlyMaterial = function FlyMaterial() { this.updateTexture(); this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] ); this.update( 0 ); - } + }; }; /////////////////////////////////////////////////////////////////////////////////////// @@ -73,7 +73,8 @@ var FlyMaterial = function FlyMaterial() { // shader spec (can also be loaded from a .JSON file, or constructed at runtime) var flyMaterialDef = -{'shaders': +{ + 'shaders': { 'defaultVShader':"assets/shaders/Basic.vert.glsl", 'defaultFShader':"assets/shaders/Fly.frag.glsl" -- cgit v1.2.3