diff options
author | Ananya Sen | 2012-02-08 15:37:23 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-08 15:37:23 -0800 |
commit | ab6f2f7ada39a9b27408575af9a565daf0a9d291 (patch) | |
tree | 92a796e34530d1a724ddb24ef22e59ffef13c12a /js/helper-classes/RDGE | |
parent | 36b2e540f06cef3887e7d0fea60527fee51e2a40 (diff) | |
parent | 5a69d5be181ea98fa842977885ebd8c861dda6ca (diff) | |
download | ninja-ab6f2f7ada39a9b27408575af9a565daf0a9d291.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Diffstat (limited to 'js/helper-classes/RDGE')
-rwxr-xr-x | js/helper-classes/RDGE/GLCircle.js | 79 | ||||
-rwxr-xr-x | js/helper-classes/RDGE/GLGeomObj.js | 51 | ||||
-rwxr-xr-x | js/helper-classes/RDGE/GLLine.js | 27 | ||||
-rwxr-xr-x | js/helper-classes/RDGE/GLRectangle.js | 65 | ||||
-rwxr-xr-x | js/helper-classes/RDGE/GLWorld.js | 2 | ||||
-rwxr-xr-x | js/helper-classes/RDGE/MaterialsLibrary.js | 2 |
6 files changed, 75 insertions, 151 deletions
diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js index fc2e6460..e6bcba89 100755 --- a/js/helper-classes/RDGE/GLCircle.js +++ b/js/helper-classes/RDGE/GLCircle.js | |||
@@ -33,14 +33,6 @@ function GLCircle() | |||
33 | 33 | ||
34 | this._ovalHeight = this._ovalHeight = 2.0*this.radius; | 34 | this._ovalHeight = this._ovalHeight = 2.0*this.radius; |
35 | 35 | ||
36 | // stroke and fill colors | ||
37 | this._strokeColor = [0.4, 0.4, 0.4, 1.0]; | ||
38 | this._fillColor = [0.0, 0.6, 0.0, 1.0]; | ||
39 | |||
40 | // stroke and fill materials | ||
41 | this._fillMaterial; | ||
42 | this._strokeMaterial; | ||
43 | |||
44 | this._strokeStyle = "Solid"; | 36 | this._strokeStyle = "Solid"; |
45 | 37 | ||
46 | this._aspectRatio = 1.0; | 38 | this._aspectRatio = 1.0; |
@@ -189,19 +181,19 @@ function GLCircle() | |||
189 | var reverseRotMat = Matrix.RotationZ( -angle ); | 181 | var reverseRotMat = Matrix.RotationZ( -angle ); |
190 | 182 | ||
191 | // calculate matrices to scale the circle and stroke to fit the bounds of the ellipse | 183 | // calculate matrices to scale the circle and stroke to fit the bounds of the ellipse |
192 | strokeScaleMat = Matrix.I(4); | 184 | var strokeScaleMat = Matrix.I(4); |
193 | strokeScaleMat[0] = xRad; | 185 | strokeScaleMat[0] = xRad; |
194 | strokeScaleMat[5] = yRad; | 186 | strokeScaleMat[5] = yRad; |
195 | 187 | ||
196 | fillScaleMat = Matrix.I(4); | 188 | var fillScaleMat = Matrix.I(4); |
197 | fillScaleMat[0] = xRad - xStroke; | 189 | fillScaleMat[0] = xRad - xStroke; |
198 | fillScaleMat[5] = yRad - yStroke; | 190 | fillScaleMat[5] = yRad - yStroke; |
199 | 191 | ||
200 | innerRadiusScaleMat = Matrix.I(4); | 192 | var innerRadiusScaleMat = Matrix.I(4); |
201 | innerRadiusScaleMat[0] = xInnRad; | 193 | innerRadiusScaleMat[0] = xInnRad; |
202 | innerRadiusScaleMat[5] = yInnRad; | 194 | innerRadiusScaleMat[5] = yInnRad; |
203 | 195 | ||
204 | innerStrokeScaleMat = Matrix.I(4); | 196 | var innerStrokeScaleMat = Matrix.I(4); |
205 | innerStrokeScaleMat[0] = xInnRad - xStroke; | 197 | innerStrokeScaleMat[0] = xInnRad - xStroke; |
206 | innerStrokeScaleMat[5] = yInnRad - yStroke; | 198 | innerStrokeScaleMat[5] = yInnRad - yStroke; |
207 | 199 | ||
@@ -233,69 +225,24 @@ function GLCircle() | |||
233 | 225 | ||
234 | if (fillPrim) | 226 | if (fillPrim) |
235 | { | 227 | { |
236 | this._primArray.push( fillPrim ); | 228 | fillMaterial = this.makeFillMaterial(); |
237 | |||
238 | if (this.getFillMaterial()) | ||
239 | fillMaterial = this.getFillMaterial().dup(); | ||
240 | else | ||
241 | fillMaterial = new FlatMaterial(); | ||
242 | 229 | ||
243 | if (fillMaterial) | 230 | this._primArray.push( fillPrim ); |
244 | { | 231 | this._materialNodeArray.push( fillMaterial.getMaterialNode() ); |
245 | fillMaterial.init( this.getWorld() ); | ||
246 | if(!this.getFillMaterial() && this._fillColor) | ||
247 | { | ||
248 | fillMaterial.setProperty("color", this._fillColor); | ||
249 | } | ||
250 | this._materialArray.push( fillMaterial ); | ||
251 | this._materialTypeArray.push( "fill" ); | ||
252 | var matNode = fillMaterial.getMaterialNode(); | ||
253 | this._materialNodeArray.push( matNode ); | ||
254 | } | ||
255 | } | 232 | } |
256 | if (strokePrim0) | 233 | if (strokePrim0) |
257 | { | 234 | { |
258 | if (this.getStrokeMaterial()) | 235 | strokeMaterial0 = this.makeStrokeMaterial(); |
259 | strokeMaterial = this.getStrokeMaterial().dup(); | ||
260 | else | ||
261 | strokeMaterial = new FlatMaterial(); | ||
262 | 236 | ||
263 | if (strokeMaterial) | 237 | this._primArray.push( strokePrim0 ); |
264 | { | 238 | this._materialNodeArray.push( strokeMaterial0.getMaterialNode() ); |
265 | strokeMaterial.init( this.getWorld() ); | ||
266 | if(!this.getStrokeMaterial() && this._strokeColor) | ||
267 | { | ||
268 | strokeMaterial.setProperty("color", this._strokeColor); | ||
269 | } | ||
270 | this._primArray.push( strokePrim0 ); | ||
271 | |||
272 | var materialNode = createMaterialNode("ovalFillMaterial"); | ||
273 | this._materialArray.push( strokeMaterial ); | ||
274 | this._materialTypeArray.push( "stroke" ); | ||
275 | this._materialNodeArray.push( strokeMaterial.getMaterialNode() ); | ||
276 | } | ||
277 | } | 239 | } |
278 | if (strokePrim1) | 240 | if (strokePrim1) |
279 | { | 241 | { |
280 | if (this.getStrokeMaterial()) | 242 | strokeMaterial2 = this.makeStrokeMaterial(); |
281 | strokeMaterial = this.getStrokeMaterial().dup(); | ||
282 | else | ||
283 | strokeMaterial = new FlatMaterial(); | ||
284 | 243 | ||
285 | if (strokeMaterial) | 244 | this._primArray.push( strokePrim1 ); |
286 | { | 245 | this._materialNodeArray.push( strokeMaterial2.getMaterialNode() ); |
287 | strokeMaterial.init( this.getWorld() ); | ||
288 | if(!this.getStrokeMaterial() && this._strokeColor) | ||
289 | { | ||
290 | strokeMaterial.setProperty("color", this._strokeColor); | ||
291 | } | ||
292 | this._primArray.push( strokePrim1 ); | ||
293 | |||
294 | var materialNode = createMaterialNode("ovalFillMaterial"); | ||
295 | this._materialArray.push( strokeMaterial ); | ||
296 | this._materialTypeArray.push( "stroke" ); | ||
297 | this._materialNodeArray.push( strokeMaterial.getMaterialNode() ); | ||
298 | } | ||
299 | } | 246 | } |
300 | 247 | ||
301 | world.updateObject(this); | 248 | world.updateObject(this); |
diff --git a/js/helper-classes/RDGE/GLGeomObj.js b/js/helper-classes/RDGE/GLGeomObj.js index 72019703..62fbf562 100755 --- a/js/helper-classes/RDGE/GLGeomObj.js +++ b/js/helper-classes/RDGE/GLGeomObj.js | |||
@@ -37,6 +37,10 @@ function GLGeomObj() | |||
37 | 37 | ||
38 | this.m_world = null; | 38 | this.m_world = null; |
39 | 39 | ||
40 | // stroke and fill colors | ||
41 | this._strokeColor; | ||
42 | this._fillColor; | ||
43 | |||
40 | // stroke and fill materials | 44 | // stroke and fill materials |
41 | this._fillMaterial; | 45 | this._fillMaterial; |
42 | this._strokeMaterial; | 46 | this._strokeMaterial; |
@@ -104,6 +108,53 @@ function GLGeomObj() | |||
104 | this.setFillColor = function(c) { this.setMaterialColor(c, "fill"); } | 108 | this.setFillColor = function(c) { this.setMaterialColor(c, "fill"); } |
105 | this.setStrokeColor = function(c) { this.setMaterialColor(c, "stroke"); } | 109 | this.setStrokeColor = function(c) { this.setMaterialColor(c, "stroke"); } |
106 | 110 | ||
111 | this.makeStrokeMaterial = function() | ||
112 | { | ||
113 | var strokeMaterial; | ||
114 | if (this.getStrokeMaterial()) | ||
115 | strokeMaterial = this.getStrokeMaterial().dup(); | ||
116 | else | ||
117 | strokeMaterial = new FlatMaterial(); | ||
118 | |||
119 | if (strokeMaterial) | ||
120 | { | ||
121 | strokeMaterial.init( this.getWorld() ); | ||
122 | if(this._strokeColor) | ||
123 | { | ||
124 | strokeMaterial.setProperty("color", this._strokeColor); | ||
125 | } | ||
126 | } | ||
127 | |||
128 | this._materialArray.push( strokeMaterial ); | ||
129 | this._materialTypeArray.push( "stroke" ); | ||
130 | |||
131 | return strokeMaterial; | ||
132 | } | ||
133 | |||
134 | this.makeFillMaterial = function() | ||
135 | { | ||
136 | var fillMaterial; | ||
137 | if (this.getFillMaterial()) | ||
138 | fillMaterial = this.getFillMaterial().dup(); | ||
139 | else | ||
140 | fillMaterial = new FlatMaterial(); | ||
141 | |||
142 | if (fillMaterial) | ||
143 | { | ||
144 | fillMaterial.init( this.getWorld() ); | ||
145 | //if(!this.getFillMaterial() && this._fillColor) | ||
146 | if (this._fillColor) | ||
147 | { | ||
148 | fillMaterial.setProperty("color", this._fillColor); | ||
149 | } | ||
150 | } | ||
151 | |||
152 | this._materialArray.push( fillMaterial ); | ||
153 | this._materialTypeArray.push( "fill" ); | ||
154 | |||
155 | return fillMaterial; | ||
156 | } | ||
157 | |||
107 | 158 | ||
108 | this.translate = function(v) | 159 | this.translate = function(v) |
109 | { | 160 | { |
diff --git a/js/helper-classes/RDGE/GLLine.js b/js/helper-classes/RDGE/GLLine.js index 9eaa69d1..bd3cbc26 100755 --- a/js/helper-classes/RDGE/GLLine.js +++ b/js/helper-classes/RDGE/GLLine.js | |||
@@ -27,12 +27,6 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro | |||
27 | 27 | ||
28 | this._strokeWidth = 0.25; | 28 | this._strokeWidth = 0.25; |
29 | 29 | ||
30 | // stroke colors | ||
31 | this._strokeColor = [0.4, 0.4, 0.4, 1.0]; | ||
32 | |||
33 | // stroke materials | ||
34 | this._strokeMaterial; | ||
35 | |||
36 | this._strokeStyle = "Solid"; | 30 | this._strokeStyle = "Solid"; |
37 |