Compare commits

...
Author SHA1 Message Date
Jason Mitchell 852bcbb38b Check before casting.
Fixes https://github.com/GTNewHorizons/Angelica/issues/388
2024-03-16 11:24:38 -07:00
ah-OOG-ah 464af945b2 Fix AIOBE in debug screen and NPE on world join (#385)
* Fix AIIOBE

* Fix NPE

* Actually fix
2024-03-15 21:42:38 -04:00
makamys 996b3df9cb Use vanilla field to count number of chunk updates
Fixes D-Tools compat
2024-03-15 15:23:48 -07:00
makamys 22d28abce6 Use ByteBuffer overload when indirect buffer is in client memory
Fixes #373
2024-03-15 15:23:37 -07:00
Jason Mitchell 636b616f64 Stop blacklisting bartworks. (#369)
Needs https://github.com/GTNewHorizons/bartworks/commit/50dfbb44acdd28bc183dc58b9cd40d5ba5121685
2024-03-09 09:27:22 -08:00
Caedis 14b7178419 Initialize toggle keybind when registering (#366)
* Initialize toggle keybind when registering

* Add comment
2024-03-08 15:26:36 -08:00
Caedis 22bf48c093 Potential fix for splash screen crashes (#363)
* Move framebuffer static initializor to getter

* missed one

* Revert "missed one"

This reverts commit 97027c1372.

* Revert "Move framebuffer static initializor to getter"

This reverts commit 6ef65735ff.

* Initialize HudCaching on world join

* run it on the client only

* remove unused imports
2024-03-08 12:40:51 -06:00
Caedis 4600bca2d0 Mixin to override FOV multiplier instead of using the forge event (#361)
* Mixin to speed check instead of using fov event

* scratch that, override return value entirely

* Revert "scratch that, override return value entirely"

This reverts commit 20a379d766.

* Revert "Mixin to speed check instead of using fov event"

This reverts commit 22db36d677.

* Change to lowest priority event so it is ran last (hopefully)
2024-03-08 10:26:34 -06:00
Jason Mitchell fcb9536d93 Don't blacklist gregtech from the render thread (#356) 2024-03-03 15:20:04 -08:00
14 changed files with 86 additions and 44 deletions

No files matched your search

+1 -1
View File
@@ -16,5 +16,5 @@ pluginManagement {
}
plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.14'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.18'
}
@@ -3,6 +3,8 @@ package com.gtnewhorizons.angelica.hudcaching;
import java.util.ArrayList;
import java.util.List;
import cpw.mods.fml.common.eventhandler.EventPriority;
import net.minecraftforge.event.world.WorldEvent;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL30;
@@ -27,16 +29,14 @@ import net.minecraft.client.shader.Framebuffer;
import net.minecraft.util.ChatComponentText;
import net.minecraftforge.client.GuiIngameForge;
import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER;
// See LICENSE+HUDCaching.md for license information.
public class HUDCaching {
private static final Minecraft mc = Minecraft.getMinecraft();
public static Framebuffer framebuffer;
static {
framebuffer = new Framebuffer(0, 0, true);
framebuffer.setFramebufferColor(0, 0, 0, 0);
}
private static boolean dirty = true;
public static boolean renderingCacheOverride;
@@ -63,9 +63,13 @@ public class HUDCaching {
private final List<Long> updateTimeList = new ArrayList<>(21);
private static boolean isEnabled = true;
private static final KeyBinding toggle = new KeyBinding("Toggle HUDCaching", 0, "Debug");
// moved initialization to when its registered to avoid an empty Debug category, which can cause crashes when
// opening the controls menu and hudcaching is disabled in the config
private static KeyBinding toggle;
public static void registerKeyBindings() {
toggle = new KeyBinding("Toggle HUDCaching", 0, "Debug");
ClientRegistry.registerKeyBinding(toggle);
}
@@ -86,7 +90,7 @@ public class HUDCaching {
@SubscribeEvent
public void onKeypress(InputEvent.KeyInputEvent event) {
if (toggle.isPressed()) {
if (toggle != null && toggle.isPressed()) {
isEnabled = !isEnabled;
final String msg = isEnabled ? "Enabled HUDCaching" : "Disabled HUDCaching";
if (mc.thePlayer != null) mc.thePlayer.addChatMessage(new ChatComponentText(msg));
@@ -102,10 +106,20 @@ public class HUDCaching {
}
}
// highest so it runs before the GLSM load event
@SubscribeEvent(priority = EventPriority.HIGH)
public void onJoinWorld(WorldEvent.Load event) {
if (event.world.isRemote){
LOGGER.info("World loaded - Initializing HUDCaching");
HUDCaching.framebuffer = new Framebuffer(0, 0, true);
HUDCaching.framebuffer.setFramebufferColor(0, 0, 0, 0);
}
}
@SuppressWarnings("unused")
public static void renderCachedHud(EntityRenderer renderer, GuiIngame ingame, float partialTicks, boolean hasScreen, int mouseX, int mouseY) {
if (!OpenGlHelper.isFramebufferEnabled() || !isEnabled) {
if (!OpenGlHelper.isFramebufferEnabled() || !isEnabled || framebuffer == null) {
ingame.renderGameOverlay(partialTicks, hasScreen, mouseX, mouseY);
return;
}
@@ -25,11 +25,6 @@ public class MixinMinecraft {
}
}
@Redirect(method="runGameLoop", at=@At(value="FIELD", target="Lnet/minecraft/client/renderer/WorldRenderer;chunksUpdated:I", ordinal=0))
private int sodium$chunksUpdated() {
return ((IRenderGlobalExt)this.renderGlobal).getChunksSubmitted();
}
@Redirect(method = "runGameLoop", at = @At(value = "FIELD", target = "Lnet/minecraft/client/settings/GameSettings;fancyGraphics:Z"))
private boolean sodium$overrideFancyGrass(GameSettings gameSettings) {
return SodiumClientMod.options().quality.grassQuality.isFancy();
@@ -60,11 +60,6 @@ public class MixinRenderGlobal implements IRenderGlobalExt {
this.renderer.scheduleTerrainUpdate();
}
@Override
public int getChunksSubmitted() {
return this.renderer.getChunksSubmitted();
}
@Inject(method="<init>", at=@At("RETURN"))
private void sodium$initRenderer(Minecraft mc, CallbackInfo ci) {
this.renderer = SodiumWorldRenderer.create(mc);
@@ -2,6 +2,5 @@ package com.gtnewhorizons.angelica.mixins.interfaces;
public interface IRenderGlobalExt {
void scheduleTerrainUpdate();
int getChunksSubmitted();
}
@@ -210,9 +210,9 @@ public class ClientProxy extends CommonProxy {
event.left.set(i + 4, String.format("lc: %d b: %s bl: %d sl: %d rl: %d",
chunk.getTopFilledSegment() + 15,
chunk.getBiomeGenForWorldCoords(bX & 15, bZ & 15, mc.theWorld.getWorldChunkManager()).biomeName,
chunk.getSavedLightValue(EnumSkyBlock.Block, bX & 15, bY, bZ & 15),
chunk.getSavedLightValue(EnumSkyBlock.Sky, bX & 15, bY, bZ & 15),
chunk.getBlockLightValue(bX & 15, bY, bZ & 15, 0)));
chunk.getSavedLightValue(EnumSkyBlock.Block, bX & 15, MathHelper.clamp_int(bY, 0, 255), bZ & 15),
chunk.getSavedLightValue(EnumSkyBlock.Sky, bX & 15, MathHelper.clamp_int(bY, 0, 255), bZ & 15),
chunk.getBlockLightValue(bX & 15, MathHelper.clamp_int(bY, 0, 255), bZ & 15, 0)));
}
}
event.setCanceled(true);
@@ -276,7 +276,8 @@ public class ClientProxy extends CommonProxy {
}
}
@SubscribeEvent
// This is a bit of a hack to prevent the FOV from being modified by other mods
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onFOVModifierUpdate(FOVUpdateEvent event) {
if (!(boolean)Settings.DYNAMIC_FOV.option.getStore()){
event.newfov = 1.0F;
@@ -37,7 +37,9 @@ public class AngelicaBlockSafetyRegistry {
&& (isbrh.getClass().isAnnotationPresent(ThreadSafeISBRH.class)
|| isbrh instanceof ThreadSafeISBRHFactory);
} else {
canBeOffThread = !(block.getClass().getName().startsWith("gregtech.")) && !(block.getClass().getName().startsWith("com.github.bartimaeusnek."));
// Check blacklist here
// !(block.getClass().getName().startsWith("com.github.bartimaeusnek."));
canBeOffThread = true;
}
final long stamp = LOCK.writeLock();
@@ -21,10 +21,10 @@ public class AnimationsRenderUtils {
if (textureAtlasSprite != null && textureAtlasSprite.hasAnimationMetadata()) {
// null if called by anything but chunk render cache update (for example to get blocks rendered as items in
// inventory)
if (blockAccess instanceof ITexturesCache) {
((ITexturesCache) blockAccess).getRenderedTextures().add(textureAtlasSprite);
} else {
((IPatchedTextureAtlasSprite) textureAtlasSprite).markNeedsAnimationUpdate();
if (blockAccess instanceof ITexturesCache texturesCache) {
texturesCache.getRenderedTextures().add(textureAtlasSprite);
} else if(textureAtlasSprite instanceof IPatchedTextureAtlasSprite patchedSprite){
patchedSprite.markNeedsAnimationUpdate();
}
}
}
@@ -1,10 +1,12 @@
package me.jellysquid.mods.sodium.client.gl.device;
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
public interface DrawCommandList extends AutoCloseable {
void multiDrawArrays(IntBuffer first, IntBuffer count);
void multiDrawArraysIndirect(ByteBuffer pointer, int count, int stride);
void multiDrawArraysIndirect(long pointer, int count, int stride);
void endTessellating();
@@ -197,6 +197,12 @@ public class GLRenderDevice implements RenderDevice {
GL14.glMultiDrawArrays(primitiveType.getId(), first, count);
}
@Override
public void multiDrawArraysIndirect(ByteBuffer pointer, int count, int stride) {
final GlPrimitiveType primitiveType = GLRenderDevice.this.activeTessellation.getPrimitiveType();
GlFunctions.INDIRECT_DRAW.glMultiDrawArraysIndirect(primitiveType.getId(), pointer, count, stride);
}
@Override
public void multiDrawArraysIndirect(long pointer, int count, int stride) {
final GlPrimitiveType primitiveType = GLRenderDevice.this.activeTessellation.getPrimitiveType();
@@ -1,23 +1,40 @@
package me.jellysquid.mods.sodium.client.gl.func;
import java.nio.ByteBuffer;
import org.lwjgl.opengl.ARBMultiDrawIndirect;
import org.lwjgl.opengl.ContextCapabilities;
import org.lwjgl.opengl.GL43;
public enum GlIndirectMultiDrawFunctions {
CORE {
@Override
public void glMultiDrawArraysIndirect(int mode, ByteBuffer indirect, int primcount, int stride) {
GL43.glMultiDrawArraysIndirect(mode, indirect, primcount, stride);
}
@Override
public void glMultiDrawArraysIndirect(int mode, long indirect, int primcount, int stride) {
GL43.glMultiDrawArraysIndirect(mode, indirect, primcount, stride);
}
},
ARB {
@Override
public void glMultiDrawArraysIndirect(int mode, ByteBuffer indirect, int primcount, int stride) {
ARBMultiDrawIndirect.glMultiDrawArraysIndirect(mode, indirect, primcount, stride);
}
@Override
public void glMultiDrawArraysIndirect(int mode, long indirect, int primcount, int stride) {
ARBMultiDrawIndirect.glMultiDrawArraysIndirect(mode, indirect, primcount, stride);
}
},
UNSUPPORTED {
@Override
public void glMultiDrawArraysIndirect(int mode, ByteBuffer indirect, int primcount, int stride) {
throw new UnsupportedOperationException();
}
@Override
public void glMultiDrawArraysIndirect(int mode, long indirect, int primcount, int stride) {
throw new UnsupportedOperationException();
@@ -34,5 +51,7 @@ public enum GlIndirectMultiDrawFunctions {
}
}
public abstract void glMultiDrawArraysIndirect(int mode, ByteBuffer indirect, int primcount, int stride);
public abstract void glMultiDrawArraysIndirect(int mode, long indirect, int primcount, int stride);
}
@@ -124,10 +124,6 @@ public class SodiumWorldRenderer implements ChunkStatusListener {
}
}
public int getChunksSubmitted() {
return this.chunkRenderManager != null ? this.chunkRenderManager.getAndResetSubmitted() : 0;
}
private void loadWorld(WorldClient world) {
this.world = world;
@@ -37,6 +37,7 @@ 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.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
import net.minecraftforge.common.util.ForgeDirection;
@@ -97,7 +98,6 @@ public class ChunkRenderManager<T extends ChunkGraphicsState> implements ChunkSt
@Getter
private int submitted;
private int totalSubmitted;
private final boolean translucencySorting;
@@ -580,7 +580,7 @@ public class ChunkRenderManager<T extends ChunkGraphicsState> implements ChunkSt
sortedAnything = true;
submitted++;
}
totalSubmitted += submitted;
WorldRenderer.chunksUpdated += submitted;
this.dirty |= submitted > 0;
@@ -596,13 +596,6 @@ public class ChunkRenderManager<T extends ChunkGraphicsState> implements ChunkSt
}
}
public int getAndResetSubmitted() {
// Return how many chunks were submitted since the last call to this method
final int submitted = totalSubmitted;
totalSubmitted = 0;
return submitted;
}
public void markDirty() {
this.dirty = true;
}
@@ -42,6 +42,7 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.Util;
import org.lwjgl.opengl.GL11;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
@@ -238,20 +239,39 @@ public class MultidrawChunkRenderBackend extends ChunkRenderShaderBackend<Multid
commandList.uploadData(this.commandBuffer, this.commandClientBufferBuilder.getBuffer());
}
long pointer = this.commandBuffer == null ? this.commandClientBufferBuilder.getBufferAddress() : 0L;
long pointer = 0L;
ByteBuffer pointerBuffer;
int originalPointerBufferPos = 0;
if (this.commandBuffer != null) {
pointerBuffer = null;
} else {
pointerBuffer = this.commandClientBufferBuilder.getBuffer();
originalPointerBufferPos = pointerBuffer.position();
}
for (ChunkRegion<?> region : this.pendingBatches) {
final ChunkDrawCallBatcher batch = region.getDrawBatcher();
if (!batch.isEmpty()) {
try (DrawCommandList drawCommandList = commandList.beginTessellating(region.getTessellation())) {
drawCommandList.multiDrawArraysIndirect(pointer, batch.getCount(), 0 /* tightly packed */);
if(pointerBuffer == null) {
drawCommandList.multiDrawArraysIndirect(pointer, batch.getCount(), 0 /* tightly packed */);
} else {
drawCommandList.multiDrawArraysIndirect(pointerBuffer, batch.getCount(), 0 /* tightly packed */);
}
}
}
pointer += batch.getArrayLength();
if(pointerBuffer == null) {
pointer += batch.getArrayLength();
} else {
pointerBuffer.position(pointerBuffer.position() + batch.getArrayLength());
}
}
if (pointerBuffer != null)
pointerBuffer.position(originalPointerBufferPos);
this.pendingBatches.clear();
}