mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-20 04:19:40 +00:00
Use GTNHLib MemoryUtils instead of the builtin compat ones (#853)
This commit is contained in:
1 parent
9029182353
commit
7e2399714c
33 files changed
+256
-1011
No files matched your search
@@ -1,5 +1,8 @@
|
||||
package net.coderbot.iris.texture.util;
|
||||
|
||||
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryStack.*;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.bytebuf.MemoryStack;
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
@@ -14,43 +17,60 @@ public class TextureManipulationUtil {
|
||||
private static int colorFillFBO = -1;
|
||||
|
||||
public static void fillWithColor(int textureId, int maxLevel, int rgba) {
|
||||
if (colorFillFBO == -1) {
|
||||
colorFillFBO = OpenGlHelper.func_153165_e/*glGenFramebuffers*/();
|
||||
}
|
||||
|
||||
final int previousFramebufferId = GL11.glGetInteger(GL30.GL_FRAMEBUFFER_BINDING);
|
||||
// TODO: allocations
|
||||
final FloatBuffer previousClearColorBuffer = BufferUtils.createFloatBuffer(4);
|
||||
GL11.glGetFloat(GL11.GL_COLOR_CLEAR_VALUE, previousClearColorBuffer);
|
||||
final int previousTextureId = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
|
||||
final IntBuffer previousViewportBuffer = BufferUtils.createIntBuffer(4);
|
||||
GL11.glGetInteger(GL11.GL_VIEWPORT, previousViewportBuffer);
|
||||
|
||||
OpenGlHelper.func_153171_g/*glBindFramebuffer*/(GL30.GL_FRAMEBUFFER, colorFillFBO);
|
||||
GL11.glClearColor(
|
||||
(rgba >> 24 & 0xFF) / 255.0f,
|
||||
(rgba >> 16 & 0xFF) / 255.0f,
|
||||
(rgba >> 8 & 0xFF) / 255.0f,
|
||||
(rgba & 0xFF) / 255.0f
|
||||
);
|
||||
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, textureId);
|
||||
for (int level = 0; level <= maxLevel; ++level) {
|
||||
final int width = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, level, GL11.GL_TEXTURE_WIDTH);
|
||||
final int height = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, level, GL11.GL_TEXTURE_HEIGHT);
|
||||
GL11.glViewport(0, 0, width, height);
|
||||
GL30.glFramebufferTexture2D(GL30.GL_FRAMEBUFFER, GL30.GL_COLOR_ATTACHMENT0, GL11.GL_TEXTURE_2D, textureId, level);
|
||||
GL11.glClear(GL11.GL_COLOR_BUFFER_BIT);
|
||||
if (Minecraft.isRunningOnMac) {
|
||||
GL11.glGetError();
|
||||
try(final MemoryStack stack = stackPush()) {
|
||||
if (colorFillFBO == -1) {
|
||||
colorFillFBO = OpenGlHelper.func_153165_e/*glGenFramebuffers*/();
|
||||
}
|
||||
|
||||
final int previousFramebufferId = GL11.glGetInteger(GL30.GL_FRAMEBUFFER_BINDING);
|
||||
final FloatBuffer previousClearColorBuffer = stack.mallocFloat(4);
|
||||
GL11.glGetFloat(GL11.GL_COLOR_CLEAR_VALUE, previousClearColorBuffer);
|
||||
final int previousTextureId = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
|
||||
final IntBuffer previousViewportBuffer = stack.mallocInt(4);
|
||||
GL11.glGetInteger(GL11.GL_VIEWPORT, previousViewportBuffer);
|
||||
|
||||
GL30.glFramebufferTexture2D(GL30.GL_FRAMEBUFFER, GL30.GL_COLOR_ATTACHMENT0, GL11.GL_TEXTURE_2D, 0, level);
|
||||
}
|
||||
OpenGlHelper.func_153171_g/*glBindFramebuffer*/(GL30.GL_FRAMEBUFFER, colorFillFBO);
|
||||
GL11.glClearColor(
|
||||
(rgba >> 24 & 0xFF) / 255.0f,
|
||||
(rgba >> 16 & 0xFF) / 255.0f,
|
||||
(rgba >> 8 & 0xFF) / 255.0f,
|
||||
(rgba & 0xFF) / 255.0f);
|
||||
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, textureId);
|
||||
for (int level = 0; level <= maxLevel; ++level) {
|
||||
final int width = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, level, GL11.GL_TEXTURE_WIDTH);
|
||||
final int height = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, level, GL11.GL_TEXTURE_HEIGHT);
|
||||
GL11.glViewport(0, 0, width, height);
|
||||
GL30.glFramebufferTexture2D(
|
||||
GL30.GL_FRAMEBUFFER,
|
||||
GL30.GL_COLOR_ATTACHMENT0,
|
||||
GL11.GL_TEXTURE_2D,
|
||||
textureId,
|
||||
level);
|
||||
GL11.glClear(GL11.GL_COLOR_BUFFER_BIT);
|
||||
if (Minecraft.isRunningOnMac) {
|
||||
GL11.glGetError();
|
||||
}
|
||||
|
||||
OpenGlHelper.func_153171_g/*glBindFramebuffer*/(GL30.GL_FRAMEBUFFER, previousFramebufferId);
|
||||
GL11.glClearColor(previousClearColorBuffer.get(0), previousClearColorBuffer.get(1), previousClearColorBuffer.get(2), previousClearColorBuffer.get(3));
|
||||
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, previousTextureId);
|
||||
GL11.glViewport(previousViewportBuffer.get(0), previousViewportBuffer.get(1), previousViewportBuffer.get(2), previousViewportBuffer.get(3));
|
||||
GL30.glFramebufferTexture2D(
|
||||
GL30.GL_FRAMEBUFFER,
|
||||
GL30.GL_COLOR_ATTACHMENT0,
|
||||
GL11.GL_TEXTURE_2D,
|
||||
0,
|
||||
level);
|
||||
}
|
||||
|
||||
OpenGlHelper.func_153171_g/*glBindFramebuffer*/(GL30.GL_FRAMEBUFFER, previousFramebufferId);
|
||||
GL11.glClearColor(
|
||||
previousClearColorBuffer.get(0),
|
||||
previousClearColorBuffer.get(1),
|
||||
previousClearColorBuffer.get(2),
|
||||
previousClearColorBuffer.get(3));
|
||||
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, previousTextureId);
|
||||
GL11.glViewport(
|
||||
previousViewportBuffer.get(0),
|
||||
previousViewportBuffer.get(1),
|
||||
previousViewportBuffer.get(2),
|
||||
previousViewportBuffer.get(3));
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user