Changeset 1102 for trunk/src/org/apollo/gui/FrameRenderPasses.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/gui/FrameRenderPasses.java (modified) (14 diffs)

trunk/src/org/apollo/gui/FrameRenderPasses.java

@@ -1 +1 @@
 package org.apollo.gui;
 
-import java.awt.Color;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.awt.Stroke;
-import java.awt.geom.Area;
-import java.awt.geom.Rectangle2D;
 import java.util.LinkedList;
 
-import org.apollo.AudioFrameKeyboardActions;
-import org.apollo.AudioFrameMouseActions;
+import org.apollo.ApolloGestureActions;
 import org.apollo.audio.util.Timeline;
 import org.apollo.items.FramePlaybackLauncher;
@@ -19 +10 @@
 import org.apollo.widgets.LinkedTrack;
 import org.apollo.widgets.SampledTrack;
+import org.expeditee.core.Clip;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Dimension;
+import org.expeditee.core.Fill;
+import org.expeditee.core.Point;
+import org.expeditee.core.Stroke;
+import org.expeditee.core.TextLayout;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.GraphicsManager;
+import org.expeditee.gio.gesture.StandardGestureActions;
+import org.expeditee.gio.input.KBMInputEvent.Key;
+import org.expeditee.gio.input.StandardInputEventListeners;
 import org.expeditee.gui.Browser;
 import org.expeditee.gui.FrameGraphics;
-import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.gui.FreeItems;
 import org.expeditee.gui.FrameGraphics.FrameRenderPass;
 import org.expeditee.items.Item;
