Improve Chunk

Author: Hartrik

sg2-core-jfx/src/cz/hartrik/sg2/engine/render/Highlighter.java

@@ -33,14 +33,14 @@ public void highlightActiveChunks() {
     }
 
     public void highlightChunk(Chunk chunk) {
-        for (int x = chunk.getBoundMinX(); x <= chunk.getBoundMaxX(); x++) {
-            highlight(x, chunk.getBoundMinY());
-            highlight(x, chunk.getBoundMaxY());
+        for (int x = chunk.getTopLeftX(); x <= chunk.getBottomRightX(); x++) {
+            highlight(x, chunk.getTopLeftY());
+            highlight(x, chunk.getBottomRightY());
         }
 
-        for (int y = chunk.getBoundMinY() + 1; y < chunk.getBoundMaxY(); y++) {
-            highlight(chunk.getBoundMaxX(), y);
-            highlight(chunk.getBoundMinX(), y);
+        for (int y = chunk.getTopLeftY() + 1; y < chunk.getBottomRightY(); y++) {
+            highlight(chunk.getBottomRightX(), y);
+            highlight(chunk.getTopLeftX(), y);
         }
     }
 

sg2-core/src/cz/hartrik/sg2/world/Chunk.java

@@ -2,14 +2,13 @@
 package cz.hartrik.sg2.world;
 
 import java.io.Serializable;
-import java.util.function.Consumer;
 
 /**
  * Spravuje čtvercovou oblast elementů uvnitř {@link ElementArea}.
  * Jeho hlavním úkolem je sdělovat, zda byl alespoň jeden z elementů uvnitř
  * chunku během cyklu změněn.
  *
- * @version 2016-06-21
+ * @version 2017-08-12
  * @author Patrik Harag
  */
 public class Chunk implements Serializable {
@@ -21,23 +20,20 @@ public class Chunk implements Serializable {
     private final int x;   // horizontální souřadnice oblasti
     private final int y;   // vertikální souřadnice oblasti
 
-    private final ElementArea elementArea;
-
-    private final int startX, startY;
-    private final int endX, endY;
+    private final int topLeftX, topLeftY;
+    private final int bottomRightX, bottomRightY;
 
     private volatile boolean changed = true;
 
-    public Chunk(ElementArea elementArea, int size, int x, int y) {
-        this.elementArea = elementArea;
+    public Chunk(int size, int x, int y) {
         this.size = size;
         this.x = x;
         this.y = y;
 
-        this.startX = x * size;
-        this.startY = y * size;
-        this.endX = startX + size - 1;
-        this.endY = startY + size - 1;
+        this.topLeftX = x * size;
+        this.topLeftY = y * size;
+        this.bottomRightX = topLeftX + size - 1;
+        this.bottomRightY = topLeftY + size - 1;
     }
 
     public int getSize() {
@@ -48,30 +44,16 @@ public int getSize() {
     public final void change(boolean b) { changed = b; }
     public final boolean isChanged()    { return changed; }
 
-    public final int getX()  { return x; }
-    public final int getY()  { return y; }
+    public final int getChunkX() { return x; }
+    public final int getChunkY() { return y; }
 
-    public final int getBoundMaxX() { return endX; }
-    public final int getBoundMinX() { return startX; }
-    public final int getBoundMaxY() { return endY; }
-    public final int getBoundMinY() { return startY; }
+    public final int getTopLeftX() { return topLeftX; }
+    public final int getTopLeftY() { return topLeftY; }
+    public final int getBottomRightX() { return bottomRightX; }
+    public final int getBottomRightY() { return bottomRightY; }
 
     public final boolean contains(int x, int y) {
-        return x >= startX && x <= endX && y >= startY && y <= endY;
-    }
-
-    // iterátory
-
-    public void forEach(PointConsumer iterator) {
-        for (int nY = startY; nY < endY; nY++)
-            for (int nX = startX; nX < endX; nX++)
-                iterator.accept(nX, nY);
-    }
-
-    public void forEach(Consumer<Element> consumer) {
-        for (int nY = startY; nY < endY; nY++)
-            for (int nX = startX; nX < endX; nX++)
-                consumer.accept(elementArea.get(x, y));
+        return x >= topLeftX && x <= bottomRightX && y >= topLeftY && y <= bottomRightY;
     }
 
 }

sg2-core/src/cz/hartrik/sg2/world/ChunkedArea.java

@@ -52,7 +52,7 @@ public ChunkedArea(ChunkedArea elementArea) {
     private void initChunks() {
         for (int y = 0; y < verChunkCount; y++)
             for (int x = 0; x < horChunkCount; x++)
-                chunks[x + (y * horChunkCount)] = new Chunk(this, chunkSize, x, y);
+                chunks[x + (y * horChunkCount)] = new Chunk(chunkSize, x, y);
     }
 
     // základní metody...