Changeset 1102 for trunk/src/org/expeditee/items/FrameBitmap.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/items/FrameBitmap.java (modified) (5 diffs)

trunk/src/org/expeditee/items/FrameBitmap.java

@@ -19 +19 @@
 package org.expeditee.items;
 
-import java.awt.Color;
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.awt.image.ImageObserver;
 import java.util.List;
 
+import org.expeditee.core.Colour;
+import org.expeditee.core.Image;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
@@ -31 +29 @@
 
 public class FrameBitmap extends FramePicture {
-        public FrameBitmap(Text source, ImageObserver observer, Image image){
-                super(source, observer, image);
+        public FrameBitmap(Text source, Image image){
+                super(source, image);
         }
 
@@ -59 +57 @@
                         return false;
                 
-                BufferedImage bi = new BufferedImage(width, height,
-                                BufferedImage.TYPE_INT_ARGB);
+                Image bi = Image.createImage(width, height);
                 // now set the bits on the image
-                final int transparent = (new Color(0F, 0F, 0F, 0F)).getRGB();
-                final int main = _source.getPaintColor().getRGB();
-                final Color c = _source.getPaintColor();
+                final int transparent = (new Colour(0F, 0F, 0F, 0F)).getARGB32BitPacked();
+                final int main = _source.getPaintColor().getARGB32BitPacked();
+                final Colour c = _source.getPaintColor();
                 int currentColor = main;
                 int row = 0;
@@ -74 +71 @@
                                         // Space is transparent as is 0
                                         if (Character.isDigit(currentPixel)) {
-                                                int alpha = Math.round((currentPixel - '0') * 25.5F);
-                                                currentColor = new Color(c.getRed(), c.getGreen(), c
-                                                                .getBlue(), alpha).getRGB();
+                                                int alpha = Math.round((currentPixel - '0') * (Colour.COMPONENT_MAX_VALUE / 10.0f));
+                                                currentColor = new Colour(c.getRed(), c.getGreen(), c
+                                                                .getBlue(), alpha).getARGB32BitPacked();
                                         }else if (currentPixel != ' ') {
                                                 currentColor = main;
                                         }
                                 }
-                                bi.setRGB(i, row, currentColor);
+                                bi.setPixel(i, row, Colour.fromARGB32BitPacked(currentColor));
                         }
                         row++;
@@ -92 +89 @@
         @Override
         protected Picture createPicture() {
-                return new FrameBitmap((Text) _source.copy(),
-                                _imageObserver, _image);
+                return new FrameBitmap((Text) _source.copy(), _image);
         }