mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 04:09:43 +00:00
Fix breaking animation rendering incorrectly with overlay
This commit is contained in:
1 parent
6082285fd7
commit
9f9a5e39a6
3 files changed
+9
-19
No files matched your search
@@ -43,7 +43,10 @@ public class TechneMachineRenderer<T extends AbstractMachineEntity> extends Tech
|
||||
}
|
||||
|
||||
super.renderWorldBlock(world, x, y, z, block, modelId, renderer);
|
||||
ccr.renderBlock(world, block, x, y, z, overlay);
|
||||
|
||||
if(renderer.overrideBlockTexture == null) {
|
||||
ccr.renderBlock(world, block, x, y, z, overlay);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
+2
-15
@@ -129,21 +129,9 @@ public class BlockCombustionGenerator extends AbstractMachineBlock<TileCombustio
|
||||
return mode == IoMode.PULL ? face.offsetY == 0 ? overlayPullSides : overlayPullTopBottom : overlayDisabledNoCenter;
|
||||
}
|
||||
|
||||
public IIcon getBackIcon() {
|
||||
return iconBuffer[0][2];
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineFrontIconKey(boolean active) {
|
||||
if(active) {
|
||||
return "enderio:combustionGenFrontOn";
|
||||
}
|
||||
return "enderio:combustionGenFront";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBackIconKey(boolean active) {
|
||||
return "enderio:blankMachinePanel";
|
||||
protected String getMachineFrontIconKey(boolean active) {
|
||||
return getBackIconKey(active);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -182,5 +170,4 @@ public class BlockCombustionGenerator extends AbstractMachineBlock<TileCombustio
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -223,6 +223,8 @@ public class TechneUtil {
|
||||
for (int i = 0; i < f.vertices.length; i++) {
|
||||
Vertex vert = f.vertices[i];
|
||||
Vector3d v = new Vector3d(vert);
|
||||
Vector3d tv = new Vector3d(v);
|
||||
tv.add(0.5, 0, 0.5);
|
||||
if(vt != null) {
|
||||
vt.apply(v);
|
||||
}
|
||||
@@ -233,9 +235,7 @@ public class TechneUtil {
|
||||
tes.setColorOpaque(c, c, c);
|
||||
|
||||
if(override != null) {
|
||||
Vector3d tv = new Vector3d(v);
|
||||
tv.add(0.5, 0, 0.5);
|
||||
|
||||
|
||||
double interpX = Math.abs(tv.x * right.offsetX + tv.y * right.offsetY + tv.z * right.offsetZ);
|
||||
double interpY = Math.abs(tv.x * down.offsetX + tv.y * down.offsetY + tv.z * down.offsetZ);
|
||||
|
||||
|
||||
Reference in new issue
Block a user