wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I think render fps pref improved???

Browse Source
This commit is contained in:
tom lee
2022-02-19 22:14:24 +08:00
parent bcf8237131
commit c450f5b960
3 changed files with 58 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/seibel/lod/core/builders/bufferBuilding/LodBufferBuilderFactory.java
+9
View File
@@ -32,6 +32,7 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.locks.ReentrantLock;
import com.seibel.lod.core.api.ClientApi;
import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
import com.seibel.lod.core.enums.LodDirection;
import com.seibel.lod.core.enums.config.GpuUploadMethod;
import com.seibel.lod.core.enums.config.VanillaOverdraw;
@@ -53,6 +54,8 @@ import com.seibel.lod.core.util.MovableGridList;
import com.seibel.lod.core.util.SingletonHandler;
import com.seibel.lod.core.util.SpamReducedLogger;
import com.seibel.lod.core.util.StatsMap;
import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
@@ -544,6 +547,12 @@ public class LodBufferBuilderFactory {
* context
*/
private void uploadBuffers(LodQuadBuilder quadBuilder, RegionPos p) {
AbstractBlockPosWrapper playerPos = MC.getPlayerBlockPos();
double relPosX = playerPos.getX() - p.x*LodUtil.REGION_WIDTH;
double relPosY = playerPos.getY() - LodBuilder.MIN_WORLD_HEIGHT;
double relPosZ = playerPos.getX() - p.z*LodUtil.REGION_WIDTH;
quadBuilder.sort(relPosX, relPosY, relPosZ);
GLProxy glProxy = GLProxy.getInstance();
GLProxyContext oldContext = glProxy.getGlContext();
glProxy.setGlContext(GLProxyContext.LOD_BUILDER);
src/main/java/com/seibel/lod/core/objects/opengl/LodQuadBuilder.java
+13
View File
@@ -24,6 +24,7 @@ public class LodQuadBuilder {
final byte skylight;
final byte blocklight;
final LodDirection dir;
double distance = 0d;
Quad(short x, short y, short z, short w0, short w1, int color, byte skylight, byte blocklight,
LodDirection dir) {
@@ -37,6 +38,13 @@ public class LodQuadBuilder {
this.blocklight = blocklight;
this.dir = dir;
}
private static double pow(double d) {return d*d;}
// NOTE: This is only a rough but fast calculation!
void calculateDistance(double relativeX, double relativeY, double relativeZ) {
distance = pow(relativeX-x) + pow(relativeY-y) + pow(relativeZ-z);
}
}
final ArrayList<Quad> quads;
@@ -142,6 +150,11 @@ public class LodQuadBuilder {
bb.rewind();
return bb;
}
public void sort(double dPlayerPosX, double dPlayerPosY, double dPlayerPosZ) {
quads.forEach(p -> p.calculateDistance(dPlayerPosX, dPlayerPosY, dPlayerPosZ));
quads.sort((a, b) -> Double.compare(a.distance, b.distance));
}
public Iterator<ByteBuffer> makeVertexBuffers() {
int numOfBuffers = getCurrentNeededVertexBuffers();
src/main/java/com/seibel/lod/core/render/LodRenderer.java
+36 -24
View File
@@ -36,6 +36,7 @@ import com.seibel.lod.core.enums.rendering.FogDistance;
import com.seibel.lod.core.handlers.IReflectionHandler;
import com.seibel.lod.core.objects.RenderRegion;
import com.seibel.lod.core.objects.lod.LodDimension;
import com.seibel.lod.core.objects.lod.LodDimension.PosComsumer;
import com.seibel.lod.core.objects.math.Mat4f;
import com.seibel.lod.core.objects.math.Vec3d;
import com.seibel.lod.core.render.objects.LightmapTexture;
@@ -249,11 +250,9 @@ public class LodRenderer
GL32.glEnable(GL32.GL_CULL_FACE);
}
drawSetPolygon.end("drawSetPolygon");
LagSpikeCatcher drawEnableCull = new LagSpikeCatcher();
GL32.glEnable(GL32.GL_CULL_FACE);
drawEnableCull.end("drawEnableCull");
LagSpikeCatcher drawEnableDepth = new LagSpikeCatcher();
GL32.glEnable(GL32.GL_DEPTH_TEST);
//GL32.glDisable(GL32.GL_DEPTH_TEST);
drawEnableDepth.end("drawEnableDepth");
drawGLSetup.end("drawGLSetup");
// enable transparent rendering
@@ -313,27 +312,39 @@ public class LodRenderer
boolean cullingDisabled = CONFIG.client().graphics().advancedGraphics().getDisableDirectionalCulling();
Vec3d cameraPos = MC_RENDER.getCameraExactPosition();
// where the center of the buffers is (needed when culling regions)
// render each of the buffers
int lowRegionX = regions.getCenterX() - regions.gridCentreToEdge;
int lowRegionZ = regions.getCenterY() - regions.gridCentreToEdge;
for (int regionX=lowRegionX; regionX<lowRegionX+regions.gridSize; regionX++) {
for (int regionZ=lowRegionZ; regionZ<lowRegionZ+regions.gridSize; regionZ++) {
RenderRegion region = regions.get(regionX, regionZ);
if (region == null) continue;
if (!region.shouldRender(MC_RENDER, !cullingDisabled)) continue;
Mat4f localModelViewMatrix = baseModelViewMatrix.copy();
localModelViewMatrix.multiplyTranslationMatrix(
(regionX * LodUtil.REGION_WIDTH) - cameraPos.x,
LodBuilder.MIN_WORLD_HEIGHT - cameraPos.y,
(regionZ * LodUtil.REGION_WIDTH) - cameraPos.z);
shaderProgram.fillUniformModelMatrix(localModelViewMatrix);
region.render(shaderProgram);
}
{
int ox,oy,dx,dy;
ox = oy = dx = 0;
dy = -1;
int len = regions.gridSize;
int maxI = len*len;
int halfLen = len/2;
for(int i =0; i < maxI; i++){
if ((-halfLen <= ox) && (ox <= halfLen) && (-halfLen <= oy) && (oy <= halfLen)){
int regionX = ox+regions.getCenterX();
int regionZ = oy+regions.getCenterY();
{
RenderRegion region = regions.get(regionX, regionZ);
if (region != null && region.shouldRender(MC_RENDER, !cullingDisabled)) {
Mat4f localModelViewMatrix = baseModelViewMatrix.copy();
localModelViewMatrix.multiplyTranslationMatrix(
(regionX * LodUtil.REGION_WIDTH) - cameraPos.x,
LodBuilder.MIN_WORLD_HEIGHT - cameraPos.y,
(regionZ * LodUtil.REGION_WIDTH) - cameraPos.z);
shaderProgram.fillUniformModelMatrix(localModelViewMatrix);
region.render(shaderProgram);
}
}
}
if( (ox == oy) || ((ox < 0) && (ox == -oy)) || ((ox > 0) && (ox == 1-oy))){
int temp = dx;
dx = -dy;
dy = temp;
}
ox += dx;
oy += dy;
}
}
//if (drawCall==0)
// ClientApi.LOGGER.info("DrawCall Count: "+drawCall+"("+vCount0+")");
@@ -367,6 +378,7 @@ public class LodRenderer
// clear the depth buffer so everything is drawn over the LODs
GL32.glClear(GL32.GL_DEPTH_BUFFER_BIT);
GL32.glEnable(GL32.GL_DEPTH_TEST);
drawCleanup.end("LodDrawCleanup");
// end of internal LOD profiling
profiler.pop();