Skip to content

Fix scissor & cleanup GlStateManager calls #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TexBlock merged 2 commits into from
May 28, 2025
Merged

Fix scissor & cleanup GlStateManager calls #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0b9120
fix: replace scissor manager with builtin methods
Motschen May 19, 2025
40ea740
clean: remove GlStateManager calls
Motschen May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions common/src/main/java/org/thinkingstudio/obsidianui/screen/SpruceHandledScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.thinkingstudio.obsidianui.SprucePositioned;
import org.thinkingstudio.obsidianui.Tooltip;
import org.thinkingstudio.obsidianui.navigation.NavigationDirection;
import org.thinkingstudio.obsidianui.util.ScissorManager;
import org.thinkingstudio.obsidianui.widget.SpruceElement;
import org.thinkingstudio.obsidianui.widget.SpruceWidget;
import java.util.function.BooleanSupplier;
Expand Down Expand Up @@ -115,12 +114,10 @@ private boolean tryNavigating(Element element, NavigationDirection direction, bo

@Override
public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
ScissorManager.pushScaleFactor(this.scaleFactor);
super.render(drawContext, mouseX, mouseY, delta);
this.renderWidgets(drawContext, mouseX, mouseY, delta);
this.renderTitle(drawContext, mouseX, mouseY, delta);
Tooltip.renderAll(drawContext);
ScissorManager.popScaleFactor();
}

