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/bump-metal-material.js | 6 +++--- js/lib/rdge/materials/deform-material.js | 4 ++-- js/lib/rdge/materials/flat-material.js | 4 ++-- js/lib/rdge/materials/fly-material.js | 4 ++-- js/lib/rdge/materials/julia-material.js | 6 +++--- js/lib/rdge/materials/keleidoscope-material.js | 6 +++--- js/lib/rdge/materials/linear-gradient-material.js | 4 ++-- js/lib/rdge/materials/mandel-material.js | 6 +++--- js/lib/rdge/materials/plasma-material.js | 4 ++-- js/lib/rdge/materials/pulse-material.js | 10 +++++----- js/lib/rdge/materials/radial-blur-material.js | 10 +++++----- js/lib/rdge/materials/radial-gradient-material.js | 4 ++-- js/lib/rdge/materials/relief-tunnel-material.js | 4 ++-- js/lib/rdge/materials/square-tunnel-material.js | 4 ++-- js/lib/rdge/materials/star-material.js | 4 ++-- js/lib/rdge/materials/taper-material.js | 4 ++-- js/lib/rdge/materials/tunnel-material.js | 4 ++-- js/lib/rdge/materials/twist-material.js | 6 +++--- js/lib/rdge/materials/twist-vert-material.js | 6 +++--- js/lib/rdge/materials/uber-material.js | 16 ++++++++-------- js/lib/rdge/materials/water-material.js | 4 ++-- js/lib/rdge/materials/z-invert-material.js | 6 +++--- 22 files changed, 63 insertions(+), 63 deletions(-) (limited to 'js/lib/rdge') diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js index 61126952..e0ca8d4a 100755 --- a/js/lib/rdge/materials/bump-metal-material.js +++ b/js/lib/rdge/materials/bump-metal-material.js @@ -110,13 +110,13 @@ var BumpMetalMaterial = function BumpMetalMaterial() { 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() ); + this._materialNode = RDGE.createMaterialNode(this.getShaderName()); this._materialNode.setShader(this._shader); // set some image maps @@ -131,7 +131,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]]; diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js index 1e6af6ac..4c6e06b1 100644 --- a/js/lib/rdge/materials/deform-material.js +++ b/js/lib/rdge/materials/deform-material.js @@ -55,12 +55,12 @@ var DeformMaterial = function DeformMaterial() { if (world) this.setWorld( world ); // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = deformMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode("deformMaterial"); + this._materialNode = RDGE.createMaterialNode("deformMaterial"); this._materialNode.setShader(this._shader); this._time = 0; diff --git a/js/lib/rdge/materials/flat-material.js b/js/lib/rdge/materials/flat-material.js index be8bf2b8..bc612476 100755 --- a/js/lib/rdge/materials/flat-material.js +++ b/js/lib/rdge/materials/flat-material.js @@ -39,7 +39,7 @@ var FlatMaterial = function FlatMaterial() { this.init = function() { // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = flatShaderDef; this._shader.init(); @@ -47,7 +47,7 @@ var FlatMaterial = function FlatMaterial() { this._shader.colorMe.color.set( this.getColor() ); // set up the material node - this._materialNode = createMaterialNode("flatMaterial"); + this._materialNode = RDGE.createMaterialNode("flatMaterial"); this._materialNode.setShader(this._shader); }; 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; diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js index 07536f33..77d9bb3a 100644 --- a/js/lib/rdge/materials/julia-material.js +++ b/js/lib/rdge/materials/julia-material.js @@ -50,12 +50,12 @@ var JuliaMaterial = function JuliaMaterial() { if (world) this.setWorld( world ); // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = JuliaMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode("juliaMaterial"); + this._materialNode = RDGE.createMaterialNode("juliaMaterial"); this._materialNode.setShader(this._shader); this._time = 0; @@ -72,7 +72,7 @@ var JuliaMaterial = function JuliaMaterial() { 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] ); diff --git a/js/lib/rdge/materials/keleidoscope-material.js b/js/lib/rdge/materials/keleidoscope-material.js index 3ef5d613..e1f4841f 100644 --- a/js/lib/rdge/materials/keleidoscope-material.js +++ b/js/lib/rdge/materials/keleidoscope-material.js @@ -55,12 +55,12 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() { if (world) this.setWorld( world ); // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = keleidoscopeMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode("keleidoscopeMaterial"); + this._materialNode = RDGE.createMaterialNode("keleidoscopeMaterial"); this._materialNode.setShader(this._shader); this._time = 0; @@ -80,7 +80,7 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() { 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']) { diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js index 2c52c67d..d9307274 100755 --- a/js/lib/rdge/materials/linear-gradient-material.js +++ b/js/lib/rdge/materials/linear-gradient-material.js @@ -207,12 +207,12 @@ var LinearGradientMaterial = function LinearGradientMaterial() { this.setWorld( world ); // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = linearGradientMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode( this.getShaderName() ); + this._materialNode = RDGE.createMaterialNode(this.getShaderName()); this._materialNode.setShader(this._shader); // send the current values to the shader 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] ); diff --git a/js/lib/rdge/materials/plasma-material.js b/js/lib/rdge/materials/plasma-material.js index 9ecc2b48..d52f4b88 100644 --- a/js/lib/rdge/materials/plasma-material.js +++ b/js/lib/rdge/materials/plasma-material.js @@ -56,7 +56,7 @@ var PlasmaMaterial = function PlasmaMaterial() { this.init = function() { // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = plasmaShaderDef; this._shader.init(); @@ -66,7 +66,7 @@ var PlasmaMaterial = function PlasmaMaterial() { this.setProperty( "color", [this._time, 0, 0, 1] ); // set up the material node - this._materialNode = createMaterialNode("plasmaMaterial"); + this._materialNode = RDGE.createMaterialNode("plasmaMaterial"); this._materialNode.setShader(this._shader); }; diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js index 63cab2f4..89cbaea4 100644 --- a/js/lib/rdge/materials/pulse-material.js +++ b/js/lib/rdge/materials/pulse-material.js @@ -96,12 +96,12 @@ var PulseMaterial = function PulseMaterial() { this._dTime = 0.01; // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = pulseMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode("pulseMaterial"); + this._materialNode = RDGE.createMaterialNode("pulseMaterial"); this._materialNode.setShader(this._shader); this._time = 0; @@ -120,7 +120,7 @@ var PulseMaterial = function PulseMaterial() { 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) { var texMapName = this._propValues[this._propNames[0]]; var wrap = 'REPEAT', mips = true; @@ -151,7 +151,7 @@ var PulseMaterial = function PulseMaterial() { 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] ); @@ -167,7 +167,7 @@ var PulseMaterial = function PulseMaterial() { 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) { technique.u_resolution.set( res ); } diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js index 41e68182..3adb6bb5 100644 --- a/js/lib/rdge/materials/radial-blur-material.js +++ b/js/lib/rdge/materials/radial-blur-material.js @@ -89,12 +89,12 @@ var RadialBlurMaterial = function RadialBlurMaterial() { if (world) this.setWorld( world ); // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = radialBlurMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode("radialBlurMaterial"); + this._materialNode = RDGE.createMaterialNode("radialBlurMaterial"); this._materialNode.setShader(this._shader); this._time = 0; @@ -112,7 +112,7 @@ var RadialBlurMaterial = function RadialBlurMaterial() { 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) { var texMapName = this._propValues[this._propNames[0]]; var tex = renderer.getTextureByName(texMapName, 'REPEAT'); @@ -130,7 +130,7 @@ var RadialBlurMaterial = function RadialBlurMaterial() { 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] ); @@ -150,7 +150,7 @@ var RadialBlurMaterial = function RadialBlurMaterial() { if (material) { var technique = material.shaderProgram['default']; - var renderer = g_Engine.getContext().renderer; + var renderer = RDGE.globals.engine.getContext().renderer; if (renderer && technique) { technique.u_resolution.set( res ); } diff --git a/js/lib/rdge/materials/radial-gradient-material.js b/js/lib/rdge/materials/radial-gradient-material.js index 13be50f5..faac7f1b 100755 --- a/js/lib/rdge/materials/radial-gradient-material.js +++ b/js/lib/rdge/materials/radial-gradient-material.js @@ -195,12 +195,12 @@ var RadialGradientMaterial = function RadialGradientMaterial() { this.init = function() { // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = radialGradientMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode("radialGradientMaterial"); + this._materialNode = RDGE.createMaterialNode("radialGradientMaterial"); this._materialNode.setShader(this._shader); // set the shader values in the shader diff --git a/js/lib/rdge/materials/relief-tunnel-material.js b/js/lib/rdge/materials/relief-tunnel-material.js index 20290895..7bf780fe 100644 --- a/js/lib/rdge/materials/relief-tunnel-material.js +++ b/js/lib/rdge/materials/relief-tunnel-material.js @@ -49,12 +49,12 @@ var ReliefTunnelMaterial = function ReliefTunnelMaterial() { if (world) this.setWorld( world ); // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = reliefTunnelMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode("reliefTunnelMaterial"); + this._materialNode = RDGE.createMaterialNode("reliefTunnelMaterial"); this._materialNode.setShader(this._shader); this._time = 0; diff --git a/js/lib/rdge/materials/square-tunnel-material.js b/js/lib/rdge/materials/square-tunnel-material.js index b5cbff30..23b0db03 100644 --- a/js/lib/rdge/materials/square-tunnel-material.js +++ b/js/lib/rdge/materials/square-tunnel-material.js @@ -50,12 +50,12 @@ var SquareTunnelMaterial = function SquareTunnelMaterial() { if (world) this.setWorld( world ); // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = squareTunnelMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode("squareTunnelMaterial"); + this._materialNode = RDGE.createMaterialNode("squareTunnelMaterial"); this._materialNode.setShader(this._shader); this._time = 0; diff --git a/js/lib/rdge/materials/star-material.js b/js/lib/rdge/materials/star-material.js index 9c0f3172..cec93301 100644 --- a/js/lib/rdge/materials/star-material.js +++ b/js/lib/rdge/materials/star-material.js @@ -50,12 +50,12 @@ var StarMaterial = function StarMaterial() { if (world) this.setWorld( world ); // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = starMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode("starMaterial"); + this._materialNode = RDGE.createMaterialNode("starMaterial"); this._materialNode.setShader(this._shader); this._time = 0; diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js index eeb08aec..7feea79a 100644 --- a/js/lib/rdge/materials/taper-material.js +++ b/js/lib/rdge/materials/taper-material.js @@ -45,7 +45,7 @@ function TaperMaterial() this.init = function() { // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = taperShaderDef; this._shader.init(); @@ -53,7 +53,7 @@ function TaperMaterial() this._shader.colorMe.color.set( this.getColor() ); // set up the material node - this._materialNode = createMaterialNode("taperMaterial"); + this._materialNode = RDGE.createMaterialNode("taperMaterial"); this._materialNode.setShader(this._shader); // initialize the taper properties diff --git a/js/lib/rdge/materials/tunnel-material.js b/js/lib/rdge/materials/tunnel-material.js index fe787d16..53a2d4f2 100644 --- a/js/lib/rdge/materials/tunnel-material.js +++ b/js/lib/rdge/materials/tunnel-material.js @@ -51,12 +51,12 @@ var TunnelMaterial = function TunnelMaterial() { if (world) this.setWorld( world ); // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = tunnelMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode("tunnelMaterial"); + this._materialNode = RDGE.createMaterialNode("tunnelMaterial"); this._materialNode.setShader(this._shader); this._time = 0; 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] ); diff --git a/js/lib/rdge/materials/twist-vert-material.js b/js/lib/rdge/materials/twist-vert-material.js index c2573071..1f7b06b1 100644 --- a/js/lib/rdge/materials/twist-vert-material.js +++ b/js/lib/rdge/materials/twist-vert-material.js @@ -49,7 +49,7 @@ function TwistVertMaterial() this.init = function() { // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = twistVertShaderDef; this._shader.init(); @@ -57,7 +57,7 @@ function TwistVertMaterial() this._shader.twistMe.color.set( this.getColor() ); // set up the material node - this._materialNode = createMaterialNode("twistVertMaterial"); + this._materialNode = RDGE.createMaterialNode("twistVertMaterial"); this._materialNode.setShader(this._shader); // initialize the twist vert properties @@ -189,7 +189,7 @@ function TwistVertMaterial() 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[5]]; diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js index 6bc35d51..e2f86511 100755 --- a/js/lib/rdge/materials/uber-material.js +++ b/js/lib/rdge/materials/uber-material.js @@ -237,7 +237,7 @@ var UberMaterial = function UberMaterial() { var material = this._materialNode; if (material) { var technique = material.shaderProgram.defaultTechnique; - var renderer = g_Engine.getContext().renderer; + var renderer = RDGE.globals.engine.getContext().renderer; if (renderer && technique) { var tex = renderer.getTextureByName(value, caps.environmentMap.wrap); this.registerTexture( tex ); @@ -265,7 +265,7 @@ var UberMaterial = function UberMaterial() { var material = this._materialNode; if (material) { var technique = material.shaderProgram.defaultTechnique; - var renderer = g_Engine.getContext().renderer; + var renderer = RDGE.globals.engine.getContext().renderer; if (renderer && technique) { var tex = renderer.getTextureByName(value, caps.diffuseMap.wrap); this.registerTexture( tex ); @@ -293,7 +293,7 @@ var UberMaterial = function UberMaterial() { var material = this._materialNode; if (material) { var technique = material.shaderProgram.defaultTechnique; - var renderer = g_Engine.getContext().renderer; + var renderer = RDGE.globals.engine.getContext().renderer; if (renderer && technique) { var tex = renderer.getTextureByName(value, caps.specularMap.wrap); this.registerTexture( tex ); @@ -321,7 +321,7 @@ var UberMaterial = function UberMaterial() { var material = this._materialNode; if (material) { var technique = material.shaderProgram.defaultTechnique; - var renderer = g_Engine.getContext().renderer; + var renderer = RDGE.globals.engine.getContext().renderer; if (renderer && technique) { var tex = renderer.getTextureByName(value, caps.normalMap.wrap); this.registerTexture( tex ); @@ -363,7 +363,7 @@ var UberMaterial = function UberMaterial() { this._shader = this.buildUberShader( this._ubershaderCaps ); // set up the material node - this._materialNode = createMaterialNode("uberMaterial"); + this._materialNode = RDGE.createMaterialNode("uberMaterial"); this._materialNode.setShader(this._shader); }; @@ -450,7 +450,7 @@ var UberMaterial = function UberMaterial() { var fshader = preproc + uberFShader; // build output jshader - var uberJShader = new jshader(); + var uberJShader = new RDGE.jshader(); uberJShader.def = { 'shaders': { 'defaultVShader': vshader, @@ -517,9 +517,9 @@ var UberMaterial = function UberMaterial() { } } } - technique.u_uvMatrix.set(caps.uvTransform || mat4.identity()); + technique.u_uvMatrix.set(caps.uvTransform || RDGE.mat4.identity()); - var renderer = g_Engine.getContext().renderer; + var renderer = RDGE.globals.engine.getContext().renderer; if(this._useDiffuseMap) { var tex = renderer.getTextureByName(caps.diffuseMap.texture, caps.diffuseMap.wrap, caps.diffuseMap.mips); this.registerTexture( tex ); diff --git a/js/lib/rdge/materials/water-material.js b/js/lib/rdge/materials/water-material.js index 92b96b18..0c7badf5 100644 --- a/js/lib/rdge/materials/water-material.js +++ b/js/lib/rdge/materials/water-material.js @@ -52,12 +52,12 @@ var WaterMaterial = function WaterMaterial() { if (world) this.setWorld( world ); // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = waterMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode("waterMaterial"); + this._materialNode = RDGE.createMaterialNode("waterMaterial"); this._materialNode.setShader(this._shader); this._time = 0; diff --git a/js/lib/rdge/materials/z-invert-material.js b/js/lib/rdge/materials/z-invert-material.js index 051b724f..fff01a15 100644 --- a/js/lib/rdge/materials/z-invert-material.js +++ b/js/lib/rdge/materials/z-invert-material.js @@ -29,7 +29,7 @@ var ZInvertMaterial = function ZInvertMaterial() { /////////////////////////////////////////////////////////////////////// // Methods /////////////////////////////////////////////////////////////////////// - // duplcate method requirde + // duplicate method required this.dup = function( world ) { // allocate a new uber material var newMat = new ZInvertMaterial(); @@ -50,12 +50,12 @@ var ZInvertMaterial = function ZInvertMaterial() { if (world) this.setWorld( world ); // set up the shader - this._shader = new jshader(); + this._shader = new RDGE.jshader(); this._shader.def = zInvertMaterialDef; this._shader.init(); // set up the material node - this._materialNode = createMaterialNode("zInvertMaterial"); + this._materialNode = RDGE.createMaterialNode("zInvertMaterial"); this._materialNode.setShader(this._shader); this._time = 0; -- cgit v1.2.3