Changeset 1064

Timestamp:

05/15/16 17:34:37 (8 years ago)

Author:

davidb

Message:

Addition of new type of frame transition, with off-screen buffering to make use of alpha-values in transition more seamless; Enhancement of display-mode to be full screen; Enahcements to mouse interactions over images -- now if the mouse is over a pixel in the image that is the same colour as the background-color of the frame, it is treated as equivalent to being over the background, rather than the image item. Overall has a natural feel. You now need to click on 'non-trival' parts of an image to get image-related interactive Expteditee behaviour. (note: this is how text already behaves)

Location:

trunk/src/org/expeditee/gui

Files:

• FrameGraphics.java (modified) (5 diffs)
• FrameKeyboardActions.java (modified) (2 diffs)
• FrameMouseActions.java (modified) (6 diffs)
• FrameTransitions.java (modified) (7 diffs)
• FrameUtils.java (modified) (1 diff)

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

@@ -65 +65 @@
 
         // modes
-        public static final int MODE_NORMAL = 0;
-
-        public static final int MODE_AUDIENCE = 1;
-
-        public static final int MODE_XRAY = 2;
+        protected static final int MODE_NORMAL = 0;
+
+        protected static final int MODE_AUDIENCE = 1;
+
+        protected static final int MODE_XRAY = 2;
         
-        public static final int MODE_AUDIENCE_FULLSCREEN = 4;
+        protected static final int MODE_AUDIENCE_FULLSCREEN = 4;
         
 
@@ -163 +163 @@
         }
 
