From 8605d02f3e0211a2a632259bcdfbab2be159da2f Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 20 Mar 2015 00:09:39 -0400 Subject: [PATCH] Partially implement telepad model --- resources/assets/enderio/models/telePad.tcn | Bin 0 -> 12166 bytes .../enderio/models/telePadAnimation.tcn | Bin 0 -> 2341 bytes .../assets/enderio/models/telePadGlass.tcn | Bin 0 -> 11684 bytes .../textures/blocks/telePadAnimation.png | Bin 0 -> 1836 bytes .../enderio/textures/blocks/telePadModel.png | Bin 0 -> 11586 bytes .../java/crazypants/enderio/ClientProxy.java | 8 +++ .../enderio/conduit/BlockConduitBundle.java | 6 +- .../conduit/render/ConduitBundleRenderer.java | 8 +-- .../teleport/telepad/BlockTelePad.java | 25 +++++++- .../teleport/telepad/TelePadRenderer.java | 50 +++++++++++++++ .../telepad/TelePadSpecialRenderer.java | 29 +++++++++ .../java/crazypants/render/RenderUtil.java | 58 +++++++----------- .../render/TechneModelRenderer.java | 36 ++--------- .../java/crazypants/render/TechneUtil.java | 34 +++++++++- 14 files changed, 174 insertions(+), 80 deletions(-) create mode 100644 resources/assets/enderio/models/telePad.tcn create mode 100644 resources/assets/enderio/models/telePadAnimation.tcn create mode 100644 resources/assets/enderio/models/telePadGlass.tcn create mode 100644 resources/assets/enderio/textures/blocks/telePadAnimation.png create mode 100644 resources/assets/enderio/textures/blocks/telePadModel.png create mode 100644 src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java create mode 100644 src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java diff --git a/resources/assets/enderio/models/telePad.tcn b/resources/assets/enderio/models/telePad.tcn new file mode 100644 index 0000000000000000000000000000000000000000..4e2d701fb83f6c75259ae648f17bd293214f9682 GIT binary patch literal 12166 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 Kw1xS>c# literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/models/telePadAnimation.tcn b/resources/assets/enderio/models/telePadAnimation.tcn new file mode 100644 index 0000000000000000000000000000000000000000..c7509e2c3988f2ecd7da6947a7acdef6282d6b12 GIT binary patch literal 2341 zcmbW3XHe4%7RCP{Q9>6&6GQ@rPyzu07Q_bu36TT{B{XT$s~{po6rZ3FsR>Vtl+dCA zuAv2_geHhIDFGn@8W9u~#VA4GSzvwp;mxcwJF~lUXYQFhbLV{e&74EP?Gl0j03ZxF z6rID|_;4tbBLD!pU;qFE2Z6|_fWQbnQe=b(p!)L(00aO9AT*4t-Q+hR@T;!6*oH6Z zOLZdG%@oR3wO!^~1&9-oA@88i8^I%!#eNhS*#U_^ChL5B+-L4O7I71VaRx%2hodm` zp%$E#oDGaQ?wT9$mFg%)*xqTZ*wA{^}Yg(<4^51bbRLWQVL5ojW zlds$B$#~LSJ^{zvCaZzQ!*mu*yHen+-?&C2PwzH;gx`pEM`_gzy;Vi?ZcTYvvUbC~ zmFaD>>5;0ANTp8n(bTm9kxr4U*Pei6;q0qmSBu#A2y1LAIAp8x5bzvNTbn z{y0O_Hz)6!&g>T4UkW>-xHrIDs&sRi8F|wL`g&GG(I>Hx{i%g5F&F~hsbi%EBz_WN7Z@KKNQyll6Q~z`CiuU>B#$Ucka2}%5g<}EGYx{3h?o8j*hZ*O z989fVKutr_H_Jp7>h7BqP!Ir3THNWgc9_^(qNbiaj5pSqV+H%AQccEn;f-9<>@zS>F3 zFxVALX*J=&K9xiS5Div({^-bl&-n=VjwI>85Q_01-{ksM1uL~qZt4hU! zo+2h_;KrK~gW^J`v*BVfNyw{qv^%-|Jr&rV0;VR#nxcMEFvxH^%-C{utS7GlFO{sS zkue&;e6D$|SeuBpF*+lX*GJkdL_C?Nfc9$@RQLj8lMILGQv-FXaE(cAXP>zf#+fxa zQh4eEzim-X$mRXo1@`5{0L^{;^G({OdFF)`)gtyTHZ|movkEYo`flkwYOA60fXo1^ z)ldR{mZ)q8Y;X5ShU=$@x&FiR(SijOL8!*2S)_|dsnF8(_3^teMniq<8T8N|JqPpKvL%v*yLN(!>o%S~kOtnb3UApUE$I|NgpBjD%U;`%8E$ z96UDg>-Zi-6u5}RbB;I3x3eGBLcTR(_rK{#lTj>9c^z9Jb>rmj>a~cUjzgMwiS;gtdzSFzw#0%#1v-txrE_@TR z{&-ib)~2=144bgVt-K#4y6>xT-2$oxae$whB3_khPz=+#?C5-d1MY1oK08lbANJ=A zn$OX>?MroKx5D{)sNH-WPp>QK0~>pa&#j1Y^L5{-&sUN+Ha&Gat9|z@mRq^5nPRP# zjxd;aCxbab`4~5yuw$k_g3&Jbrz#iAmqy4!wk`$59s#p)8?GxQS-MZ!JBo-6X;<5F znh)PwLtcFCGh}nPzfsOT*d(QB+Isl0VY4YM@MFTm%V#NlwcmQX7n`2Z(;~N&`({6s ztlFEcA7_ZnbS}gVPFm`u)O7}rY+9moaF+Y{u%y|nXYz9KM&ZZFeGTd`iql5^Z!gKGJ_N!w8Wkq-LZAA}7 z-a`qXjK{}eQHydK{??`eGtRxz;_vl8b&OxFe~qKRT>&*g;Qt6G0uHqM QFAu?=!}_Vt!hc==1Q8}3Z2$lO literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/models/telePadGlass.tcn b/resources/assets/enderio/models/telePadGlass.tcn new file mode 100644 index 0000000000000000000000000000000000000000..d346a8c9bcba12ad8a3e0f6c8d8be3299cf451a3 GIT binary patch literal 11684 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 K%UX&A7v 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 literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index d18d3175..4f7856cb 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -129,7 +129,11 @@ import crazypants.enderio.teleport.TravelController; import crazypants.enderio.teleport.anchor.BlockTravelAnchor; import crazypants.enderio.teleport.anchor.TileTravelAnchor; import crazypants.enderio.teleport.anchor.TravelEntitySpecialRenderer; +import crazypants.enderio.teleport.telepad.BlockTelePad; +import crazypants.enderio.teleport.telepad.TelePadRenderer; +import crazypants.enderio.teleport.telepad.TelePadSpecialRenderer; import crazypants.enderio.teleport.telepad.TeleportEntityRenderHandler; +import crazypants.enderio.teleport.telepad.TileTelePad; import crazypants.render.IconUtil; @SideOnly(Side.CLIENT) @@ -334,6 +338,10 @@ public class ClientProxy extends CommonProxy { BlockTravelAnchor.renderId = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(new PaintedBlockRenderer(BlockTravelAnchor.renderId, EnderIO.blockTravelPlatform)); + BlockTelePad.renderId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(new TelePadRenderer()); + ClientRegistry.bindTileEntitySpecialRenderer(TileTelePad.class, new TelePadSpecialRenderer()); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemMachinePart, new MachinePartRenderer()); MinecraftForgeClient.registerItemRenderer(EnderIO.itemConduitFacade, new FacadeRenderer()); diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index 2b7a6560..5cbe1b4b 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -62,6 +62,7 @@ import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.ToolUtil; import crazypants.render.BoundingBox; +import crazypants.render.RenderUtil; import crazypants.util.IFacade; import crazypants.util.Util; @@ -331,11 +332,10 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade return 1; } - public static volatile int theRenderPass; - @Override + @SideOnly(Side.CLIENT) public boolean canRenderInPass(int pass) { - theRenderPass = pass; + RenderUtil.theRenderPass = pass; return pass == 0 || pass == 1; } diff --git a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java index 53c38be3..2c0f1102 100644 --- a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java @@ -111,7 +111,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements //enable the alpha pass based on state so the only work around is to ensure we always render something in this //pass. Throwing in a polygon with a 0 area does the job //See: https://github.com/MinecraftForge/MinecraftForge/issues/981 - if(BlockConduitBundle.theRenderPass == 1) { + if(RenderUtil.theRenderPass == 1) { Tessellator.instance.addVertexWithUV(x, y, z, 0, 0); Tessellator.instance.addVertexWithUV(x, y, z, 0, 0); Tessellator.instance.addVertexWithUV(x, y, z, 0, 0); @@ -124,7 +124,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements boolean renderedFacade = renderFacade(x, y, z, rb, bundle, player); boolean renderConduit = !renderedFacade || ConduitUtil.isFacadeHidden(bundle, player); - if(renderConduit && (BlockConduitBundle.theRenderPass == 0 || rb.overrideBlockTexture != null)) { + if(renderConduit && (RenderUtil.theRenderPass == 0 || rb.overrideBlockTexture != null)) { BlockCoord loc = bundle.getLocation(); float brightness; if(!Config.updateLightingWhenHidingFacades && bundle.hasFacade() && ConduitUtil.isFacadeHidden(bundle, player)) { @@ -162,8 +162,8 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements bundle.setFacadeRenderAs(FacadeRenderState.FULL); boolean isFacadeOpaque = facadeId.isOpaqueCube(); - if((isFacadeOpaque && BlockConduitBundle.theRenderPass == 0) || - (rb.hasOverrideBlockTexture() || (!isFacadeOpaque && BlockConduitBundle.theRenderPass == 1))) { + if((isFacadeOpaque && RenderUtil.theRenderPass == 0) || + (rb.hasOverrideBlockTexture() || (!isFacadeOpaque && RenderUtil.theRenderPass == 1))) { IBlockAccess origBa = rb.blockAccess; rb.blockAccess = new FacadeAccessWrapper(origBa); try { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/BlockTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/BlockTelePad.java index 3e01a158..8e205240 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/BlockTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/BlockTelePad.java @@ -20,6 +20,7 @@ import crazypants.enderio.teleport.ContainerTravelAccessable; import crazypants.enderio.teleport.ContainerTravelAuth; import crazypants.enderio.teleport.GuiTravelAuth; import crazypants.enderio.teleport.anchor.BlockTravelAnchor; +import crazypants.render.RenderUtil; public class BlockTelePad extends BlockTravelAnchor { @@ -27,6 +28,10 @@ public class BlockTelePad extends BlockTravelAnchor { private IIcon unconnected; @SideOnly(Side.CLIENT) private IIcon connected; + @SideOnly(Side.CLIENT) + IIcon animationIcon; + + public static int renderId; public static BlockTelePad create() { BlockTelePad ret = new BlockTelePad(); @@ -51,8 +56,9 @@ public class BlockTelePad extends BlockTravelAnchor { @Override public void registerBlockIcons(IIconRegister iIconRegister) { - unconnected = iIconRegister.registerIcon("EnderIO:blockTelePad"); - connected = iIconRegister.registerIcon("EnderIO:blockTelePadConnected"); + unconnected = iIconRegister.registerIcon("enderio:blockTelePad"); + connected = iIconRegister.registerIcon("enderio:telePadModel"); + animationIcon = iIconRegister.registerIcon("enderio:telePadAnimation"); } @Override @@ -71,9 +77,22 @@ public class BlockTelePad extends BlockTravelAnchor { @Override public int getRenderType() { - return 0; + return renderId; + } + + @Override + @SideOnly(Side.CLIENT) + public int getRenderBlockPass() { + return 1; } + @Override + @SideOnly(Side.CLIENT) + public boolean canRenderInPass(int pass) { + RenderUtil.theRenderPass = pass; + return pass <= 1; + } + @Override public void onNeighborBlockChange(World world, int x, int y, int z, Block changedTo) { super.onNeighborBlockChange(world, x, y, z, changedTo); diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java new file mode 100644 index 00000000..db9534f6 --- /dev/null +++ b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java @@ -0,0 +1,50 @@ +package crazypants.enderio.teleport.telepad; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.model.obj.GroupObject; +import crazypants.render.CubeRenderer; +import crazypants.render.RenderUtil; +import crazypants.render.TechneModelRenderer; +import crazypants.render.TechneUtil; + +public class TelePadRenderer extends TechneModelRenderer { + + private List glass = TechneUtil.getModel("models/telePadGlass"); + + public TelePadRenderer() { + super("models/telePad", BlockTelePad.renderId); + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + TileTelePad te = (TileTelePad) world.getTileEntity(x, y, z); + IIcon cached = renderer.overrideBlockTexture; + boolean ret = true; + if(te.inNetwork()) { + renderer.overrideBlockTexture = null; + if(te.isMaster()) { + if(RenderUtil.theRenderPass == 0) { + super.renderWorldBlock(world, x, y, z, block, modelId, renderer); + } else { + TechneUtil.renderWorldBlock(glass, world, x, y, z, block, renderer); + } + } else { + ret = false; + } + } else { + renderer.renderStandardBlock(block, x, y, z); + } + renderer.overrideBlockTexture = cached; + return ret; + } + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + CubeRenderer.render(block, metadata); + } +} diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java b/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java new file mode 100644 index 00000000..7822d83a --- /dev/null +++ b/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java @@ -0,0 +1,29 @@ +package crazypants.enderio.teleport.telepad; + +import java.util.List; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.client.model.obj.GroupObject; +import crazypants.render.TechneUtil; + +public class TelePadSpecialRenderer extends TileEntitySpecialRenderer { + + // This will probably need to be a Map + private List model = TechneUtil.getModel("models/telePadAnimation"); + + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float p_147500_8_) { + // TODO spin the spinny thingies + if(((TileTelePad) te).isMaster()) { + GL11.glPushMatrix(); + GL11.glTranslated(x, y, z); + // not working + TechneUtil.renderWithIcon(model, ((BlockTelePad) te.getBlockType()).animationIcon, null, Tessellator.instance, te.getWorldObj(), 0, 0, 0); + GL11.glPopMatrix(); + } + } +} diff --git a/src/main/java/crazypants/render/RenderUtil.java b/src/main/java/crazypants/render/RenderUtil.java index f4d62bcc..846e15b9 100644 --- a/src/main/java/crazypants/render/RenderUtil.java +++ b/src/main/java/crazypants/render/RenderUtil.java @@ -1,30 +1,5 @@ package crazypants.render; -import static net.minecraftforge.common.util.ForgeDirection.DOWN; -import static net.minecraftforge.common.util.ForgeDirection.EAST; -import static net.minecraftforge.common.util.ForgeDirection.NORTH; -import static net.minecraftforge.common.util.ForgeDirection.SOUTH; -import static net.minecraftforge.common.util.ForgeDirection.UP; -import static net.minecraftforge.common.util.ForgeDirection.WEST; -import static org.lwjgl.opengl.GL11.GL_ALL_ATTRIB_BITS; -import static org.lwjgl.opengl.GL11.GL_ALPHA_TEST; -import static org.lwjgl.opengl.GL11.GL_BLEND; -import static org.lwjgl.opengl.GL11.GL_CULL_FACE; -import static org.lwjgl.opengl.GL11.GL_ONE; -import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.GL_SMOOTH; -import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D; -import static org.lwjgl.opengl.GL11.GL_ZERO; -import static org.lwjgl.opengl.GL11.glDepthMask; -import static org.lwjgl.opengl.GL11.glDisable; -import static org.lwjgl.opengl.GL11.glEnable; -import static org.lwjgl.opengl.GL11.glPopAttrib; -import static org.lwjgl.opengl.GL11.glPushAttrib; -import static org.lwjgl.opengl.GL11.glRotatef; -import static org.lwjgl.opengl.GL11.glShadeModel; -import static org.lwjgl.opengl.GL11.glTranslatef; - import java.lang.reflect.Field; import java.nio.FloatBuffer; import java.util.ArrayList; @@ -69,6 +44,9 @@ import crazypants.vecmath.Vector4d; import crazypants.vecmath.Vector4f; import crazypants.vecmath.Vertex; +import static net.minecraftforge.common.util.ForgeDirection.*; +import static org.lwjgl.opengl.GL11.*; + public class RenderUtil { public static final Vector4f DEFAULT_TEXT_SHADOW_COL = new Vector4f(0.33f, 0.33f, 0.33f, 0.33f); @@ -112,9 +90,15 @@ public class RenderUtil { MATRIX_BUFFER.rewind(); GL11.glLoadMatrix(MATRIX_BUFFER); } - + private static Field timerField = initTimer(); - + + /** + * Non-thread-safe holder for the current render pass. You must update this in + * your block's canRenderInPass method for it to work properly! + */ + public static volatile int theRenderPass = 0; + private static Field initTimer() { Field f = null; try { @@ -126,7 +110,7 @@ public class RenderUtil { } return f; } - + @Nullable public static Timer getTimer() { if(timerField == null) { @@ -354,12 +338,13 @@ public class RenderUtil { } } - public static void renderConnectedTextureFace(IBlockAccess blockAccess, Block block, int x, int y, int z, ForgeDirection face, IIcon texture, boolean forceAllEdges) { + public static void renderConnectedTextureFace(IBlockAccess blockAccess, Block block, int x, int y, int z, ForgeDirection face, IIcon texture, + boolean forceAllEdges) { renderConnectedTextureFace(blockAccess, block, x, y, z, face, texture, forceAllEdges, true, true); } - public static void renderConnectedTextureFace(IBlockAccess blockAccess, Block block, int x, int y, int z, ForgeDirection face, IIcon texture, boolean forceAllEdges, - boolean translateToXYZ, boolean applyFaceShading) { + public static void renderConnectedTextureFace(IBlockAccess blockAccess, Block block, int x, int y, int z, ForgeDirection face, IIcon texture, + boolean forceAllEdges, boolean translateToXYZ, boolean applyFaceShading) { if((blockAccess == null && !forceAllEdges) || face == null || texture == null) { return; @@ -398,10 +383,10 @@ public class RenderUtil { float xLen = 1 - Math.abs(edge.offsetX) * scaleFactor; float yLen = 1 - Math.abs(edge.offsetY) * scaleFactor; float zLen = 1 - Math.abs(edge.offsetZ) * scaleFactor; - - xLen -= 2* (1 - block.getBlockBoundsMaxX()) - block.getBlockBoundsMinX(); - yLen -= 2* (1 - block.getBlockBoundsMaxY()) - block.getBlockBoundsMinY(); - zLen -= 2* (1 - block.getBlockBoundsMaxZ()) - block.getBlockBoundsMinZ(); + + xLen -= 2 * (1 - block.getBlockBoundsMaxX()) - block.getBlockBoundsMinX(); + yLen -= 2 * (1 - block.getBlockBoundsMaxY()) - block.getBlockBoundsMinY(); + zLen -= 2 * (1 - block.getBlockBoundsMaxZ()) - block.getBlockBoundsMinZ(); BoundingBox bb = BoundingBox.UNIT_CUBE.scale(xLen, yLen, zLen); @@ -435,7 +420,8 @@ public class RenderUtil { return getNonConectedEdgesForFace(blockAccess, x, y, z, face, null); } - public static List getNonConectedEdgesForFace(IBlockAccess blockAccess, int x, int y, int z, ForgeDirection face, IConnectedTextureRenderer render) { + public static List getNonConectedEdgesForFace(IBlockAccess blockAccess, int x, int y, int z, ForgeDirection face, + IConnectedTextureRenderer render) { Block block = blockAccess.getBlock(x, y, z); if(block == null) { diff --git a/src/main/java/crazypants/render/TechneModelRenderer.java b/src/main/java/crazypants/render/TechneModelRenderer.java index 0eda3df5..1c73693f 100644 --- a/src/main/java/crazypants/render/TechneModelRenderer.java +++ b/src/main/java/crazypants/render/TechneModelRenderer.java @@ -4,56 +4,36 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.model.obj.GroupObject; -import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import crazypants.enderio.machine.AbstractMachineEntity; public class TechneModelRenderer implements ISimpleBlockRenderingHandler { private List model; private int renderId; - protected VertexTransform vt = new VertexRotationFacing(ForgeDirection.NORTH); + protected VertexTransform vt; - private boolean vtDefault = true; - public TechneModelRenderer(String modelPath, int renderId) { this(modelPath, renderId, null); } - /** {@link #shouldRotate()} has no effect as {@link #vt} overrides it */ public TechneModelRenderer(String modelPath, int renderId, VertexTransform vt) { model = TechneUtil.getModel(modelPath); this.renderId = renderId; - if(vt != null) { - this.vt = vt; - vtDefault = false; - } + this.vt = vt; } @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - if(useVT()) { - if(vtDefault) { - ((VertexRotationFacing) vt).setRotation(ForgeDirection.SOUTH); - } - TechneUtil.vt = this.vt; - } + TechneUtil.vt = this.vt; TechneUtil.renderInventoryBlock(model, block, metadata, renderer); } @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - if(useVT()) { - TileEntity te = world.getTileEntity(x, y, z); - if(vtDefault && te instanceof AbstractMachineEntity) { - ((VertexRotationFacing) vt).setRotation(((AbstractMachineEntity) te).getFacingDir()); - } - TechneUtil.vt = this.vt; - } + TechneUtil.vt = this.vt; return TechneUtil.renderWorldBlock(model, world, x, y, z, block, renderer); } @@ -66,12 +46,4 @@ public class TechneModelRenderer implements ISimpleBlockRenderingHandler { public int getRenderId() { return renderId; } - - private boolean useVT() { - return shouldRotate() || !vtDefault; - } - - protected boolean shouldRotate() { - return true; - } } diff --git a/src/main/java/crazypants/render/TechneUtil.java b/src/main/java/crazypants/render/TechneUtil.java index 69209898..68db5a07 100644 --- a/src/main/java/crazypants/render/TechneUtil.java +++ b/src/main/java/crazypants/render/TechneUtil.java @@ -128,6 +128,8 @@ public class TechneUtil { Vector4f vec = new Vector4f(); List res = new ArrayList(); + + for (ModelBox box : (List) model.cubeList) { GroupObject obj = new GroupObject("", GL11.GL_QUADS); TexturedQuad[] quads = (TexturedQuad[]) ObfuscationReflectionHelper.getPrivateValue(ModelBox.class, box, "quadList", "field_78254_i"); @@ -147,6 +149,14 @@ public class TechneUtil { face.vertices[j] = new Vertex(vec.x / vec.w, vec.y / vec.w, vec.z / vec.w); + // Increase the interpolation scale by multiples of 2 + while (pv.texturePositionX > uMult) { + uMult *= 2; + } + while (pv.texturePositionY > vMult) { + vMult *= 2; + } + face.textureCoordinates[j] = new TextureCoordinate(pv.texturePositionX, pv.texturePositionY); } face.faceNormal = face.calculateFaceNormal(); @@ -154,6 +164,7 @@ public class TechneUtil { } res.add(obj); } + return res; } @@ -169,6 +180,9 @@ public class TechneUtil { return bakeModel(model, scale, m, false); } + // Used in the second pass of baking to adjust UVs to the proper interpolation + private static int uMult = 1, vMult = 1; + /** * Use this to convert TechneModel to it's static representation */ @@ -176,10 +190,26 @@ public class TechneUtil { public static List bakeModel(TechneModel model, float scale, Matrix4f m, boolean rotateYFirst) { Map parts = (Map) ObfuscationReflectionHelper.getPrivateValue(TechneModel.class, model, "parts"); List res = Lists.newArrayList(); + for (Map.Entry e : parts.entrySet()) { GroupObject obj = bakeModel(e.getValue(), scale, m, rotateYFirst).get(0); res.add(obj); } + + // Second pass, adjust the UVs to be on a 0-1 interpolation scale + if(uMult + vMult != 2) { + for (GroupObject go : res) { + for (Face f : go.faces) { + for (TextureCoordinate tc : f.textureCoordinates) { + tc.u /= uMult; + tc.v /= vMult; + } + } + } + } + + uMult = vMult = 1; + return res; } @@ -256,7 +286,7 @@ public class TechneUtil { tes.addVertexWithUV(v.x, v.y, v.z, override.getInterpolatedU(interpX * 16), override.getInterpolatedV(interpY * 16)); } else { TextureCoordinate t = f.textureCoordinates[i]; - tes.addVertexWithUV(v.x, v.y, v.z, icon.getInterpolatedU(t.u * 16), icon.getInterpolatedV(t.v * 8)); + tes.addVertexWithUV(v.x, v.y, v.z, icon.getInterpolatedU(t.u * 16), icon.getInterpolatedV(t.v * 16)); } } } @@ -310,7 +340,7 @@ public class TechneUtil { if(block instanceof AbstractMachineBlock) { return ((AbstractMachineBlock) block).getModelIcon(world, x, y, z); } - return getIconFor(block, world.getBlockMetadata(x, y, z)); + return block.getIcon(world, x, y, z, 0); } private static IIcon getIconFor(Block block, int metadata) {