Refactoring.

[sixth-3d.git] / src / main / java / eu / svjatoslav / sixth / e3d / gui / View.java

diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/gui/View.java b/src/main/java/eu/svjatoslav/sixth/e3d/gui/View.java
index 43d19c4..6f1b474 100755 (executable)
--- a/src/main/java/eu/svjatoslav/sixth/e3d/gui/View.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/gui/View.java
@@ -31,7 +31,7 @@ public class View extends JPanel implements ComponentListener {
     long lastUpdateMillis = 0;
     private Timer canvasUpdateTimer;
     private ViewUpdateTimerTask canvasUpdateTimerTask;
-    private RenderingContext renderingContext = new RenderingContext(1, 1, null);
+    private RenderingContext renderingContext = null;
     private MouseInteractionController currentMouseOverComponent;
     /**
      * Currently target FPS for this view. It might change at runtime.
@@ -153,8 +153,7 @@ public class View extends JPanel implements ComponentListener {
         if ((renderingContext == null)
                 || (renderingContext.width != getWidth())
                 || (renderingContext.height != getHeight()))
-            renderingContext = new RenderingContext(getWidth(), getHeight(),
-                    renderingContext);
+            renderingContext = new RenderingContext(getWidth(), getHeight());
 
         // clear drawing area
         {
@@ -219,8 +218,10 @@ public class View extends JPanel implements ComponentListener {
      * graphics is needed.
      */
     public void updateView() {
-        renderingContext.mouseClick = null;
-        renderingContext.clickedItem = null;
+        if (renderingContext != null){
+            renderingContext.mouseClick = null;
+            renderingContext.clickedItem = null;
+        }
 
         // compute time passed since last view update
         final long currentTime = System.currentTimeMillis();
@@ -234,12 +235,12 @@ public class View extends JPanel implements ComponentListener {
         lastUpdateMillis = currentTime;
 
         // notify update listeners
-        boolean rerenderView = false;
+        boolean reRenderFrame = false;
 
         for (final ViewUpdateListener listener : viewUpdateListeners)
             if (listener.beforeViewUpdate(context,
                     millisecondsPassedSinceLastUpdate))
-                rerenderView = true;
+                reRenderFrame = true;
 
         // abort rendering if window size is invalid
         if ((getWidth() <= 0) || (getHeight() <= 0))
@@ -247,10 +248,10 @@ public class View extends JPanel implements ComponentListener {
 
         if (repaintDuringNextViewUpdate) {
             repaintDuringNextViewUpdate = false;
-            rerenderView = true;
+            reRenderFrame = true;
         }
 
-        if (rerenderView) {
+        if (reRenderFrame) {
             renderFrame();
             handleDetectedComponentMouseEvents();
         }