diff options
| author | Nivesh Rajbhandari | 2012-01-30 15:53:11 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-01-30 15:53:11 -0800 |
| commit | b88ebb47d82fc1ffebea49c3bf182aaf3c9419af (patch) | |
| tree | 44cb3aeec436161ea1a9cc73315d60a1d6e3d6a4 /js/controllers | |
| parent | 8b8b9bc1cd033b483f3a5c57acc75dfb56e099a4 (diff) | |
| download | ninja-b88ebb47d82fc1ffebea49c3bf182aaf3c9419af.tar.gz | |
Fixed issue with elements not drawing in the correct plane.
When first adding an element, force the 3d model to update with the element's webkit transform values.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/controllers')
| -rw-r--r-- | js/controllers/elements/element-controller.js | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index f254220c..30469db0 100644 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js | |||
| @@ -127,36 +127,35 @@ var ElementController = exports.ElementController = Montage.create(NJComponent, | |||
| 127 | } | 127 | } |
| 128 | else | 128 | else |
| 129 | { | 129 | { |
| 130 | // TODO - for now, just return the identity matrix | 130 | var mat; |
| 131 | return Matrix.I(4); | 131 | |
| 132 | // var mat; | 132 | if (el) |
| 133 | // | 133 | { |
| 134 | // if (elt) | 134 | var xformStr = this.application.ninja.elementMediator.getProperty(el, "-webkit-transform"); |
| 135 | // { | 135 | if (xformStr) |
| 136 | // var xformStr = ElementsMediator.getProperty(elt, "-webkit-transform"); | 136 | mat = this.transformStringToMat( xformStr ); |
| 137 | // if (xformStr) | 137 | if (!mat) |
| 138 | // mat = this.transformStringToMat( xformStr ); | 138 | mat = Matrix.I(4); |
| 139 | // if (!mat) | 139 | |
| 140 | // mat = Matrix.I(4); | 140 | var zoom = this.application.ninja.elementMediator.getProperty(el, "zoom"); |
| 141 | // | 141 | if (zoom) |
| 142 | // if (elt.style && elt.style.zoom) | 142 | { |
| 143 | // { | 143 | zoom = Number(zoom); |
| 144 | // var zoom = Number(elt.style.zoom); | 144 | if (zoom != 1) |
| 145 | // if (zoom != 1) | 145 | { |
| 146 | // { | 146 | var zoomMat = Matrix.create( [ |
| 147 | // var zoomMat = Matrix.create( [ | 147 | [ zoom, 0, 0, 0], |
| 148 | // [ zoom, 0, 0, 0], | 148 | [ 0, zoom, 0, 0], |
| 149 | // [ 0, zoom, 0, 0], | 149 | [ 0, 0, zoom, 0], |
| 150 | // [ 0, 0, zoom, 0], | 150 | [ 0, 0, 0, 1] |
| 151 | // [ 0, 0, 0, 1] | 151 | ] ); |
| 152 | // ] ); | 152 | glmat4.multiply( zoomMat, mat, mat ); |
| 153 | // glmat4.multiply( zoomMat, mat, mat ); | 153 | } |
| 154 | // } | 154 | } |
| 155 | // } | 155 | } |
| 156 | // } | 156 | |
| 157 | // | 157 | el.elementModel.props3D.matrix3d = mat; |
| 158 | // elt.elementModel.props3D.matrix3d = mat; | 158 | return mat; |
| 159 | // return mat; | ||
| 160 | } | 159 | } |
| 161 | } | 160 | } |
| 162 | }, | 161 | }, |