diff options
author | John Mayhew | 2012-04-02 16:28:39 -0700 |
---|---|---|
committer | John Mayhew | 2012-04-02 16:28:39 -0700 |
commit | b4155fb4c33675a8a7cd37473513718043fdf0ba (patch) | |
tree | 3d8c802473f2395d53d599ec9d8b70b60a4db50c /js/data/pi/pi-data.js | |
parent | 5ba9aeac94c86049423fd5d4b37b277263939c13 (diff) | |
parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
download | ninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/helper-classes/RDGE/rdge-compiled.js
js/helper-classes/RDGE/runtime/GLRuntime.js
js/helper-classes/RDGE/src/core/script/MeshManager.js
js/helper-classes/RDGE/src/core/script/engine.js
js/helper-classes/RDGE/src/core/script/fx/ssao.js
js/helper-classes/RDGE/src/core/script/init_state.js
js/helper-classes/RDGE/src/core/script/run_state.js
js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
js/helper-classes/RDGE/src/core/script/utilities.js
js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/lib/drawing/world.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/deform-material.js
js/lib/rdge/materials/flat-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/linear-gradient-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-blur-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/relief-tunnel-material.js
js/lib/rdge/materials/square-tunnel-material.js
js/lib/rdge/materials/star-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/tunnel-material.js
js/lib/rdge/materials/twist-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/uber-material.js
js/lib/rdge/materials/water-material.js
js/lib/rdge/materials/z-invert-material.js
js/preloader/Preloader.js
Diffstat (limited to 'js/data/pi/pi-data.js')
-rwxr-xr-x | js/data/pi/pi-data.js | 209 |
1 files changed, 208 insertions, 1 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index ba03c347..7edc90d8 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -393,6 +393,17 @@ exports.PiData = Montage.create( Montage, { | |||
393 | ], | 393 | ], |
394 | [ | 394 | [ |
395 | { | 395 | { |
396 | type: "checkbox", | ||
397 | id: "animate", | ||
398 | prop: "animate", | ||
399 | defaultValue: true, | ||
400 | value: "Animate", | ||
401 | checked: true, | ||
402 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | ||
403 | } | ||
404 | ], | ||
405 | [ | ||
406 | { | ||
396 | type: "dropdown", | 407 | type: "dropdown", |
397 | id: "strokeMaterial", | 408 | id: "strokeMaterial", |
398 | prop: "strokeMaterial", | 409 | prop: "strokeMaterial", |
@@ -402,6 +413,13 @@ exports.PiData = Montage.create( Montage, { | |||
402 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 413 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
403 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, | 414 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, |
404 | divider : true | 415 | divider : true |
416 | }, | ||
417 | { | ||
418 | type: "button", | ||
419 | id: "editStrokeMaterial", | ||
420 | prop: "editStrokeMaterial", | ||
421 | label: "Edit", | ||
422 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | ||
405 | } | 423 | } |
406 | ], | 424 | ], |
407 | [ | 425 | [ |
@@ -414,6 +432,13 @@ exports.PiData = Montage.create( Montage, { | |||
414 | dataField: "_name", | 432 | dataField: "_name", |
415 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 433 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
416 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | 434 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } |
435 | }, | ||
436 | { | ||
437 | type: "button", | ||
438 | id: "editFillMaterial", | ||
439 | prop: "editFillMaterial", | ||
440 | label: "Edit", | ||
441 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | ||
417 | } | 442 | } |
418 | ] | 443 | ] |
419 | ] | 444 | ] |
@@ -472,6 +497,17 @@ exports.PiData = Montage.create( Montage, { | |||
472 | ], | 497 | ], |
473 | [ | 498 | [ |
474 | { | 499 | { |
500 | type: "checkbox", | ||
501 | id: "animate", | ||
502 | prop: "animate", | ||
503 | defaultValue: true, | ||
504 | value: "Animate", | ||
505 | checked: true, | ||
506 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | ||
507 | } | ||
508 | ], | ||
509 | [ | ||
510 | { | ||
475 | type: "dropdown", | 511 | type: "dropdown", |
476 | id: "strokeMaterial", | 512 | id: "strokeMaterial", |
477 | prop: "strokeMaterial", | 513 | prop: "strokeMaterial", |
@@ -481,6 +517,13 @@ exports.PiData = Montage.create( Montage, { | |||
481 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 517 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
482 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, | 518 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, |
483 | divider : true | 519 | divider : true |
520 | }, | ||
521 | { | ||
522 | type: "button", | ||
523 | id: "editStrokeMaterial", | ||
524 | prop: "editStrokeMaterial", | ||
525 | label: "Edit", | ||
526 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | ||
484 | } | 527 | } |
485 | ] | 528 | ] |
486 | ] | 529 | ] |
@@ -559,6 +602,17 @@ exports.PiData = Montage.create( Montage, { | |||
559 | ], | 602 | ], |
560 | [ | 603 | [ |
561 | { | 604 | { |
605 | type: "checkbox", | ||
606 | id: "animate", | ||
607 | prop: "animate", | ||
608 | defaultValue: true, | ||
609 | value: "Animate", | ||
610 | checked: true, | ||
611 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | ||
612 | } | ||
613 | ], | ||
614 | [ | ||
615 | { | ||
562 | type: "dropdown", | 616 | type: "dropdown", |
563 | id: "strokeMaterial", | 617 | id: "strokeMaterial", |
564 | prop: "strokeMaterial", | 618 | prop: "strokeMaterial", |
@@ -568,6 +622,13 @@ exports.PiData = Montage.create( Montage, { | |||
568 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 622 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
569 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, | 623 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, |
570 | divider : true | 624 | divider : true |
625 | }, | ||
626 | { | ||
627 | type: "button", | ||
628 | id: "editStrokeMaterial", | ||
629 | prop: "editStrokeMaterial", | ||
630 | label: "Edit", | ||
631 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | ||
571 | } | 632 | } |
572 | ], | 633 | ], |
573 | [ | 634 | [ |
@@ -580,12 +641,158 @@ exports.PiData = Montage.create( Montage, { | |||
580 | dataField: "_name", | 641 | dataField: "_name", |
581 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 642 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
582 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | 643 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } |
644 | }, | ||
645 | { | ||
646 | type: "button", | ||
647 | id: "editFillMaterial", | ||
648 | prop: "editFillMaterial", | ||
649 | label: "Edit", | ||
650 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | ||
583 | } | 651 | } |
584 | ] | 652 | ] |
585 | ] | 653 | ] |
586 | } | 654 | } |
587 | ] | 655 | ] |
588 | } | 656 | }, |
657 | SubpathPi: { | ||
658 | value: [ | ||
659 | { | ||
660 | label: "Stroke", | ||
661 | |||
662 | Section: [ | ||
663 | [ | ||
664 | { | ||
665 | type : "color", | ||
666 | prop: "border", | ||
667 | id : "stroke" | ||
668 | }, | ||
669 | { | ||
670 | type : "color", | ||
671 | id : "fill", | ||
672 | prop: "background", | ||
673 | divider : true | ||
674 | } | ||
675 | ], | ||
676 | [ | ||
677 | { | ||
678 | type : "hottext", | ||
679 | id : "strokeSize", | ||
680 | prop : "strokeSize", | ||
681 | label : "Stroke", | ||
682 | valueMutator: parseFloat, | ||
683 | min : 1, | ||
684 | max : 100, | ||
685 | value : 1, | ||
686 | unit : "px", | ||
687 | acceptableUnits: ["pt", "px"] | ||
688 | } | ||
689 | ] | ||
690 | ] | ||
691 | } | ||
692 | ] | ||
693 | }, | ||
694 | BrushStrokePi: { | ||
695 | value: [ | ||
696 | { | ||
697 | label: "Stroke", | ||
698 | |||
699 | Section: [ | ||
700 | [ | ||
701 | { | ||
702 | type : "color", | ||
703 | prop: "border", | ||
704 | id : "stroke" | ||
705 | }, | ||
706 | { | ||
707 | type : "color", | ||
708 | id : "fill", | ||
709 | prop: "background", | ||
710 | visible : false, | ||
711 | divider : true | ||
712 | } | ||
713 | ], | ||
714 | [ | ||
715 | { | ||
716 | type : "hottext", | ||
717 | id : "strokeSize", | ||
718 | prop : "strokeSize", | ||
719 | label : "Stroke", | ||
720 | valueMutator: parseInt, | ||
721 | min : 1, | ||
722 | max : 100, | ||
723 | value : 1, | ||
724 | unit : "px", | ||
725 | acceptableUnits: ["pt", "px"] | ||
726 | }, | ||
727 | { | ||
728 | type : "hottext", | ||
729 | id : "strokeHardness", | ||
730 | prop : "strokeHardness", | ||
731 | label : "Hardness", | ||
732 |