Skip to content

Fix fluid icons rendering cropped when sprites are padded #161

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

Open
Eldrinn-Elantey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix fluid icons rendering cropped when sprites are padded #161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/main/java/com/cleanroommc/modularui/drawable/GuiDraw.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public class GuiDraw {

public static final double PI2 = Math.PI * 2;
public static final double PI_2 = Math.PI / 2;
private static final int FLUID_TILE_SIZE = 16;

public static void drawRect(float x0, float y0, float w, float h, int color) {
Platform.setupDrawColor();
Expand Down Expand Up @@ -337,7 +338,10 @@ public static void drawFluidTexture(FluidStack content, float x0, float y0, floa
float r = Color.getRedF(fluidColor), g = Color.getGreenF(fluidColor), b = Color.getBlueF(fluidColor), a = Color.getAlphaF(fluidColor);
a = a == 0f ? 1f : a;
GlStateManager.color(r, g, b, a);
drawTiledTexture(TextureMap.locationBlocksTexture, x0, y0, width, height, fluidStill.getMinU(), fluidStill.getMinV(), fluidStill.getMaxU(), fluidStill.getMaxV(), fluidStill.getIconWidth(), fluidStill.getIconHeight(), z);
// Tile the icon every 16 gui pixels instead of using the sprite resolution. The sprite can be larger than 16x16
// because of hd resource packs or because of the atlas padding added for anisotropic filtering, in which case
// the sprite size does not describe how large one tile should be drawn and the icon would end up cropped.
drawTiledTexture(TextureMap.locationBlocksTexture, x0, y0, width, height, fluidStill.getMinU(), fluidStill.getMinV(), fluidStill.getMaxU(), fluidStill.getMaxV(), FLUID_TILE_SIZE, FLUID_TILE_SIZE, z);
GlStateManager.color(1f, 1f, 1f, 1f);
}

Expand Down