diff options
author | Valerio Virgillito | 2012-02-23 17:05:43 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-23 17:05:43 -0800 |
commit | afc53c6f553c97ab778154154aa2b7a146cb5fef (patch) | |
tree | 66b5ec886a49894feda44ccf8b5233ef39a46536 /js/helper-classes/RDGE | |
parent | 8974ecd564563a991ff96f9cb6d47da172174242 (diff) | |
parent | db2fd02a1b0e909bb536fa63cefd2144f4642ead (diff) | |
download | ninja-afc53c6f553c97ab778154154aa2b7a146cb5fef.tar.gz |
Merge branch 'refs/heads/master' into local-storage-version
Diffstat (limited to 'js/helper-classes/RDGE')
29 files changed, 3671 insertions, 435 deletions
diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js index 08057778..5b32547e 100755 --- a/js/helper-classes/RDGE/GLCircle.js +++ b/js/helper-classes/RDGE/GLCircle.js | |||
@@ -400,7 +400,10 @@ function GLCircle() | |||
400 | ctx.lineWidth = 0; | 400 | ctx.lineWidth = 0; |
401 | ctx.fillStyle = "#990000"; | 401 | ctx.fillStyle = "#990000"; |
402 | if (this._fillColor) | 402 | if (this._fillColor) |
403 | ctx.fillStyle = MathUtils.colorToHex( this._fillColor ); | 403 | { |
404 | var c = "rgba(" + 255*this._fillColor[0] + "," + 255*this._fillColor[1] + "," + 255*this._fillColor[2] + "," + this._fillColor[3] + ")"; | ||
405 | ctx.fillStyle = c; | ||
406 | } | ||
404 | 407 | ||
405 | // draw the fill | 408 | // draw the fill |
406 | ctx.beginPath(); | 409 | ctx.beginPath(); |
@@ -460,7 +463,10 @@ function GLCircle() | |||
460 | ctx.lineWidth = lineWidth; | 463 | ctx.lineWidth = lineWidth; |
461 | ctx.strokeStyle = "#0000ff"; | 464 | ctx.strokeStyle = "#0000ff"; |
462 | if (this._strokeColor) | 465 | if (this._strokeColor) |
463 | ctx.strokeStyle = MathUtils.colorToHex( this._strokeColor ); | 466 | { |
467 | var c = "rgba(" + 255*this._strokeColor[0] + "," + 255*this._strokeColor[1] + "," + 255*this._strokeColor[2] + "," + this._strokeColor[3] + ")"; | ||
468 | ctx.strokeStyle = c; | ||
469 | } | ||
464 | 470 | ||
465 | // draw the stroke | 471 | // draw the stroke |
466 | p = MathUtils.transformPoint( bezPts[0], mat ); | 472 | p = MathUtils.transformPoint( bezPts[0], mat ); |
diff --git a/js/helper-classes/RDGE/GLLine.js b/js/helper-classes/RDGE/GLLine.js index 5ec51230..0d815145 100755 --- a/js/helper-classes/RDGE/GLLine.js +++ b/js/helper-classes/RDGE/GLLine.js | |||
@@ -11,74 +11,74 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
11 | /////////////////////////////////////////////////////////////////////// | 11 | /////////////////////////////////////////////////////////////////////// |
12 | function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj) | 12 | function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj) |
13 | { | 13 | { |
14 | /////////////////////////////////////////////////////////////////////// | 14 | /////////////////////////////////////////////////////////////////////// |
15 | // Instance variables | 15 | // Instance variables |
16 | /////////////////////////////////////////////////////////////////////// | 16 | /////////////////////////////////////////////////////////////////////// |
17 | this._width = 2.0; | 17 | this._width = 2.0; |
18 | this._height = 2.0; | 18 | this._height = 2.0; |
19 | this._xOffset = 0; | 19 | this._xOffset = 0; |
20 | this._yOffset = 0; | 20 | this._yOffset = 0; |
21 | 21 | ||
22 | // If line doesn't fit in canvas world, we had to grow the canvas by this much on either side | 22 | // If line doesn't fit in canvas world, we had to grow the canvas by this much on either side |
23 | this._xAdj = 0; | 23 | this._xAdj = 0; |
24 | this._yAdj = 0; | 24 | this._yAdj = 0; |
25 | 25 | ||
26 | this._slope = 0; | 26 | this._slope = 0; |
27 | 27 | ||
28 | this._strokeWidth = 0.25; | 28 | this._strokeWidth = 0.25; |
29 | 29 | ||
30 | this._strokeStyle = "Solid"; | 30 | this._strokeStyle = "Solid"; |
31 | this._scaleX = 1.0; | 31 | this._scaleX = 1.0; |
32 | this._scaleY = 1.0; | 32 | this._scaleY = 1.0; |
33 | 33 | ||
34 | if (arguments.length > 0) | 34 | if (arguments.length > 0) |
35 | { | 35 | { |
36 | this._width = width; | 36 | this._width = width; |
37 | this._height = height; | 37 | this._height = height; |
38 | this._xOffset = xOffset; | 38 | this._xOffset = xOffset; |
39 | this._yOffset = yOffset; | 39 | this._yOffset = yOffset; |
40 | 40 | ||
41 | this._xAdj = xAdj; | 41 | this._xAdj = xAdj; |
42 | this._yAdj = yAdj; | 42 | this._yAdj = yAdj; |
43 | 43 | ||
44 | this._slope = slope; | 44 | this._slope = slope; |
45 | this._strokeWidth = strokeSize; | 45 | this._strokeWidth = strokeSize; |
46 | this._strokeColor = strokeColor; | 46 | this._strokeColor = strokeColor; |
47 | 47 | ||
48 | this._strokeStyle = strokeStyle; | 48 | this._strokeStyle = strokeStyle; |
49 | this._scaleX = (world.getViewportWidth())/(world.getViewportHeight()); | 49 | this._scaleX = (world.getViewportWidth())/(world.getViewportHeight()); |
50 | } | 50 | } |
51 | 51 | ||
52 | this._strokeVerticesLen = 0; | 52 | this._strokeVerticesLen = 0; |
53 | 53 | ||
54 | this.m_world = world; | 54 | this.m_world = world; |
55 | 55 | ||
56 | this._materialAmbient = [0.2, 0.2, 0.2, 1.0]; | 56 | this._materialAmbient = [0.2, 0.2, 0.2, 1.0]; |
57 | this._materialDiffuse = [0.4, 0.4, 0.4, 1.0]; | 57 | this._materialDiffuse = [0.4, 0.4, 0.4, 1.0]; |
58 | this._materialSpecular = [0.4, 0.4, 0.4, 1.0]; | 58 | this._materialSpecular = [0.4, 0.4, 0.4, 1.0]; |
59 | 59 | ||
60 | // initialize the inherited members | 60 | // initialize the inherited members |
61 | this.inheritedFrom = GLGeomObj; | 61 | this.inheritedFrom = GLGeomObj; |
62 | this.inheritedFrom(); | 62 | this.inheritedFrom(); |
63 | 63 | ||
64 | if(strokeMaterial) | 64 | if(strokeMaterial) |
65 | { | 65 | { |
66 | this._strokeMaterial = strokeMaterial; | 66 | this._strokeMaterial = strokeMaterial; |
67 | } | 67 | } |
68 | 68 | ||
69 | /////////////////////////////////////////////////////////////////////// | 69 | /////////////////////////////////////////////////////////////////////// |
70 | // Property Accessors | 70 | // Property Accessors |
71 | /////////////////////////////////////////////////////////////////////// | 71 | /////////////////////////////////////////////////////////////////////// |
72 | this.getStrokeWidth = function() { return this._strokeWidth; } | 72 | this.getStrokeWidth = function() { return this._strokeWidth; } |
73 | this.setStrokeWidth = function(w) { this._strokeWidth = w; } | 73 | this.setStrokeWidth = function(w) { this._strokeWidth = w; } |
74 | 74 | ||
75 | this.getStrokeMaterial = function() { return this._strokeMaterial; } | 75 | this.getStrokeMaterial = function() { return this._strokeMaterial; } |
76 | this.setStrokeMaterial = function(m) { this._strokeMaterial = m; } | 76 | this.setStrokeMaterial = function(m) { this._strokeMaterial = m; } |
77 | 77 | ||
78 | this.getStrokeColor = function() { return this._strokeColor; } | 78 | this.getStrokeColor = function() { return this._strokeColor; } |
79 | //this.setStrokeColor = function(c) { this._strokeColor = c; } | 79 | //this.setStrokeColor = function(c) { this._strokeColor = c; } |
80 | 80 | ||
81 | this.getStrokeStyle = function() { return this._strokeStyle; } | 81 | this.getStrokeStyle = function() { return this._strokeStyle; } |
82 | this.setStrokeStyle = function(s) { this._strokeStyle = s; } | 82 | this.setStrokeStyle = function(s) { this._strokeStyle = s; } |
83 | 83 | ||
84 | this.getFillMaterial = function() { return null; } | 84 | this.getFillMaterial = function() { return null; } |
@@ -86,24 +86,24 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro | |||
86 | this.setStrokeMaterial = function(m) { this._strokeMaterial = m; } | 86 | this.setStrokeMaterial = function(m) { this._strokeMaterial = m; } |
87 | this.getStrokeMaterial = function() { return this._strokeMaterial; } | 87 | this.getStrokeMaterial = function() { return this._strokeMaterial; } |
88 | 88 | ||
89 | this.getWidth = function() { return this._width; } | 89 | this.getWidth = function() { return this._width; } |
90 | this.setWidth = function(w) { this._width = w; } | 90 | this.setWidth = function(w) { this._width = w; } |
91 | 91 | ||
92 | this.getHeight = function() { return this._height; } | 92 | this.getHeight = function() { return this._height; } |
93 | this.setHeight = function(h) { this._height = h; } | 93 | this.setHeight = function(h) { this._height = h; } |
94 | 94 | ||
95 | this.getXAdj = function() { return this._xAdj; } | 95 | this.getXAdj = function() { return this._xAdj; } |
96 | this.setXAdj = function(x) { this._xAdj = x; } | 96 | this.setXAdj = function(x) { this._xAdj = x; } |
97 | 97 | ||
98 | this.getYAdj = function() { return this._yAdj; } | 98 | this.getYAdj = function() { return this._yAdj; } |