projects
/
featherfall2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c6b5fcb
)
Support passing a material name to QuadC.
author
Joe Wreschnig
<joe.wreschnig@gmail.com>
Sat, 6 Sep 2014 10:26:38 +0000
(12:26 +0200)
committer
Joe Wreschnig
<joe.wreschnig@gmail.com>
Sat, 6 Sep 2014 10:26:38 +0000
(12:26 +0200)
src/yuu/rdr.js
patch
|
blob
|
history
diff --git
a/src/yuu/rdr.js
b/src/yuu/rdr.js
index a03cbec56482b6274583b09a581ec5082e425591..99b8c3f56e142499432dda1612a56e170fec7c2e 100644
(file)
--- a/
src/yuu/rdr.js
+++ b/
src/yuu/rdr.js
@@
-272,6
+272,9
@@
constructor: function (material) {
var buffer = new yuu.VertexBuffer(yuu.V3T2C4_F, 4);
this._quad = new yuu.Quad(buffer);
constructor: function (material) {
var buffer = new yuu.VertexBuffer(yuu.V3T2C4_F, 4);
this._quad = new yuu.Quad(buffer);
+ material = yf.isString(material)
+ ? new yuu.Material(material)
+ : material;
this._rdro = new yuu.Renderable(
buffer, yuu.gl.TRIANGLE_STRIP, material,
{ model: mat4.create() }, 0.0);
this._rdro = new yuu.Renderable(
buffer, yuu.gl.TRIANGLE_STRIP, material,
{ model: mat4.create() }, 0.0);