mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-18 19:39:09 +00:00
Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
99a81369f0 | ||
|
|
e2ee822948 | ||
|
|
9fe7e800f6 | ||
|
|
debfcdfda0 | ||
|
|
df662188f4 | ||
|
|
842916405f | ||
|
|
09afe81290 | ||
|
|
292809d8e8 | ||
|
|
47503ce254 |
No files matched your search
@@ -136,6 +136,10 @@ public class HUDCaching {
|
||||
guiForge.callRenderPortal(width, height, partialTicks);
|
||||
}
|
||||
if (renderCrosshairsCaptured) {
|
||||
if (ModStatus.isXaerosMinimapLoaded){
|
||||
// this fixes the crosshair going invisible when no lines are being drawn under the minimap
|
||||
GLStateManager.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
}
|
||||
guiForge.callRenderCrosshairs(width, height);
|
||||
}
|
||||
if (ModStatus.isThaumcraftLoaded || ModStatus.isThaumicHorizonsLoaded){
|
||||
|
||||
@@ -35,6 +35,7 @@ import me.jellysquid.mods.sodium.client.world.ChunkStatusListener;
|
||||
import me.jellysquid.mods.sodium.common.util.IdTable;
|
||||
import me.jellysquid.mods.sodium.common.util.collections.FutureDequeDrain;
|
||||
import net.coderbot.iris.shadows.ShadowRenderingState;
|
||||
import net.coderbot.iris.sodium.shadow_map.SwappableChunkRenderManager;
|
||||
import net.minecraft.client.multiplayer.WorldClient;
|
||||
import net.minecraft.client.renderer.WorldRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -47,7 +48,7 @@ import java.util.Collection;
|
||||
import java.util.Deque;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public class ChunkRenderManager<T extends ChunkGraphicsState> implements ChunkStatusListener {
|
||||
public class ChunkRenderManager<T extends ChunkGraphicsState> implements ChunkStatusListener, SwappableChunkRenderManager {
|
||||
/**
|
||||
* The maximum distance a chunk can be from the player's camera in order to be eligible for blocking updates.
|
||||
*/
|
||||
@@ -249,7 +250,11 @@ public class ChunkRenderManager<T extends ChunkGraphicsState> implements ChunkSt
|
||||
}
|
||||
|
||||
private void addChunk(ChunkRenderContainer<T> render) {
|
||||
final boolean canRebuild = AngelicaConfig.enableIris ? !ShadowRenderingState.areShadowsCurrentlyBeingRendered() : render.canRebuild();
|
||||
boolean canRebuild = render.canRebuild();
|
||||
|
||||
if (AngelicaConfig.enableIris && ShadowRenderingState.areShadowsCurrentlyBeingRendered()) {
|
||||
canRebuild = false;
|
||||
}
|
||||
|
||||
if (render.needsRebuild() && canRebuild) {
|
||||
if (!this.alwaysDeferChunkUpdates && render.needsImportantRebuild()) {
|
||||
@@ -366,9 +371,7 @@ public class ChunkRenderManager<T extends ChunkGraphicsState> implements ChunkSt
|
||||
private void reset() {
|
||||
if(!AngelicaConfig.enableIris || !ShadowRenderingState.areShadowsCurrentlyBeingRendered()) this.rebuildQueue.clear();
|
||||
if(!AngelicaConfig.enableIris || !ShadowRenderingState.areShadowsCurrentlyBeingRendered()) this.importantRebuildQueue.clear();
|
||||
|
||||
|
||||
this.sortQueue.clear();
|
||||
if(!AngelicaConfig.enableIris || !ShadowRenderingState.areShadowsCurrentlyBeingRendered()) this.sortQueue.clear();
|
||||
|
||||
this.visibleTileEntities.clear();
|
||||
|
||||
|
||||
+2
-13
@@ -5,6 +5,7 @@ import it.unimi.dsi.fastutil.ints.IntArrays;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.type.ChunkVertexType;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.format.hfp.HFPModelVertexType;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.format.sfp.SFPModelVertexType;
|
||||
import net.coderbot.iris.sodium.vertex_format.terrain_xhfp.XHFPModelVertexType;
|
||||
|
||||
import java.nio.Buffer;
|
||||
import java.nio.ByteBuffer;
|
||||
@@ -14,22 +15,10 @@ import java.util.BitSet;
|
||||
|
||||
public class ChunkBufferSorter {
|
||||
|
||||
private static final Class<?> OCULUS_VERTEX_TYPE;
|
||||
|
||||
static {
|
||||
Class<?> clz;
|
||||
try {
|
||||
clz = Class.forName("net.coderbot.iris.compat.sodium.impl.vertex_format.terrain_xhfp.XHFPModelVertexType");
|
||||
} catch(Throwable e) {
|
||||
clz = null;
|
||||
}
|
||||
OCULUS_VERTEX_TYPE = clz;
|
||||
}
|
||||
|
||||
public static void sortStandardFormat(ChunkVertexType vertexType, ByteBuffer buffer, int bufferLen, float x, float y, float z) {
|
||||
boolean isCompact;
|
||||
|
||||
if(vertexType.getClass() == HFPModelVertexType.class || vertexType.getClass() == OCULUS_VERTEX_TYPE) {
|
||||
if(vertexType.getClass() == HFPModelVertexType.class || vertexType.getClass() == XHFPModelVertexType.class) {
|
||||
isCompact = true;
|
||||
} else if(vertexType.getClass() == SFPModelVertexType.class) {
|
||||
isCompact = false;
|
||||
|
||||
+2
@@ -142,6 +142,8 @@ public class ChunkBuildBuffers implements ChunkBuildBuffersExt {
|
||||
|
||||
if (sortTranslucent && pass.isTranslucent()) {
|
||||
ChunkBufferSorter.sortStandardFormat(vertexType, buffer, bufferLen, x, y, z);
|
||||
meshData.clearSlices();
|
||||
meshData.setModelSlice(ModelQuadFacing.UNASSIGNED, new BufferSlice(0, bufferLen));
|
||||
}
|
||||
|
||||
meshData.setVertexData(new VertexData(buffer, this.vertexType.getCustomVertexFormat()));
|
||||
|
||||
@@ -17,6 +17,10 @@ public class ChunkMeshData {
|
||||
this.vertexData = vertexData;
|
||||
}
|
||||
|
||||
public void clearSlices() {
|
||||
this.parts.clear();
|
||||
}
|
||||
|
||||
public void setModelSlice(ModelQuadFacing facing, BufferSlice slice) {
|
||||
this.parts.put(facing, slice);
|
||||
}
|
||||
|
||||
@@ -37,6 +37,7 @@ import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
public class BlockRenderer {
|
||||
private static final BlockPos POS_ZERO = new BlockPos(0, 0, 0);
|
||||
|
||||
private final Random random = new XoRoShiRoRandom();
|
||||
|
||||
@@ -97,9 +98,10 @@ public class BlockRenderer {
|
||||
TessellatorManager.startCapturing();
|
||||
final CapturingTessellator tess = (CapturingTessellator) TessellatorManager.get();
|
||||
tess.startDrawingQuads();
|
||||
// RenderBlocks adds the subchunk-relative coordinates as the offset, cancel it out here
|
||||
|
||||
tess.setOffset(pos);
|
||||
// Use setTranslation rather than setOffset so that the float data written to the internal buffer
|
||||
// is done in subchunk-relative coordinates
|
||||
tess.setOffset(POS_ZERO);
|
||||
tess.setTranslation(-pos.x, -pos.y, -pos.z);
|
||||
renderBlocks.renderBlockByRenderType(block, pos.x, pos.y, pos.z);
|
||||
final List<QuadView> quads = TessellatorManager.stopCapturingToPooledQuads();
|
||||
tess.resetOffset();
|
||||
|
||||
Reference in new issue
Block a user