aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/makamys/lodmod/renderer/ChunkMesh.java84
-rw-r--r--src/main/java/makamys/lodmod/renderer/LODRenderer.java7
-rw-r--r--src/main/java/makamys/lodmod/renderer/Mesh.java9
3 files changed, 29 insertions, 71 deletions
diff --git a/src/main/java/makamys/lodmod/renderer/ChunkMesh.java b/src/main/java/makamys/lodmod/renderer/ChunkMesh.java
index cbac60f..bb93b6e 100644
--- a/src/main/java/makamys/lodmod/renderer/ChunkMesh.java
+++ b/src/main/java/makamys/lodmod/renderer/ChunkMesh.java
@@ -39,6 +39,9 @@ public class ChunkMesh extends Mesh {
NBTBase nbtData;
+ // TODO move this somewhere else
+ List<String> nameList = (List<String>) ((TextureMap)Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)).mapUploadedSprites.keySet().stream().collect(Collectors.toList());
+
public static int usedRAM = 0;
public static int instances = 0;
@@ -50,10 +53,7 @@ public class ChunkMesh extends Mesh {
this.quadCount = quadCount;
this.pass = pass;
- this.buffer = createBuffer(data, stringTable);
this.nbtData = new NBTTagByteArray(data);
-
- usedRAM += buffer.limit();
instances++;
}
@@ -66,11 +66,6 @@ public class ChunkMesh extends Mesh {
this.pass = pass;
this.nbtData = toNBT(quads, quadCount);
- // TODO move this somewhere else
- List<String> nameList = (List<String>) ((TextureMap)Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)).mapUploadedSprites.keySet().stream().collect(Collectors.toList());
- this.buffer = createBuffer(((NBTTagByteArray)nbtData).func_150292_c(), nameList);
-
- usedRAM += buffer.limit();
instances++;
}
@@ -88,69 +83,20 @@ public class ChunkMesh extends Mesh {
}
void destroy() {
- usedRAM -= buffer.limit();
- instances--;
+ if(buffer != null) {
+ usedRAM -= buffer.limit();
+ instances--;
+ }
}
- private ByteBuffer createBuffer(List<MeshQuad> quads) {
- if(!(flags.hasTexture && flags.hasColor && flags.hasBrightness && !flags.hasNormals)) {
- // for simplicity's sake we just assume this setup
- System.out.println("invalid mesh properties, expected a chunk");
- return null;
+ @Override
+ public void onVisibilityChanged() {
+ if(visible) {
+ this.buffer = createBuffer(((NBTTagByteArray)nbtData).func_150292_c(), nameList);
+ } else {
+ usedRAM -= buffer.limit();
+ this.buffer = null;
}
-
- ByteBuffer buffer = BufferUtils.createByteBuffer(quadCount * 6 * getStride());
- FloatBuffer floatBuffer = buffer.asFloatBuffer();
- ShortBuffer shortBuffer = buffer.asShortBuffer();
- IntBuffer intBuffer = buffer.asIntBuffer();
-
- try {
- for(MeshQuad quad : quads) {
- if(quad.deleted) {
- continue;
- }
- String spriteName = quad.spriteName;
-
- TextureAtlasSprite tas = ((TextureMap)Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite(spriteName);
-
- for (int vertexNum = 0; vertexNum < 6; vertexNum++) {
- int vi = new int[]{0, 1, 3, 1, 2, 3}[vertexNum];
- int simpleX = quad.xs[vi];
- if(simpleX == 255) simpleX = 256;
- int simpleY = quad.ys[vi];
- if(simpleY == 255) simpleY = 256;
- int simpleZ = quad.zs[vi];
- if(simpleZ == 255) simpleZ = 256;
- floatBuffer.put(x * 16 + simpleX / 16f); // x
- floatBuffer.put(y * 16 + simpleY / 16f); // y
- floatBuffer.put(z * 16 + simpleZ / 16f); // z
-
- int relU = quad.relUs[vi];
- int relV = quad.relVs[vi];
-
- floatBuffer.put(tas.getMinU() + (tas.getMaxU() - tas.getMinU()) * (relU / 16f)); // u
- floatBuffer.put(tas.getMinV() + (tas.getMaxV() - tas.getMinV()) * (relV / 16f)); // v
-
- shortBuffer.position(floatBuffer.position() * 2);
-
- shortBuffer.put((short)quad.bUs[vi]); // bU
- shortBuffer.put((short)quad.bVs[vi]); // bV
-
- intBuffer.position(shortBuffer.position() / 2);
-
- intBuffer.put(quad.cs[vi]); // c
-
- floatBuffer.position(intBuffer.position());
- }
- }
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- buffer.position(floatBuffer.position() * 4);
- buffer.flip();
-
- return buffer;
}
private ByteBuffer createBuffer(byte[] data, List<String> stringTable) {
@@ -217,6 +163,8 @@ public class ChunkMesh extends Mesh {
buffer.position(floatBuffer.position() * 4);
buffer.flip();
+ usedRAM += buffer.limit();
+
return buffer;
}
diff --git a/src/main/java/makamys/lodmod/renderer/LODRenderer.java b/src/main/java/makamys/lodmod/renderer/LODRenderer.java
index 37a4661..1c270f5 100644
--- a/src/main/java/makamys/lodmod/renderer/LODRenderer.java
+++ b/src/main/java/makamys/lodmod/renderer/LODRenderer.java
@@ -221,7 +221,7 @@ public class LODRenderer {
mesh.iFirst = nextTri;
mesh.offset = nextMeshOffset;
- nextMeshOffset += mesh.buffer.limit();
+ nextMeshOffset += mesh.bufferSize();
nextTri += mesh.quadCount * 6;
piFirst[i].limit(piFirst[i].limit() + 1);
@@ -234,7 +234,7 @@ public class LODRenderer {
mesh.pendingGPUDelete = false;
it.remove();
deletedNum++;
- deletedRAM += mesh.buffer.limit();
+ deletedRAM += mesh.bufferSize();
}
}
}
@@ -569,12 +569,13 @@ public class LODRenderer {
if((!force && freezeMeshes) || mesh == null) return;
if(mesh.visible != visible) {
+ mesh.visible = visible;
+ mesh.onVisibilityChanged();
if(!visible) {
deleteMeshFromGPU(mesh);
} else if(visible) {
sendMeshToGPU(mesh);
}
- mesh.visible = visible;
}
}
diff --git a/src/main/java/makamys/lodmod/renderer/Mesh.java b/src/main/java/makamys/lodmod/renderer/Mesh.java
index 7c7e6c2..3f8b0fe 100644
--- a/src/main/java/makamys/lodmod/renderer/Mesh.java
+++ b/src/main/java/makamys/lodmod/renderer/Mesh.java
@@ -19,8 +19,17 @@ public abstract class Mesh {
int x, y, z;
public abstract int getStride();
+ public void onVisibilityChanged() {}
public double distSq(double x2, double y2, double z2) {
return Util.distSq(x, y, z, x2, y2, z2);
}
+
+ public int bufferSize() {
+ int bufferSize = quadCount * 6 * getStride();
+ if(buffer != null) {
+ assert buffer.limit() == bufferSize;
+ }
+ return bufferSize;
+ }
}
generated by cgit (git 2.46.0) at 2024-11-23 12:59:19 +0000