diff options
author | Jonathan Duran | 2012-04-05 08:09:18 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-05 08:09:18 -0700 |
commit | e186c49247689b5c2df6125037e2473636701d17 (patch) | |
tree | e626b006027949f87b5aa1e76eb0ed719adb99bb /js/lib/rdge/materials/material.js | |
parent | 135c5257e2a4d5f1b25f62758c6783fd2ebe5e19 (diff) | |
parent | 17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff) | |
download | ninja-e186c49247689b5c2df6125037e2473636701d17.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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 | { |