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

Improves perf alot

Browse Source
This commit is contained in:
mcrcortex
2024-01-13 13:59:51 +10:00
parent 168c4f4d81
commit 79cfe99e8d
9 changed files with 179 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/me/cortex/voxelmon/core/DistanceTracker.java
View File

@@ -3,6 +3,7 @@ package me.cortex.voxelmon.core;
//Contains the logic to determine what is loaded and at what LoD level, dispatches render changes
// also determines what faces are built etc
import it.unimi.dsi.fastutil.Arrays;
import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
import me.cortex.voxelmon.core.rendering.AbstractFarWorldRenderer;
@@ -22,7 +23,7 @@ public class DistanceTracker {
private final TransitionRing2D[] rings;
private final RenderTracker tracker;
public DistanceTracker(RenderTracker tracker, int rings) {
this.rings = new TransitionRing2D[rings+1];
this.rings = new TransitionRing2D[rings];
this.tracker = tracker;
//NOTE: This is in our render distance units, to convert to chunks at lvl 0 multiply by 2
@@ -48,13 +49,13 @@ public class DistanceTracker {
}
private void inc(int lvl, int x, int z) {
for (int y = -2>>lvl; y < 10>>lvl; y++) {
for (int y = -2>>lvl; y <= 10>>lvl; y++) {
this.tracker.inc(lvl, x, y, z);
}
}
private void dec(int lvl, int x, int z) {
for (int y = -2>>lvl; y < 10>>lvl; y++) {
for (int y = -2>>lvl; y <= 10>>lvl; y++) {
this.tracker.dec(lvl, x, y, z);
}
}
@@ -73,6 +74,14 @@ public class DistanceTracker {
}
}
public void init(int x, int z) {
for (int i = this.rings.length-1; 0 <= i; i--) {
if (this.rings[i] != null) {
this.rings[i].fill(x, z);
}
}
}
//TODO: add a new class thing that can track the central axis point so that
// geometry can be rebuilt with new flags with correct facing geometry built
@@ -204,8 +213,22 @@ public class DistanceTracker {
ops.clear();
}
public void fill() {
public void fill(int x, int z) {
int cx = x>>this.shiftSize;
int cz = z>>this.shiftSize;
int r2 = this.radius*this.radius;
for (int a = -this.radius; a <= this.radius; a++) {
int b = (int) Math.floor(Math.sqrt(r2-(a*a)));
for (int c = -b; c <= b; c++) {
this.enter.callback(a + cx, c + cz);
}
}
this.currentX = cx;
this.currentZ = cz;
this.lastUpdateX = x;
this.lastUpdateZ = z;
}
}
}

5
src/main/java/me/cortex/voxelmon/core/VoxelCore.java
View File

@@ -148,7 +148,12 @@ public class VoxelCore {
this.world.ingestService.enqueueIngest(worldChunk);
}
boolean firstTime = true;
public void renderSetup(Frustum frustum, Camera camera) {
if (this.firstTime) {
this.distanceTracker.init(camera.getBlockPos().getX(), camera.getBlockPos().getZ());
this.firstTime = false;
}
this.distanceTracker.setCenter(camera.getBlockPos().getX(), camera.getBlockPos().getY(), camera.getBlockPos().getZ());
this.renderer.setupRender(frustum, camera);
}

70
src/main/java/me/cortex/voxelmon/core/rendering/building/RenderDataFactory.java
View File

@@ -3,7 +3,6 @@ package me.cortex.voxelmon.core.rendering.building;
import it.unimi.dsi.fastutil.longs.LongArrayList;
import me.cortex.voxelmon.core.util.MemoryBuffer;
import me.cortex.voxelmon.core.util.Mesher2D;
import me.cortex.voxelmon.core.util.Mesher2Dv2;
import me.cortex.voxelmon.core.world.WorldEngine;
import me.cortex.voxelmon.core.world.WorldSection;
import me.cortex.voxelmon.core.world.other.Mapper;
@@ -12,9 +11,12 @@ import org.lwjgl.system.MemoryUtil;
public class RenderDataFactory {
private final Mesher2Dv2 mesher = new Mesher2Dv2(5,15);//15
private final Mesher2D mesher = new Mesher2D(5,15);//15
private final LongArrayList outData = new LongArrayList(1000);
private final WorldEngine world;
private final long[] sectionCache = new long[32*32*32];
private final long[] connectedSectionCache = new long[32*32*32];
public RenderDataFactory(WorldEngine world) {
this.world = world;
}
@@ -39,8 +41,8 @@ public class RenderDataFactory {
// return new BuiltSectionGeometry(section.getKey(), null, null);
//}
var data = section.copyData();
section.copyDataTo(this.sectionCache);
var data = this.sectionCache;
long[] connectedData = null;
int dirId = Direction.UP.getId();
@@ -65,7 +67,8 @@ public class RenderDataFactory {
//Load and copy the data into a local cache, TODO: optimize so its not doing billion of copies
if (connectedData == null) {
var connectedSection = this.world.acquire(section.lvl, section.x, section.y + 1, section.z);
connectedData = connectedSection.copyData();
connectedSection.copyDataTo(this.connectedSectionCache);
connectedData = this.connectedSectionCache;
connectedSection.release();
}
up = connectedData[WorldSection.getIndex(x, 0, z)];
@@ -77,9 +80,10 @@ public class RenderDataFactory {
}
}
var quads = this.mesher.process();
for (int i = 0; i < quads.length; i++) {
var quad = quads[i];
var count = this.mesher.process();
var array = this.mesher.getArray();
for (int i = 0; i < count; i++) {
var quad = array[i];
this.outData.add(QuadFormat.encode(null, this.mesher.getDataFromQuad(quad), 1, y, quad));
}
}
@@ -108,7 +112,8 @@ public class RenderDataFactory {
//Load and copy the data into a local cache, TODO: optimize so its not doing billion of copies
if (connectedData == null) {
var connectedSection = this.world.acquire(section.lvl, section.x + 1, section.y, section.z);
connectedData = connectedSection.copyData();
connectedSection.copyDataTo(this.connectedSectionCache);
connectedData = this.connectedSectionCache;
connectedSection.release();
}
up = connectedData[WorldSection.getIndex(0, y, z)];
@@ -120,9 +125,10 @@ public class RenderDataFactory {
}
}
var quads = this.mesher.process();
for (int i = 0; i < quads.length; i++) {
var quad = quads[i];
var count = this.mesher.process();
var array = this.mesher.getArray();
for (int i = 0; i < count; i++) {
var quad = array[i];
this.outData.add(QuadFormat.encode(null, this.mesher.getDataFromQuad(quad), 5, x, quad));
}
}
@@ -151,7 +157,8 @@ public class RenderDataFactory {
//Load and copy the data into a local cache, TODO: optimize so its not doing billion of copies
if (connectedData == null) {
var connectedSection = this.world.acquire(section.lvl, section.x, section.y, section.z + 1);
connectedData = connectedSection.copyData();
connectedSection.copyDataTo(this.connectedSectionCache);
connectedData = this.connectedSectionCache;
connectedSection.release();
}
up = connectedData[WorldSection.getIndex(x, y, 0)];
@@ -163,9 +170,10 @@ public class RenderDataFactory {
}
}
var quads = this.mesher.process();
for (int i = 0; i < quads.length; i++) {
var quad = quads[i];
var count = this.mesher.process();
var array = this.mesher.getArray();
for (int i = 0; i < count; i++) {
var quad = array[i];
this.outData.add(QuadFormat.encode(null, this.mesher.getDataFromQuad(quad), 3, z, quad));
}
}
@@ -194,7 +202,8 @@ public class RenderDataFactory {
//Load and copy the data into a local cache, TODO: optimize so its not doing billion of copies
if (connectedData == null) {
var connectedSection = this.world.acquire(section.lvl, section.x - 1, section.y, section.z);
connectedData = connectedSection.copyData();
connectedSection.copyDataTo(this.connectedSectionCache);
connectedData = this.connectedSectionCache;
connectedSection.release();
}
up = connectedData[WorldSection.getIndex(31, y, z)];
@@ -206,9 +215,10 @@ public class RenderDataFactory {
}
}
var quads = this.mesher.process();
for (int i = 0; i < quads.length; i++) {
var quad = quads[i];
var count = this.mesher.process();
var array = this.mesher.getArray();
for (int i = 0; i < count; i++) {
var quad = array[i];
this.outData.add(QuadFormat.encode(null, this.mesher.getDataFromQuad(quad), 4, x, quad));
}
}
@@ -237,7 +247,8 @@ public class RenderDataFactory {
//Load and copy the data into a local cache, TODO: optimize so its not doing billion of copies
if (connectedData == null) {
var connectedSection = this.world.acquire(section.lvl, section.x, section.y, section.z - 1);
connectedData = connectedSection.copyData();
connectedSection.copyDataTo(this.connectedSectionCache);
connectedData = this.connectedSectionCache;
connectedSection.release();
}
up = connectedData[WorldSection.getIndex(x, y, 31)];
@@ -249,9 +260,10 @@ public class RenderDataFactory {
}
}
var quads = this.mesher.process();
for (int i = 0; i < quads.length; i++) {
var quad = quads[i];
var count = this.mesher.process();
var array = this.mesher.getArray();
for (int i = 0; i < count; i++) {
var quad = array[i];
this.outData.add(QuadFormat.encode(null, this.mesher.getDataFromQuad(quad), 2, z, quad));
}
}
@@ -280,7 +292,8 @@ public class RenderDataFactory {
//Load and copy the data into a local cache, TODO: optimize so its not doing billion of copies
if (connectedData == null) {
var connectedSection = this.world.acquire(section.lvl, section.x, section.y - 1, section.z);
connectedData = connectedSection.copyData();
connectedSection.copyDataTo(this.connectedSectionCache);
connectedData = this.connectedSectionCache;
connectedSection.release();
}
up = connectedData[WorldSection.getIndex(x, 31, z)];
@@ -292,9 +305,10 @@ public class RenderDataFactory {
}
}
var quads = this.mesher.process();
for (int i = 0; i < quads.length; i++) {
var quad = quads[i];
var count = this.mesher.process();
var array = this.mesher.getArray();
for (int i = 0; i < count; i++) {
var quad = array[i];
this.outData.add(QuadFormat.encode(null, this.mesher.getDataFromQuad(quad), 0, y, quad));
}
}

141
src/main/java/me/cortex/voxelmon/core/util/Mesher2D.java
View File

@@ -8,13 +8,13 @@ public class Mesher2D {
private final int size;
private final int maxSize;
private final long[] data;
private final BitSet meshed;
private final BitSet setset;
private int[] quadCache;
public Mesher2D(int sizeBits, int maxSize) {
this.size = sizeBits;
this.maxSize = maxSize;
this.data = new long[1<<(sizeBits<<1)];
this.meshed = new BitSet(1<<(sizeBits<<1));
this.setset = new BitSet(1<<(sizeBits<<1));
this.quadCache = new int[128];
}
@@ -27,7 +27,9 @@ public class Mesher2D {
}
public Mesher2D put(int x, int z, long data) {
this.data[this.getIdx(x, z)] = data;
int idx = this.getIdx(x, z);
this.data[idx] = data;
this.setset.set(idx);
return this;
}
@@ -54,90 +56,91 @@ public class Mesher2D {
private boolean canMerge(int x, int z, long match) {
int id = this.getIdx(x, z);
return this.data[id] == match && !this.meshed.get(id);
return this.setset.get(id) && this.data[id] == match;
}
public int[] process() {
//TODO: replace this loop with a loop over a bitset of data that has been put into the mesher, have the this.meshed be removed
// and just clear the databitset when its meshed
//Returns the number of compacted quads
public int process() {
int[] quads = this.quadCache;
int idxCount = 0;
//TODO: add different strategies/ways to mesh
for (int z = 0; z < 1<<this.size; z++) {
for (int x = 0; x < 1<<this.size; x++) {
int idx = this.getIdx(x,z);
long data = this.data[idx];
if (data == 0 || this.meshed.get(idx)) {
//if this position has been meshed or is empty, dont mesh and continue
continue;
int posId = this.data[0] == 0?this.setset.nextSetBit(0):0;
while (posId < this.data.length && posId != -1) {
int idx = posId;
long data = this.data[idx];
int M = (1<<this.size)-1;
int x = idx&M;
int z = (idx>>>this.size)&M;
boolean ex = x != ((1<<this.size)-1);
boolean ez = z != ((1<<this.size)-1);
int endX = x;
int endZ = z;
while (ex || ez) {
//Expand in the x direction
if (ex) {
if (endX + 1 > this.maxSize || endX+1 == (1 << this.size) - 1) {
ex = false;
}
}
boolean ex = x != ((1<<this.size)-1);
boolean ez = z != ((1<<this.size)-1);
int endX = x;
int endZ = z;
while (ex || ez) {
//Expand in the x direction
if (ex) {
if (endX + 1 > this.maxSize || endX+1 == (1 << this.size) - 1) {
if (ex) {
for (int tz = z; tz < endZ+1; tz++) {
if (!this.canMerge(endX + 1, tz, data)) {
ex = false;
}
}
if (ex) {
for (int tz = z; tz < endZ+1; tz++) {
if (!this.canMerge(endX + 1, tz, data)) {
ex = false;
}
}
}
if (ex) {
endX++;
}
if (ez) {
if (endZ + 1 > this.maxSize || endZ+1 == (1<<this.size)-1) {
ez = false;
}
if (ex) {
endX++;
}
if (ez) {
if (endZ + 1 > this.maxSize || endZ+1 == (1<<this.size)-1) {
}
if (ez) {
for (int tx = x; tx < endX+1; tx++) {
if (!this.canMerge(tx, endZ + 1, data)) {
ez = false;
}
}
if (ez) {
for (int tx = x; tx < endX+1; tx++) {
if (!this.canMerge(tx, endZ + 1, data)) {
ez = false;
}
}
}
if (ez) {
endZ++;
}
}
//Mark the sections as meshed
for (int mx = x; mx <= endX; mx++) {
for (int mz = z; mz <= endZ; mz++) {
this.meshed.set(this.getIdx(mx, mz));
}
}
int encodedQuad = encodeQuad(x, z, endX - x + 1, endZ - z + 1);
{
int pIdx = idxCount++;
if (pIdx == quads.length) {
var newArray = new int[quads.length + 64];
System.arraycopy(quads, 0, newArray, 0, quads.length);
quads = newArray;
}
quads[pIdx] = encodedQuad;
if (ez) {
endZ++;
}
}
//Mark the sections as meshed
for (int mx = x; mx <= endX; mx++) {
for (int mz = z; mz <= endZ; mz++) {
this.setset.clear(this.getIdx(mx, mz));
}
}
int encodedQuad = encodeQuad(x, z, endX - x + 1, endZ - z + 1);
{
int pIdx = idxCount++;
if (pIdx == quads.length) {
var newArray = new int[quads.length + 64];
System.arraycopy(quads, 0, newArray, 0, quads.length);
quads = newArray;
}
quads[pIdx] = encodedQuad;
}
posId = this.setset.nextSetBit(posId);
}
var out = new int[idxCount];
System.arraycopy(quads, 0, out, 0, idxCount);
this.quadCache = quads;
return out;
return idxCount;
}
public int[] getArray() {
return this.quadCache;
}
public static void main(String[] args) {
@@ -152,7 +155,7 @@ public class Mesher2D {
long s = System.nanoTime();
var result = mesh.process();
total += System.nanoTime() - s;
a += result.hashCode();
a += result;
}
System.out.println(total/(1e+6));
System.out.println((double) (total/(1e+6))/200000);
@@ -160,7 +163,7 @@ public class Mesher2D {
}
public void reset() {
this.meshed.clear();
this.setset.clear();
Arrays.fill(this.data, 0);
}

175
src/main/java/me/cortex/voxelmon/core/util/Mesher2Dv2.java
View File

@@ -1,175 +0,0 @@
package me.cortex.voxelmon.core.util;
import java.util.Arrays;
import java.util.BitSet;
import java.util.Random;
public class Mesher2Dv2 {
private final int size;
private final int maxSize;
private final long[] data;
private final BitSet setset;
private int[] quadCache;
public Mesher2Dv2(int sizeBits, int maxSize) {
this.size = sizeBits;
this.maxSize = maxSize;
this.data = new long[1<<(sizeBits<<1)];
this.setset = new BitSet(1<<(sizeBits<<1));
this.quadCache = new int[128];
}
private int getIdx(int x, int z) {
int M = (1<<this.size)-1;
if (x>M || z>M) {
throw new IllegalStateException();
}
return ((z&M)<<this.size)|(x&M);
}
public Mesher2Dv2 put(int x, int z, long data) {
int idx = this.getIdx(x, z);
this.data[idx] = data;
this.setset.set(idx);
return this;
}
public static int getX(int data) {
return (data>>24)&0xFF;
}
public static int getZ(int data) {
return (data>>16)&0xFF;
}
public static int getH(int data) {
return (data>>8)&0xFF;
}
public static int getW(int data) {
return data&0xFF;
}
//
private static int encodeQuad(int x, int z, int sx, int sz) {
return ((x&0xFF)<<24)|((z&0xFF)<<16)|((sx&0xFF)<<8)|((sz&0xFF)<<0);
}
private boolean canMerge(int x, int z, long match) {
int id = this.getIdx(x, z);
return this.setset.get(id) && this.data[id] == match;
}
public int[] process() {
int[] quads = this.quadCache;
int idxCount = 0;
//TODO: add different strategies/ways to mesh
int posId = this.data[0] == 0?this.setset.nextSetBit(0):0;
while (posId < this.data.length && posId != -1) {
int idx = posId;
long data = this.data[idx];
int M = (1<<this.size)-1;
int x = idx&M;
int z = (idx>>>this.size)&M;
boolean ex = x != ((1<<this.size)-1);
boolean ez = z != ((1<<this.size)-1);
int endX = x;
int endZ = z;
while (ex || ez) {
//Expand in the x direction
if (ex) {
if (endX + 1 > this.maxSize || endX+1 == (1 << this.size) - 1) {
ex = false;
}
}
if (ex) {
for (int tz = z; tz < endZ+1; tz++) {
if (!this.canMerge(endX + 1, tz, data)) {
ex = false;
}
}
}
if (ex) {
endX++;
}
if (ez) {
if (endZ + 1 > this.maxSize || endZ+1 == (1<<this.size)-1) {
ez = false;
}
}
if (ez) {
for (int tx = x; tx < endX+1; tx++) {
if (!this.canMerge(tx, endZ + 1, data)) {
ez = false;
}
}
}
if (ez) {
endZ++;
}
}
//Mark the sections as meshed
for (int mx = x; mx <= endX; mx++) {
for (int mz = z; mz <= endZ; mz++) {
this.setset.clear(this.getIdx(mx, mz));
}
}
int encodedQuad = encodeQuad(x, z, endX - x + 1, endZ - z + 1);
{
int pIdx = idxCount++;
if (pIdx == quads.length) {
var newArray = new int[quads.length + 64];
System.arraycopy(quads, 0, newArray, 0, quads.length);
quads = newArray;
}
quads[pIdx] = encodedQuad;
}
posId = this.setset.nextSetBit(posId);
}
var out = new int[idxCount];
System.arraycopy(quads, 0, out, 0, idxCount);
this.quadCache = quads;
return out;
}
public static void main(String[] args) {
var r = new Random(123451);
int a = 0;
long total = 0;
for (int i = 0; i < 200000; i++) {
var mesh = new Mesher2Dv2(5,16);
for (int j = 0; j < 512; j++) {
mesh.put(r.nextInt(32), r.nextInt(32), r.nextInt(100));
}
long s = System.nanoTime();
var result = mesh.process();
total += System.nanoTime() - s;
a += result.hashCode();
}
System.out.println(total/(1e+6));
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)];
}
}

6
src/main/java/me/cortex/voxelmon/core/world/WorldSection.java
View File

@@ -103,6 +103,12 @@ public final class WorldSection {
return Arrays.copyOf(this.data, this.data.length);
}
public void copyDataTo(long[] cache) {
this.assertNotFree();
if (cache.length != this.data.length) throw new IllegalArgumentException();
System.arraycopy(this.data, 0, cache, 0, this.data.length);
}
public boolean tryAcquire() {
int state = this.atomicState.updateAndGet(val -> {
if ((val&1) != 0) {

10
src/main/java/me/cortex/voxelmon/core/world/other/Mapper.java
View File

@@ -4,6 +4,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import me.cortex.voxelmon.core.util.MemoryBuffer;
import me.cortex.voxelmon.core.world.storage.StorageBackend;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.nbt.NbtCompound;
@@ -51,6 +52,7 @@ public class Mapper {
this.loadFromStorage();
}
public static boolean isTranslucent(long id) {
//Atm hardcode to air
return ((id>>27)&((1<<20)-1)) == 0;
@@ -74,8 +76,14 @@ public class Mapper {
int id = entry.getIntKey() & ((1<<30)-1);
if (entryType == BLOCK_STATE_TYPE) {
var sentry = StateEntry.deserialize(id, entry.getValue());
if (sentry.state.isAir()) {
System.err.println("Deserialization had air, probably corrupt, Inserting garbage type");
sentry = new StateEntry(id, Block.STATE_IDS.get(new Random().nextInt(Block.STATE_IDS.size()-1)));
//TODO THIS
}
sentries.add(sentry);
if (this.block2stateEntry.put(sentry.state, sentry) != null) {
var oldEntry = this.block2stateEntry.put(sentry.state, sentry);
if (oldEntry != null) {
throw new IllegalStateException("Multiple mappings for blockstate");
}
} else if (entryType == BIOME_TYPE) {

32
src/main/resources/assets/voxelmon/shaders/lod/gl46/quads.vert
View File

@@ -85,20 +85,20 @@ void main() {
}
//gl_Position = MVP * vec4(vec3(((cornerIdx)&1)+10,10,((cornerIdx>>1)&1)+10),1);
//uint i = uint(quad>>32);
//uint i = uint(gl_BaseInstance);
//i ^= i>>16;
//i *= 124128573;
//i ^= i>>16;
//i *= 4211346123;
//i ^= i>>16;
//i *= 462312435;
//i ^= i>>16;
//i *= 542354341;
//i ^= i>>16;
}
//gl_Position = MVP * vec4(vec3(((cornerIdx)&1)+10,10,((cornerIdx>>1)&1)+10),1);
//uint i = uint(quad>>32);
//uint i = uint(gl_BaseInstance);
//i ^= i>>16;
//i *= 124128573;
//i ^= i>>16;
//i *= 4211346123;
//i ^= i>>16;
//i *= 462312435;
//i ^= i>>16;
//i *= 542354341;
//i ^= i>>16;
//uint i = uint(lodLevel+12)*215387625;
//colour *= vec4(vec3(float((uint(i)>>2)&7)/7,float((uint(i)>>5)&7)/7,float((uint(i)>>8)&7)/7)*0.7+0.3,1);
//colour = vec4(vec3(float((uint(i)>>2)&7)/7,float((uint(i)>>5)&7)/7,float((uint(i)>>8)&7)/7),1);
}
//uint i = uint(lodLevel+12)*215387625;
//colour *= vec4(vec3(float((uint(i)>>2)&7)/7,float((uint(i)>>5)&7)/7,float((uint(i)>>8)&7)/7)*0.7+0.3,1);
//colour = vec4(vec3(float((uint(i)>>2)&7)/7,float((uint(i)>>5)&7)/7,float((uint(i)>>8)&7)/7),1);