spdis/voxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempted to move to native buffer directly

Browse Source
This commit is contained in:
mcrcortex
2024-12-05 10:40:49 +10:00
parent 70a1fe36c7
commit eeeecb982c
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory4.java
View File

@@ -7,6 +7,7 @@ import me.cortex.voxy.client.core.model.ModelQueries;
import me.cortex.voxy.client.core.util.Mesher2D; import me.cortex.voxy.client.core.util.Mesher2D;
import me.cortex.voxy.client.core.util.ScanMesher2D; import me.cortex.voxy.client.core.util.ScanMesher2D;
import me.cortex.voxy.common.util.MemoryBuffer; import me.cortex.voxy.common.util.MemoryBuffer;
import me.cortex.voxy.common.util.UnsafeUtil;
import me.cortex.voxy.common.world.WorldEngine; import me.cortex.voxy.common.world.WorldEngine;
import me.cortex.voxy.common.world.WorldSection; import me.cortex.voxy.common.world.WorldSection;
import me.cortex.voxy.common.world.other.Mapper; import me.cortex.voxy.common.world.other.Mapper;
@@ -26,7 +27,11 @@ public class RenderDataFactory4 {
//TODO: emit directly to memory buffer instead of long arrays //TODO: emit directly to memory buffer instead of long arrays
private final LongArrayList[] directionalQuadCollectors = new LongArrayList[]{new LongArrayList(), new LongArrayList(), new LongArrayList(), new LongArrayList(), new LongArrayList(), new LongArrayList()};
//Each axis gets a max quad count of 2^16 (65536 quads) since that is the max the basic geometry manager can handle
private final MemoryBuffer directionalQuadBuffer = new MemoryBuffer(6*(8*(1<<16)));
private final long directionalQuadBufferPtr = this.directionalQuadBuffer.address;
private final int[] directionalQuadCounters = new int[6];//Maybe change to short? (or long /w raw pointers)
private int minX; private int minX;
@@ -83,7 +88,7 @@ public class RenderDataFactory4 {
long quad = data | encodedPosition; long quad = data | encodedPosition;
RenderDataFactory4.this.directionalQuadCollectors[face].add(quad); MemoryUtil.memPutLong(RenderDataFactory4.this.directionalQuadBufferPtr + (RenderDataFactory4.this.directionalQuadCounters[face]++)*8L + face*8L*(1<<16), quad);
} }
} }
@@ -352,9 +357,8 @@ public class RenderDataFactory4 {
this.maxY = Integer.MIN_VALUE; this.maxY = Integer.MIN_VALUE;
this.maxZ = Integer.MIN_VALUE; this.maxZ = Integer.MIN_VALUE;
for (var i : this.directionalQuadCollectors) { Arrays.fill(this.directionalQuadCounters, (short) 0);
i.clear();
}
/* /*
this.world.acquire(section.lvl, section.x+1, section.y, section.z).release(); this.world.acquire(section.lvl, section.x+1, section.y, section.z).release();
this.world.acquire(section.lvl, section.x-1, section.y, section.z).release(); this.world.acquire(section.lvl, section.x-1, section.y, section.z).release();
@@ -385,15 +389,11 @@ public class RenderDataFactory4 {
long ptr = buff.address; long ptr = buff.address;
int coff = 0; int coff = 0;
long size = 0;
for (int face = 0; face < 6; face++) { for (int face = 0; face < 6; face++) {
offsets[face + 2] = coff; offsets[face + 2] = coff;
final LongArrayList faceArray = this.directionalQuadCollectors[face]; int size = this.directionalQuadCounters[face];
size = faceArray.size(); UnsafeUtil.memcpy(this.directionalQuadBufferPtr + (face*(8*(1<<16))) + (size*8L), ptr + coff*8L, (size* 8L));
for (int i = 0; i < size; i++) { coff += size;
long data = faceArray.getLong(i);
MemoryUtil.memPutLong(ptr + ((coff++) * 8L), data);
}
} }