Skip to content
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

Fix rotation + flipping for GT textures #4016

Merged
merged 5 commits into from
Mar 3, 2025
+80 −101
Merged

Fix rotation + flipping for GT textures #4016

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8084194
Fix rotation + flipping for GT textures
RecursivePineapple Mar 2, 2025
d3d35d5
Do it properly
RecursivePineapple Mar 3, 2025
f5beb8e
Merge branch 'master' into texture-extended-facing
Dream-Master Mar 3, 2025
070dbc8
Merge branch 'master' into texture-extended-facing
Dream-Master Mar 3, 2025
ce532a2
Merge branch 'master' into texture-extended-facing
Dream-Master Mar 3, 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
181 changes: 80 additions & 101 deletions src/main/java/gregtech/common/render/GTRenderedTexture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
import com.gtnewhorizon.structurelib.alignment.IAlignment;
import com.gtnewhorizon.structurelib.alignment.IAlignmentProvider;
import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
import com.gtnewhorizon.structurelib.alignment.enumerable.Flip;
import com.gtnewhorizon.structurelib.alignment.enumerable.Rotation;

import gregtech.GTMod;
import gregtech.api.interfaces.IColorModulationContainer;
Expand Down Expand Up @@ -221,22 +219,11 @@ public boolean isValidTexture() {
protected void renderFaceYNeg(RenderBlocks aRenderer, double x, double y, double z, IIcon icon,
ExtendedFacing extendedFacing) {

switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) {
case COUNTER_CLOCKWISE -> aRenderer.uvRotateBottom = 2;
case CLOCKWISE -> aRenderer.uvRotateBottom = 1;
case UPSIDE_DOWN -> aRenderer.uvRotateBottom = 3;
default -> aRenderer.uvRotateBottom = 0;
}
aRenderer.uvRotateBottom = getRotation(extendedFacing);
icon = getFlipped(extendedFacing, icon);

aRenderer.renderFaceYNeg(Blocks.air, x, y, z, icon);

final Flip aFlip = extendedFacing.getFlip();
aRenderer.renderFaceYNeg(
Blocks.air,
x,
y,
z,
useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped() ^ !stdOrient, aFlip.isVerticallyFliped())
: new GTIconFlipped(icon, !stdOrient, false));
aRenderer.uvRotateBottom = 0;
}

Expand All @@ -246,22 +233,11 @@ protected void renderFaceYNeg(RenderBlocks aRenderer, double x, double y, double
protected void renderFaceYPos(RenderBlocks aRenderer, double x, double y, double z, IIcon icon,
ExtendedFacing extendedFacing) {

switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) {
case COUNTER_CLOCKWISE -> aRenderer.uvRotateTop = 2;
case CLOCKWISE -> aRenderer.uvRotateTop = 1;
case UPSIDE_DOWN -> aRenderer.uvRotateTop = 3;
default -> aRenderer.uvRotateTop = 0;
}
aRenderer.uvRotateTop = getRotation(extendedFacing);
icon = getFlipped(extendedFacing, icon);

aRenderer.renderFaceYPos(Blocks.air, x, y, z, icon);

final Flip aFlip = extendedFacing.getFlip();
aRenderer.renderFaceYPos(
Blocks.air,
x,
y,
z,
useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
: icon);
aRenderer.uvRotateTop = 0;
}

Expand All @@ -270,50 +246,26 @@ protected void renderFaceYPos(RenderBlocks aRenderer, double x, double y, double
*/
protected void renderFaceZNeg(RenderBlocks aRenderer, double x, double y, double z, IIcon icon,
ExtendedFacing extendedFacing) {
aRenderer.field_152631_f = true;
// **NOT A BUG**: aRenderer.uvRotateEast REALLY CONTROLS THE ROTATION OF THE NORTH SIDE
switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) {
case COUNTER_CLOCKWISE -> aRenderer.uvRotateEast = 2;
case CLOCKWISE -> aRenderer.uvRotateEast = 1;
case UPSIDE_DOWN -> aRenderer.uvRotateEast = 3;
default -> aRenderer.uvRotateEast = 0;
}

final Flip aFlip = extendedFacing.getFlip();
aRenderer.renderFaceZNeg(
Blocks.air,
x,
y,
z,
useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
: icon);
aRenderer.uvRotateEast = getRotation(extendedFacing);
icon = getFlipped(extendedFacing, icon);

aRenderer.renderFaceZNeg(Blocks.air, x, y, z, icon);

aRenderer.uvRotateEast = 0;
aRenderer.field_152631_f = false;
}

/**
* Renders the given texture to the south (z-positive) face of the block. Args: block, x, y, z, texture
*/
protected void renderFaceZPos(RenderBlocks aRenderer, double x, double y, double z, IIcon icon,
ExtendedFacing extendedFacing) {
// **NOT A BUG**: aRenderer.uvRotateWest REALLY CONTROLS THE ROTATION OF THE SOUTH SIDE
switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) {
case COUNTER_CLOCKWISE -> aRenderer.uvRotateWest = 2;
case CLOCKWISE -> aRenderer.uvRotateWest = 1;
case UPSIDE_DOWN -> aRenderer.uvRotateWest = 3;
default -> aRenderer.uvRotateWest = 0;
}

