aboutsummaryrefslogtreecommitdiff
path: root/js/data/pi
diff options
context:
space:
mode:
authorJonathan Duran2012-02-08 10:48:52 -0800
committerJonathan Duran2012-02-08 10:48:52 -0800
commit8a2ef825490358f992d6d687174b0a16fd8302c1 (patch)
tree12cdf68a4f1de01fc33b9e23bbce0afab6c2d7ae /js/data/pi
parenta460855c2132bffc666582659520e575d687d0cd (diff)
downloadninja-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/data/pi')
-rw-r--r--js/data/pi/pi-data.js48
1 files changed, 44 insertions, 4 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index dd75e255..10b33a0e 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -369,12 +369,24 @@ exports.PiData = Montage.create( Montage, {
369 Section: [ 369 Section: [
370 [ 370 [
371 { 371 {
372 type: "checkbox",
373 id: "useWebGl",
374 prop: "useWebGl",
375 defaultValue: false,
376 value: "Use WebGL",
377 checked: false
378 }
379 ],
380 [
381 {
372 type: "dropdown", 382 type: "dropdown",
373 id: "strokeMaterial", 383 id: "strokeMaterial",
374 prop: "strokeMaterial", 384 prop: "strokeMaterial",
375 label: "Stroke", 385 label: "Stroke",
376 labelField: "_name", 386 labelField: "_name",
387 dataField: "_name",
377 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 388 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
389 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
378 divider : true 390 divider : true
379 } 391 }
380 ], 392 ],
@@ -385,7 +397,9 @@ exports.PiData = Montage.create( Montage, {
385 prop: "fillMaterial", 397 prop: "fillMaterial",
386 label: "Fill", 398 label: "Fill",
387 labelField: "_name", 399 labelField: "_name",
388 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 400 dataField: "_name",
401 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
402 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
389 } 403 }
390 ] 404 ]
391 ] 405 ]
@@ -434,11 +448,23 @@ exports.PiData = Montage.create( Montage, {
434 Section: [ 448 Section: [
435 [ 449 [
436 { 450 {
451 type: "checkbox",
452 id: "useWebGl",
453 prop: "useWebGl",
454 defaultValue: false,
455 value: "Use WebGL",
456 checked: false
457 }
458 ],
459 [
460 {
437 type: "dropdown", 461 type: "dropdown",
438 id: "stroke", 462 id: "stroke",
439 label: "Stroke", 463 label: "Stroke",
440 labelField: "_name", 464 labelField: "_name",
441 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 465 dataField: "_name",
466 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
467 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
442 } 468 }
443 ] 469 ]
444 ] 470 ]
@@ -507,12 +533,24 @@ exports.PiData = Montage.create( Montage, {
507 Section: [ 533 Section: [
508 [ 534 [
509 { 535 {
536 type: "checkbox",
537 id: "useWebGl",
538 prop: "useWebGl",
539 defaultValue: false,
540 value: "Use WebGL",
541 checked: false
542 }
543 ],
544 [
545 {
510 type: "dropdown", 546 type: "dropdown",
511 id: "strokeMaterial", 547 id: "strokeMaterial",
512 prop: "strokeMaterial", 548 prop: "strokeMaterial",
513 label: "Stroke", 549 label: "Stroke",
514 labelFunction: function(item) { return item.getName(); }, 550 labelField: "_name",
551 dataField: "_name",
515 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 552 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
553 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
516 divider : true 554 divider : true
517 } 555 }
518 ], 556 ],
@@ -523,7 +561,9 @@ exports.PiData = Montage.create( Montage, {
523 prop: "fillMaterial", 561 prop: "fillMaterial",
524 label: "Fill", 562 label: "Fill",
525 labelField: "_name", 563 labelField: "_name",
526 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 564 dataField: "_name",
565 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
566 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
527 } 567 }
528 ] 568 ]
529 ] 569 ]