diff options
author | Jonathan Duran | 2012-02-08 10:48:52 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-02-08 10:48:52 -0800 |
commit | 8a2ef825490358f992d6d687174b0a16fd8302c1 (patch) | |
tree | 12cdf68a4f1de01fc33b9e23bbce0afab6c2d7ae /js/helper-classes/RDGE/GLRectangle.js | |
parent | a460855c2132bffc666582659520e575d687d0cd (diff) | |
download | ninja-8a2ef825490358f992d6d687174b0a16fd8302c1.tar.gz |
Squashed commit of the following:
commit 763910b9d074137eb7dee80447b89407ce5750c9
Merge: e557937 329a859
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Feb 8 10:18:36 2012 -0800
Merge pull request #20 from mqg734/ToolFixes
Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs:
commit e5579374ff39b80b8c0c69faba37f6f581758fe0
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Feb 7 13:28:17 2012 -0800
updated montage v.0.6 to the latest changes.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 329a859e2666716c3a1d99c6bd2679e10c81fc8d
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Tue Feb 7 15:25:11 2012 -0800
Added ability to toggle combobox's visibility so we can show/hide materials comboboxes in the tool options.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 668510892537eaaeb2e11520831d87b44b2489b7
Merge: 8950b34 c066fb4
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Feb 7 14:19:22 2012 -0800
Merge pull request #19 from ericguzman/TreeComponents
Tree Components - Added copyright comments
commit aec849d91e4b697d496b9ede28b5d89cf2283781
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Tue Feb 7 14:18:13 2012 -0800
id's must start with a letter, so our workaround for using uuid for RDGE canvas id's won't work because they often start with a number.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit e8e21367e59bb521801fe2e843f42ad5bca5ea9f
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Tue Feb 7 13:52:54 2012 -0800
Fixing some typos and undeclared variables in GLRectangle and ShapesController.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit c066fb41ebee85bacf9b2155366b16831af41d76
Author: Eric Guzman <ericg@motorola.com>
Date: Tue Feb 7 13:46:05 2012 -0800
Tree Components - Added copyright comments
commit 3a8875c288049b466bfeb8b7f0510fd8cbfb970d
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Tue Feb 7 13:30:08 2012 -0800
Supporting switching materials in the PI. Also, moved makeFillMaterial and makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 8ad767b61460984a4031ba630f76ac8247a61857
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Tue Feb 7 11:42:10 2012 -0800
Fixed PI to support WebGL materials.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 486842239c71e7964f38a09aacda4970f2a82e1a
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Tue Feb 7 10:58:14 2012 -0800
Updated tools and PI to get/set materials by binding to appModel's materials property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 789eaf5a92c903f27462c69a8890fbec695ab14e
Merge: 92ae17b 8950b34
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Tue Feb 7 09:36:29 2012 -0800
Merge branch 'refs/heads/ninja-internal' into ToolFixes
commit 92ae17bc800cf82cdbd1482ef1af1a5fd7bd632a
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Feb 6 16:35:12 2012 -0800
Force layout canvas and SelectionController to update their info when a 2d canvas is replaced by a 3d canvas (and vice-versa).
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 75486be2839494c9b54833aff8f5eef3f9542151
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Feb 6 15:41:48 2012 -0800
Support toggling between 2d and 3d canvas context. This requires us to create a new canvas with all the same values as the canvas being replaced and copying over all the shape data.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit f94b0c5ada403379b3ff8a900c2a2aabcecce49e
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Feb 6 14:03:40 2012 -0800
Add enabled property for ComboBox to support enabling/disabling materials dropdowns in the PI.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 5737864d1d55d96e3cc3c1bc9b38ec58303b3981
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Feb 6 13:35:30 2012 -0800
Allow users to switch between 2d and webGL mode. Note that this doesn't currently work.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 486d9a31a85dd833a1c798049a00403756703034
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Feb 6 11:35:49 2012 -0800
Support use WebGL checkbox in the PI.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/helper-classes/RDGE/GLRectangle.js')
-rw-r--r-- | js/helper-classes/RDGE/GLRectangle.js | 65 |
1 files changed, 5 insertions, 60 deletions
diff --git a/js/helper-classes/RDGE/GLRectangle.js b/js/helper-classes/RDGE/GLRectangle.js index 1334d7e6..8535a683 100644 --- a/js/helper-classes/RDGE/GLRectangle.js +++ b/js/helper-classes/RDGE/GLRectangle.js | |||
@@ -33,14 +33,6 @@ function GLRectangle() | |||
33 | 33 | ||
34 | this._strokeWidth = 0.25; | 34 | this._strokeWidth = 0.25; |
35 | 35 | ||
36 | // stroke and fill colors | ||
37 | this._strokeColor; | ||
38 | this._fillColor; | ||
39 | |||
40 | // stroke and fill materials | ||
41 | this._fillMaterial; | ||
42 | this._strokeMaterial; | ||
43 | |||
44 | this._strokeStyle = "Solid"; | 36 | this._strokeStyle = "Solid"; |
45 | this.init = function(world, xOffset, yOffset, width, height, strokeSize, strokeColor, fillColor, | 37 | this.init = function(world, xOffset, yOffset, width, height, strokeSize, strokeColor, fillColor, |
46 | tlRadius, trRadius, blRadius, brRadius, strokeMaterial, fillMaterial, strokeStyle) | 38 | tlRadius, trRadius, blRadius, brRadius, strokeMaterial, fillMaterial, strokeStyle) |
@@ -279,8 +271,8 @@ function GLRectangle() | |||
279 | 271 | ||
280 | // stroke | 272 | // stroke |
281 | var strokeMaterial = this.makeStrokeMaterial(); | 273 | var strokeMaterial = this.makeStrokeMaterial(); |
282 | prim = this.createStroke([x,y], 2*xFill, 2*yFill, strokeSize, tlRadius, blRadius, brRadius, trRadius, strokeMaterial) | 274 | var strokePrim = this.createStroke([x,y], 2*xFill, 2*yFill, strokeSize, tlRadius, blRadius, brRadius, trRadius, strokeMaterial); |
283 | this._primArray.push( prim ); | 275 | this._primArray.push( strokePrim ); |
284 | this._materialNodeArray.push( strokeMaterial.getMaterialNode() ); | 276 | this._materialNodeArray.push( strokeMaterial.getMaterialNode() ); |
285 | 277 | ||
286 | // fill | 278 | // fill |
@@ -291,60 +283,13 @@ function GLRectangle() | |||
291 | xFill -= strokeSize; | 283 | xFill -= strokeSize; |
292 | yFill -= strokeSize; | 284 | yFill -= strokeSize; |
293 | var fillMaterial = this.makeFillMaterial(); | 285 | var fillMaterial = this.makeFillMaterial(); |
294 | prim = this.createFill([x,y], 2*xFill, 2*yFill, tlRadius, blRadius, brRadius, trRadius, fillMaterial) | 286 | var fillPrim = this.createFill([x,y], 2*xFill, 2*yFill, tlRadius, blRadius, brRadius, trRadius, fillMaterial); |
295 | this._primArray.push( prim ); | 287 | this._primArray.push( fillPrim ); |
296 | this._materialNodeArray.push( fillMaterial.getMaterialNode() ); | 288 | this._materialNodeArray.push( fillMaterial.getMaterialNode() ); |
297 | 289 | ||
298 | world.updateObject(this); | 290 | world.updateObject(this); |
299 | } | 291 | } |
300 | 292 | ||
301 | this.makeStrokeMaterial = function() | ||
302 | { | ||
303 | var strokeMaterial; | ||
304 | if (this.getStrokeMaterial()) | ||
305 | strokeMaterial = this.getStrokeMaterial().dup(); | ||
306 | else | ||
307 | strokeMaterial = new FlatMaterial(); | ||
308 | |||
309 | if (strokeMaterial) | ||
310 | { | ||
311 | strokeMaterial.init( this.getWorld() ); | ||
312 | if(this._strokeColor) | ||
313 | { | ||
314 | strokeMaterial.setProperty("color", this._strokeColor); | ||
315 | } | ||
316 | } | ||
317 | |||
318 | this._materialArray.push( strokeMaterial ); | ||
319 | this._materialTypeArray.push( "stroke" ); | ||
320 | |||
321 | return strokeMaterial; | ||
322 | } | ||
323 | |||
324 | this.makeFillMaterial = function() | ||
325 | { | ||
326 | var fillMaterial; | ||
327 | if (this.getFillMaterial()) | ||
328 | fillMaterial = this.getFillMaterial().dup(); | ||
329 | else | ||
330 | fillMaterial = new FlatMaterial(); | ||
331 | |||
332 | if (fillMaterial) | ||
333 | { | ||
334 | fillMaterial.init( this.getWorld() ); | ||
335 | //if(!this.getFillMaterial() && this._fillColor) | ||
336 | if (this._fillColor) | ||
337 | { | ||
338 | fillMaterial.setProperty("color", this._fillColor); | ||
339 | } | ||
340 | } | ||
341 | |||
342 | this._materialArray.push( fillMaterial ); | ||
343 | this._materialTypeArray.push( "fill" ); | ||
344 | |||
345 | return fillMaterial; | ||
346 | } | ||
347 | |||
348 | this.renderQuadraticBezier = function( bPts, ctx ) | 293 | this.renderQuadraticBezier = function( bPts, ctx ) |
349 | { | 294 | { |
350 | if (!bPts) return; | 295 | if (!bPts) return; |
@@ -1217,7 +1162,7 @@ ShapePrimitive.create = function(coords, normals, uvs, indices, primType, ver | |||
1217 | "a_normal":{'type':renderer.VS_ELEMENT_FLOAT3, 'bufferIndex':1, 'bufferUsage': renderer.BUFFER_STATIC}, | 1162 | "a_normal":{'type':renderer.VS_ELEMENT_FLOAT3, 'bufferIndex':1, 'bufferUsage': renderer.BUFFER_STATIC}, |
1218 | 1163 | ||
1219 | "texcoord":{'type':renderer.VS_ELEMENT_FLOAT2, 'bufferIndex':2, 'bufferUsage': renderer.BUFFER_STATIC}, | 1164 | "texcoord":{'type':renderer.VS_ELEMENT_FLOAT2, 'bufferIndex':2, 'bufferUsage': renderer.BUFFER_STATIC}, |
1220 | "a_texcoord":{'type':renderer.VS_ELEMENT_FLOAT2, 'bufferIndex':2, 'bufferUsage': renderer.BUFFER_STATIC}, | 1165 | "a_texcoord":{'type':renderer.VS_ELEMENT_FLOAT2, 'bufferIndex':2, 'bufferUsage': renderer.BUFFER_STATIC} |
1221 | }; | 1166 | }; |
1222 | 1167 | ||
1223 | 1168 | ||