aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-20 13:38:42 -0700
committerValerio Virgillito2012-03-20 13:38:42 -0700
commit9facfb41b0b0f9fab9ddc9c8473af1d1d7e1ff18 (patch)
treeb6c35ce69c667f3ee8c16cc5e9a86021a4646288 /js/data
parentafe4b3d6567a35586e970682d71cba61c416e496 (diff)
parent634358d2697d9668bb9406ac7a029aafae542285 (diff)
downloadninja-9facfb41b0b0f9fab9ddc9c8473af1d1d7e1ff18.tar.gz
Merge pull request #129 from mqg734/WebGLMaterials
Added Montage button as a valid PI control and used it to invoke the edit material popup.
Diffstat (limited to 'js/data')
-rwxr-xr-xjs/data/pi/pi-data.js35
1 files changed, 35 insertions, 0 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index ba03c347..53fec3be 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -402,6 +402,13 @@ exports.PiData = Montage.create( Montage, {
402 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 402 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
403 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, 403 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
404 divider : true 404 divider : true
405 },
406 {
407 type: "button",
408 id: "editStrokeMaterial",
409 prop: "editStrokeMaterial",
410 label: "Edit",
411 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
405 } 412 }
406 ], 413 ],
407 [ 414 [
@@ -414,6 +421,13 @@ exports.PiData = Montage.create( Montage, {
414 dataField: "_name", 421 dataField: "_name",
415 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 422 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
416 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } 423 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
424 },
425 {
426 type: "button",
427 id: "editFillMaterial",
428 prop: "editFillMaterial",
429 label: "Edit",
430 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
417 } 431 }
418 ] 432 ]
419 ] 433 ]
@@ -481,6 +495,13 @@ exports.PiData = Montage.create( Montage, {
481 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 495 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
482 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, 496 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
483 divider : true 497 divider : true
498 },
499 {
500 type: "button",
501 id: "editStrokeMaterial",
502 prop: "editStrokeMaterial",
503 label: "Edit",
504 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
484 } 505 }
485 ] 506 ]
486 ] 507 ]
@@ -568,6 +589,13 @@ exports.PiData = Montage.create( Montage, {
568 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 589 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
569 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, 590 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
570 divider : true 591 divider : true
592 },
593 {
594 type: "button",
595 id: "editStrokeMaterial",
596 prop: "editStrokeMaterial",
597 label: "Edit",
598 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
571 } 599 }
572 ], 600 ],
573 [ 601 [
@@ -580,6 +608,13 @@ exports.PiData = Montage.create( Montage, {
580 dataField: "_name", 608 dataField: "_name",
581 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 609 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
582 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } 610 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
611 },
612 {
613 type: "button",
614 id: "editFillMaterial",
615 prop: "editFillMaterial",
616 label: "Edit",
617 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
583 } 618 }
584 ] 619 ]
585 ] 620 ]