diff options
Diffstat (limited to 'js/data/pi/pi-data.js')
-rwxr-xr-x | js/data/pi/pi-data.js | 76 |
1 files changed, 60 insertions, 16 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index de5cd34d..10b33a0e 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -23,13 +23,13 @@ exports.PiData = Montage.create( Montage, { | |||
23 | { | 23 | { |
24 | type : "color", | 24 | type : "color", |
25 | id : "colorStroke", | 25 | id : "colorStroke", |
26 | prop: "border-color", | 26 | prop: "border", |
27 | label : "Stroke" | 27 | label : "Stroke" |
28 | }, | 28 | }, |
29 | { | 29 | { |
30 | type : "color", | 30 | type : "color", |
31 | id : "colorFill", | 31 | id : "colorFill", |
32 | prop: "background-color", | 32 | prop: "background", |
33 | divider : true | 33 | divider : true |
34 | } | 34 | } |
35 | ], | 35 | ], |
@@ -102,11 +102,13 @@ exports.PiData = Montage.create( Montage, { | |||
102 | { | 102 | { |
103 | type : "color", | 103 | type : "color", |
104 | id : "colorStroke", | 104 | id : "colorStroke", |
105 | prop: "border", | ||
105 | label : "Stroke" | 106 | label : "Stroke" |
106 | }, | 107 | }, |
107 | { | 108 | { |
108 | type : "color", | 109 | type : "color", |
109 | id : "colorFill", | 110 | id : "colorFill", |
111 | prop: "background", | ||
110 | divider : true | 112 | divider : true |
111 | } | 113 | } |
112 | ], | 114 | ], |
@@ -221,13 +223,13 @@ exports.PiData = Montage.create( Montage, { | |||
221 | { | 223 | { |
222 | type : "color", | 224 | type : "color", |
223 | id : "colorStroke", | 225 | id : "colorStroke", |
224 | prop: "border-color", | 226 | prop: "border", |
225 | label : "Stroke" | 227 | label : "Stroke" |
226 | }, | 228 | }, |
227 | { | 229 | { |
228 | type : "color", | 230 | type : "color", |
229 | id : "colorFill", | 231 | id : "colorFill", |
230 | prop: "background-color", | 232 | prop: "background", |
231 | divider : true | 233 | divider : true |
232 | } | 234 | } |
233 | ], | 235 | ], |
@@ -279,13 +281,13 @@ exports.PiData = Montage.create( Montage, { | |||
279 | [ | 281 | [ |
280 | { | 282 | { |
281 | type : "color", | 283 | type : "color", |
282 | id : "stroke", | 284 | prop: "border", |
283 | prop : "stroke" | 285 | id : "stroke" |
284 | }, | 286 | }, |
285 | { | 287 | { |
286 | type : "color", | 288 | type : "color", |
289 | prop: "background", | ||
287 | id : "fill", | 290 | id : "fill", |
288 | prop : "fill", | ||
289 | divider : true | 291 | divider : true |
290 | } | 292 | } |
291 | ], | 293 | ], |
@@ -367,12 +369,24 @@ exports.PiData = Montage.create( Montage, { | |||
367 | Section: [ | 369 | Section: [ |
368 | [ | 370 | [ |
369 | { | 371 | { |
372 | type: "checkbox", | ||
373 | id: "useWebGl", | ||
374 | prop: "useWebGl", | ||
375 | defaultValue: false, | ||
376 | value: "Use WebGL", | ||
377 | checked: false | ||
378 | } | ||
379 | ], | ||
380 | [ | ||
381 | { | ||
370 | type: "dropdown", | 382 | type: "dropdown", |
371 | id: "strokeMaterial", | 383 | id: "strokeMaterial", |
372 | prop: "strokeMaterial", | 384 | prop: "strokeMaterial", |
373 | label: "Stroke", | 385 | label: "Stroke", |
374 | labelField: "_name", | 386 | labelField: "_name", |
387 | dataField: "_name", | ||
375 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 388 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
389 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, | ||
376 | divider : true | 390 | divider : true |
377 | } | 391 | } |
378 | ], | 392 | ], |
@@ -383,7 +397,9 @@ exports.PiData = Montage.create( Montage, { | |||
383 | prop: "fillMaterial", | 397 | prop: "fillMaterial", |
384 | label: "Fill", | 398 | label: "Fill", |
385 | labelField: "_name", | 399 | labelField: "_name", |
386 | 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" } | ||
387 | } | 403 | } |
388 | ] | 404 | ] |
389 | ] | 405 | ] |
@@ -399,12 +415,13 @@ exports.PiData = Montage.create( Montage, { | |||
399 | [ | 415 | [ |
400 | { | 416 | { |
401 | type : "color", | 417 | type : "color", |
402 | id : "stroke", | 418 | prop: "border", |
403 | prop : "stroke" | 419 | id : "stroke" |
404 | }, | 420 | }, |
405 | { | 421 | { |
406 | type : "color", | 422 | type : "color", |
407 | id : "fill", | 423 | id : "fill", |
424 | prop: "background", | ||
408 | visible : false, | 425 | visible : false, |
409 | divider : true | 426 | divider : true |
410 | } | 427 | } |
@@ -431,11 +448,23 @@ exports.PiData = Montage.create( Montage, { | |||
431 | Section: [ | 448 | Section: [ |
432 | [ | 449 | [ |
433 | { | 450 | { |
451 | type: "checkbox", | ||
452 | id: "useWebGl", | ||
453 | prop: "useWebGl", | ||
454 | defaultValue: false, | ||
455 | value: "Use WebGL", | ||
456 | checked: false | ||
457 | } | ||
458 | ], | ||
459 | [ | ||
460 | { | ||
434 | type: "dropdown", | 461 | type: "dropdown", |
435 | id: "stroke", | 462 | id: "stroke", |
436 | label: "Stroke", | 463 | label: "Stroke", |
437 | labelField: "_name", | 464 | labelField: "_name", |
438 | 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" } | ||
439 | } | 468 | } |
440 | ] | 469 | ] |
441 | ] | 470 | ] |
@@ -451,13 +480,13 @@ exports.PiData = Montage.create( Montage, { | |||
451 | [ | 480 | [ |
452 | { | 481 | { |
453 | type : "color", | 482 | type : "color", |
454 | id : "stroke", | 483 | prop: "border", |
455 | prop : "stroke" | 484 | id : "stroke" |
456 | }, | 485 | }, |
457 | { | 486 | { |
458 | type : "color", | 487 | type : "color", |
488 | prop: "background", | ||
459 | id : "fill", | 489 | id : "fill", |
460 | prop : "fill", | ||
461 | divider : true | 490 | divider : true |
462 | } | 491 | } |
463 | ], | 492 | ], |
@@ -467,6 +496,7 @@ exports.PiData = Montage.create( Montage, { | |||
467 | id : "strokeSize", | 496 | id : "strokeSize", |
468 | prop : "strokeSize", | 497 | prop : "strokeSize", |
469 | label : "Stroke", | 498 | label : "Stroke", |
499 | valueMutator: parseFloat, | ||
470 | min : 0, | 500 | min : 0, |
471 | max : 100, | 501 | max : 100, |
472 | value : 1, | 502 | value : 1, |
@@ -503,12 +533,24 @@ exports.PiData = Montage.create( Montage, { | |||
503 | Section: [ | 533 | Section: [ |
504 | [ | 534 | [ |
505 | { | 535 | { |
536 | type: "checkbox", | ||
537 | id: "useWebGl", | ||
538 | prop: "useWebGl", | ||
539 | defaultValue: false, | ||
540 | value: "Use WebGL", | ||
541 | checked: false | ||
542 | } | ||
543 | ], | ||
544 | [ | ||
545 | { | ||
506 | type: "dropdown", | 546 | type: "dropdown", |
507 | id: "strokeMaterial", | 547 | id: "strokeMaterial", |
508 | prop: "strokeMaterial", | 548 | prop: "strokeMaterial", |
509 | label: "Stroke", | 549 | label: "Stroke", |
510 | labelFunction: function(item) { return item.getName(); }, | 550 | labelField: "_name", |
551 | dataField: "_name", | ||
511 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 552 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
553 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, | ||
512 | divider : true | 554 | divider : true |
513 | } | 555 | } |
514 | ], |