+        public static void forceXRayMode(boolean parse) {
+                setMode(MODE_XRAY,parse);
+        }
+        
         /**
          * @return True if Audience Mode is currently on, False otherwise.
@@ -559 +563 @@
                                 PaintLines(bg, lines);
                 } else {
-                        // Dont paint the
+                        // Don't paint the
                         if (isActualFrame)
                                 PaintLines(bg, freeItemsToPaint);
@@ -669 +673 @@
                 else {
                     if (DisplayIO.getCurrentSide() == 0) {
-                        g.drawImage(left, 0, 0, Item.DEFAULT_BACKGROUND, null);
-                        paintTransition(g,left);
+                        if (!paintTransition(g,left)) {
+                                // Nothing fancy occurred, just need to render the next slide to screen
+                                g.drawImage(left, 0, 0, Item.DEFAULT_BACKGROUND, null);
+                        }
                     }
                     else {
-                        g.drawImage(right, 0, 0, Item.DEFAULT_BACKGROUND, null);
-                        paintTransition(g,right);
+                        if (!paintTransition(g,right)) {
+                                // Nothing fancy occurred, just need to render the next slide to screen
+                                g.drawImage(right, 0, 0, Item.DEFAULT_BACKGROUND, null);
+                        }
                     }
                 }
@@ -681 +689 @@
 
         
-    private static void paintTransition(Graphics g, Image image)
+    private static boolean paintTransition(Graphics g, Image image)
     {
-                                  
-        //If we are doing a transition
-        if(FrameTransitions.getSlide() == true){                                                
-            
-            String input = "org.expeditee.gui.FrameTransitions";
-            String slide_mode_method = FrameTransitions.getslideModeMethod();
-        
-            try {
-                Class<?> c = Class.forName(input);
-                
-                Class[] cArg = new Class[3];
-                cArg[0] = Graphics.class;
-                cArg[1] = Image.class;
-                cArg[2] = Dimension.class;                                                      
-                
-                //Gets the method of transition and calls it
-                Method lMethod = c.getDeclaredMethod(slide_mode_method, cArg);
-                
-                if(lMethod != null){
-                    // calling static method, so no class parameter needed
-                    Object o = lMethod.invoke(null, g, image, _MaxSize);
-                }
-                else{
-                    System.err.println("Unable to locate the transition '" + slide_mode_method + "'");
-                }                                               
-                
-            } catch (Exception e) {                                             
-                
-                System.err.println("An Reflection Exception occurred trying to invoke '" + slide_mode_method + "'");
-                e.printStackTrace();
-            }   
-        }               
-        //Tells the frame to only transition once
-        FrameTransitions.setSlideFalse();                               
+        boolean performed_transition = false;
+        
+        //If we are doing a transition
+        if(FrameTransitions.getSlide() == true){                                                
+
+                String input = "org.expeditee.gui.FrameTransitions";
+                String slide_mode_method = FrameTransitions.getslideModeMethod();
+
+                try {
+                        Class<?> c = Class.forName(input);
+
+                        Class[] cArg = new Class[3];
+                        cArg[0] = Graphics.class;
+                        cArg[1] = Image.class;
+                        cArg[2] = Dimension.class;                                                      
+
+                        //Gets the method of transition and calls it
+                        Method lMethod = c.getDeclaredMethod(slide_mode_method, cArg);
+
+                        if(lMethod != null){
+                                // calling static method, so no class parameter needed
+                                Object o = lMethod.invoke(null, g, image, _MaxSize);
+                                performed_transition = true;
+                                
+                        }
+                        else{
+                                System.err.println("Unable to locate the transition '" + slide_mode_method + "'");
+                        }                                               
+
+                } catch (Exception e) {                                         
+
+                        System.err.println("An Reflection Exception occurred trying to invoke '" + slide_mode_method + "'");
+                        e.printStackTrace();
+                }       
+        }               
+        //Tells the frame to only transition once
+        FrameTransitions.setSlideFalse();               
+        
+        return performed_transition;
     }
     

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

@@ -46 +46 @@
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Line;
+import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
 import org.expeditee.items.UserAppliedPermission;
@@ -464 +465 @@
                 Item on = FrameUtils.getCurrentItem();
 
-                if (on == null) {
+                if ((on == null) || (on instanceof Picture)){
                         navigateFrame(direction);
                         return;

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

@@ -1551 +1551 @@
                 }
 
+                if (clicked instanceof Picture) {
+                        int mouseX = DisplayIO.getMouseX();
+                        int mouseY = FrameMouseActions.getY();
+                        Picture clickedOnPicture = (Picture)clicked;
+                        Frame current_frame = DisplayIO.getCurrentFrame();
+                        Color bg_col = current_frame.getBackgroundColor();
+                        if (clickedOnPicture.MouseOverBackgroundPixel(mouseX,mouseY,bg_col)) {
+                                // Make 'clicked' null, effectively causing a back() operation
+                                return false;
+                        }
+                }
+                
                 return true;
         }
@@ -1617 +1629 @@
                         }
                         // otherwise if the user is pointing at something, pick it up unless shift is down
-                } else if (clicked != null && !isShiftDown) {
-                        
-                        // check permissions
-                        if (!clicked.hasPermission(UserAppliedPermission.full)) {
-                                Item editTarget = clicked.getEditTarget();
-                                if (editTarget != clicked
-                                                && editTarget.hasPermission(UserAppliedPermission.full)) {
-                                        clicked = editTarget;
-                                } else {
-                                        MessageBay
-                                                        .displayMessage("Insufficient permission to pick up item");
-                                        return;
-                                }
-                        }
-                        IndirectMouseActions.getInstance().getDetachLineAction().exec(new MouseInfo(clicked, clickedIn, false, false));
-                        // if we're inside a shape, pick it up unless shift is down
-                } else if (clickedIn != null && !isShiftDown) {
-                        IndirectMouseActions.getInstance().getGroupPickupAction().exec(new MouseInfo(clicked, clickedIn, false, false));
                 } else {
-                        IndirectMouseActions.getInstance().getNewLineAction().exec(new MouseInfo(clicked, clickedIn, false, false));
+                        if (clicked instanceof Picture) {
+                                int mouseX = DisplayIO.getMouseX();
+                                int mouseY = FrameMouseActions.getY();
+                                Picture clickedOnPicture = (Picture)clicked;
+                                Frame current_frame = DisplayIO.getCurrentFrame();
+                                Color bg_col = current_frame.getBackgroundColor();
+                                if (clickedOnPicture.MouseOverBackgroundPixel(mouseX,mouseY,bg_col)) {
+                                        clicked = null; // Effectively make it as if they haven't clicked on anything
+                                }
+                        }
+                        if (clicked != null && !isShiftDown) {
+
+                                // check permissions
+                                if (!clicked.hasPermission(UserAppliedPermission.full)) {
+                                        Item editTarget = clicked.getEditTarget();
+                                        if (editTarget != clicked
+                                                        && editTarget.hasPermission(UserAppliedPermission.full)) {
+                                                clicked = editTarget;
+                                        } else {
+                                                MessageBay
+                                                .displayMessage("Insufficient permission to pick up item");
+                                                return;
+                                        }
+                                }
+                                IndirectMouseActions.getInstance().getDetachLineAction().exec(new MouseInfo(clicked, clickedIn, false, false));
+                                // if we're inside a shape, pick it up unless shift is down
+                        } else if (clickedIn != null && !isShiftDown) {
+                                IndirectMouseActions.getInstance().getGroupPickupAction().exec(new MouseInfo(clicked, clickedIn, false, false));
+                        } else {
+                                IndirectMouseActions.getInstance().getNewLineAction().exec(new MouseInfo(clicked, clickedIn, false, false));
+                        }
                 }
                 SessionStats.MovedItems(FreeItems.getInstance());
@@ -1727 +1751 @@
                                 return;
                                 // if the user is clicking on something, merge the items
-                                // unless it is a point onto somethin other than a lineEnd or a
+                                // unless it is a point onto something other than a lineEnd or a
                                 // dot
                         } else if (clicked != null
@@ -1782 +1806 @@
                         }
                 } else {
+                        
+                        if (clicked instanceof Picture) {
+                                int mouseX = DisplayIO.getMouseX();
+                                int mouseY = FrameMouseActions.getY();
+                                Picture clickedOnPicture = (Picture)clicked;
+                                Frame current_frame = DisplayIO.getCurrentFrame();
+                                Color bg_col = current_frame.getBackgroundColor();
+                                if (clickedOnPicture.MouseOverBackgroundPixel(mouseX,mouseY,bg_col)) {
+                                        clicked = null; // Effectively make it as if they haven't clicked on anything
+                                }
+                        }
+                        
                         // if the user is pointing at something and shift isn't down, make a copy
                         if (clicked != null && !isShiftDown()) {
@@ -2811 +2847 @@
                                                         Item start = l.getStartItem();
 
-                                                        // If one end of a line is being delted, remove the
+                                                        // If one end of a line is being deleted, remove the
                                                         // other end if all its connecting lines are being
-                                                        // delted
+                                                        // deleted
                                                         if (items.contains(end)) {
                                                                 if (!items.contains(start)
@@ -2848 +2884 @@
                         // this is a delete command
                 } else {
+                        
+                        // Special case if toDelete item is an image: only want to delete if over non-background pixel color
+                        if (toDelete instanceof Picture) {
+                                int mouseX = DisplayIO.getMouseX();
+                                int mouseY = FrameMouseActions.getY();
+                                Picture clickedOnPicture = (Picture)toDelete;
+                                Frame current_frame = DisplayIO.getCurrentFrame();
+                                Color bg_col = current_frame.getBackgroundColor();
+                                if (clickedOnPicture.MouseOverBackgroundPixel(mouseX,mouseY,bg_col)) {
+                                        // behave as if Redo/Undo request, then return
+                                        if(isControlDown()) {
+                                                DisplayIO.getCurrentFrame().redo();
+                                        } else {
+                                                DisplayIO.getCurrentFrame().undo();
+                                        }
+                                        return;
+                                }
+                                // If get to here, then user clicked on an image (non-trival pixel color),
+                                // so go ahead and let it be deleted in the usual way
+                        }
+                                
+                        
                         // check permissions
                         if (!toDelete.hasPermission(UserAppliedPermission.full)) {

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

@@ -9 +9 @@
 import java.awt.Image;
 import java.awt.RenderingHints;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
 
 import org.expeditee.items.Item;
@@ -19 +21 @@
         //Stores the frame before the new frame being transitioned to
         private static Image _slideModeBaseImage = null;
-                        
+        private static Image _slideModeScratchImage = null;
+        
         //Tells graphics which method of transition is going to be used
         private static String _slideModeMethod;
@@ -41 +44 @@
                 
                 _slideModeBaseImage = i;
+                _slideModeScratchImage = new BufferedImage(i.getWidth(null), i.getHeight(null), BufferedImage.TYPE_INT_ARGB);
         }
         public static Image getSlideModeBaseImage(){
@@ -146 +150 @@
                 Graphics2D g2d = (Graphics2D) g;                
                 
+                Graphics2D scratch_g2d = (Graphics2D)_slideModeScratchImage.getGraphics();
+                
                 while(alpha >= 0.1f){                   
                         
-                        g.drawImage(FrameTransitions.getSlideModeBaseImage(),  0,  0,  Item.DEFAULT_BACKGROUND,  null);                 
-                        g2d.setComposite(alphaCalcUp(alpha, fadeType));                         
-                        g2d.setColor(Color.WHITE);
-                        g2d.fillRect(0, 0, d.width, d.height);
+                        
+                        scratch_g2d.drawImage(getSlideModeBaseImage(),  0,  0,  Item.DEFAULT_BACKGROUND,  null);                        
+                        scratch_g2d.setComposite(alphaCalcUp(alpha, fadeType));                         
+                        scratch_g2d.setColor(Color.WHITE);
+                        scratch_g2d.fillRect(0, 0, d.width, d.height);
+                        
+                        g2d.drawImage(_slideModeScratchImage, 0, 0, null);
+                        
                         alpha = alphaCalcUp(alpha, fadeType).getAlpha();
                         
@@ -165 +175 @@
                 while(alpha <= 0.75f){                  
                 
-                        g.drawImage(i,  0,  0,  Item.DEFAULT_BACKGROUND,  null);
-                        g2d.setComposite(alphaCalcDown(alpha, fadeType));
-                        g2d.setColor(Color.WHITE);
-                        g2d.fillRect(0, 0, d.width, d.height);
+                        scratch_g2d.drawImage(i,  0,  0,  Item.DEFAULT_BACKGROUND,  null);
+                        scratch_g2d.setComposite(alphaCalcDown(alpha, fadeType));
+                        scratch_g2d.setColor(Color.WHITE);
+                        scratch_g2d.fillRect(0, 0, d.width, d.height);
+                
+                        g2d.drawImage(_slideModeScratchImage, 0, 0, null);
+                        
                         alpha = alphaCalcDown(alpha, fadeType).getAlpha();
                         
@@ -181 +194 @@
                 } 
         }
+
         //Calculates alpha values for transitions from transparent to opaque
         //AlphaComposite is returned
@@ -220 +234 @@
                 }
         }
+        
+        public static void CrossFade(Graphics g, Image i, Dimension d)
+        { 
+                // Based on: http://stackoverflow.com/questions/20346661/java-fade-in-and-out-of-images
+                // TODO: make use of timer, as this example does, rather than fixed delay
+                
+                Image inImage = i;
+                Image outImage = _slideModeBaseImage;
+                int scratch_x_dim = _slideModeScratchImage.getWidth(null);
+                int scratch_y_dim = _slideModeScratchImage.getHeight(null);
+
+                int anim_timestep_msec = 10;
+                float alpha = 0.0f;
+                float alpha_inc = 0.04f;
+                
+                Graphics2D g2d = (Graphics2D) g;                
+
+                Graphics scratch_g = _slideModeScratchImage.getGraphics();
+
+                while(alpha <= 1.0f){                   
+
+                        //scratch_g.clearRect(0, 0, scratch_x_dim, scratch_y_dim);
+                        scratch_g.setColor(Color.WHITE);
+                        scratch_g.fillRect(0, 0, scratch_x_dim, scratch_y_dim);
+                        
+                        Graphics2D scratch_g2d = (Graphics2D) scratch_g.create();
+                        scratch_g2d.setComposite(AlphaComposite.SrcOver.derive(alpha));
+                        scratch_g2d.drawImage(inImage, 0, 0, null);
+
+                        scratch_g2d.setComposite(AlphaComposite.SrcOver.derive(1f - alpha));
+                        scratch_g2d.drawImage(outImage, 0, 0, null);
+                        scratch_g2d.dispose();
+
+                        g2d.drawImage(_slideModeScratchImage, 0, 0, null);
+
+                        try {
+                                Thread.sleep(anim_timestep_msec);
+                        } catch (InterruptedException e) {
+                                e.printStackTrace();
+                        }                       
+
+                        alpha += alpha_inc;     
+                }               
+        }       
+
+        
 }

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

@@ -540 +540 @@
         Parse(toDisplay);
 
-        // Test to see if frame transition required, and perform it if one if found
-        Item frameTransition = getAnnotation(toDisplay, "@frameTransition");
-        if (frameTransition != null) {
-            doFrameTransition(frameTransition,current,toDisplay);
-        }
+        if (FrameGraphics.isAudienceMode()) {
+                // Only need to worry about frame transitions when in Audience Mode
                 
+                // Test to see if frame transition specified through annotation, and perform it if one if found
+                Item frameTransition = getAnnotation(toDisplay, "@frameTransition");
+                if (frameTransition != null) {
+                        doFrameTransition(frameTransition,current,toDisplay);
+                }
+        }
+        
         DisplayIO.setCurrentFrame(toDisplay, incrementStats);
         FrameMouseActions.updateCursor();