public void renderTitle(DrawContext drawContext, int mouseX, int mouseY, float delta) {
Expand Down
3 changes: 0 additions & 3 deletions common/src/main/java/org/thinkingstudio/obsidianui/screen/SpruceScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.thinkingstudio.obsidianui.SprucePositioned;
import org.thinkingstudio.obsidianui.Tooltip;
import org.thinkingstudio.obsidianui.navigation.NavigationDirection;
import org.thinkingstudio.obsidianui.util.ScissorManager;
import org.thinkingstudio.obsidianui.widget.SpruceElement;
import org.thinkingstudio.obsidianui.widget.SpruceWidget;
import java.util.function.BooleanSupplier;
Expand Down Expand Up @@ -110,12 +109,10 @@ private boolean tryNavigating(Element element, NavigationDirection direction, bo

@Override
public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
ScissorManager.pushScaleFactor(this.scaleFactor);
this.renderBackground(drawContext, mouseX, mouseY, delta);
this.renderWidgets(drawContext, mouseX, mouseY, delta);
this.renderTitle(drawContext, mouseX, mouseY, delta);
Tooltip.renderAll(drawContext);
ScissorManager.popScaleFactor();
}

public void renderTitle(DrawContext drawContext, int mouseX, int mouseY, float delta) {
Expand Down
100 changes: 0 additions & 100 deletions common/src/main/java/org/thinkingstudio/obsidianui/util/ScissorManager.java
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions common/src/main/java/org/thinkingstudio/obsidianui/widget/AbstractSpruceButtonWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

package org.thinkingstudio.obsidianui.widget;

import com.mojang.blaze3d.opengl.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.ButtonTextures;
Expand Down Expand Up @@ -164,8 +163,6 @@ protected void renderButton(DrawContext drawContext, int mouseX, int mouseY, flo
@Override
protected void renderBackground(DrawContext drawContext, int mouseX, int mouseY, float delta) {
RenderSystem.setShaderColor(1.f, 1.f, 1.f, this.getAlpha());
GlStateManager._enableBlend();
GlStateManager._enableDepthTest();
drawContext.drawGuiTexture(RenderLayer::getGuiTextured, this.getTexture(), this.getX(), this.getY(), this.getWidth(), this.getHeight());
}

Expand Down
5 changes: 0 additions & 5 deletions common/src/main/java/org/thinkingstudio/obsidianui/widget/SpruceCheckboxWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

package org.thinkingstudio.obsidianui.widget;

import com.mojang.blaze3d.opengl.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext;
Expand Down Expand Up @@ -91,8 +90,6 @@ public void setColored(boolean colored) {

@Override
protected void renderButton(DrawContext drawContext, int mouseX, int mouseY, float delta) {
GlStateManager._enableDepthTest();
GlStateManager._enableBlend();
float[] oldColor = RenderSystem.getShaderColor();
float oldRed = oldColor[0], oldGreen = oldColor[1], oldBlue = oldColor[2], oldAlpha = oldColor[3];

Expand All @@ -119,9 +116,7 @@ protected void renderButton(DrawContext drawContext, int mouseX, int mouseY, flo

@Override
protected void renderBackground(DrawContext drawContext, int mouseX, int mouseY, float delta) {
GlStateManager._enableDepthTest();
int color = ColorHelper.fromFloats(this.alpha, 1.f, 1.f, 1.f);
GlStateManager._enableBlend();
drawContext.drawTexture(RenderLayer::getGuiTextured, TEXTURE, this.getX(), this.getY(), this.isFocusedOrHovered() ? 20.f : 0.f, 0.f, this.getHeight(), this.getHeight(), 64, 64, color);
}

Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/org/thinkingstudio/obsidianui/widget/SpruceTexturedButtonWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

package org.thinkingstudio.obsidianui.widget;

import com.mojang.blaze3d.opengl.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.RenderLayer;
Expand Down Expand Up @@ -77,7 +76,6 @@ protected void renderBackground(DrawContext drawContext, int mouseX, int mouseY,
}

RenderSystem.setShaderColor(1.f, 1.f, 1.f, this.getAlpha());
GlStateManager._enableDepthTest();
drawContext.drawTexture(RenderLayer::getGuiTextured, this.texture,
this.getX(), this.getY(),
this.u, v,
Expand Down
5 changes: 0 additions & 5 deletions common/src/main/java/org/thinkingstudio/obsidianui/widget/SpruceToggleSwitch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

package org.thinkingstudio.obsidianui.widget;

import com.mojang.blaze3d.opengl.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.RenderLayer;
Expand Down Expand Up @@ -55,8 +54,6 @@ public SpruceToggleSwitch(Position position, int width, int height, Text message

@Override
protected void renderButton(DrawContext drawContext, int mouseX, int mouseY, float delta) {
GlStateManager._enableDepthTest();
GlStateManager._enableBlend();
drawContext.drawTexture(RenderLayer::getGuiTextured, TEXTURE, this.getX() + (this.getValue() ? 14 : 0), this.getY() + (this.getHeight() / 2 - 9),
this.getValue() ? 50.f : 32.f, this.isFocusedOrHovered() ? 18.f : 0.f,
18, 18, 68, 36);
Expand All @@ -72,9 +69,7 @@ protected void renderButton(DrawContext drawContext, int mouseX, int mouseY, flo

@Override
protected void renderBackground(DrawContext drawContext, int mouseX, int mouseY, float delta) {
GlStateManager._enableDepthTest();
RenderSystem.setShaderColor(1.f, 1.f, 1.f, this.alpha);
GlStateManager._enableBlend();
drawContext.drawTexture(RenderLayer::getGuiTextured, TEXTURE, this.getX(), this.getY() + (this.getHeight() / 2 - 9),
0.f, this.isFocusedOrHovered() ? 18.f : 0.f, 32, 18, 68, 36);
}
Expand Down
10 changes: 2 additions & 8 deletions ...n/src/main/java/org/thinkingstudio/obsidianui/widget/container/SpruceEntryListWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
package org.thinkingstudio.obsidianui.widget.container;

import com.google.common.collect.Lists;
import com.mojang.blaze3d.opengl.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.gui.DrawContext;
Expand All @@ -31,7 +29,6 @@
import org.thinkingstudio.obsidianui.border.EmptyBorder;
import org.thinkingstudio.obsidianui.mixin.DrawContextAccessor;
import org.thinkingstudio.obsidianui.navigation.NavigationDirection;
import org.thinkingstudio.obsidianui.util.ScissorManager;
import org.thinkingstudio.obsidianui.widget.AbstractSpruceWidget;
import org.thinkingstudio.obsidianui.widget.WithBackground;
import org.thinkingstudio.obsidianui.widget.WithBorder;
Expand Down Expand Up @@ -345,12 +342,11 @@ protected void renderWidget(DrawContext drawContext, int mouseX, int mouseY, flo
int top = this.getY();
int bottom = top + this.getHeight();

ScissorManager.push(this.getX(), this.getY(), this.getWidth(), this.getHeight());
drawContext.enableScissor(left, top, right, bottom);
this.entries.forEach(e -> e.render(drawContext, mouseX, mouseY, delta));
ScissorManager.pop();
drawContext.disableScissor();


GlStateManager._enableBlend();
// Render the transition thingy.
if (this.shouldRenderTransition()) {
Identifier topTexture = getSeparatorTexture(true);
Expand Down Expand Up @@ -378,8 +374,6 @@ protected void renderWidget(DrawContext drawContext, int mouseX, int mouseY, flo
}

this.getBorder().render(drawContext, this, mouseX, mouseY, delta);

GlStateManager._disableBlend();
}

protected void renderScrollbar(DrawContext drawContext, int scrollbarX, int scrollbarEndX, int scrollbarY, int scrollbarHeight) {
Expand Down
5 changes: 0 additions & 5 deletions common/src/main/java/org/thinkingstudio/obsidianui/widget/text/SpruceTextAreaWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

package org.thinkingstudio.obsidianui.widget.text;

import com.mojang.blaze3d.opengl.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawContext;
Expand Down Expand Up @@ -511,8 +509,6 @@ protected void drawSelection(DrawContext drawContext, String line, int lineY, in
int x2 = x + this.textRenderer.getWidth(selected);
int y2 = lineY + this.textRenderer.fontHeight;

GlStateManager._enableColorLogicOp();
GlStateManager._logicOp(5387);
RenderLayer renderLayer = RenderLayer.getGui();
VertexConsumer vertexConsumer = ((DrawContextAccessor)drawContext).getVertexConsumers().getBuffer(renderLayer);
int color = ColorHelper.fromFloats(1.f, 0.f, 0.f, 1.f);
Expand All @@ -521,7 +517,6 @@ protected void drawSelection(DrawContext drawContext, String line, int lineY, in
vertexConsumer.vertex(x2, lineY, 0).color(color);
vertexConsumer.vertex(x, lineY, 0).color(color);
drawContext.draw();
GlStateManager._disableColorLogicOp();
}

/**
Expand Down
4 changes: 0 additions & 4 deletions common/src/main/java/org/thinkingstudio/obsidianui/widget/text/SpruceTextFieldWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

package org.thinkingstudio.obsidianui.widget.text;

import com.mojang.blaze3d.opengl.GlStateManager;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
Expand Down Expand Up @@ -467,8 +466,6 @@ protected void drawSelection(DrawContext drawContext, String line, int lineY) {
int x2 = x + this.client.textRenderer.getWidth(selected);
int y2 = lineY + this.client.textRenderer.fontHeight;

GlStateManager._enableColorLogicOp();
GlStateManager._logicOp(5387);
RenderLayer renderLayer = RenderLayer.getGui();
VertexConsumer vertexConsumer = ((DrawContextAccessor)drawContext).getVertexConsumers().getBuffer(renderLayer);
int color = ColorHelper.fromFloats(255.f, 0.f, 0.f, 255.f);
Expand All @@ -477,7 +474,6 @@ protected void drawSelection(DrawContext drawContext, String line, int lineY) {
vertexConsumer.vertex(x2, lineY, 0).color(color);
vertexConsumer.vertex(x, lineY, 0).color(color);
drawContext.draw();
GlStateManager._disableColorLogicOp();
}

/**
Expand Down