diff options
Diffstat (limited to 'js/lib/rdge/materials')
22 files changed, 63 insertions, 63 deletions
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() { | |||
110 | if (world) this.setWorld( world ); | 110 | if (world) this.setWorld( world ); |
111 | 111 | ||
112 | // set up the shader | 112 | // set up the shader |
113 | this._shader = new jshader(); | 113 | this._shader = new RDGE.jshader(); |
114 | this._shader.def = bumpMetalMaterialDef; | 114 | this._shader.def = bumpMetalMaterialDef; |
115 | this._shader.init(); | 115 | this._shader.init(); |
116 | this._shader['default'].u_light0Diff.set( this.getLightDiff() ); | 116 | this._shader['default'].u_light0Diff.set( this.getLightDiff() ); |
117 | 117 | ||
118 | // set up the material node | 118 | // set up the material node |
119 | this._materialNode = createMaterialNode( this.getShaderName() ); | 119 | this._materialNode = RDGE.createMaterialNode(this.getShaderName()); |
120 | this._materialNode.setShader(this._shader); | 120 | this._materialNode.setShader(this._shader); |
121 | 121 | ||
122 | // set some image maps | 122 | // set some image maps |
@@ -131,7 +131,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() { | |||
131 | if (material) | 131 | if (material) |
132 | { | 132 | { |
133 | var technique = material.shaderProgram['default']; | 133 | var technique = material.shaderProgram['default']; |
134 | var renderer = g_Engine.getContext().renderer; | 134 | var renderer = RDGE.globals.engine.getContext().renderer; |
135 | if (renderer && technique) | 135 | if (renderer && technique) |
136 | { | 136 | { |
137 | var texMapName = this._propValues[this._propNames[index]]; | 137 | 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() { | |||
55 | if (world) this.setWorld( world ); | 55 | if (world) this.setWorld( world ); |
56 | 56 | ||
57 | // set up the shader | 57 | // set up the shader |
58 | this._shader = new jshader(); | 58 | this._shader = new RDGE.jshader(); |
59 | this._shader.def = deformMaterialDef; | 59 | this._shader.def = deformMaterialDef; |
60 | this._shader.init(); | 60 | this._shader.init(); |
61 | 61 | ||
62 | // set up the material node | 62 | // set up the material node |
63 | this._materialNode = createMaterialNode("deformMaterial"); | 63 | this._materialNode = RDGE.createMaterialNode("deformMaterial"); |
64 | this._materialNode.setShader(this._shader); | 64 | this._materialNode.setShader(this._shader); |
65 | 65 | ||
66 | this._time = 0; | 66 | 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() { | |||
39 | this.init = function() | 39 | this.init = function() |
40 | { | 40 | { |
41 | // set up the shader | 41 | // set up the shader |
42 | this._shader = new jshader(); | 42 | this._shader = new RDGE.jshader(); |
43 | this._shader.def = flatShaderDef; | 43 | this._shader.def = flatShaderDef; |
44 | this._shader.init(); | 44 | this._shader.init(); |
45 | 45 | ||
@@ -47,7 +47,7 @@ var FlatMaterial = function FlatMaterial() { | |||
47 | this._shader.colorMe.color.set( this.getColor() ); | 47 | this._shader.colorMe.color.set( this.getColor() ); |
48 | 48 | ||
49 | // set up the material node | 49 | // set up the material node |
50 | this._materialNode = createMaterialNode("flatMaterial"); | 50 | this._materialNode = RDGE.createMaterialNode("flatMaterial"); |
51 | this._materialNode.setShader(this._shader); | 51 | this._materialNode.setShader(this._shader); |
52 | }; | 52 | }; |
53 | 53 | ||
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() { | |||
48 | if (world) this.setWorld( world ); | 48 | if (world) this.setWorld( world ); |
49 | 49 | ||
50 | // set up the shader | 50 | // set up the shader |
51 | this._shader = new jshader(); | 51 | this._shader = new RDGE.jshader(); |
52 | this._shader.def = flyMaterialDef; | 52 | this._shader.def = flyMaterialDef; |
53 | this._shader.init(); | 53 | this._shader.init(); |
54 | 54 | ||
55 | // set up the material node | 55 | // set up the material node |
56 | this._materialNode = createMaterialNode("flyMaterial"); | 56 | this._materialNode = RDGE.createMaterialNode("flyMaterial"); |
57 | this._materialNode.setShader(this._shader); | 57 | this._materialNode.setShader(this._shader); |
58 | 58 | ||
59 | this._time = 0; | 59 | 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() { | |||
50 | if (world) this.setWorld( world ); | 50 | if (world) this.setWorld( world ); |
51 | 51 | ||
52 | // set up the shader | 52 | // set up the shader |
53 | this._shader = new jshader(); | 53 | this._shader = new RDGE.jshader(); |
54 | this._shader.def = JuliaMaterialDef; | 54 | this._shader.def = JuliaMaterialDef; |
55 | this._shader.init(); | 55 | this._shader.init(); |
56 | 56 | ||
57 | // set up the material node | 57 | // set up the material node |
58 | this._materialNode = createMaterialNode("juliaMaterial"); | 58 | this._materialNode = RDGE.createMaterialNode("juliaMaterial"); |
59 | this._materialNode.setShader(this._shader); | 59 | this._materialNode.setShader(this._shader); |
60 | 60 | ||
61 | this._time = 0; | 61 | this._time = 0; |
@@ -72,7 +72,7 @@ var JuliaMaterial = function JuliaMaterial() { | |||
72 | var material = this._materialNode; | 72 | var material = this._materialNode; |
73 | if (material) { | 73 | if (material) { |
74 | var technique = material.shaderProgram['default']; | 74 | var technique = material.shaderProgram['default']; |
75 | var renderer = g_Engine.getContext().renderer; | 75 | var renderer = RDGE.globals.engine.getContext().renderer; |
76 | if (renderer && technique) { | 76 | if (renderer && technique) { |
77 | if (this._shader && this._shader['default']) { | 77 | if (this._shader && this._shader['default']) { |
78 | this._shader['default'].u_time.set( [this._time] ); | 78 | 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() { | |||
55 | if (world) this.setWorld( world ); | 55 | if (world) this.setWorld( world ); |
56 | 56 | ||
57 | // set up the shader | 57 | // set up the shader |
58 | this._shader = new jshader(); | 58 | this._shader = new RDGE.jshader(); |
59 | this._shader.def = keleidoscopeMaterialDef; | 59 | this._shader.def = keleidoscopeMaterialDef; |
60 | this._shader.init(); | 60 | this._shader.init(); |
61 | 61 | ||
62 | // set up the material node | 62 | // set up the material node |
63 | this._materialNode = createMaterialNode("keleidoscopeMaterial"); | 63 | this._materialNode = RDGE.createMaterialNode("keleidoscopeMaterial"); |
64 | this._materialNode.setShader(this._shader); | 64 | this._materialNode.setShader(this._shader); |
65 | 65 | ||
66 | this._time = 0; | 66 | this._time = 0; |
@@ -80,7 +80,7 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() { | |||
80 | if (material) | 80 | if (material) |
81 | { | 81 | { |
82 | var technique = material.shaderProgram['default']; | 82 | var technique = material.shaderProgram['default']; |
83 | var renderer = g_Engine.getContext().renderer; | 83 | var renderer = RDGE.globals.engine.getContext().renderer; |
84 | if (renderer && technique) | 84 | if (renderer && technique) |
85 | { | 85 | { |
86 | if (this._shader && this._shader['default']) { | 86 | 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() { | |||
207 | this.setWorld( world ); | 207 | this.setWorld( world ); |
208 | 208 | ||
209 | // set up the shader | 209 | // set up the shader |
210 | this._shader = new jshader(); | 210 | this._shader = new RDGE.jshader(); |
211 | this._shader.def = linearGradientMaterialDef; | 211 | this._shader.def |