[piccolo2d-dev] [piccolo2d] r654 committed - undid stack clean up in r647 since it caused a pretty major break in S...

[codesite-noreply]

Revision: 654
Author: allain.lalonde
Date: Wed Aug  5 18:13:48 2009
Log: undid stack clean up in r647 since it caused a pretty major break in  
ScrollExample and others. That's what I get for thinking I'm being clever.
http://code.google.com/p/piccolo2d/source/detail?r=654

Modified:
  /piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/PCamera.java
  /piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/PNode.java
   
/piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/util/PPaintContext.java

=======================================
---  
/piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/PCamera.java        
 
Tue Aug  4 18:13:28 2009
+++  
/piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/PCamera.java        
 
Wed Aug  5 18:13:48 2009
@@ -356,7 +356,7 @@
          paintCameraView(paintContext);
          paintDebugInfo(paintContext);

-        paintContext.popTransform();
+        paintContext.popTransform(viewTransform);
          paintContext.popClip(getBoundsReference());
      }

=======================================
--- /piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/PNode.java      
 
Wed Aug  5 07:49:03 2009
+++ /piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/PNode.java      
 
Wed Aug  5 18:13:48 2009
@@ -2818,7 +2818,7 @@
              paintAfterChildren(paintContext);

              paintContext.popTransparency(transparency);
-            paintContext.popTransform();
+            paintContext.popTransform(transform);
          }
      }

=======================================
---  
/piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/util/PPaintContext.java
      
Mon Aug  3 19:46:04 2009
+++  
/piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/util/PPaintContext.java
      
Wed Aug  5 18:13:48 2009
@@ -244,7 +244,6 @@
       * Pops the topmost Transform from the top of the transform if the  
passed in
       * transform is not null.
       *
-     * @deprecated in favor of popTransform()
       * @param aTransform transform that should be at the top of the stack
       */
      public void popTransform(final PAffineTransform aTransform) {
@@ -252,17 +251,7 @@
              graphics.setTransform((AffineTransform) transformStack.pop());
              localClipStack.pop();
          }
-    }
-
-    /**
-     * Pops the topmost Transform from the top of the transform stack, or  
does nothing if it's empty.
-     */
-    public void popTransform() {
-        if (!transformStack.isEmpty()) {
-            graphics.setTransform((AffineTransform) transformStack.pop());
-            localClipStack.pop();
-        }
-    }
+    }

      /**
       * Return the render quality used by this paint context.

--~--~---------~--~----~------------~-------~--~----~
Piccolo2D Developers Group: http://groups.google.com/group/piccolo2d-dev?hl=en
-~----------~----~----~----~------~----~------~--~---