Changeset 1102 for trunk/src/org/apollo/items/FramePlaybackLauncher.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/apollo/items/FramePlaybackLauncher.java (modified) (8 diffs)

trunk/src/org/apollo/items/FramePlaybackLauncher.java

@@ -1 +1 @@
 package org.apollo.items;
-
-import java.awt.Color;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Polygon;
-import java.awt.Stroke;
 
 import org.apollo.ApolloSystem;
@@ -24 +17 @@
 import org.apollo.util.ODFrameHeirarchyFetcher.ODFrameReceiver;
 import org.apollo.widgets.FramePlayer;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Dimension;
+import org.expeditee.core.Fill;
+import org.expeditee.core.GradientFill;
+import org.expeditee.core.Point;
+import org.expeditee.core.Stroke;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.core.bounds.Bounds;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.GraphicsManager;
 import org.expeditee.gui.Browser;
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
@@ -43 +46 @@
         private static int WIDTH = 80;
         private static int HEIGHT = 80;
-        private static Stroke BORDER_STOKE = Strokes.SOLID_1;
-        
-        private static final Color BASE_COLOR = new Color(60, 148, 255);
-        private static final Color HIGHLIGHT_COLOR = new Color(253, 255, 201);
+        private static Stroke BORDER_STROKE = Strokes.SOLID_1;
+        
+        private static final Colour BASE_COLOR = Colour.FromRGB255(60, 148, 255);
+        private static final Colour HIGHLIGHT_COLOR = Colour.FromRGB255(253, 255, 201);
         
         private String frameToPlay = null;
@@ -74 +77 @@
 
         @Override
-        public void paint(Graphics2D g) {
+        public void paint()
+        {
                 if (Browser._theBrowser == null) return;
                 
-                Paint restore = g.getPaint();
-                
+                GraphicsManager g = EcosystemManager.getGraphicsManager();
+                
+                Fill fill = null;
                 if (ApolloSystem.useQualityGraphics) {
-                        GradientPaint gp = new GradientPaint(
-                                        _x + (WIDTH / 2), _y, HIGHLIGHT_COLOR,
-                                        _x + (WIDTH / 2), _y + HEIGHT - (HEIGHT / 5), BASE_COLOR);
-                        g.setPaint(gp);
+                        Point fromPoint = new Point(_x + (WIDTH / 2), _y);
+                        Point toPoint = new Point(_x + (WIDTH / 2), _y + HEIGHT - (HEIGHT / 5));
+                        fill = new GradientFill(HIGHLIGHT_COLOR, fromPoint, BASE_COLOR, toPoint);
                 } else {
-                        g.setColor(BASE_COLOR);
-                }
-                
-                g.fillRect((int)_x, (int)_y, WIDTH, HEIGHT);
-                
-                g.setPaint(restore);
-                
-                g.setColor(Color.BLACK);
-                g.setStroke(BORDER_STOKE);
-                g.drawRect((int)_x, (int)_y, WIDTH, HEIGHT);
-                
-                IconRepository.getIcon("frameplay.png").paintIcon(
-                                Browser._theBrowser.getContentPane(), g, getX() + 25, getY() + 25);
+                        fill = new Fill(BASE_COLOR);
+                }
+
+                Point topLeft = new Point((int)_x, (int)_y);
+                Dimension size = new Dimension(WIDTH, HEIGHT);
+                g.drawRectangle(topLeft, size, 0.0, fill, Colour.BLACK, BORDER_STROKE, null);
+                
+                /*IconRepository.getIcon("frameplay.png").paintIcon(
+                                Browser._theBrowser.getContentPane(), g, getX() + 25, getY() + 25);*/
+                
+                g.drawImage(IconRepository.getIcon("frameplay.png"), new Point(getX() + 25, getY() + 25));
                 
         }
@@ -117 +119 @@
 
         @Override
-        public void updatePolygon() {
-                
-                _poly = new Polygon();
-
-                int x = (int)_x;
-                int y = (int)_y;
-                
-                _poly.addPoint(x, y);
-                _poly.addPoint(x + WIDTH, y);
-                _poly.addPoint(x + WIDTH, y + HEIGHT);
-                _poly.addPoint(x, y + HEIGHT);
-
+        public Bounds updateBounds()
+        {
+                return new AxisAlignedBoxBounds((int) _x, (int) _y, WIDTH, HEIGHT);
         }
 
@@ -148 +141 @@
         }
         
-        private void selfDestruct() {
-                
+        private void selfDestruct()
+        {
                 Frame parent = getParent();
                 parent.removeItem(this);
                 
-                if (DisplayIO.getCurrentFrame() == null) return;
+                if (DisplayController.getCurrentFrame() == null) return;
                 
                 Frame audioFrame = null;
                 
                 // Flag as null if frame to play is actually current frame
-                if (frameToPlay != null && frameToPlay.equals(DisplayIO.getCurrentFrame().getName()))
+                if (frameToPlay != null && frameToPlay.equals(DisplayController.getCurrentFrame().getName()))
                         frameToPlay = null;
                 
                 if (frameToPlay == null) {
-                        audioFrame = DisplayIO.getCurrentFrame();
+                        audioFrame = DisplayController.getCurrentFrame();
                 } else {
                         audioFrame = FrameIO.LoadFrame(frameToPlay);
@@ -199 +192 @@
                         } else {
                                 // Fetch the audio graph for the frame
-                                GraphReceiver receiver = new GraphReceiver(DisplayIO.getCurrentFrame());
+                                GraphReceiver receiver = new GraphReceiver(DisplayController.getCurrentFrame());
                                 ODFrameHeirarchyFetcher.getInstance().doFetch(audioFrame.getName(), receiver);
                                 // The callback will later begin playback
@@ -257 +250 @@
                                 // Thus the start frame will be hence taken as a percentage of the whole frame
                                 
-                                float percent = _x / Browser._theBrowser.getContentPane().getWidth();
+                                float percent = _x / EcosystemManager.getGraphicsManager().getWindowSize().getWidth();
                                 if (percent < 0) percent = 0;
                                 if (percent > 1) percent = 1;