diff options
author | hwc487 | 2012-03-30 06:23:53 -0700 |
---|---|---|
committer | hwc487 | 2012-03-30 06:23:53 -0700 |
commit | 947bad893335e1023bcbe177ff8db454c27c4bf8 (patch) | |
tree | 8e4ab2a709e638f21b50f55b6e1842699b46accc /js/lib/rdge/materials/mandel-material.js | |
parent | 2ab7fbef0df37f0c2bb6a4447f03993b9d50b5d0 (diff) | |
download | ninja-947bad893335e1023bcbe177ff8db454c27c4bf8.tar.gz |
converted materials to new texture structure
Diffstat (limited to 'js/lib/rdge/materials/mandel-material.js')
-rw-r--r-- | js/lib/rdge/materials/mandel-material.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js index e7b105e1..4babe239 100644 --- a/js/lib/rdge/materials/mandel-material.js +++ b/js/lib/rdge/materials/mandel-material.js | |||
@@ -5,6 +5,7 @@ | |||
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial; | 7 | var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial; |
8 | var Texture = require("js/lib/rdge/texture").Texture; | ||
8 | 9 | ||
9 | var MandelMaterial = function MandelMaterial() { | 10 | var MandelMaterial = function MandelMaterial() { |
10 | /////////////////////////////////////////////////////////////////////// | 11 | /////////////////////////////////////////////////////////////////////// |
@@ -70,6 +71,10 @@ var MandelMaterial = function MandelMaterial() { | |||
70 | this._shader['default'].u_time.set( [this._time] ); | 71 | this._shader['default'].u_time.set( [this._time] ); |
71 | } | 72 | } |
72 | 73 | ||
74 | // set up the texture | ||
75 | var texMapName = this._propValues[this._propNames[0]]; | ||
76 | this._glTex = new Texture( world, texMapName ); | ||
77 | |||
73 | // set the shader values in the shader | 78 | // set the shader values in the shader |
74 | this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] ); | 79 | this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] ); |
75 | this.update( 0 ); | 80 | this.update( 0 ); |