diff options
Diffstat (limited to 'assets')
-rw-r--r-- | assets/canvas-runtime.js | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js index a35f473d..2ca76962 100644 --- a/assets/canvas-runtime.js +++ b/assets/canvas-runtime.js | |||
@@ -121,13 +121,13 @@ NinjaCvsRt.GLRuntime = function ( canvas, jObj, assetPath ) | |||
121 | // all "live" materials | 121 | // all "live" materials |
122 | this._materials = []; | 122 | this._materials = []; |
123 | 123 | ||
124 | // provide the mapping for the asset directory | 124 | // provide the mapping for the asset directory |
125 | if (assetPath) | 125 | if (assetPath) |
126 | { | 126 | { |
127 | this._assetPath = assetPath.slice(); | 127 | this._assetPath = assetPath.slice(); |
128 | if (this._assetPath[this._assetPath.length-1] != '/') | 128 | if (this._assetPath[this._assetPath.length-1] != '/') |
129 | this._assetPath += '/'; | 129 | this._assetPath += '/'; |
130 | } | 130 | } |
131 | 131 | ||
132 | if(this._assetPath !== undefined) { | 132 | if(this._assetPath !== undefined) { |
133 | RDGE.globals.engine.setAssetPath(this._assetPath); | 133 | RDGE.globals.engine.setAssetPath(this._assetPath); |
@@ -638,7 +638,7 @@ NinjaCvsRt.RuntimeGeomObj = function () | |||
638 | 638 | ||
639 | return mat; | 639 | return mat; |
640 | }; | 640 | }; |
641 | 641 | ||
642 | this.MatrixRotationZ = function( angle ) | 642 | this.MatrixRotationZ = function( angle ) |
643 | { | 643 | { |
644 | var mat = this.MatrixIdentity(4); | 644 | var mat = this.MatrixIdentity(4); |
@@ -998,7 +998,7 @@ NinjaCvsRt.RuntimeOval = function () | |||
998 | mat[5] = yScale; | 998 | mat[5] = yScale; |
999 | 999 | ||
1000 | // get the bezier points | 1000 | // get the bezier points |
1001 | var bezPtsInside = this.circularArcToBezier( Vector.create([0,0,0]), Vector.create([1,0,0]), -2.0*Math.PI ); | 1001 | var bezPtsInside = this.circularArcToBezier( [0,0,0], [1,0,0], -2.0*Math.PI ); |
1002 | if (bezPtsInside) | 1002 | if (bezPtsInside) |
1003 | { | 1003 | { |
1004 | n = bezPtsInside.length; | 1004 | n = bezPtsInside.length; |
@@ -1465,7 +1465,7 @@ NinjaCvsRt.RuntimeUberMaterial = function () | |||
1465 | // currently not exported | 1465 | // currently not exported |
1466 | var uvTransform = [ 2.0, 0, 0, 0, 0, 2.0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1]; | 1466 | var uvTransform = [ 2.0, 0, 0, 0, 0, 2.0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1]; |
1467 | technique.u_uvMatrix.set(uvTransform); | 1467 | technique.u_uvMatrix.set(uvTransform); |
1468 | 1468 | ||
1469 | var tex = null; | 1469 | var tex = null; |
1470 | if (this._diffuseMap) | 1470 | if (this._diffuseMap) |
1471 | { | 1471 | { |