aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-20 10:24:15 -0700
committerPushkar Joshi2012-03-20 10:24:15 -0700
commit92bc54df4acfec849568ab619150a5da49c087fa (patch)
tree0ecf92f98a29c10045b1e8e2e764793868cfcdef /js/controllers
parentc0bd8d8efcc501d4efa116a7cc0e802fd4e9f3e9 (diff)
downloadninja-92bc54df4acfec849568ab619150a5da49c087fa.tar.gz
revert to using the angle without flipping its sign...fixing some minor bugs and code cleanup
GOOD status before doing 3D unprojection step
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/elements/shapes-controller.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index b5e63514..46e337b7 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -122,7 +122,7 @@ exports.ShapesController = Montage.create(CanvasController, {
122 break; 122 break;
123 case "strokeAngle": 123 case "strokeAngle":
124 this.setShapeProperty(el, "strokeAngle", value); 124 this.setShapeProperty(el, "strokeAngle", value);
125 el.elementModel.shapeModel.GLGeomObj.setStrokeAngle(Math.PI * -val/180); 125 el.elementModel.shapeModel.GLGeomObj.setStrokeAngle(Math.PI * val/180);
126 el.elementModel.shapeModel.GLWorld.render(); 126 el.elementModel.shapeModel.GLWorld.render();
127 break; 127 break;
128 default: 128 default:
@@ -146,35 +146,35 @@ exports.ShapesController = Montage.create(CanvasController, {
146 return this.getShapeProperty(el, p); 146 return this.getShapeProperty(el, p);
147 case "strokeHardness": 147 case "strokeHardness":
148 if (el.elementModel && el.elementModel.shapeModel){ 148 if (el.elementModel && el.elementModel.shapeModel){
149 return el.elementModel.shapeModel.GLGeomObj.getStrokeHardness();; 149 return el.elementModel.shapeModel.GLGeomObj.getStrokeHardness();
150 } else { 150 } else {
151 return null; 151 return null;
152 } 152 }
153 break; 153 break;
154 case "doSmoothing": 154 case "doSmoothing":
155 if (el.elementModel && el.elementModel.shapeModel){ 155 if (el.elementModel && el.elementModel.shapeModel){
156 return el.elementModel.shapeModel.GLGeomObj.getDoSmoothing();; 156 return el.elementModel.shapeModel.GLGeomObj.getDoSmoothing();
157 } else { 157 } else {
158 return null; 158 return null;
159 } 159 }
160 break; 160 break;
161 case "strokeSmoothing": 161 case "strokeSmoothing":
162 if (el.elementModel && el.elementModel.shapeModel){ 162 if (el.elementModel && el.elementModel.shapeModel){
163 return el.elementModel.shapeModel.GLGeomObj.getSmoothingAmount();; 163 return el.elementModel.shapeModel.GLGeomObj.getSmoothingAmount();
164 } else { 164 } else {
165 return null; 165 return null;
166 } 166 }
167 break; 167 break;
168 case "isCalligraphic": 168 case "isCalligraphic":
169 if (el.elementModel && el.elementModel.shapeModel){ 169 if (el.elementModel && el.elementModel.shapeModel){
170 return el.elementModel.shapeModel.GLGeomObj.getStrokeUseCalligraphic();; 170 return el.elementModel.shapeModel.GLGeomObj.getStrokeUseCalligraphic();
171 } else { 171 } else {
172 return null; 172 return null;
173 } 173 }
174 break; 174 break;
175 case "strokeAngle": 175 case "strokeAngle":
176 if (el.elementModel && el.elementModel.shapeModel){ 176 if (el.elementModel && el.elementModel.shapeModel){
177 return el.elementModel.shapeModel.GLGeomObj.getStrokeAngle();; 177 return 180*el.elementModel.shapeModel.GLGeomObj.getStrokeAngle()/Math.PI;
178 } else { 178 } else {
179 return null; 179 return null;
180 } 180 }