diff options
author | Nivesh Rajbhandari | 2012-04-16 16:06:24 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-16 16:06:24 -0700 |
commit | c253192a08b499ea7be46fa5438d273e51f7ec5a (patch) | |
tree | 18a1f0e3679c0eb993a9dedb537035d3861f49ac /js/lib/rdge/materials/material.js | |
parent | e19376c54eedd1f1c457ba405b2f110be376a559 (diff) | |
parent | 4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff) | |
download | ninja-c253192a08b499ea7be46fa5438d273e51f7ec5a.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/lib/rdge/materials/material.js')
-rwxr-xr-x | js/lib/rdge/materials/material.js | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js index c1d13b15..276c7687 100755 --- a/js/lib/rdge/materials/material.js +++ b/js/lib/rdge/materials/material.js | |||
@@ -252,21 +252,6 @@ var Material = function GLMaterial( world ) { | |||
252 | return tex; | 252 | return tex; |
253 | }; | 253 | }; |
254 | 254 | ||
255 | this.export = function() { | ||
256 | // this function should be overridden by subclasses | ||
257 | var exportStr = "material: " + this.getShaderName() + "\n" + "endMaterial\n"; | ||
258 | return exportStr; | ||
259 | }; | ||
260 | |||
261 | this.import = function( importStr ) { | ||
262 | var endKey = "endMaterial\n"; | ||
263 | var index = importStr.indexOf( endKey ); | ||
264 | index += endKey.length; | ||
265 | var rtnStr = importStr.substr( index ); | ||
266 | |||
267 | return rtnStr; | ||
268 | }; | ||
269 | |||
270 | /* | 255 | /* |
271 | this.setRenderProperties = function( glContext, shaderProgram ) | 256 | this.setRenderProperties = function( glContext, shaderProgram ) |
272 | { | 257 | { |