final Flip aFlip = extendedFacing.getFlip();
aRenderer.renderFaceZPos(
Blocks.air,
x,
y,
z,
useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
: icon);
aRenderer.uvRotateWest = getRotation(extendedFacing);
icon = getFlipped(extendedFacing, icon);

aRenderer.renderFaceZPos(Blocks.air, x, y, z, icon);

aRenderer.uvRotateWest = 0;
}

Expand All @@ -322,23 +274,12 @@ protected void renderFaceZPos(RenderBlocks aRenderer, double x, double y, double
*/
protected void renderFaceXNeg(RenderBlocks aRenderer, double x, double y, double z, IIcon icon,
ExtendedFacing extendedFacing) {
// **NOT A BUG**: aRenderer.uvRotateNorth REALLY CONTROLS THE ROTATION OF THE WEST SIDE
switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) {
case COUNTER_CLOCKWISE -> aRenderer.uvRotateNorth = 2;
case CLOCKWISE -> aRenderer.uvRotateNorth = 1;
case UPSIDE_DOWN -> aRenderer.uvRotateNorth = 3;
default -> aRenderer.uvRotateNorth = 0;
}

final Flip aFlip = extendedFacing.getFlip();
aRenderer.renderFaceXNeg(
Blocks.air,
x,
y,
z,
useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
: icon);
aRenderer.uvRotateNorth = getRotation(extendedFacing);
icon = getFlipped(extendedFacing, icon);

aRenderer.renderFaceXNeg(Blocks.air, x, y, z, icon);

aRenderer.uvRotateNorth = 0;
}

Expand All @@ -347,38 +288,74 @@ protected void renderFaceXNeg(RenderBlocks aRenderer, double x, double y, double
*/
protected void renderFaceXPos(RenderBlocks aRenderer, double x, double y, double z, IIcon icon,
ExtendedFacing extendedFacing) {
aRenderer.field_152631_f = true;
// **NOT A BUG**: aRenderer.uvRotateSouth REALLY CONTROLS THE ROTATION OF THE EAST SIDE
switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) {
case COUNTER_CLOCKWISE -> aRenderer.uvRotateSouth = 2;
case CLOCKWISE -> aRenderer.uvRotateSouth = 1;
case UPSIDE_DOWN -> aRenderer.uvRotateSouth = 3;
default -> aRenderer.uvRotateSouth = 0;
}

final Flip aFlip = extendedFacing.getFlip();
aRenderer.renderFaceXPos(
Blocks.air,
x,
y,
z,
useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
: icon);
aRenderer.uvRotateSouth = getRotation(extendedFacing);
icon = getFlipped(extendedFacing, icon);

aRenderer.renderFaceXPos(Blocks.air, x, y, z, icon);

aRenderer.uvRotateSouth = 0;
aRenderer.field_152631_f = false;
}

private static final int NORMAL = 0;
private static final int CLOCKWISE = 1;
private static final int COUNTER_CLOCKWISE = 2;
private static final int UPSIDE_DOWN = 3;

private int getRotation(ExtendedFacing extendedFacing) {
return switch (extendedFacing.getRotation()) {
case NORMAL -> NORMAL;
case CLOCKWISE -> CLOCKWISE;
case UPSIDE_DOWN -> UPSIDE_DOWN;
case COUNTER_CLOCKWISE -> COUNTER_CLOCKWISE;
};
}

private GTIconFlipped getFlipped(ExtendedFacing extendedFacing, IIcon icon) {
boolean flipU = false, flipV = false;

ForgeDirection dir = extendedFacing.getDirection();

// certain directions need to be flipped horizontally seemingly randomly
// maybe there's a reason, maybe there isn't, I haven't bothered to dig into the code to figure out why

// spotless:off
if (extendedFacing.getRotation().getIndex() % 2 == 0) {
// flip U's if normal or upside down
flipU ^= extendedFacing.getFlip().isHorizontallyFlipped();
} else {
// flip V's if clockwise or counter-clockwise
flipV ^= extendedFacing.getFlip().isHorizontallyFlipped();

if (dir == ForgeDirection.EAST || dir == ForgeDirection.NORTH) {
flipU ^= true;
}
}
// spotless:on

if (dir == ForgeDirection.DOWN) {
flipU ^= true;
}

return new GTIconFlipped(icon, flipU, flipV);
}

private ExtendedFacing getExtendedFacing(int x, int y, int z) {
if (stdOrient) return ExtendedFacing.DEFAULT;
if (stdOrient || !useExtFacing) return ExtendedFacing.DEFAULT;

final EntityPlayer player = GTMod.gregtechproxy.getThePlayer();
if (player == null) return ExtendedFacing.DEFAULT;

final World w = player.getEntityWorld();
if (w == null) return ExtendedFacing.DEFAULT;

final TileEntity te = w.getTileEntity(x, y, z);

IAlignment alignment = null;

if (te instanceof IGregTechTileEntity) {
final IMetaTileEntity meta = ((IGregTechTileEntity) te).getMetaTileEntity();

if (meta instanceof IAlignmentProvider) {
alignment = ((IAlignmentProvider) meta).getAlignment();
} else if (meta != null) {
Expand All @@ -389,7 +366,9 @@ private ExtendedFacing getExtendedFacing(int x, int y, int z) {
} else if (te instanceof IAlignmentProvider) {
alignment = ((IAlignmentProvider) te).getAlignment();
}

if (alignment != null) return alignment.getExtendedFacing();

return ExtendedFacing.DEFAULT;
}
}