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

Closes !950 (Texture name does not refer to a texture object)

Browse Source
This commit is contained in:
James Seibel
2025-03-13 18:09:43 -05:00
parent b6a0878241
commit 6ba0490cf7
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java
+10 -1
View File
@@ -21,8 +21,10 @@ package com.seibel.distanthorizons.common.wrappers.misc;
import com.mojang.blaze3d.platform.NativeImage;
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper;
import org.apache.logging.log4j.Logger;
import org.lwjgl.opengl.GL32;
import java.nio.ByteBuffer;
@@ -30,6 +32,7 @@ import java.nio.ByteBuffer;
public class LightMapWrapper implements ILightMapWrapper
{
private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
private int textureId = 0;
@@ -59,7 +62,13 @@ public class LightMapWrapper implements ILightMapWrapper
GLMC.glBindTexture(this.textureId);
}
image.upload(0, 0, 0, false);
GLMC.glBindTexture(currentTexture);
// getActiveTexture() may return textures that aren't valid and attempting to bind them will
// throw a GL error
if (GL32.glIsTexture(currentTexture))
{
GLMC.glBindTexture(currentTexture);
}
}
private void createLightmap(NativeImage image)
{