aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-30 11:04:47 -0700
committerNivesh Rajbhandari2012-03-30 11:04:47 -0700
commit80782d5d0721463f716f0a7241afd09a38543199 (patch)
tree2dfb0531f2498afcad5afe95f8e338d0f1d34161 /js
parent5b4f6b1618cf571a6bce5a631f976a008e04a64e (diff)
parentf4949cab544886702e7ad6eeaa6215125c7b067a (diff)
downloadninja-80782d5d0721463f716f0a7241afd09a38543199.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFileIO
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html25
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.js30
-rwxr-xr-xjs/controllers/elements/shapes-controller.js92
-rwxr-xr-xjs/data/pi/pi-data.js141
-rwxr-xr-xjs/document/html-document.js6
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js2
-rwxr-xr-xjs/helper-classes/3D/vec-utils.js2
-rwxr-xr-xjs/helper-classes/3D/view-utils.js13
-rwxr-xr-xjs/lib/drawing/world.js6
-rwxr-xr-xjs/lib/geom/brush-stroke.js638
-rwxr-xr-xjs/lib/geom/geom-obj.js1
-rwxr-xr-xjs/lib/geom/sub-path.js18
-rw-r--r--js/tools/BrushTool.js174
-rwxr-xr-xjs/tools/PenTool.js33
14 files changed, 902 insertions, 279 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index 608111bd..98442164 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -33,7 +33,8 @@
33 "maxValue": 100, 33 "maxValue": 100,
34 "value": 100, 34 "value": 100,
35 "decimalPlace": 10, 35 "decimalPlace": 10,
36 "acceptableUnits" : ["px", "pt"] 36 "acceptableUnits" : ["%"],
37 "units" : "%"
37 } 38 }
38 }, 39 },
39 40
@@ -46,7 +47,20 @@
46 "maxValue": 90, 47 "maxValue": 90,
47 "value": 0, 48 "value": 0,
48 "decimalPlace": 10, 49 "decimalPlace": 10,
49 "acceptableUnits" : ["px", "pt"] 50 "acceptableUnits" : ["deg."],
51 "units" : "deg."
52 }
53 },
54
55 "smoothingAmountHT": {
56 "module": "js/components/hottext.reel",
57 "name": "HotText",
58 "properties": {
59 "element": {"#": "smoothingAmount"},
60 "minValue": 0,
61 "maxValue": 100,
62 "value": 0,
63 "decimalPlace": 10
50 } 64 }
51 }, 65 },
52 66
@@ -58,8 +72,10 @@
58 "_strokeSize": {"@": "strokeSizeHT"}, 72 "_strokeSize": {"@": "strokeSizeHT"},
59 "_strokeHardness": {"@": "strokeHardnessHT"}, 73 "_strokeHardness": {"@": "strokeHardnessHT"},
60 "_doSmoothing": {"#": "doSmoothing"}, 74 "_doSmoothing": {"#": "doSmoothing"},
75 "_smoothingAmount": {"@": "smoothingAmountHT"},
61 "_useCalligraphic":{"#": "useCalligraphic"}, 76 "_useCalligraphic":{"#": "useCalligraphic"},
62 "_strokeAngle": {"@": "strokeAngleHT"} 77 "_strokeAngle": {"@": "strokeAngleHT"},
78 "_angleLabel": {"#": "angleLabel"}
63 } 79 }
64 } 80 }
65 } 81 }
@@ -75,8 +91,9 @@
75 <label class="label"> Hardness:</label> 91 <label class="label"> Hardness:</label>
76 <div id="strokeHardness" class="label"></div> 92 <div id="strokeHardness" class="label"></div>
77 <label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label> 93 <label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label>
94 <div id="smoothingAmount" class="label"></div>
78 <label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label> 95 <label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label>
79 <label class="label"> Angle:</label> 96 <label class="label" id="angleLabel"> Angle:</label>
80 <div id="strokeAngle" class="label"></div> 97 <div id="strokeAngle" class="label"></div>
81 98
82 </div> 99 </div>
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.js b/js/components/tools-properties/brush-properties.reel/brush-properties.js
index e6faa0f0..fdcd50f8 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.js
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.js
@@ -9,6 +9,33 @@ var Component = require("montage/ui/component").Component;
9var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; 9var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
10 10
11exports.BrushProperties = Montage.create(ToolProperties, { 11exports.BrushProperties = Montage.create(ToolProperties, {
12 _subPrepare: {
13 value: function() {
14 this.handleChange(null);
15 this._useCalligraphic.addEventListener("change", this, false);
16 this._doSmoothing.addEventListener("change", this, false);
17 }
18 },
19 handleChange: {
20 value: function(event) {
21 if(this._useCalligraphic.checked) {
22 this._strokeAngle.element.style["display"] = "";
23 this._strokeAngle.visible = true;
24 this._angleLabel.style["display"] = "";
25 } else {
26 this._strokeAngle.element.style["display"] = "none";
27 this._strokeAngle.visible = false;
28 this._angleLabel.style["display"] = "none";
29 }
30 if(this._doSmoothing.checked) {
31 this._smoothingAmount.element.style["display"] = "";
32 this._smoothingAmount.visible = true;
33 } else {
34 this._smoothingAmount.element.style["display"] = "none";
35 this._smoothingAmount.visible = false;
36 }
37 }
38 },
12 strokeSize: { 39 strokeSize: {
13 get: function() { return this._strokeSize; } 40 get: function() { return this._strokeSize; }
14 }, 41 },
@@ -18,6 +45,9 @@ exports.BrushProperties = Montage.create(ToolProperties, {
18 doSmoothing:{ 45 doSmoothing:{
19 get: function() {return this._doSmoothing.checked; } 46 get: function() {return this._doSmoothing.checked; }
20 }, 47 },
48 smoothingAmount:{
49 get: function() {return this._smoothingAmount;}
50 },
21 useCalligraphic: { 51 useCalligraphic: {
22 get: function() {return this._useCalligraphic.checked;} 52 get: function() {return this._useCalligraphic.checked;}
23 }, 53 },
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 45b822e2..a4d53e50 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -117,6 +117,31 @@ exports.ShapesController = Montage.create(CanvasController, {
117 el.elementModel.shapeModel.GLWorld._canvas.task.stop(); 117 el.elementModel.shapeModel.GLWorld._canvas.task.stop();
118 } 118 }
119 break; 119 break;
120 case "strokeHardness":
121 this.setShapeProperty(el, "strokeHardness", value);
122 el.elementModel.shapeModel.GLGeomObj.setStrokeHardness(val);
123 el.elementModel.shapeModel.GLWorld.render();
124 break;
125 case "strokeSmoothing":
126 this.setShapeProperty(el, "strokeSmoothing", value);
127 el.elementModel.shapeModel.GLGeomObj.setSmoothingAmount(val);
128 el.elementModel.shapeModel.GLWorld.render();
129 break;
130 case "doSmoothing":
131 this.setShapeProperty(el, "doSmoothing", value);
132 el.elementModel.shapeModel.GLGeomObj.setDoSmoothing(value);
133 el.elementModel.shapeModel.GLWorld.render();
134 break;
135 case "isCalligraphic":
136 this.setShapeProperty(el, "isCalligraphic", value);
137 el.elementModel.shapeModel.GLGeomObj.setStrokeUseCalligraphic(value);
138 el.elementModel.shapeModel.GLWorld.render();
139 break;
140 case "strokeAngle":
141 this.setShapeProperty(el, "strokeAngle", value);
142 el.elementModel.shapeModel.GLGeomObj.setStrokeAngle(Math.PI * val/180);
143 el.elementModel.shapeModel.GLWorld.render();
144 break;
120 default: 145 default:
121 CanvasController.setProperty(el, p, value); 146 CanvasController.setProperty(el, p, value);
122 } 147 }
@@ -139,6 +164,43 @@ exports.ShapesController = Montage.create(CanvasController, {
139 return this.getColor(el, false); 164 return this.getColor(el, false);
140 case "background": 165 case "background":
141 return this.getColor(el, true); 166 return this.getColor(el, true);
167 case "strokeHardness":
168 if (el.elementModel && el.elementModel.shapeModel){
169 return el.elementModel.shapeModel.GLGeomObj.getStrokeHardness();
170 } else {
171 return null;
172 }
173 break;
174 case "doSmoothing":
175 if (el.elementModel && el.elementModel.shapeModel){
176 return el.elementModel.shapeModel.GLGeomObj.getDoSmoothing();
177 } else {
178 return null;
179 }
180 break;
181 case "strokeSmoothing":
182 if (el.elementModel && el.elementModel.shapeModel){
183 return el.elementModel.shapeModel.GLGeomObj.getSmoothingAmount();