From 0041182dc81d2e2acbcf1536ec3e607fae73b4fa Mon Sep 17 00:00:00 2001
From: Viktor Lidholt <viktorl@google.com>
Date: Mon, 27 Jul 2015 16:36:42 -0700
Subject: [PATCH] Optimizes sprites by replacing save/restore by caching the
 total matrix

---
 packages/flutter/example/game/lib/node.dart   | 27 ++++++++++---------
 packages/flutter/example/game/lib/sprite.dart | 15 ++++++-----
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/packages/flutter/example/game/lib/node.dart b/packages/flutter/example/game/lib/node.dart
index 319bf00907c..03027066d29 100644
--- a/packages/flutter/example/game/lib/node.dart
+++ b/packages/flutter/example/game/lib/node.dart
@@ -37,6 +37,7 @@ class Node {
   int _addedOrder;
   int _childrenLastAddedOrder = 0;
   bool _childrenNeedSorting = false;
+  Matrix4 _savedTotalMatrix;
 
   /// Decides if the node and its children is currently paused.
   ///
@@ -96,7 +97,7 @@ class Node {
   ///
   ///     myNode.rotation = 45.0;
   double get rotation => _rotation;
-  
+
   void set rotation(double rotation) {
     assert(rotation != null);
     _rotation = rotation;
@@ -107,7 +108,7 @@ class Node {
   ///
   ///     myNode.position = new Point(42.0, 42.0);
   Point get position => _position;
-  
+
   void set position(Point position) {
     assert(position != null);
     _position = position;
@@ -265,9 +266,9 @@ class Node {
     if (_transformMatrix != null) {
       return _transformMatrix;
     }
-    
+
     double cx, sx, cy, sy;
-    
+
     if (_rotation == 0.0) {
       cx = 1.0;
       sx = 0.0;
@@ -277,7 +278,7 @@ class Node {
     else {
       double radiansX = convertDegrees2Radians(_rotation);
       double radiansY = convertDegrees2Radians(_rotation);
-      
+
       cx = math.cos(radiansX);
       sx = math.sin(radiansX);
       cy = math.cos(radiansY);
@@ -289,7 +290,7 @@ class Node {
                -sx * _scaleY, cx * _scaleY, 0.0, 0.0,
                0.0, 0.0, 1.0, 0.0,
               _position.x, _position.y, 0.0, 1.0);
-    
+
     return _transformMatrix;
   }
 
@@ -403,7 +404,7 @@ class Node {
   }
 
   // Rendering
-  
+
   void _visit(PaintingCanvas canvas) {
     assert(canvas != null);
     if (!visible) return;
@@ -412,9 +413,9 @@ class Node {
     _visitChildren(canvas);
     _postPaint(canvas);
   }
-  
+
   void _prePaint(PaintingCanvas canvas) {
-    canvas.save();
+    _savedTotalMatrix = canvas.getTotalMatrix();
 
     // Get the transformation matrix and apply transform
     canvas.concat(transformMatrix.storage);
@@ -438,7 +439,7 @@ class Node {
   ///     }
   void paint(PaintingCanvas canvas) {
   }
- 
+
   void _visitChildren(PaintingCanvas canvas) {
     // Sort children if needed
     _sortChildren();
@@ -463,9 +464,9 @@ class Node {
       i++;
     }
   }
-  
+
   void _postPaint(PaintingCanvas canvas) {
-    canvas.restore();
+    canvas.setMatrix(_savedTotalMatrix);
   }
 
   // Receiving update calls
@@ -536,4 +537,4 @@ class Node {
   bool handleEvent(SpriteBoxEvent event) {
     return false;
   }
-}
\ No newline at end of file
+}
diff --git a/packages/flutter/example/game/lib/sprite.dart b/packages/flutter/example/game/lib/sprite.dart
index 0eea4800611..ea09e17bdf1 100644
--- a/packages/flutter/example/game/lib/sprite.dart
+++ b/packages/flutter/example/game/lib/sprite.dart
@@ -65,7 +65,8 @@ class Sprite extends NodeWithSize {
   }
 
   void paint(PaintingCanvas canvas) {
-    canvas.save();
+    // Store old matrix
+    Matrix4 savedMatrix = canvas.getTotalMatrix();
 
     // Account for pivot point
     applyTransformForPivot(canvas);
@@ -75,10 +76,10 @@ class Sprite extends NodeWithSize {
       double h = texture.size.height;
 
       if (w <= 0 || h <= 0) return;
-      
+
       double scaleX = size.width / w;
       double scaleY = size.height / h;
-      
+
       if (constrainProportions) {
         // Constrain proportions, using the smallest scale and by centering the image
         if (scaleX < scaleY) {
@@ -89,7 +90,7 @@ class Sprite extends NodeWithSize {
           scaleX = scaleY;
         }
       }
-      
+
       canvas.scale(scaleX, scaleY);
 
       // Setup paint object for opacity and transfer mode
@@ -107,8 +108,10 @@ class Sprite extends NodeWithSize {
     } else {
       // Paint a red square for missing texture
       canvas.drawRect(new Rect.fromLTRB(0.0, 0.0, size.width, size.height),
-      new Paint()..color = const Color.fromARGB(255, 255, 0, 0));
+      new Paint()..color = new Color.fromARGB(255, 255, 0, 0));
     }
-    canvas.restore();
+
+    // Restore matrix
+    canvas.setMatrix(savedMatrix);
   }
 }