-import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.Widget;
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
@@ -31 +34 @@
 /**
  * All final effects rendered here - to give extra feedback to the user and simply to make
- * it more apealing.
+ * it more appealing.
  * @author Brook Novak
  *
@@ -37 +40 @@
 public class FrameRenderPasses implements FrameRenderPass {
         
-        private static final Color SHADED_EXPANDED_BACKING_COLOR = new Color(80, 80, 80, 140);
-        private static final Color Y_HELPER_LINES_COLOR = Color.DARK_GRAY;
+        private static final Colour SHADED_EXPANDED_BACKING_COLOR = Colour.FromRGBA255(80, 80, 80, 140);
+        private static final Colour Y_HELPER_LINES_COLOR = Colour.DARK_GREY;
         private static final Stroke Y_HELPER_LINES_STROKE = OverdubbedFrameTimeAxis.TRACK_TIMELINE_STROKE;
         
@@ -48 +51 @@
         private boolean shouldDrawFullscreenHelpers = false;
         
-        private FrameRenderPasses() {
+        private FrameRenderPasses()
+        {
                 FrameGraphics.addFrameRenderPass(this);
         }
         
-        public static FrameRenderPasses getInstance() {
+        public static FrameRenderPasses getInstance()
+        {
                 return instance;
         }
 
-        public void paintFinalPass(Graphics g) {
+        public void paintFinalPass()
+        {
                 if (Browser._theBrowser == null) return;
-                int frameHeight = Browser._theBrowser.getContentPane().getHeight();
+                
+                GraphicsManager gm = EcosystemManager.getGraphicsManager();
+                
+                int frameHeight = EcosystemManager.getGraphicsManager().getWindowSize().getHeight();
                 if (ExpandedTrackManager.getInstance().isAnyExpandedTrackVisible()
                                 && !FreeItems.getInstance().isEmpty()) {
@@ -67 +76 @@
                         for (Item i : FreeItems.getInstance()) {
                                 if (i instanceof WidgetCorner) {
-                                        InteractiveWidget iw = ((WidgetCorner)i).getWidgetSource();
+                                        Widget iw = ((WidgetCorner)i).getWidgetSource();
                                         
                                         if (iw != null && iw instanceof SampledTrack) {
@@ -84 +93 @@
                         if (toPaint != null) {
                                 for (SampledTrack trackWidget : toPaint) {
-                                        if (g.getClip() == null
-                                                        || g.getClip().intersects(trackWidget.getComponant().getBounds()))
-                                        trackWidget.paintInFreeSpace(g, true);
-                                        
+                                        if (gm.peekClip() == null || gm.peekClip().isNotClipped() || (!gm.peekClip().isFullyClipped() && gm.peekClip().getBounds().intersects(trackWidget.getBounds()))) {
+                                                trackWidget.paintInFreeSpace(true);
+                                        }
                                 }
                         }
@@ -93 +101 @@
                 } 
                 
-                OverdubbedFrameTimeAxis.getInstance().paint(g);
+                OverdubbedFrameTimeAxis.getInstance().paint();
                 
                 TimeAxis timeAxis = OverdubbedFrameTimeAxis.getInstance().getTimeAxis();        
                 Timeline lastTimeline = OverdubbedFrameTimeAxis.getInstance().getLastTimeline();
                 
-                FramePlaybackBarRenderer.getInstance().paint((Graphics2D)g);
+                FramePlaybackBarRenderer.getInstance().paint();
 
                 if (timeHelperLinesToPaint != null && timeAxis != null && lastTimeline != null) {
 
-                        Rectangle r = OverdubbedFrameTimeAxis.getInstance().getCurrentTimelineArea();
+                        AxisAlignedBoxBounds r = OverdubbedFrameTimeAxis.getInstance().getCurrentTimelineArea();
                         
                         // Draw helper bar and text
                         for (Integer x : timeHelperLinesToPaint) {
                                 
-                                ((Graphics2D)g).setStroke(OverdubbedFrameTimeAxis.TRACK_TIMELINE_STROKE);
-                                g.setColor(Color.RED);
-                                
-                                if (shouldDrawFullscreenHelpers) 
-                                        g.drawLine(x, 0, x, frameHeight);
-                                else 
-                                        g.drawLine(x, r.y, x, r.y + r.height);
-                                                                        
+                                if (shouldDrawFullscreenHelpers) {
+                                        gm.drawLine(new Point(x, 0), new Point(x, frameHeight), Colour.RED, OverdubbedFrameTimeAxis.TRACK_TIMELINE_STROKE);
+                                } else {
+                                        gm.drawLine(new Point(x, r.getMinY()), new Point(x, r.getMinY() + r.getHeight()), Colour.RED, OverdubbedFrameTimeAxis.TRACK_TIMELINE_STROKE);
+                                }
+                                
                                 long ms = lastTimeline.getMSTimeAtX(x) - lastTimeline.getFirstInitiationTime();
 
@@ -120 +126 @@
                                 if (ms < 0) label = "-" + label;
                                 
-                                FontMetrics fm   = g.getFontMetrics(SampledTrackGraphViewPort.TIME_HELPER_FONT);
-                                Rectangle2D rect = fm.getStringBounds(label, g);
+                                //FontMetrics fm   = g.getFontMetrics(SampledTrackGraphViewPort.TIME_HELPER_FONT);
+                                //Rectangle2D rect = fm.getStringBounds(label, g);
+                                TextLayout layout = EcosystemManager.getTextLayoutManager().layoutStringSimple(label, SampledTrackGraphViewPort.TIME_HELPER_FONT);
+                                AxisAlignedBoxBounds rect = layout.getPixelBounds(0, 0);
                                 int labelWidth  = (int)(rect.getWidth());
                                 int labelHeight  = (int)(rect.getHeight());
                                 
-                                int y = r.y + (r.height / 2) - ((labelHeight + 4) / 2);
-                                
-
-                                g.setColor(SampledTrackGraphViewPort.TIME_HELPER_COLOR);
-                                g.fillRect(x + 2,  y, labelWidth + 3, labelHeight + 4);
-        
-                                g.setColor(SampledTrackGraphViewPort.TIME_HELPER_BORDERCOLOR);
-                                ((Graphics2D)g).setStroke(SampledTrackGraphViewPort.ZOOM_BACKING_BORDER_STROKE);
-                                g.fillRect(x + 2,  y, labelWidth + 3, labelHeight + 4);
-
-                                g.setFont(SampledTrackGraphViewPort.TIME_HELPER_FONT);
-                                g.setColor(Color.BLACK);
-                                g.drawString(label, x + 4, y + labelHeight);
-                                
-                                
+                                int y = r.getMinY() + (r.getHeight() / 2) - ((labelHeight + 4) / 2);
+                                
+                                gm.drawRectangle(new Point(x + 2,  y), new Dimension(labelWidth + 3, labelHeight + 4), 0.0, new Fill(SampledTrackGraphViewPort.TIME_HELPER_COLOR), SampledTrackGraphViewPort.TIME_HELPER_BORDERCOLOR, SampledTrackGraphViewPort.ZOOM_BACKING_BORDER_STROKE, null);
+
+                                gm.drawTextLayout(layout, new Point(x + 4, y + labelHeight), Colour.BLACK);
                         }
                 
@@ -146 +144 @@
 //               Draw Y helper
                 if (yAxisTimelineHelperToPaint != null) {
-
-                        ((Graphics2D)g).setStroke(Y_HELPER_LINES_STROKE);
-                        g.setColor(Y_HELPER_LINES_COLOR);
-
-                        g.drawLine(
-                                        0, 
-                                        yAxisTimelineHelperToPaint.value, 
-                                        Browser._theBrowser.getContentPane().getWidth(), 
-                                        yAxisTimelineHelperToPaint.value);
-                        
-                }
-                
-        
-        }
-
-        public void paintPreLayeredPanePass(Graphics g) {
+                        gm.drawLine(0, yAxisTimelineHelperToPaint.value, EcosystemManager.getGraphicsManager().getWindowSize().getWidth(), yAxisTimelineHelperToPaint.value, Y_HELPER_LINES_COLOR, Y_HELPER_LINES_STROKE);
+                }
+                
+        
+        }
+
+        public void paintPreLayeredPanePass()
+        {
                 if (Browser._theBrowser == null) return;
                 
                 if (ExpandedTrackManager.getInstance().isAnyExpandedTrackVisible()) {
-                        
-                        g.setColor(SHADED_EXPANDED_BACKING_COLOR);
-                        g.fillRect(0, 0, 
-                                        Browser._theBrowser.getContentPane().getWidth(), 
-                                        Browser._theBrowser.getContentPane().getHeight());
-                }
-                
-        }
-
-        public Area paintStarted(Area currentClip) {
+                        Dimension windowSize = EcosystemManager.getGraphicsManager().getWindowSize();
+                        EcosystemManager.getGraphicsManager().drawRectangle(Point.ORIGIN, windowSize, 0.0, new Fill(SHADED_EXPANDED_BACKING_COLOR), null, null, null);
+                }
+                
+        }
+
+        public Clip paintStarted(Clip currentClip)
+        {
                 if (Browser._theBrowser == null) return currentClip;
 
-                LinkedList<InteractiveWidget> seen = null;
+                LinkedList<Widget> seen = null;
                 
                 //boolean idDirty = false;
@@ -189 +177 @@
                 timeHelperLinesToPaint = null;
                 yAxisTimelineHelperToPaint = null;
-                shouldDrawFullscreenHelpers = AudioFrameKeyboardActions.isControlDown() || 
-                        (AudioFrameKeyboardActions.isShiftDown() && !FreeItems.getInstance().isEmpty());
+                shouldDrawFullscreenHelpers = StandardInputEventListeners.kbmStateListener.isKeyDown(Key.CTRL) || 
+                        (StandardInputEventListeners.kbmStateListener.isKeyDown(Key.SHIFT) && !FreeItems.getInstance().isEmpty());
 
                 // Get free tracks and paint line helpers
-                if (!FreeItems.getInstance().isEmpty() || FrameMouseActions.getlastHighlightedItem() != null) {
+                if (!FreeItems.getInstance().isEmpty() || StandardGestureActions.getlastHighlightedItem() != null) {
 
                         LinkedList<Item> possibles = new LinkedList<Item>(FreeItems.getInstance());
-                        if (FreeItems.getInstance().isEmpty() &&
-                                        FrameMouseActions.getlastHighlightedItem() != null)
-                                possibles.add(FrameMouseActions.getlastHighlightedItem());
+                        if (FreeItems.getInstance().isEmpty() && StandardGestureActions.getlastHighlightedItem() != null) {
+                                possibles.add(StandardGestureActions.getlastHighlightedItem());
+                        }
                         
                         for (Item i : possibles) {
                                 
-                                InteractiveWidget iw = null;
+                                Widget iw = null;
                                 
                                 if (i instanceof WidgetCorner) {
@@ -216 +204 @@
                                                 
                                                 if (seen == null) {
-                                                        seen = new LinkedList<InteractiveWidget>();
+                                                        seen = new LinkedList<Widget>();
                                                 } else if (seen.contains(iw)) {
                                                         continue;
@@ -235 +223 @@
                 } 
                 
-                if ((AudioFrameMouseActions.isYAxisRestictionOn() || AudioFrameMouseActions.isSnapOn()) 
+                if ((ApolloGestureActions.isYAxisRestictionOn() || ApolloGestureActions.isSnapOn()) 
                         && !FreeItems.getInstance().isEmpty()) {
                         
@@ -255 +243 @@
         }
         
-        private void invalidateHelperLines(Area currentClip) {
-                if (currentClip != null) {
-                        
-                        if (timeHelperLinesToPaint != null && !timeHelperLinesToPaint.isEmpty()) {
-                                currentClip.add(new Area(OverdubbedFrameTimeAxis.getInstance().getCurrentTimelineArea()));
-                                if (shouldDrawFullscreenHelpers) {
-                                        int fsHeight = Browser._theBrowser.getContentPane().getHeight();
-                                        for (Integer n : timeHelperLinesToPaint) {
-                                                currentClip.add(new Area(new Rectangle(n - 1, 0, 3, fsHeight)));
-                                        }
-                                }
-                        }
-                        
-                        if (yAxisTimelineHelperToPaint != null && shouldDrawFullscreenHelpers) {
-
-                                currentClip.add(new Area(new Rectangle(
-                                                0, 
-                                                yAxisTimelineHelperToPaint.value - 1, 
-                                                Browser._theBrowser.getContentPane().getWidth(), 
-                                                3)));
-                        
-                        }
-                }
-        }
-        
-        
-        
-
+        private void invalidateHelperLines(Clip currentClip)
+        {
+                if (currentClip == null) return;
+                
+                if (timeHelperLinesToPaint != null && !timeHelperLinesToPaint.isEmpty()) {
+                        currentClip.includeBounds(OverdubbedFrameTimeAxis.getInstance().getCurrentTimelineArea().clone());
+                        if (shouldDrawFullscreenHelpers) {
+                                int fsHeight = EcosystemManager.getGraphicsManager().getWindowSize().getHeight();
+                                for (Integer n : timeHelperLinesToPaint) {
+                                        currentClip.includeBounds(new AxisAlignedBoxBounds(n - 1, 0, 3, fsHeight));
+                                }
+                        }
+                }
+                
+                if (yAxisTimelineHelperToPaint != null && shouldDrawFullscreenHelpers) {
+
+                        currentClip.includeBounds(new AxisAlignedBoxBounds(
+                                        0, 
+                                        yAxisTimelineHelperToPaint.value - 1, 
+                                        EcosystemManager.getGraphicsManager().getWindowSize().getWidth(), 
+                                        3));
+                
+                }
+        }
 }