From 2abfb0da45774856b48b2fcb818b2f739c4c1634 Mon Sep 17 00:00:00 2001
From: mcrcortex <18544518+MCRcortex@users.noreply.github.com>
Date: Fri, 26 Jan 2024 10:37:02 +1000
Subject: [PATCH] Updated mesher

---
 .../zenith/client/core/util/Mesher2D.java     | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/main/java/me/cortex/zenith/client/core/util/Mesher2D.java b/src/main/java/me/cortex/zenith/client/core/util/Mesher2D.java
index 8977f476..08461b3b 100644
--- a/src/main/java/me/cortex/zenith/client/core/util/Mesher2D.java
+++ b/src/main/java/me/cortex/zenith/client/core/util/Mesher2D.java
@@ -81,7 +81,7 @@ public class Mesher2D {
             while (ex || ez) {
                 //Expand in the x direction
                 if (ex) {
-                    if (endX + 1 > this.maxSize || endX+1 == (1 << this.size) - 1) {
+                    if (endX - x >= this.maxSize || endX >= (1 << this.size) - 1) {
                         ex = false;
                     }
                 }
@@ -96,7 +96,7 @@ public class Mesher2D {
                     endX++;
                 }
                 if (ez) {
-                    if (endZ + 1 > this.maxSize || endZ+1 == (1<<this.size)-1) {
+                    if (endZ - z >= this.maxSize || endZ >= (1<<this.size)-1) {
                         ez = false;
                     }
                 }
@@ -143,7 +143,31 @@ public class Mesher2D {
         return this.quadCache;
     }
 
+    public void reset() {
+        this.setset.clear();
+        Arrays.fill(this.data, 0);
+    }
+
+    public long getDataFromQuad(int quad) {
+        return this.getData(getX(quad), getZ(quad));
+    }
+
+    public long getData(int x, int z) {
+        return this.data[this.getIdx(x, z)];
+    }
+
     public static void main(String[] args) {
+        var mesh = new Mesher2D(5,15);
+        mesh.put(30,30, 123);
+        mesh.put(31,30, 123);
+        mesh.put(30,31, 123);
+        mesh.put(31,31, 123);
+        int count = mesh.process();
+
+        System.err.println(count);
+    }
+
+    public static void main2(String[] args) {
         var r = new Random(123451);
         int a = 0;
         long total = 0;
@@ -161,18 +185,5 @@ public class Mesher2D {
         System.out.println((double) (total/(1e+6))/200000);
         //mesh.put(0,0,1);
     }
-
-    public void reset() {
-        this.setset.clear();
-        Arrays.fill(this.data, 0);
-    }
-
-    public long getDataFromQuad(int quad) {
-        return this.getData(getX(quad), getZ(quad));
-    }
-
-    public long getData(int x, int z) {
-        return this.data[this.getIdx(x, z)];
-    }
 }