Changeset 78 for trunk/src/org/expeditee/actions/Misc.java

Timestamp:

05/26/08 09:11:05 (16 years ago)

Author:

ra33

Message:

Added @b and @v...
Also changed @f... so that images can be displayed with transparent backgrounds.
Did a bunch of refactoring in the process to remove duplicated code and simplify managing @i, @f and @b.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/org/expeditee/actions/Misc.java (modified) (3 diffs)

trunk

@@ -8 +8 @@
 testdummyaudio
 tests_apollos
+*.txt

@@ -8 +8 @@
 testdummyaudio
 tests_apollos
+*.txt

trunk/src/org/expeditee/actions/Misc.java

@@ -4 +4 @@
 import java.awt.Dimension;
 import java.awt.GraphicsEnvironment;
+import java.awt.Image;
 import java.awt.image.BufferedImage;
+import java.awt.image.VolatileImage;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -228 +230 @@
                 SessionStats.CreatedText();
                 Frame current = DisplayIO.getCurrentFrame();
-                Text text = current.getStatsTextItem(itemText);
+                Item text = current.getStatsTextItem(itemText);
                 FrameMouseActions.pickup(text);
                 FrameGraphics.Repaint();
@@ -360 +362 @@
                         // if (loaded.getBuffer() == null)
                         FrameGraphics.UpdateBuffer(loaded, false);
-
-                        BufferedImage screen = loaded.getBuffer().getSnapshot();
+                        
+                        BufferedImage screen = null;
+                        Image frameBuffer = loaded.getBuffer();
+                        if (loaded.getBuffer() instanceof BufferedImage){
+                                screen = (BufferedImage)frameBuffer;
+                        }else if (frameBuffer instanceof VolatileImage){
+                                screen = ((VolatileImage)frameBuffer).getSnapshot();
+                        }else{
+                                assert(false);
+                        }
 
                         try {

@@ -8 +8 @@
 testdummyaudio
 tests_apollos
+*.txt