diff options
author | hwc487 | 2012-05-22 16:40:42 -0700 |
---|---|---|
committer | hwc487 | 2012-05-22 16:40:42 -0700 |
commit | 08851078e89e9d4cb8fa341fa697a91be8de8ab9 (patch) | |
tree | fee8c0d38c1c540ef00c33e728346d765a4e699c /js/lib/rdge/materials/material.js | |
parent | 50ede4afa801f53caff7939dad0408f9a0a8b744 (diff) | |
parent | 862ee363584dfba4bdd9abacbc3a3244c7ec66b5 (diff) | |
download | ninja-08851078e89e9d4cb8fa341fa697a91be8de8ab9.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/linear-gradient-material.js
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 77220bf7..9f0ae6f1 100755 --- a/js/lib/rdge/materials/material.js +++ b/js/lib/rdge/materials/material.js | |||
@@ -233,6 +233,10 @@ var Material = function GLMaterial( world ) { | |||
233 | // animated materials should implement the update method | 233 | // animated materials should implement the update method |
234 | }; | 234 | }; |
235 | 235 | ||
236 | this.fitToPrimitive = function( prim ) { | ||
237 | // some materials need to preserve an aspect ratio - or someting else. | ||
238 | }; | ||
239 | |||
236 | this.registerTexture = function( texture ) { | 240 | this.registerTexture = function( texture ) { |
237 | // the world needs to know about the texture map | 241 | // the world needs to know about the texture map |
238 | var world = this.getWorld(); | 242 | var world = this.getWorld(); |