aboutsummaryrefslogtreecommitdiffstats
path: root/src/ru/olamedia/olacraft/render/jogl/ChunkRenderer.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/ru/olamedia/olacraft/render/jogl/ChunkRenderer.java')
-rw-r--r--src/ru/olamedia/olacraft/render/jogl/ChunkRenderer.java213
1 files changed, 169 insertions, 44 deletions
diff --git a/src/ru/olamedia/olacraft/render/jogl/ChunkRenderer.java b/src/ru/olamedia/olacraft/render/jogl/ChunkRenderer.java
index e24e8e9..22a88ab 100644
--- a/src/ru/olamedia/olacraft/render/jogl/ChunkRenderer.java
+++ b/src/ru/olamedia/olacraft/render/jogl/ChunkRenderer.java
@@ -4,6 +4,8 @@ import javax.media.opengl.GL;
import javax.media.opengl.GLAutoDrawable;
import javax.media.opengl.GLContext;
+import ru.olamedia.Options;
+import ru.olamedia.geom.SimpleQuadMesh;
import ru.olamedia.math.Box;
import ru.olamedia.math.Classifier;
import ru.olamedia.olacraft.game.Game;
@@ -11,6 +13,8 @@ import ru.olamedia.olacraft.world.chunk.BlockSlice;
import ru.olamedia.olacraft.world.chunk.Chunk;
import ru.olamedia.olacraft.world.chunk.ChunkMeshBulder;
import ru.olamedia.olacraft.world.chunk.ChunkSlice;
+import ru.olamedia.olacraft.world.location.BlockLocation;
+import ru.olamedia.olacraft.world.location.ChunkLocation;
public class ChunkRenderer {
private BlockSlice slice;
@@ -30,22 +34,21 @@ public class ChunkRenderer {
public int frustumIntersectChunks = 0;
public boolean renderChunk(Chunk chunk, boolean skipnew) {
- GL gl = GLContext.getCurrentGL();
+
if (!chunk.isAvailable()) {
// System.out.println("not available");
chunk.request();
return skipnew;
}
- /*
- * if (!chunk.isNeighborsAvailable()) {
- * System.out.println("no neighbors");
- * chunk.requestNeighbors();
- * return;
- * }
- */
+
+ if (!chunk.isNeighborsAvailable()) {
+ chunk.requestNeighbors();
+ return skipnew;
+ }
+
// System.out.println("available");
- Box box = new Box(chunk.getX(), chunk.getY(), chunk.getZ(), chunk.getX() + chunk.getWidth(), chunk.getY()
- + chunk.getHeight(), chunk.getZ() + chunk.getDepth());
+ Box box = new Box(chunk.getOffset().x, chunk.getOffset().y, chunk.getOffset().z, chunk.getOffset().x
+ + chunk.getWidth(), chunk.getOffset().y + chunk.getHeight(), chunk.getOffset().z + chunk.getDepth());
if (Game.instance.camera.frustum.quickClassify(box) == Classifier.OUTSIDE) {
frustumCulledChunks++;
return skipnew;
@@ -74,20 +77,27 @@ public class ChunkRenderer {
if (!chunk.isMeshCostructed) {
ChunkMeshBulder.instance.add(chunk);
if (ChunkMeshBulder.instance.isFull()) {
+ // System.out.println("queue is full, skipping");
skipnew = true;
}
+ // System.out.println("not constructed");
return skipnew;
}
if (null == chunk.getMesh()) {
+ // System.out.println("mesh is null");
+ // skipnew = true;
} else {
- chunk.getMesh().joglRender(gl);
+ SimpleQuadMesh mesh = chunk.getMesh();
+ // System.out.println("render " + chunk + " " +
+ // mesh.getVertexCount());
+ mesh.joglRender();
}
return skipnew;
}
public void render(GLAutoDrawable drawable) {
- if (!ChunkMeshBulder.instance.isAlive()) {
+ if (!ChunkMeshBulder.instance.isAlive() && !ChunkMeshBulder.instance.isInterrupted()) {
ChunkMeshBulder.instance.start();
}
@@ -100,47 +110,162 @@ public class ChunkRenderer {
frustumCulledChunks = 0;
boolean skipnew = false;
ChunkSlice cs = slice.getChunkSlice();
+ for (int x = cs.getX(); x < cs.getX() + cs.getWidth(); x++) {
+ for (int z = cs.getZ(); z < cs.getZ() + cs.getDepth(); z++) {
+ for (int y = cs.getY(); y < cs.getY() + cs.getHeight(); y++) {
+ skipnew = renderChunk(cs.getChunk(new ChunkLocation(x, y, z)), skipnew);
+ }
+ }
+ }
+ if (true) {
+ return;
+ }
// rendering from center
int x, y, z;
- int dw = cs.getWidth() / 2;
- int dd = cs.getDepth() / 2;
- int dh = cs.getHeight() / 2;
- for (int dx = 0; dx < dw; dx++) {
- x = cs.getX() + dw + dx;
- for (int dz = 0; dz < dd; dz++) {
- z = cs.getZ() + dd + dz;
- for (int dy = 0; dy < dh; dy++) {
- y = cs.getY() + dh + dy;
- skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
- y = cs.getY() + dh - dy - 1;
- skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ int half = (Options.renderDistance / 16) / 2 + 1;
+ BlockLocation camera = new BlockLocation();
+ camera.x = (int) Game.client.getScene().getPlayer().getCameraX();
+ camera.y = (int) Game.client.getScene().getPlayer().getCameraY();
+ camera.z = (int) Game.client.getScene().getPlayer().getCameraZ();
+ ChunkLocation cameraChunk = camera.getChunkLocation();
+ int cx = cameraChunk.x;
+ int cy = cameraChunk.y;
+ int cz = cameraChunk.z;
+ ChunkLocation cLoc = new ChunkLocation(cx, cy, cz);
+ for (int r = 0; r <= half; r++) {
+ // +x
+ x = cx + r;
+ for (z = cz - r - 1; z <= cz + r; z++) {
+ for (y = cy - r - 1; y <= cy + r; y++) {
+ cLoc = new ChunkLocation(x, y, z);
+ skipnew = renderChunk(cs.getChunk(cLoc), skipnew);
}
- z = cs.getZ() + dd - dz - 1;
- for (int dy = 0; dy < dh; dy++) {
- y = cs.getY() + dh + dy;
- skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
- y = cs.getY() + dh - dy - 1;
- skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ }
+ // -x
+ x = cx - r - 1;
+ for (z = cz - r - 1; z <= cz + r; z++) {
+ for (y = cy - r - 1; y <= cy + r; y++) {
+ cLoc = new ChunkLocation(x, y, z);
+ skipnew = renderChunk(cs.getChunk(cLoc), skipnew);
+ }
+ }
+
+ // +z
+ z = cz + r;
+ for (x = cx - r - 1; x <= cz + r; x++) {
+ for (y = cy - r - 1; y <= cy + r; y++) {
+ cLoc = new ChunkLocation(x, y, z);
+ skipnew = renderChunk(cs.getChunk(cLoc), skipnew);
}
}
- x = cs.getX() + dw - dx - 1;
- for (int dz = 0; dz < dd; dz++) {
- z = cs.getZ() + dd + dz;
- for (int dy = 0; dy < dh; dy++) {
- y = cs.getY() + dh + dy;
- skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
- y = cs.getY() + dh - dy - 1;
- skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // -z
+ z = cz - r - 1;
+ for (x = cx - r - 1; x <= cz + r; x++) {
+ for (y = cy - r - 1; y <= cy + r; y++) {
+ cLoc = new ChunkLocation(x, y, z);
+ skipnew = renderChunk(cs.getChunk(cLoc), skipnew);
}
- z = cs.getZ() + dd - dz - 1;
- for (int dy = 0; dy < dh; dy++) {
- y = cs.getY() + dh + dy;
- skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
- y = cs.getY() + dh - dy - 1;
- skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ }
+ // +y
+ y = cy + r;
+ for (x = cx - r - 1; x <= cz + r; x++) {
+ for (z = cz - r - 1; z <= cz + r; z++) {
+ cLoc = new ChunkLocation(x, y, z);
+ skipnew = renderChunk(cs.getChunk(cLoc), skipnew);
+ }
+ }
+ // -y
+ y = cy - r - 1;
+ for (x = cx - r - 1; x <= cz + r; x++) {
+ for (z = cz - r - 1; z <= cz + r; z++) {
+ cLoc = new ChunkLocation(x, y, z);
+ skipnew = renderChunk(cs.getChunk(cLoc), skipnew);
}
}
+ if (skipnew) {
+ // break;
+ }
+ // break;
}
+
+ // int dw = cs.getWidth() / 2;
+ // int dd = cs.getDepth() / 2;
+ // int dh = cs.getHeight() / 2;
+ // for (int dx = 0; dx < dw; dx++) {
+ // x = cs.getX() + dw + dx;
+ // for (int dz = 0; dz < dd; dz++) {
+ // z = cs.getZ() + dd + dz;
+ // for (int dy = 0; dy < dh; dy++) {
+ // y = cs.getY() + dh + dy;
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // y = cs.getY() + dh - dy - 1;
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // }
+ // z = cs.getZ() + dd - dz - 1;
+ // for (int dy = 0; dy < dh; dy++) {
+ // y = cs.getY() + dh + dy;
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // y = cs.getY() + dh - dy - 1;
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // }
+ // }
+ // x = cs.getX() + dw - dx - 1;
+ // for (int dz = 0; dz < dd; dz++) {
+ // z = cs.getZ() + dd + dz;
+ // for (int dy = 0; dy < dh; dy++) {
+ // y = cs.getY() + dh + dy;
+ // int dd = cs.getDepth() / 2;
+ // int dh = cs.getHeight() / 2;
+ // for (int dx = 0; dx < dw; dx++) {
+ // x = cs.getX() + dw + dx;
+ // for (int dz = 0; dz < dd; dz++) {
+ // z = cs.getZ() + dd + dz;
+ // for (int dy = 0; dy < dh; dy++) {
+ // y = cs.getY() + dh + dy;
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // y = cs.getY() + dh - dy - 1;
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // }
+ // z = cs.getZ() + dd - dz - 1;
+ // for (int dy = 0; dy < dh; dy++) {
+ // y = cs.getY() + dh + dy;
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // y = cs.getY() + dh - dy - 1;
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // }
+ // }
+ // x = cs.getX() + dw - dx - 1;
+ // for (int dz = 0; dz < dd; dz++) {
+ // z = cs.getZ() + dd + dz;
+ // for (int dy = 0; dy < dh; dy++) {
+ // y = cs.getY() + dh + dy;
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // y = cs.getY() + dh - dy - 1;
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // }
+ // z = cs.getZ() + dd - dz - 1;
+ // for (int dy = 0; dy < dh; dy++) {
+ // y = cs.getY() + dh + dy;
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // y = cs.getY() + dh - dy - 1;
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // }
+ // }
+ // }
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // y = cs.getY() + dh - dy - 1;
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // }
+ // z = cs.getZ() + dd - dz - 1;
+ // for (int dy = 0; dy < dh; dy++) {
+ // y = cs.getY() + dh + dy;
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // y = cs.getY() + dh - dy - 1;
+ // skipnew = renderChunk(cs.getChunk(x, y, z), skipnew);
+ // }
+ // }
+ // }
+
// System.out.println("visible top " + visibleTop);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 12:35:38 +0000