X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=sixth-3d.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fe3d%2Fgui%2FViewPanel.java;h=ea55a312fe1e451b8971ec0e53717083f71b123e;hp=87f0dd39fefedae9976b0b54e46ad2e7822e9fa9;hb=4bb8945294848559aab76e248207781c6e097714;hpb=96f76bab30b47db83a1c9061b8916c69657f1e13 diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/gui/ViewPanel.java b/src/main/java/eu/svjatoslav/sixth/e3d/gui/ViewPanel.java index 87f0dd3..ea55a31 100755 --- a/src/main/java/eu/svjatoslav/sixth/e3d/gui/ViewPanel.java +++ b/src/main/java/eu/svjatoslav/sixth/e3d/gui/ViewPanel.java @@ -9,21 +9,30 @@ package eu.svjatoslav.sixth.e3d.gui; +import eu.svjatoslav.sixth.e3d.gui.humaninput.HIDInputTracker; +import eu.svjatoslav.sixth.e3d.gui.humaninput.KeyboardFocusStack; import eu.svjatoslav.sixth.e3d.gui.humaninput.MouseInteractionController; +import eu.svjatoslav.sixth.e3d.renderer.raster.ShapeCollection; import javax.swing.*; import java.awt.*; import java.awt.event.ComponentEvent; import java.awt.event.ComponentListener; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; import java.util.Timer; +import java.util.concurrent.ConcurrentHashMap; +/** + * Java Swing GUI panel that contains canvas for 3D rendering. + */ public class ViewPanel extends JPanel implements ComponentListener { - private static final long serialVersionUID = 1683277888885045387L; - private final List viewRenderListeners = new ArrayList<>(); - private final ViewContext context = new ViewContext(this); + public Color backgroundColor = Color.BLACK; + private final HIDInputTracker HIDInputTracker = new HIDInputTracker(this); + private final KeyboardFocusStack keyboardFocusStack; + private final Avatar avatar = new Avatar(); + private final ShapeCollection rootShapeCollection = new ShapeCollection(); + private final Set viewRenderListeners = ConcurrentHashMap.newKeySet(); /** * Last time this view was updated. */ @@ -31,27 +40,49 @@ public class ViewPanel extends JPanel implements ComponentListener { private Timer canvasUpdateTimer; private ViewUpdateTimerTask canvasUpdateTimerTask; private RenderingContext renderingContext = null; + /** + * UI component that mouse is currently hovering over. + */ private MouseInteractionController currentMouseOverComponent; /** - * Currently target FPS for this view. It might change at runtime. + * Currently target FPS for this view. It can be changed at runtime. Also when nothing + * changes in the view, then frames are not really repainted. */ - private int targetFramerate = 30; - private boolean repaintDuringNextViewUpdate = true; - + private int targetFPS = 30; + /** + * Set to true if it is known than next frame reeds to be painted. Flag is cleared + * immediately after frame got updated. + */ + private boolean viewRepaintNeeded = true; public ViewPanel() { - viewRenderListeners.add(context.getAvatar()); + viewRenderListeners.add(avatar); + viewRenderListeners.add(HIDInputTracker); - // initialize input tracker - context.getUserInputTracker().bind(this); - viewRenderListeners.add(context.getUserInputTracker()); + keyboardFocusStack = new KeyboardFocusStack(this); initializePanelLayout(); - setFrameRate(targetFramerate); + setFrameRate(targetFPS); addComponentListener(this); } + public Avatar getAvatar() { + return avatar; + } + + public KeyboardFocusStack getKeyboardFocusStack() { + return keyboardFocusStack; + } + + public ShapeCollection getRootShapeCollection() { + return rootShapeCollection; + } + + public HIDInputTracker getHIDInputTracker() { + return HIDInputTracker; + } + public void addViewUpdateListener(final ViewRenderListener listener) { viewRenderListeners.add(listener); } @@ -68,16 +99,12 @@ public class ViewPanel extends JPanel implements ComponentListener { @Override public void componentResized(final ComponentEvent e) { - repaintDuringNextViewUpdate = true; + viewRepaintNeeded = true; } @Override public void componentShown(final ComponentEvent e) { - repaintDuringNextViewUpdate = true; - } - - public ViewContext getContext() { - return context; + viewRepaintNeeded = true; } @Override @@ -95,10 +122,6 @@ public class ViewPanel extends JPanel implements ComponentListener { return new java.awt.Dimension(640, 480); } - public RenderingContext getRenderBuffer() { - return renderingContext; - } - public RenderingContext getRenderingContext() { return renderingContext; } @@ -110,21 +133,21 @@ public class ViewPanel extends JPanel implements ComponentListener { if (currentMouseOverComponent == null) { currentMouseOverComponent = renderingContext.clickedItem; currentMouseOverComponent.mouseEntered(); - repaintDuringNextViewUpdate = true; + viewRepaintNeeded = true; } else if (currentMouseOverComponent != renderingContext.clickedItem) { currentMouseOverComponent.mouseExited(); currentMouseOverComponent = renderingContext.clickedItem; currentMouseOverComponent.mouseEntered(); - repaintDuringNextViewUpdate = true; + viewRepaintNeeded = true; } } else { // mouse click renderingContext.clickedItem.mouseClicked(); - repaintDuringNextViewUpdate = true; + viewRepaintNeeded = true; } } else if (currentMouseOverComponent != null) { currentMouseOverComponent.mouseExited(); - repaintDuringNextViewUpdate = true; + viewRepaintNeeded = true; currentMouseOverComponent = null; } } @@ -138,35 +161,37 @@ public class ViewPanel extends JPanel implements ComponentListener { requestFocusInWindow(); } - public void renderFrame() { - // build new render buffer if needed, this happens when window was just - // created or resized - if ((renderingContext == null) - || (renderingContext.width != getWidth()) - || (renderingContext.height != getHeight())) + private void renderFrame() { + if (isNewRenderingContextNeeded()) renderingContext = new RenderingContext(getWidth(), getHeight()); - // clear drawing area - { - renderingContext.graphics.setColor(Color.BLACK); - renderingContext.graphics.fillRect(0, 0, getWidth(), getHeight()); - } - // paint root geometry collection to the offscreen render buffer - context.getRootShapeCollection().paint(context, renderingContext); + clearCanvas(); + rootShapeCollection.paint(this, renderingContext); - // draw rendered offscreen image to visible screen + // draw rendered offscreen buffer to visible screen final Graphics graphics = getGraphics(); if (graphics != null) graphics.drawImage(renderingContext.bufferedImage, 0, 0, null); } + private void clearCanvas() { + renderingContext.graphics.setColor(backgroundColor); + renderingContext.graphics.fillRect(0, 0, getWidth(), getHeight()); + } + + private boolean isNewRenderingContextNeeded() { + return (renderingContext == null) + || (renderingContext.width != getWidth()) + || (renderingContext.height != getHeight()); + } + /** * Calling this methods tells 3D engine that current 3D view needs to be * repainted on first opportunity. */ public void repaintDuringNextViewUpdate() { - repaintDuringNextViewUpdate = true; + viewRepaintNeeded = true; } public void setFrameRate(final int frameRate) { @@ -178,7 +203,7 @@ public class ViewPanel extends JPanel implements ComponentListener { canvasUpdateTimer = null; } - targetFramerate = frameRate; + targetFPS = frameRate; if (frameRate > 0) { canvasUpdateTimer = new Timer(); @@ -208,43 +233,56 @@ public class ViewPanel extends JPanel implements ComponentListener { * It tells view to update itself. View can decide if actual re-rendering of * graphics is needed. */ - public void updateView() { - if (renderingContext != null){ + void updateView() { + if (renderingContext != null) { renderingContext.mouseClick = null; renderingContext.clickedItem = null; } - // compute time passed since last view update - final long currentTime = System.currentTimeMillis(); + final int millisecondsPassedSinceLastUpdate = getMillisecondsPassedSinceLastUpdate(); - if (lastUpdateMillis == 0) { - lastUpdateMillis = currentTime; - return; + boolean renderFrame = notifyViewRenderListeners(millisecondsPassedSinceLastUpdate); + + if (viewRepaintNeeded) { + viewRepaintNeeded = false; + renderFrame = true; } - final int millisecondsPassedSinceLastUpdate = (int) (currentTime - lastUpdateMillis); - lastUpdateMillis = currentTime; + // abort rendering if window size is invalid + if ((getWidth() <= 0) || (getHeight() <= 0)) + renderFrame = false; - // notify update listeners - boolean reRenderFrame = false; + if (renderFrame) { + renderFrame(); + handleDetectedComponentMouseEvents(); + } + } + private boolean notifyViewRenderListeners(int millisecondsPassedSinceLastUpdate) { + boolean reRenderFrame = false; for (final ViewRenderListener listener : viewRenderListeners) - if (listener.beforeRender(context, - millisecondsPassedSinceLastUpdate)) + if (listener.beforeRender(this, millisecondsPassedSinceLastUpdate)) reRenderFrame = true; + return reRenderFrame; + } - // abort rendering if window size is invalid - if ((getWidth() <= 0) || (getHeight() <= 0)) - return; + private int getMillisecondsPassedSinceLastUpdate() { + final long currentTime = System.currentTimeMillis(); - if (repaintDuringNextViewUpdate) { - repaintDuringNextViewUpdate = false; - reRenderFrame = true; - } + if (lastUpdateMillis == 0) + lastUpdateMillis = currentTime; - if (reRenderFrame) { - renderFrame(); - handleDetectedComponentMouseEvents(); - } + final int millisecondsPassedSinceLastUpdate = (int) (currentTime - lastUpdateMillis); + lastUpdateMillis = currentTime; + return millisecondsPassedSinceLastUpdate; + } + + public void addViewRenderListener(ViewRenderListener viewRenderListener) { + viewRenderListeners.add(viewRenderListener); } + + public void removeViewRenderListener(ViewRenderListener viewRenderListener) { + viewRenderListeners.remove(viewRenderListener); + } + }