aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements
diff options
context:
space:
mode:
authorArmen Kesablyan2012-03-22 14:31:43 -0700
committerArmen Kesablyan2012-03-22 14:31:43 -0700
commitcd0b4714b782f8cc4cf9255fa2653d3d5eeade43 (patch)
tree297399e5ece4aa5800abd17b74da47af1899708c /js/controllers/elements
parent49596f2a6b518ed0ee945006787d3c69e40a5757 (diff)
parent57cc00a5ef3ab525e54a030d7692b2d9eefaa68b (diff)
downloadninja-cd0b4714b782f8cc4cf9255fa2653d3d5eeade43.tar.gz
Merge branch 'refs/heads/master' into DataBinding
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-xjs/controllers/elements/element-controller.js16
-rwxr-xr-xjs/controllers/elements/shapes-controller.js13
-rwxr-xr-xjs/controllers/elements/stage-controller.js41
3 files changed, 50 insertions, 20 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 70aba54e..b35251ad 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -228,22 +228,6 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
228 mat = this.transformStringToMat( xformStr ); 228 mat = this.transformStringToMat( xformStr );
229 if (!mat) 229 if (!mat)
230 mat = Matrix.I(4); 230 mat = Matrix.I(4);
231
232 var zoom = this.application.ninja.elementMediator.getProperty(el, "zoom");
233 if (zoom)
234 {
235 zoom = Number(zoom);
236 if (zoom != 1)
237 {
238 var zoomMat = Matrix.create( [
239 [ zoom, 0, 0, 0],
240 [ 0, zoom, 0, 0],
241 [ 0, 0, zoom, 0],
242 [ 0, 0, 0, 1]
243 ] );
244 glmat4.multiply( zoomMat, mat, mat );
245 }
246 }
247 } 231 }
248 232
249 el.elementModel.props3D.matrix3d = mat; 233 el.elementModel.props3D.matrix3d = mat;
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index d72d9c14..b3ac9ddb 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -6,10 +6,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
6 6
7var Montage = require("montage/core/core").Montage, 7var Montage = require("montage/core/core").Montage,
8 CanvasController = require("js/controllers/elements/canvas-controller").CanvasController, 8 CanvasController = require("js/controllers/elements/canvas-controller").CanvasController,
9 njModule = require("js/lib/NJUtils"); 9 njModule = require("js/lib/NJUtils"),
10 10 World = require("js/lib/drawing/world").World,
11var World = require("js/lib/drawing/world").World; 11 MaterialsModel = require("js/models/materials-model").MaterialsModel;
12var MaterialsModel = require("js/models/materials-model").MaterialsModel;
13 12
14exports.ShapesController = Montage.create(CanvasController, { 13exports.ShapesController = Montage.create(CanvasController, {
15 14
@@ -100,6 +99,12 @@ exports.ShapesController = Montage.create(CanvasController, {
100 el.elementModel.shapeModel.GLWorld.render(); 99 el.elementModel.shapeModel.GLWorld.render();
101 } 100 }
102 break; 101 break;
102 case "editStrokeMaterial":
103 NJevent("showMaterialPopup",{materialId : el.elementModel.shapeModel.strokeMaterial.getName()});
104 break;
105 case "editFillMaterial":
106 NJevent("showMaterialPopup",{materialId : el.elementModel.shapeModel.fillMaterial.getName()});
107 break;
103 default: 108 default:
104 CanvasController.setProperty(el, p, value); 109 CanvasController.setProperty(el, p, value);
105 } 110 }
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js
index 34bb1fb5..97ea3aa5 100755
--- a/js/controllers/elements/stage-controller.js
+++ b/js/controllers/elements/stage-controller.js
@@ -129,5 +129,46 @@ exports.StageController = Montage.create(ElementController, {
129 value: function(el, rule, selector) { 129 value: function(el, rule, selector) {
130 el.elementModel.transitionStopRule.selectorText = selector; 130 el.elementModel.transitionStopRule.selectorText = selector;
131 } 131 }
132 },
133
134 getMatrix: {
135 value: function(el) {
136 if(el.elementModel && el.elementModel.props3D && el.elementModel.props3D.matrix3d)
137 {
138 return el.elementModel.props3D.matrix3d.slice(0);
139 }
140 else
141 {
142 var mat;
143
144 if (el)
145 {
146 var xformStr = this.application.ninja.elementMediator.getProperty(el, "-webkit-transform");
147 if (xformStr)
148 mat = this.transformStringToMat( xformStr );
149 if (!mat)
150 mat = Matrix.I(4);
151
152 var zoom = this.application.ninja.elementMediator.getProperty(el, "zoom");
153 if (zoom)
154 {
155 zoom = Number(zoom);
156 if (zoom != 1)
157 {
158 var zoomMat = Matrix.create( [
159 [ zoom, 0, 0, 0],
160 [ 0, zoom, 0, 0],
161 [ 0, 0, zoom, 0],
162 [ 0, 0, 0, 1]
163 ] );
164 glmat4.multiply( zoomMat, mat, mat );
165 }
166 }
167 }
168
169 el.elementModel.props3D.matrix3d = mat;
170 return mat;
171 }
172 }
132 } 173 }
133}); 174});