From a89e30ab834a48be32b6122e0c8ac1e0c3ed43e8 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 29 Feb 2012 11:58:28 -0800
Subject: Fix for performance issue when moving shapes.  We don't need to call
 render except if the geometry and materials change.

This is more easy to see with shapes like the brush tool.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/controllers/elements/shapes-controller.js | 11 ++++++++++-
 js/tools/SelectionTool.js                    | 16 +++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index e0bff70c..749a1dd9 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -19,43 +19,51 @@ exports.ShapesController = Montage.create(CanvasController, {
                     this.setShapeProperty(el, "strokeSize", value);
                     el.elementModel.shapeModel.GLGeomObj.setStrokeWidth(val);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "innerRadius":
                     this.setShapeProperty(el, "innerRadius", value);
                     el.elementModel.shapeModel.GLGeomObj.setInnerRadius(val/100);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "tlRadius":
                     this.setShapeProperty(el, "tlRadius", value);
                     el.elementModel.shapeModel.GLGeomObj.setTLRadius(val);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "trRadius":
                     this.setShapeProperty(el, "trRadius", value);
                     el.elementModel.shapeModel.GLGeomObj.setTRRadius(val);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "blRadius":
                     this.setShapeProperty(el, "blRadius", value);
                     el.elementModel.shapeModel.GLGeomObj.setBLRadius(val);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "brRadius":
                     this.setShapeProperty(el, "brRadius", value);
                     el.elementModel.shapeModel.GLGeomObj.setBRRadius(val);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "width":
                     el.elementModel.shapeModel.GLGeomObj.setWidth(val);
                     CanvasController.setProperty(el, p, value);
                     el.elementModel.shapeModel.GLWorld.setViewportFromCanvas(el);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "height":
                     el.elementModel.shapeModel.GLGeomObj.setHeight(val);
                     CanvasController.setProperty(el, p, value);
                     el.elementModel.shapeModel.GLWorld.setViewportFromCanvas(el);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "useWebGl":
                     var canvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", el.className, true);
@@ -76,6 +84,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                         el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(sm);
                         el.elementModel.shapeModel.strokeMaterial = sm;
                         el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                        el.elementModel.shapeModel.GLWorld.render();
                     }
                     break;
                 case "fillMaterial":
@@ -85,12 +94,12 @@ exports.ShapesController = Montage.create(CanvasController, {
                         el.elementModel.shapeModel.GLGeomObj.setFillMaterial(fm);
                         el.elementModel.shapeModel.fillMaterial = fm;
                         el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                        el.elementModel.shapeModel.GLWorld.render();
                     }
                     break;
                 default:
                     CanvasController.setProperty(el, p, value);
             }
-            el.elementModel.shapeModel.GLWorld.render();
         }
     },
 
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 83d52d52..caa9e8d6 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -312,12 +312,26 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             }
             if(addToUndoStack)
             {
-                ElementsMediator.setProperties(this.application.ninja.selectedElements,
+                // if we have a delta, that means the transform handles were used and
+                // we should update the width and height too.  Otherwise, just update left and top.
+                if(this._delta)
+                {
+                    ElementsMediator.setProperties(this.application.ninja.selectedElements,
                                                 { "left": newLeft, "top": newTop, "width": newWidth, "height": newHeight },
                                                 "Change",
                                                 "selectionTool",
                                                 { "left" : previousLeft, "top" : previousTop, "width": previousWidth, "height": previousHeight}
                                               );
+                }
+                else
+                {
+                    ElementsMediator.setProperties(this.application.ninja.selectedElements,
+                                                { "left": newLeft, "top": newTop },
+                                                "Change",
+                                                "selectionTool",
+                                                { "left" : previousLeft, "top" : previousTop }
+                                              );
+                }
             }
             // Save previous value for undo/redo
             this._undoArray = [];
-- 
cgit v1.2.3