diff options
| author | Nivesh Rajbhandari | 2012-02-07 11:42:10 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-07 11:42:10 -0800 |
| commit | 8ad767b61460984a4031ba630f76ac8247a61857 (patch) | |
| tree | 67c178dfa5e88f95a95af419f8e2ce6a72127b80 /js/data/pi | |
| parent | 486842239c71e7964f38a09aacda4970f2a82e1a (diff) | |
| download | ninja-8ad767b61460984a4031ba630f76ac8247a61857.tar.gz | |
Fixed PI to support WebGL materials.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/data/pi')
| -rw-r--r-- | js/data/pi/pi-data.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index de192b57..10b33a0e 100644 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
| @@ -384,6 +384,7 @@ exports.PiData = Montage.create( Montage, { | |||
| 384 | prop: "strokeMaterial", | 384 | prop: "strokeMaterial", |
| 385 | label: "Stroke", | 385 | label: "Stroke", |
| 386 | labelField: "_name", | 386 | labelField: "_name", |
| 387 | dataField: "_name", | ||
| 387 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 388 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
| 388 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, | 389 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, |
| 389 | divider : true | 390 | divider : true |
| @@ -396,6 +397,7 @@ exports.PiData = Montage.create( Montage, { | |||
| 396 | prop: "fillMaterial", | 397 | prop: "fillMaterial", |
| 397 | label: "Fill", | 398 | label: "Fill", |
| 398 | labelField: "_name", | 399 | labelField: "_name", |
| 400 | dataField: "_name", | ||
| 399 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 401 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
| 400 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | 402 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } |
| 401 | } | 403 | } |
| @@ -460,6 +462,7 @@ exports.PiData = Montage.create( Montage, { | |||
| 460 | id: "stroke", | 462 | id: "stroke", |
| 461 | label: "Stroke", | 463 | label: "Stroke", |
| 462 | labelField: "_name", | 464 | labelField: "_name", |
| 465 | dataField: "_name", | ||
| 463 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 466 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
| 464 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | 467 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } |
| 465 | } | 468 | } |
| @@ -545,6 +548,7 @@ exports.PiData = Montage.create( Montage, { | |||
| 545 | prop: "strokeMaterial", | 548 | prop: "strokeMaterial", |
| 546 | label: "Stroke", | 549 | label: "Stroke", |
| 547 | labelField: "_name", | 550 | labelField: "_name", |
| 551 | dataField: "_name", | ||
| 548 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 552 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
| 549 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, | 553 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, |
| 550 | divider : true | 554 | divider : true |
| @@ -557,6 +561,7 @@ exports.PiData = Montage.create( Montage, { | |||
| 557 | prop: "fillMaterial", | 561 | prop: "fillMaterial", |
| 558 | label: "Fill", | 562 | label: "Fill", |
| 559 | labelField: "_name", | 563 | labelField: "_name", |
| 564 | dataField: "_name", | ||
| 560 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 565 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
| 561 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | 566 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } |
| 562 | } | 567 | } |