diff options
author | hwc487 | 2012-05-17 09:51:11 -0700 |
---|---|---|
committer | hwc487 | 2012-05-17 09:51:11 -0700 |
commit | 9321b1d7ab2d23e165ac90e9eea3287f72463948 (patch) | |
tree | 0b50e138dfc1044dde01fbec401bfdabcdd65c26 /assets | |
parent | a73034090b30d79a0722fc5d32e081f35d2c7f5c (diff) | |
download | ninja-9321b1d7ab2d23e165ac90e9eea3287f72463948.tar.gz |
Linear & radial gradients for runtime fixes
Diffstat (limited to 'assets')
-rw-r--r-- | assets/canvas-runtime.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js index eeafaab6..b6682493 100644 --- a/assets/canvas-runtime.js +++ b/assets/canvas-runtime.js | |||
@@ -1456,6 +1456,8 @@ NinjaCvsRt.RuntimeRadialGradientMaterial = Object.create(NinjaCvsRt.RuntimeMater | |||
1456 | _colorStop3: { value: 0.6, writable: true }, | 1456 | _colorStop3: { value: 0.6, writable: true }, |
1457 | _colorStop4: { value: 1.0, writable: true }, | 1457 | _colorStop4: { value: 1.0, writable: true }, |
1458 | 1458 | ||
1459 | _textureTransform: { value: [1,0,0, 0,1,0, 0,0,1], writable: true }, | ||
1460 | |||
1459 | init: { | 1461 | init: { |
1460 | value: function(world) { | 1462 | value: function(world) { |
1461 | var material = this._materialNode; | 1463 | var material = this._materialNode; |
@@ -1477,6 +1479,8 @@ NinjaCvsRt.RuntimeRadialGradientMaterial = Object.create(NinjaCvsRt.RuntimeMater | |||
1477 | this._shader["default"].u_colorStop3.set( [this._colorStop3] ); | 1479 | this._shader["default"].u_colorStop3.set( [this._colorStop3] ); |
1478 | this._shader["default"].u_colorStop4.set( [this._colorStop4] ); | 1480 | this._shader["default"].u_colorStop4.set( [this._colorStop4] ); |
1479 | 1481 | ||
1482 | this._shader["default"].u_texTransform.set( this._textureTransform ); | ||
1483 | |||
1480 | if (this._angle !== undefined) | 1484 | if (this._angle !== undefined) |
1481 | this._shader["default"].u_cos_sin_angle.set([Math.cos(this._angle), Math.sin(this._angle)]); | 1485 | this._shader["default"].u_cos_sin_angle.set([Math.cos(this._angle), Math.sin(this._angle)]); |
1482 | } | 1486 | } |
@@ -1496,6 +1500,8 @@ NinjaCvsRt.RuntimeRadialGradientMaterial = Object.create(NinjaCvsRt.RuntimeMater | |||
1496 | this._colorStop3 = jObj.colorStop3; | 1500 | this._colorStop3 = jObj.colorStop3; |
1497 | this._colorStop4 = jObj.colorStop4; | 1501 | this._colorStop4 = jObj.colorStop4; |
1498 | 1502 | ||
1503 | this._textureTransform = jObj.textureTransform; | ||
1504 | |||
1499 | if (this._angle !== undefined) | 1505 | if (this._angle !== undefined) |
1500 | this._angle = jObj.angle; | 1506 | this._angle = jObj.angle; |
1501 | } | 1507 | } |