From d42af4f0f5e893ab0e1f74f50055e0be3bd9e78e Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 5 Apr 2012 16:43:25 -0700
Subject: -webkit-transform-style needs to be set to preserve-3d for shapes
 regardless of whether they are 2d shapes or WebGL shapes.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/controllers/elements/shapes-controller.js | 1 -
 js/tools/BrushTool.js                        | 2 +-
 js/tools/LineTool.js                         | 2 +-
 js/tools/PenTool.js                          | 2 +-
 js/tools/ShapeTool.js                        | 2 +-
 js/tools/TagTool.js                          | 4 ++--
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 514b1472..51ddea20 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -629,7 +629,6 @@ exports.ShapesController = Montage.create(CanvasController, {
                 world = new World(el, true);
                 el.elementModel.shapeModel.GLWorld = world;
                 el.elementModel.shapeModel.useWebGl = true;
-				el.elementModel.controller.setProperty(el, "-webkit-transform-style", "preserve-3d");
                 world.importJSON(worldData);
                 el.elementModel.shapeModel.GLGeomObj = world.getGeomRoot();
                 }
diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 1365896a..4347658a 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -305,7 +305,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
 
                 if (!canvas) {
                     var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
-                    var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas, this._useWebGL);
+                    var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas, true);
                     ElementMediator.addElements(newCanvas, elementModel.data, false);
 
                     // create all the GL stuff
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index de2eb21d..3e9167fd 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -78,7 +78,7 @@ exports.LineTool = Montage.create(ShapeTool, {
                         }
 
                         canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
-                        var elementModel = TagTool.makeElement(w, h, drawData.planeMat, drawData.midPt, canvas, this.options.use3D);
+                        var elementModel = TagTool.makeElement(w, h, drawData.planeMat, drawData.midPt, canvas, true);
                         canvas.elementModel.isShape = true;
                         this.application.ninja.elementMediator.addElements(canvas, elementModel.data);
                     } else {
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 7f6f190a..7fc8dd95 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -584,7 +584,7 @@ exports.PenTool = Montage.create(ShapeTool, {
             if (!canvas) {
                 var newCanvas = null;
                 newCanvas = NJUtils.makeNJElement("canvas", "Subpath", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
-                var elementModel = TagTool.makeElement(parseInt(w), parseInt(h), planeMat, midPt, newCanvas, this._useWebGL);
+                var elementModel = TagTool.makeElement(parseInt(w), parseInt(h), planeMat, midPt, newCanvas, true);
                 ElementMediator.addElements(newCanvas, elementModel.data, false);
 
                 // create all the GL stuff
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 00d36528..a8da7921 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -66,7 +66,7 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                 if(!this._useExistingCanvas()) {
                     canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
                     var elementModel = TagTool.makeElement(~~drawData.width, ~~drawData.height,
-                                                                        drawData.planeMat, drawData.midPt, canvas, this.options.use3D);
+                                                                        drawData.planeMat, drawData.midPt, canvas, true);
 
                     canvas.elementModel.isShape = true;
                     this.application.ninja.elementMediator.addElements(canvas, elementModel.data);
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index f4b65c3e..752500e0 100755
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
@@ -221,7 +221,7 @@ exports.TagTool = Montage.create(DrawingTool, {
     },
 
     makeElement: {
-        value: function(w, h, planeMat, midPt,tag, isWebGl) {
+        value: function(w, h, planeMat, midPt, tag, isShape) {
             var left = Math.round(midPt[0] - 0.5 * w);
             var top = Math.round(midPt[1] - 0.5 * h);
 
@@ -234,7 +234,7 @@ exports.TagTool = Montage.create(DrawingTool, {
             if(!MathUtils.isIdentityMatrix(planeMat)) {
                 styles['-webkit-transform-style'] = 'preserve-3d';
                 styles['-webkit-transform'] = DrawingToolBase.getElementMatrix(planeMat, midPt);
-            } else if(isWebGl) {
+            } else if(isShape) {
                 styles['-webkit-transform-style'] = 'preserve-3d';
             }
 
-- 
cgit v1.2.3