From 23baa44e0bc7bfb24e42702c1ef58bf62da083d8 Mon Sep 17 00:00:00 2001 From: Pushkar Joshi Date: Wed, 14 Mar 2012 15:37:09 -0700 Subject: PI for pen and brush strokes --- js/data/pi/pi-data.js | 139 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 138 insertions(+), 1 deletion(-) (limited to 'js/data/pi') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index ba03c347..ebd15832 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -585,7 +585,144 @@ exports.PiData = Montage.create( Montage, { ] } ] - } + }, + SubpathPi: { + value: [ + { + label: "Stroke", + + Section: [ + [ + { + type : "color", + prop: "border", + id : "stroke" + }, + { + type : "color", + id : "fill", + prop: "background", + divider : true + } + ], + [ + { + type : "hottext", + id : "strokeSize", + prop : "strokeSize", + label : "Stroke", + valueMutator: parseFloat, + min : 1, + max : 100, + value : 1, + unit : "px", + acceptableUnits: ["pt", "px"] + } + ] + ] + } + ] + }, + BrushStrokePi: { + value: [ + { + label: "Stroke", + + Section: [ + [ + { + type : "color", + prop: "border", + id : "stroke" + }, + { + type : "color", + id : "fill", + prop: "background", + visible : false, + divider : true + } + ], + [ + { + type : "hottext", + id : "strokeSize", + prop : "strokeSize", + label : "Stroke", + valueMutator: parseFloat, + min : 1, + max : 100, + value : 1, + unit : "px", + acceptableUnits: ["pt", "px"] + }, + { + type : "hottext", + id : "strokeHardness", + prop : "strokeHardness", + label : "Hardness", + valueMutator: parseFloat, + min : 0, + max : 100, + value : 100, + unit : "%", + acceptableUnits: ["%"] + } + ] + ] + }, + { + label: "Smoothing", + Section: [ + [ + { + type: "checkbox", + id: "doSmoothing", + prop: "doSmoothing", + defaultValue: false, + value: "Smoothing", + checked: false + }, + { + type : "hottext", + id : "strokeSmoothing", + prop : "strokeSmoothing", + label : "", + valueMutator: parseFloat, + min : 0, + max : 100, + value : 0 + } + ] + ] + }, + { + label: "Calligraphic", + Section: [ + [ + { + type: "checkbox", + id: "isCalligraphic", + prop: "isCalligraphic", + defaultValue: false, + value: "Calligraphic", + checked: false + }, + { + type : "hottext", + id : "strokeAngle", + prop : "strokeAngle", + label : "", + valueMutator: parseFloat, + min : -90, + max : 90, + value : 0 + } + ] + ] + } + ] //value: [ + } //BrushStrokePi: { }); -- cgit v1.2.3 From e574f722864a246bad40d3f5a4e59f7ccb206ea9 Mon Sep 17 00:00:00 2001 From: Pushkar Joshi Date: Thu, 15 Mar 2012 14:33:48 -0700 Subject: update values in the PI from values of the selected brush stroke or pen tool path --- js/data/pi/pi-data.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'js/data/pi') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index ebd15832..9d90aa3d 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -680,14 +680,14 @@ exports.PiData = Montage.create( Montage, { id: "doSmoothing", prop: "doSmoothing", defaultValue: false, - value: "Smoothing", + value: "Y/N", checked: false }, { type : "hottext", id : "strokeSmoothing", prop : "strokeSmoothing", - label : "", + label : "Amount", valueMutator: parseFloat, min : 0, max : 100, @@ -705,18 +705,20 @@ exports.PiData = Montage.create( Montage, { id: "isCalligraphic", prop: "isCalligraphic", defaultValue: false, - value: "Calligraphic", - checked: false + value: "Y/N", + checked: false, + divider : true }, { type : "hottext", id : "strokeAngle", prop : "strokeAngle", - label : "", + label : "Angle", valueMutator: parseFloat, min : -90, max : 90, - value : 0 + value : 0, + unit : "deg." } ] ] -- cgit v1.2.3 From 92bc54df4acfec849568ab619150a5da49c087fa Mon Sep 17 00:00:00 2001 From: Pushkar Joshi Date: Tue, 20 Mar 2012 10:24:15 -0700 Subject: revert to using the angle without flipping its sign...fixing some minor bugs and code cleanup GOOD status before doing 3D unprojection step --- js/data/pi/pi-data.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/data/pi') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 9d90aa3d..ad2f3088 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -649,7 +649,7 @@ exports.PiData = Montage.create( Montage, { id : "strokeSize", prop : "strokeSize", label : "Stroke", - valueMutator: parseFloat, + valueMutator: parseInt, min : 1, max : 100, value : 1, @@ -661,7 +661,7 @@ exports.PiData = Montage.create( Montage, { id : "strokeHardness", prop : "strokeHardness", label : "Hardness", - valueMutator: parseFloat, + valueMutator: parseInt, min : 0, max : 100, value : 100, -- cgit v1.2.3 From e1c4f30a4c13d747fa69d78598e0961286bbe571 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Tue, 20 Mar 2012 10:59:05 -0700 Subject: Support button control in Properties Panel and use them for edit fill and stroke material. Signed-off-by: Nivesh Rajbhandari --- js/data/pi/pi-data.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'js/data/pi') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index ba03c347..28ffa536 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -402,6 +402,13 @@ exports.PiData = Montage.create( Montage, { items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, divider : true + }, + { + type: "button", + id: "editStrokeMaterial", + prop: "editStrokeMaterial", + label: "Edit", + enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } } ], [ @@ -414,6 +421,13 @@ exports.PiData = Montage.create( Montage, { dataField: "_name", items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } + }, + { + type: "button", + id: "editFillMaterial", + prop: "editFillMaterial", + label: "Edit", + enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } } ] ] -- cgit v1.2.3 From 1eb663dc0ab2f9f2a6daea57ad2974b731dbc513 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Tue, 20 Mar 2012 11:07:49 -0700 Subject: Support edit material button in oval and line PI. Signed-off-by: Nivesh Rajbhandari --- js/data/pi/pi-data.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'js/data/pi') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 28ffa536..53fec3be 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -495,6 +495,13 @@ exports.PiData = Montage.create( Montage, { items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, divider : true + }, + { + type: "button", + id: "editStrokeMaterial", + prop: "editStrokeMaterial", + label: "Edit", + enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } } ] ] @@ -582,6 +589,13 @@ exports.PiData = Montage.create( Montage, { items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, divider : true + }, + { + type: "button", + id: "editStrokeMaterial", + prop: "editStrokeMaterial", + label: "Edit", + enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } } ], [ @@ -594,6 +608,13 @@ exports.PiData = Montage.create( Montage, { dataField: "_name", items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } + }, + { + type: "button", + id: "editFillMaterial", + prop: "editFillMaterial", + label: "Edit", + enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } } ] ] -- cgit v1.2.3 From e52b0dcb9540b854a341a881de2d26aa753e9a82 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Thu, 22 Mar 2012 16:18:38 -0700 Subject: Adding checkbox in PI to start/stop WebGL animation preview. Signed-off-by: Nivesh Rajbhandari --- js/data/pi/pi-data.js | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'js/data/pi') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 53fec3be..56337124 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -391,6 +391,16 @@ exports.PiData = Montage.create( Montage, { checked: false } ], + [ + { + type: "checkbox", + id: "animate", + prop: "animate", + defaultValue: true, + value: "Animate", + checked: true + } + ], [ { type: "dropdown", @@ -484,6 +494,16 @@ exports.PiData = Montage.create( Montage, { checked: false } ], + [ + { + type: "checkbox", + id: "animate", + prop: "animate", + defaultValue: true, + value: "Animate", + checked: true + } + ], [ { type: "dropdown", @@ -578,6 +598,16 @@ exports.PiData = Montage.create( Montage, { checked: false } ], + [ + { + type: "checkbox", + id: "animate", + prop: "animate", + defaultValue: true, + value: "Animate", + checked: true + } + ], [ { type: "dropdown", -- cgit v1.2.3 From f2371c4a5a18a4dadb2e76f0275b90ac541e889d Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Thu, 22 Mar 2012 21:20:44 -0700 Subject: Adding enabled/disabled support for PI's checkbox control. Signed-off-by: Nivesh Rajbhandari --- js/data/pi/pi-data.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'js/data/pi') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 56337124..52360302 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -398,7 +398,8 @@ exports.PiData = Montage.create( Montage, { prop: "animate", defaultValue: true, value: "Animate", - checked: true + checked: true, + enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } } ], [ @@ -501,7 +502,8 @@ exports.PiData = Montage.create( Montage, { prop: "animate", defaultValue: true, value: "Animate", - checked: true + checked: true, + enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } } ], [ @@ -605,7 +607,8 @@ exports.PiData = Montage.create( Montage, { prop: "animate", defaultValue: true, value: "Animate", - checked: true + checked: true, + enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } } ], [ -- cgit v1.2.3 From c2e9ed5bc4cbef870283784fa2a91f43ff72cade Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Mon, 2 Apr 2012 11:14:46 -0700 Subject: IKNinja-1410 - Inner Radius should be restricted to 99%. Signed-off-by: Nivesh Rajbhandari --- js/data/pi/pi-data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/data/pi') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 7edc90d8..07017f09 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -578,7 +578,7 @@ exports.PiData = Montage.create( Montage, { valueMutator: parseFloat, value : 0, min : 0, - max : 100, + max : 99, unit : "%", acceptableUnits: ["%"] -- cgit v1.2.3 From 77c6ab76ffe9fc380ed6fdb7b29ccd40acaee74d Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Thu, 12 Apr 2012 14:24:25 -0700 Subject: Fixing selection/tag layout drawing when canvas and image elements have borders. Signed-off-by: Nivesh Rajbhandari --- js/data/pi/pi-data.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js/data/pi') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 07017f09..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, { type : "hottext", id : "borderWidth", prop : "border-width", + defaultValue: 0, + valueMutator: parseFloat, label : "Border", min : 0, max : 100, -- cgit v1.2.3