aboutsummaryrefslogtreecommitdiff
path: root/js/data/pi
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-16 16:06:24 -0700
committerNivesh Rajbhandari2012-04-16 16:06:24 -0700
commitc253192a08b499ea7be46fa5438d273e51f7ec5a (patch)
tree18a1f0e3679c0eb993a9dedb537035d3861f49ac /js/data/pi
parente19376c54eedd1f1c457ba405b2f110be376a559 (diff)
parent4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff)
downloadninja-c253192a08b499ea7be46fa5438d273e51f7ec5a.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/data/pi')
-rwxr-xr-xjs/data/pi/pi-data.js213
1 files changed, 211 insertions, 2 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index ba03c347..157c54ec 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -131,6 +131,8 @@ exports.PiData = Montage.create( Montage, {
131 type : "hottext", 131 type : "hottext",
132 id : "borderWidth", 132 id : "borderWidth",
133 prop : "border-width", 133 prop : "border-width",
134 defaultValue: 0,
135 valueMutator: parseFloat,
134 label : "Border", 136 label : "Border",
135 min : 0, 137 min : 0,
136 max : 100, 138 max : 100,
@@ -393,6 +395,17 @@ exports.PiData = Montage.create( Montage, {
393 ], 395 ],
394 [ 396 [
395 { 397 {
398 type: "checkbox",
399 id: "animate",
400 prop: "animate",
401 defaultValue: true,
402 value: "Animate",
403 checked: true,
404 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
405 }
406 ],
407 [
408 {
396 type: "dropdown", 409 type: "dropdown",
397 id: "strokeMaterial", 410 id: "strokeMaterial",
398 prop: "strokeMaterial", 411 prop: "strokeMaterial",
@@ -402,6 +415,13 @@ exports.PiData = Montage.create( Montage, {
402 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 415 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
403 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, 416 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
404 divider : true 417 divider : true
418 },
419 {
420 type: "button",
421 id: "editStrokeMaterial",
422 prop: "editStrokeMaterial",
423 label: "Edit",
424 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
405 } 425 }
406 ], 426 ],
407 [ 427 [
@@ -414,6 +434,13 @@ exports.PiData = Montage.create( Montage, {
414 dataField: "_name", 434 dataField: "_name",
415 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 435 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
416 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } 436 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
437 },
438 {
439 type: "button",
440 id: "editFillMaterial",
441 prop: "editFillMaterial",
442 label: "Edit",
443 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
417 } 444 }
418 ] 445 ]
419 ] 446 ]
@@ -472,6 +499,17 @@ exports.PiData = Montage.create( Montage, {
472 ], 499 ],
473 [ 500 [
474 { 501 {
502 type: "checkbox",
503 id: "animate",
504 prop: "animate",
505 defaultValue: true,
506 value: "Animate",
507 checked: true,
508 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
509 }
510 ],
511 [
512 {
475 type: "dropdown", 513 type: "dropdown",
476 id: "strokeMaterial", 514 id: "strokeMaterial",
477 prop: "strokeMaterial", 515 prop: "strokeMaterial",
@@ -481,6 +519,13 @@ exports.PiData = Montage.create( Montage, {
481 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 519 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
482 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, 520 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
483 divider : true 521 divider : true
522 },
523 {
524 type: "button",
525 id: "editStrokeMaterial",
526 prop: "editStrokeMaterial",
527 label: "Edit",
528 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
484 } 529 }
485 ] 530 ]
486 ] 531 ]
@@ -535,7 +580,7 @@ exports.PiData = Montage.create( Montage, {
535 valueMutator: parseFloat, 580 valueMutator: parseFloat,
536 value : 0, 581 value : 0,
537 min : 0, 582 min : 0,
538 max : 100, 583 max : 99,
539 unit : "%", 584 unit : "%",
540 acceptableUnits: ["%"] 585 acceptableUnits: ["%"]
541 586
@@ -559,6 +604,17 @@ exports.PiData = Montage.create( Montage, {
559 ], 604 ],
560 [ 605 [
561 { 606 {
607 type: "checkbox",
608 id: "animate",
609 prop: "animate",
610 defaultValue: true,
611 value: "Animate",
612 checked: true,
613 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
614 }
615 ],
616 [
617 {
562 type: "dropdown", 618 type: "dropdown",
563 id: "strokeMaterial", 619 id: "strokeMaterial",
564 prop: "strokeMaterial", 620 prop: "strokeMaterial",
@@ -568,6 +624,13 @@ exports.PiData = Montage.create( Montage, {
568 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 624 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
569 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, 625 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
570 divider : true 626 divider : true
627 },
628 {
629 type: "button",
630 id: "editStrokeMaterial",
631 prop: "editStrokeMaterial",
632 label: "Edit",
633 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
571 } 634 }
572 ], 635 ],
573 [ 636 [
@@ -580,12 +643,158 @@ exports.PiData = Montage.create( Montage, {
580 dataField: "_name", 643 dataField: "_name",
581 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 644 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
582 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } 645 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
646 },
647 {
648 type: "button",
649 id: "editFillMaterial",
650 prop: "editFillMaterial",
651 label: "Edit",
652 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
583 } 653 }
584 ] 654 ]
585 ] 655 ]
586 } 656 }
587 ] 657 ]
588 } 658 },
659 SubpathPi: {
660 value: [
661 {
662 label: "Stroke",
663
664 Section: [
665 [
666 {
667 type : "color",
668 prop: "border",
669 id : "stroke"
670 },
671 {
672 type : "color",
673 id : "fill",
674 prop: "background",
675 divider : true
676 }
677 ],
678 [
679 {
680 type : "hottext",
681 id : "strokeSize",
682 prop : "strokeSize",
683 label : "Stroke",
684 valueMutator: parseFloat,
685 min : 1,
686 max : 100,
687 value : 1,
688 unit : "px",
689 acceptableUnits: ["pt", "px"]
690 }
691 ]
692 ]
693 }
694 ]
695 },
696 BrushStrokePi: {
697 value: [
698 {
699 label: "Stroke",
700
701 Section: [
702 [
703 {
704 type : "color",
705 prop: "border",
706 id : "stroke"
707 },
708 {
709 type : "color",
710 id : "fill",
711 prop: "background",
712 visible : false,
713 divider : true
714 }
715 ],
716 [
717 {
718 type : "hottext",
719 id : "strokeSi