Changeset 1068

Timestamp:

05/16/16 17:29:05 (8 years ago)

Author:

davidb

Message:

Additional transitions

File:

• trunk/src/org/expeditee/gui/FrameTransitions.java (modified) (3 diffs)

trunk/src/org/expeditee/gui/FrameTransitions.java

@@ -60 +60 @@
         
         //Slides new frame over current from from Right to Left
+        public static void CoverFromRight(Graphics g, Image i, Dimension d){
+
+                Image image = i;
+
+                int frameX = d.width;
+
+                while(frameX >= 0){
+
+                        g.drawImage(image, frameX, 0, Item.DEFAULT_BACKGROUND, null);
+
+                        frameX -= 2;                                                            
+                }       
+        }
+
+
+        public static void CoverFromLeft(Graphics g, Image i, Dimension d){
+
+                Image image = i;
+
+                int frameX = 0;
+
+                while(frameX <= d.width){
+
+                        g.drawImage(image, frameX, 0, Item.DEFAULT_BACKGROUND, null);
+
+                        frameX += 2;                                                            
+                }       
+        }
+
+        //Slides new frame over current from from Right to Left
         public static void Swipe(Graphics g, Image i, Dimension d){
-                
+                CoverFromRight(g,i,d);
+        }
+                
+        
+
+        public static void WipeFromLeft(Graphics g, Image i, Dimension d)
+        {
                 Image image = i;
-                
+                int image_y_dim = image.getHeight(null);
+                
+
+                int frameX = 0;
+
+                while(frameX <= d.width){
+                        
+                        g.drawImage(image, 0,0, frameX,image_y_dim, 0,0, frameX,image_y_dim, null);
+
+                        frameX += 2;                                                            
+                }       
+        }
+        
+        public static void WipeFromRight(Graphics g, Image i, Dimension d)
+        {
+                Image image = i;
+                int image_x_dim = image.getWidth(null);
+                int image_y_dim = image.getHeight(null);
+                
+
                 int frameX = d.width;
-                
-                while(frameX != 0){
-                        
-                        g.drawImage(image, frameX, 0, Item.DEFAULT_BACKGROUND, null);
-                                                                
-                        frameX--;                                                               
+
+                while (frameX >= 0) {
+                        
+                        g.drawImage(image, frameX,0, image_x_dim,image_y_dim, frameX,0, image_x_dim,image_y_dim, null);
+
+                        frameX -= 2;                                                            
                 }       
         }
+        
         //Drops new frame from top of display
         //Draws rectangle with gradient effect to create illusion of drop shadow        
@@ -85 +141 @@
                 int vertCount = 0;
                 
-                while(frameY != 0){
+                while (frameY <= 0){
                         
                         GradientPaint shadow = new GradientPaint(0, vertCount + 10, Color.WHITE, 0, vertCount, Color.gray);
@@ -92 +148 @@
                         g2.fillRect(0, vertCount, d.width, 10);         
                         
-                        frameY++;
-                        vertCount++;
-                        try {
-                                Thread.sleep(3);
+                        frameY+=8;
+                        vertCount+=8;
+                        try {
+                                Thread.sleep(4);
                         } catch (InterruptedException e) {