diff options
author | Jonathan Duran | 2012-05-24 09:35:02 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-24 09:35:02 -0700 |
commit | 458714f5bf2ab095f6e96dfec3f9ff7042527c04 (patch) | |
tree | 779ba55d14f059572cb81d27024ca8b8a92956e0 /js/lib/rdge/materials/material.js | |
parent | 2e4831cf0fe04f37a179f84b098ae0899d4e40b8 (diff) | |
parent | 862ee363584dfba4bdd9abacbc3a3244c7ec66b5 (diff) | |
download | ninja-458714f5bf2ab095f6e96dfec3f9ff7042527c04.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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js index 276c7687..b96768b3 100755 --- a/js/lib/rdge/materials/material.js +++ b/js/lib/rdge/materials/material.js | |||
@@ -228,6 +228,10 @@ var Material = function GLMaterial( world ) { | |||
228 | // animated materials should implement the update method | 228 | // animated materials should implement the update method |
229 | }; | 229 | }; |
230 | 230 | ||
231 | this.fitToPrimitive = function( prim ) { | ||
232 | // some materials need to preserve an aspect ratio - or someting else. | ||
233 | }; | ||
234 | |||
231 | this.registerTexture = function( texture ) { | 235 | this.registerTexture = function( texture ) { |
232 | // the world needs to know about the texture map | 236 | // the world needs to know about the texture map |
233 | var world = this.getWorld(); | 237 | var world = this.getWorld(); |