From e5cd70f90510b5e511d502bf5dff89d2073b15ca Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 28 Apr 2014 23:08:23 +0800 Subject: [PATCH] Fixed up rendering of combustion gen and vat. --- .../textures/blocks/combustionGenFront.png | Bin 1407 -> 1049 bytes .../textures/blocks/combustionGenFrontOn.png | Bin 1409 -> 1117 bytes .../textures/blocks/machineTemplate.png | Bin 0 -> 1127 bytes .../enderio/textures/blocks/vatFront.png | Bin 1245 -> 840 bytes .../textures/blocks/vatFrontSingle.png | Bin 0 -> 1245 bytes .../enderio/farm/FarmingStationRenderer.java | 21 +++-- .../enderio/gui/IAdvancedTooltipProvider.java | 5 -- .../CombustionGeneratorRenderer.java | 17 ++-- .../generator/FacingVertexTransform.java | 10 ++- .../generator/TranslatedCubeRenderer.java | 25 +++--- .../enderio/machine/still/BlockVat.java | 13 +++ .../enderio/machine/still/VatRenderer.java | 75 +++++------------- .../crazypants/render/VertexRotation.java | 6 ++ .../crazypants/render/VertexTransform.java | 3 + .../render/VertexTransformComposite.java | 9 ++- .../crazypants/render/VertexTranslation.java | 6 ++ 16 files changed, 89 insertions(+), 101 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/machineTemplate.png create mode 100644 resources/assets/enderio/textures/blocks/vatFrontSingle.png diff --git a/resources/assets/enderio/textures/blocks/combustionGenFront.png b/resources/assets/enderio/textures/blocks/combustionGenFront.png index 0f932a5bcf1eadbaffcf6416d0c8514d87a91906..ee936433c5052d1032f7aa727df3c58867b554c8 100644 GIT binary patch delta 967 zcmV;&133Ku3YiFyJPNx201mqW$N1DXkwz$g1C>ccK~zXft(IAG<2DpUvny{PvAeq* zilhe40|=55Nr_oV|76F>d4S{=;PhZSu3IdL2JX3dc!2%e??G^{KQ^1ED15h=?iv2i z0OT270sE#-yDsnh$IzefR&DEQSJ!b_I)JR}s^eHsCvWsSl=m7Xs&xRos!zvuo}QwA z$eZw15wsk~Om_~T9EN6^)G{-oUFK$S0SLvNM!8l}2RJB4r&naIV^m*emh zh6F`L-#Y+ab?2qKoCPq?jkq6~fV&3}cO$HAHLxy*fx!e~3z>^Z>;QyxD0$%`pu%FQ{uD~+z1<=hiU%5RU!1G}r=6O`)0C*x{ zl*O;Cfc>+t|IDjv^?IugZJYxh;1j7P;`hy*!=!ognFceyEOZV@==Qs}1 zB+R}6VgOaSud9RxQ!1lJ`HQ4=(d&{P<&@E;R@`)`@2NY}anF>BvfKfGe2OChm=%0b zxF=1sNs{jZBzsxxXxygeKuB;-7B@5TwI(SmAhikJOK|f(XP8m~pxx^_I2?Qcdtf(N zdbFxI1akT;fcd646hQzt-CGkJYo@0Fswz0_9l+;p9A?s~jG+CkJMrauxRu^@H*4Zo z*1c^J)&gi60qkACmu(z><=M`h13D~WwB1;49upJy7l6QQ_FHgFt(czF^}a0s^Z?KM z9i^vdWP}ZFtWEV_QVTS3e(g9(4f*YUFVH{hj5n_cmOUtIk)CAHvOQYEF=E2x5+PJ pg!kr6dOh6-y#D|DP4WRj@Gl9YH2-wy7I**v002ovPDHLkV1lAR*%|-< delta 1328 zcmV-01<(4K2>%L@JPN!301mtXmArCEkwz$g1p7%uK~zXfjh1P0+c*$~bt|7BjvdM2 zzJdf-Nu*_;B!A|{ldl_Gx7_@w)P z0PwOui^W0%I^^TPM~gjZK?I(CW2mWYOBVuH&kTfH7fNIs|1A@On{v z4}4#?BJya!c3=rXwic9SR9BcVW^J2yUEX&^-#hSMR@#U0)!GuUihrS#JGlEfnF<=6@rAi{!G?}#ky|k_Y`;&ERy(}YJI3XT5 z0eok7@`MTqow8SF#Ue8rl_^!GP??;atxCk5|0vsl9_O+#c9 zn}*2nfNF@0Y5;@sAK%}X{HqKR#udt! zZlJLVzRQ7xh(hv;98(00iD;a1hEE|Si3kuM1~qhP*J4us31B`q%~w2d^$I)G zM4P%AZa4a$n8SR~L6k**%tBhX?=UG%{?NwgeaQo=R!eqxdn4#55i~qt{)>QiK+b02 zrQR{Q7Q-Mt+;<3k`r8D?cM)LwjKs_MnyMQqwz!JgA``+jzz~ow8FPMx62B)3}2&`CpN`|X{c5k!fK%C%p7oraW zls}u5Nifft%$eG0&@y`9NU#1yEyG90wU+6kLD2a_L-5!VB3DA?I6_J^F}YeaDCdjN zEds*6&z$=SDicsA>+k^oE- z?rND9B5)rfwt%UB0yE>D6-l^iECQoem(y5|AkLp%hS#~WLQ<(6=G~rT9%ADvFpI#S zPKbtM=V3V~)}vx8HgZN0a%F|Glu?0zmT8{0Ql^MwLe2JZdGTNk5p>dkeMbXsfJjbO z)kBOv<;n_&75xjF>*SOa{?lAu|JBN6JJA>x!Wp0CNYO@Q~`XuUH`gu*0@|wxEF@%nVFYvZCNQ z0?7JHE}y+8K05jAO_L)?K7d7Tainv_kM m+-7)XG8C)LPCaJ4^Sw=;% zvo_34XtGyx*klt9BVMyCG-hjadCVA3AgycY?Dfb zRqo5;9aR}S;3I8t*#Is*0dCn-4`V6RmzkZLrtdQ9a2g7g0Wd1*#M@>^3BYt6cRT@e zJQnBCI~v7srW$#4Vpq%pOKR@GPL&!jo

No&dM%>!rS3IhMm9$@D!hz`hdDpupr> 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 t?3;8dnh@7qCGBeVQ9P7*R@sIQKqpQoK ztE-=vzYZ@h4lmA`!5GWx_p?(YpdEZWIqARa*@LswgVR%HFb1;vbu=;p)^FP$yY9q) z^KO0r&iDCbJekdIdXv>_$1wuh!Ni;0hv7pUJ;d=t6fvF#!L(l>t2eG|1T36P!_doB zFfYP#9u$SI)GSTiG;xwdR{0?#V38os(UPXl+BR*Pq^hF%JS>VJ&t=t)A|rqUXGfr^ zMLR%c83SntlIp~<5wOONb038ynAAFd1l6`#)1*}e5fz23Y6m8OGq9(D?-UwLNwtW})vn=hSsIs8_x*Ro1E8Ufu0cR>I#Q(3r6bJ6BqS9D#zSjZ|{Zv=*aMk7a0 zW$a_z6UDNdua?DfDXXEb0s}BK+DxfkH$D-|a=j|oYguK}jey0KQcMvjEAPsLDKFE1Y)Bu!Ip*6#>v zfK%G1VyJYJyd1!yirFvx&>#oPsLE#9Cq^bb|#_XFe^z&8K@002ovPDHLkV1o80aG(GH delta 1171 zcmV;E1Z?}r2HgpeJPN=701m(bYSxJfkwzhZF-P-4Hvj+xSxH1eR7gwJmdSeCHWWtn zKy4f+jjhpM)k7s$Bt=r3M@iOTzyH!b_kxrtFZ^kfMg9Fj1Q5IjcL0dqA2&Bw{r>f6 z^m8))Ihp*rzx#E6-|FtKJ2YYZ$7K9tJZ{?Y=o*dA#GpPB(fvLgeCziyE`UF8Z|Pir z4F=bvVLP>vdHMTrh^~eM<`{h&^hN!S24bOk+V5i%%L4d&K7X*RN85gKoae;?{o^9{ zsA=c7Nau){-->rnvTdwk^I<;6xB%!sFC1Q;`QD4~zbu#kq5uVF(s7>39N(XLUMqK| z>o8({;02?M9w@Lg-=Bw}9mk6_akJEa%Q7#|{5%&G+UB_oW|^C&Zjvle96M2DWJjUR z>tSdiS&HCcV7$ljVX|IK1XYQ-pe)0x3hOGW>v)A$s+um6M`all1zP6$GRu&U(iC}V zD&tu;UoHtI3;>n^u(V}S906iZttV?$gIUFji4+qmCSYYp5&+yyQ~YQFmPN>aUY0&? z5+5S7EDK!eG6bVKG6cf}We7$YM~s&wC%}U>mmGMm6$VZc6I{sw2`KW0bRH{1O6W2O z!(du(2-;^4Nc59qPd%5+*m2~*$cL9_s0FwrbVt|1k zErYDIDLH3oR#fWBdBn&$6*cXDdcY!P))AssQeLZGN!_5{Ii z_QBNi=3#IGD8p?S_+d&*VkJ(f^>njA+3O~wRmlkB>op{D$!4T{1i*i6G>iQbi!iO( zJ_YJ5;Rdh~fLMQh&C#|I-D0~1hU;v50(07EtX)kf*fqlXR{&#O>~4#H9oiW&NEq>W z9t1?Gr}1&EI1+PtM!P_*bw<7dU|mg@`(1U|SBC?t-wx$|4})Wa$P0k@a0+40FJ&hq z4{`V)?fMk>CxGTaJum>Vj_K9=+v@$jJ{%}HVvgmWZsX;GlZ0hfWl&WZ;s+Lmr{cFh zY5);6(*^8zlH809v{Ef$H#|;sByx0a0Z|>Su9D*DTDovyrqV* zUS9}k(;%7P2c^Zk zyo&*nJhrj!3|dl1%tC!IKj)8{F&M%q*@?rmP^&hMgyQ#6j13* zQct&Zw@kjqMp%?R!R#V$ zHhG#lX~KzOqqrk}J-*B_L(2&9k-LRCO}W^>;H$~qL=V)cRmeR2WBetM3(Jh_0v8tF zn?(GB4vPde#e%(bK{ab?;k?=H4bx9mm|gZP=0C9)0XfZDjPL*e002ovPDHLkV1oTrF984m diff --git a/resources/assets/enderio/textures/blocks/vatFrontSingle.png b/resources/assets/enderio/textures/blocks/vatFrontSingle.png new file mode 100644 index 0000000000000000000000000000000000000000..754a0f9aec111a7c303fe9e30f55191577debe73 GIT binary patch literal 1245 zcmV<31S0#1P)<{98gxZibW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE-^7j^FlWO00db{L_t(YOVyUidfPS>M)g2#94C#f(O%Uk$L(1aEPvk1Lhcg8}vo} zjs{|(dD`z|6Uzeldp>`#tVi2^a-8SI0{!D6_o!*-w@BxRnBR(bPqJ;SVe?@=$G8CK zKQA0!p84L3@4qaU|Dpf|XVP(=${gRHd0s1brt2_bec%P7j2tSdiS&HCcV7$ljVX|IK1XYQ-pe)0x z3hOGW>v)A$s+um6M`all1zP6$GRu&U(iC}VD&tu;UoHtI3;>n^u(V}S906iZttV?$ zgIUFji4+qmCSYYp5&+yyQ~YQFmPN>3mOgG0A0o3X3tZ_k1fx1K1j7Vn2u2x4jF%)Q zz=JiH9C)r322K(aT*(0mDDsAM9xFpi=rRbyU|Meo+Gh_)^pj&xJ(tYbapc5NlV@cF zWf4|o)M2y$(U~iT0f0Dn0hB2KlLm`ofPo(^gRHbEIcI2ARO-rk#K<`nHSK!9CNO|5 z!^=`itCNySY#HmKwW=WW>MY>~un~Y*e|^o-wh`T8y9I{pYlH809v{Ef z$H#|;sByx0a0Z|>Su9D*DTDovyrqV*US9}k(;%7P2c^Z>_VAd73(D!ii#|xFbEj%rQgD2=S4-g*i>R*udbc z$=yT`)TmX+Jp5z)C6EitjOzjy7T=p9?@SEpBN1KBH>}I8!rY7K0OU|=r#3P#<0*R9 z3y;y$!Vz`vTZ`u2CQlv5+`Z)D_1mwG{QK>f-~aRN`sU_8u@?b3&037`00000NkvXX Hu0mjfV)#4U literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/farm/FarmingStationRenderer.java b/src/main/java/crazypants/enderio/farm/FarmingStationRenderer.java index 679b3549..d6e95662 100644 --- a/src/main/java/crazypants/enderio/farm/FarmingStationRenderer.java +++ b/src/main/java/crazypants/enderio/farm/FarmingStationRenderer.java @@ -1,7 +1,6 @@ package crazypants.enderio.farm; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; @@ -15,6 +14,7 @@ import crazypants.render.RenderUtil; import crazypants.render.VertexTransform; import crazypants.vecmath.Vector3d; import crazypants.vecmath.Vector3f; +import crazypants.vecmath.Vertex; public class FarmingStationRenderer implements ISimpleBlockRenderingHandler { @@ -38,16 +38,9 @@ public class FarmingStationRenderer implements ISimpleBlockRenderingHandler { textures[4] = EnderIO.blockFarmStation.getIcon(3, 0); textures[5] = EnderIO.blockFarmStation.getIcon(3, 0); - Tessellator.instance.setBrightness(15 << 20 | 15 << 4); - float b = 1; - if(world != null) { - b = RenderUtil.claculateTotalBrightnessForLocation(Minecraft.getMinecraft().theWorld, x, y, z); - } - float[] cols = new float[6]; for (int i = 0; i < 6; i++) { - float m = RenderUtil.getColorMultiplierForFace(ForgeDirection.values()[i]); - cols[i] = b * m; + cols[i] = RenderUtil.getColorMultiplierForFace(ForgeDirection.values()[i]); } BoundingBox bb = BoundingBox.UNIT_CUBE; @@ -56,7 +49,7 @@ public class FarmingStationRenderer implements ISimpleBlockRenderingHandler { float scale = 0.7f; float width = 0.4f; - float trans = (1 - scale)/2; + float trans = (1 - scale) / 2; bb = BoundingBox.UNIT_CUBE.scale(1, scale, width); bb = bb.translate(0, -trans, 0); Tessellator.instance.addTranslation(x, y, z); @@ -71,12 +64,11 @@ public class FarmingStationRenderer implements ISimpleBlockRenderingHandler { float topWidth = 0.15f; bb = BoundingBox.UNIT_CUBE.scale(1, topWidth, 1); - bb = bb.translate(0, 0.2f + topWidth/2f, 0); + bb = bb.translate(0, 0.2f + topWidth / 2f, 0); Tessellator.instance.addTranslation(x, y, z); CubeRenderer.render(bb, textures, null, cols); Tessellator.instance.addTranslation(-x, -y, -z); - return true; } @@ -105,6 +97,11 @@ public class FarmingStationRenderer implements ISimpleBlockRenderingHandler { this.z = z; } + @Override + public void apply(Vertex vertex) { + apply(vertex.xyz); + } + @Override public void apply(Vector3d vec) { if(vec.y > 0.9) { diff --git a/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java b/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java index fb1d63cf..b18ae29d 100644 --- a/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java +++ b/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java @@ -4,18 +4,13 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public interface IAdvancedTooltipProvider { - @SideOnly(Side.CLIENT) public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); - @SideOnly(Side.CLIENT) public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); - @SideOnly(Side.CLIENT) public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); diff --git a/src/main/java/crazypants/enderio/machine/generator/CombustionGeneratorRenderer.java b/src/main/java/crazypants/enderio/machine/generator/CombustionGeneratorRenderer.java index c48b6082..6b935e38 100644 --- a/src/main/java/crazypants/enderio/machine/generator/CombustionGeneratorRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/CombustionGeneratorRenderer.java @@ -35,12 +35,14 @@ public class CombustionGeneratorRenderer extends TileEntitySpecialRenderer imple private OverlayRenderer overlayRenderer = new OverlayRenderer(); + private FacingVertexTransform vt = new FacingVertexTransform(); + private TileCombustionGenerator gen; @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - short facing = 3; + short facing = (short)ForgeDirection.EAST.ordinal(); boolean active = false; if(world != null) { TileEntity te = world.getTileEntity(x, y, z); @@ -61,7 +63,8 @@ public class CombustionGeneratorRenderer extends TileEntitySpecialRenderer imple //middle chunk bb = BoundingBox.UNIT_CUBE; bb = bb.scale(1, 0.34, 1); - TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, facing); + vt.setFacing(facing); + TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, vt); scaleX = facing != 4 && facing != 5; scx = scaleX ? 0.7f : 1; @@ -71,18 +74,18 @@ public class CombustionGeneratorRenderer extends TileEntitySpecialRenderer imple bb = BoundingBox.UNIT_CUBE; bb = bb.scale(scx, 0.21, scz); bb = bb.translate(0, 0.26f, 0); - TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, facing); + TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, vt); //lower 1/3 bb = BoundingBox.UNIT_CUBE; bb = bb.scale(scx, 0.21, scz); bb = bb.translate(0, -0.26f, 0); - TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, facing); + TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, vt); //top / bottom connectors bb = BoundingBox.UNIT_CUBE.scale(0.35, 1, 0.35); - TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, facing); + TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, vt); //tanks float size = 0.64f; @@ -96,10 +99,10 @@ public class CombustionGeneratorRenderer extends TileEntitySpecialRenderer imple bb = bb.translate(tx, 0, tz); IIcon tex = EnderIO.blockFusedQuartz.getDefaultFrameIcon(0); - TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, facing, tex); + TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, vt, tex); bb = bb.translate(-tx * 2, 0, -tz * 2); - TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, facing, tex); + TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, vt,tex); if(gen != null) { ccr.renderBlock(world, block, x, y, z, overlayRenderer); diff --git a/src/main/java/crazypants/enderio/machine/generator/FacingVertexTransform.java b/src/main/java/crazypants/enderio/machine/generator/FacingVertexTransform.java index 7391ce7d..7c4e1cd1 100644 --- a/src/main/java/crazypants/enderio/machine/generator/FacingVertexTransform.java +++ b/src/main/java/crazypants/enderio/machine/generator/FacingVertexTransform.java @@ -3,6 +3,7 @@ package crazypants.enderio.machine.generator; import crazypants.render.VertexTransform; import crazypants.vecmath.Vector3d; import crazypants.vecmath.Vector3f; +import crazypants.vecmath.Vertex; class FacingVertexTransform implements VertexTransform { @@ -16,6 +17,11 @@ class FacingVertexTransform implements VertexTransform { transX = facing != 4 && facing != 5; } + @Override + public void apply(Vertex vertex) { + apply(vertex.xyz); + } + @Override public void apply(Vector3d vec) { if(vec.y > 0.8 || vec.y < 0.2) { @@ -29,10 +35,6 @@ class FacingVertexTransform implements VertexTransform { vec.z += 0.5; } } - -// vec.y -= 0.5; -// vec.y *= 0.8; -// vec.y += 0.5; } @Override diff --git a/src/main/java/crazypants/enderio/machine/generator/TranslatedCubeRenderer.java b/src/main/java/crazypants/enderio/machine/generator/TranslatedCubeRenderer.java index 22d9b4e6..1d9b651f 100644 --- a/src/main/java/crazypants/enderio/machine/generator/TranslatedCubeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/TranslatedCubeRenderer.java @@ -12,6 +12,7 @@ import crazypants.render.CustomCubeRenderer; import crazypants.render.CustomRenderBlocks; import crazypants.render.IRenderFace; import crazypants.render.RenderUtil; +import crazypants.render.VertexTransform; import crazypants.vecmath.Vector3d; import crazypants.vecmath.Vertex; @@ -19,32 +20,26 @@ public class TranslatedCubeRenderer { public static TranslatedCubeRenderer instance = new TranslatedCubeRenderer(); - private FaceRenderer faceRenderer = new FaceRenderer(); + private XFormRenderer xformRenderer = new XFormRenderer(); private CustomCubeRenderer ccr = new CustomCubeRenderer(); - public void renderBoundingBox(int x, int y, int z, Block block, BoundingBox bb, int facing) { -// block.setBlockBounds(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); -// faceRenderer.xform.setFacing(facing); -// ccr.renderBlock(Minecraft.getMinecraft().theWorld, block, x, y, z, faceRenderer); -// block.setBlockBounds(0, 0, 0, 1, 1, 1); - renderBoundingBox(x, y, z, block, bb, facing, null); + public void renderBoundingBox(int x, int y, int z, Block block, BoundingBox bb, VertexTransform vt) { + renderBoundingBox(x, y, z, block, bb, vt, null); } - public void renderBoundingBox(int x, int y, int z, Block block, BoundingBox bb, int facing, IIcon overrideTexture) { + public void renderBoundingBox(int x, int y, int z, Block block, BoundingBox bb, VertexTransform vt, IIcon overrideTexture) { block.setBlockBounds(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); - - faceRenderer.xform.setFacing(facing); - + xformRenderer.xform = vt; ccr.setOverrideTexture(overrideTexture); - ccr.renderBlock(Minecraft.getMinecraft().theWorld, block, x, y, z, faceRenderer); + ccr.renderBlock(Minecraft.getMinecraft().theWorld, block, x, y, z, xformRenderer); ccr.setOverrideTexture(null); block.setBlockBounds(0, 0, 0, 1, 1, 1); } - private class FaceRenderer implements IRenderFace { + private class XFormRenderer implements IRenderFace { - public FacingVertexTransform xform = new FacingVertexTransform(); + public VertexTransform xform; @Override public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z, IIcon texture, List refVertices, @@ -53,7 +48,7 @@ public class TranslatedCubeRenderer { Vector3d xyz = new Vector3d(x,y,z); for (Vertex v : refVertices) { v.xyz.sub(xyz); - xform.apply(v.xyz); + xform.apply(v); } } Tessellator.instance.addTranslation((float)x, (float)y, (float)z); diff --git a/src/main/java/crazypants/enderio/machine/still/BlockVat.java b/src/main/java/crazypants/enderio/machine/still/BlockVat.java index b3741f44..e802cdbf 100644 --- a/src/main/java/crazypants/enderio/machine/still/BlockVat.java +++ b/src/main/java/crazypants/enderio/machine/still/BlockVat.java @@ -35,6 +35,7 @@ public class BlockVat extends AbstractMachineBlock { protected IIcon onIcon; protected IIcon topIcon; + protected IIcon blockIconSingle; public BlockVat() { super(ModObject.blockVat, TileVat.class); @@ -43,7 +44,10 @@ public class BlockVat extends AbstractMachineBlock { @Override public void registerBlockIcons(IIconRegister iIconRegister) { blockIcon = iIconRegister.registerIcon("enderio:vatFront"); + blockIconSingle = iIconRegister.registerIcon("enderio:vatFrontSingle"); onIcon = iIconRegister.registerIcon("enderio:vatFrontOn"); + + topIcon = iIconRegister.registerIcon("enderio:vatTop"); overlayIconPull = iIconRegister.registerIcon("enderio:vatOverlayPull"); @@ -53,6 +57,11 @@ public class BlockVat extends AbstractMachineBlock { overlayIconNone = iIconRegister.registerIcon("enderio:machineOverlayNone"); } + @Override + public int getLightOpacity() { + return 0; + } + @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { // used to render the block in the world @@ -65,6 +74,8 @@ public class BlockVat extends AbstractMachineBlock { if(blockSide == ForgeDirection.UP.ordinal() || blockSide == ForgeDirection.DOWN.ordinal()) { return topIcon; + } else if(blockSide == ForgeDirection.EAST.ordinal() || blockSide == ForgeDirection.WEST.ordinal()) { + return blockIconSingle; } if(on) { @@ -74,6 +85,8 @@ public class BlockVat extends AbstractMachineBlock { } } + + @Override public IIcon getIcon(int blockSide, int blockMeta) { if(blockSide == ForgeDirection.UP.ordinal() || blockSide == ForgeDirection.DOWN.ordinal()) { diff --git a/src/main/java/crazypants/enderio/machine/still/VatRenderer.java b/src/main/java/crazypants/enderio/machine/still/VatRenderer.java index db37cc33..e79f4943 100644 --- a/src/main/java/crazypants/enderio/machine/still/VatRenderer.java +++ b/src/main/java/crazypants/enderio/machine/still/VatRenderer.java @@ -3,23 +3,23 @@ package crazypants.enderio.machine.still; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import crazypants.enderio.EnderIO; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.generator.TranslatedCubeRenderer; import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; import crazypants.render.CustomCubeRenderer; import crazypants.render.CustomRenderBlocks; import crazypants.render.IRenderFace; -import crazypants.render.RenderUtil; import crazypants.render.VertexTransform; import crazypants.util.ForgeDirectionOffsets; import crazypants.vecmath.Vector3d; @@ -52,52 +52,19 @@ public class VatRenderer implements ISimpleBlockRenderingHandler { } } - - IIcon[] textures = new IIcon[6]; - if(world != null) { - textures[0] = EnderIO.blockVat.getIcon(world, x, y, z, ForgeDirection.NORTH.ordinal()); - textures[1] = EnderIO.blockVat.getIcon(world, x, y, z, ForgeDirection.NORTH.ordinal()); - textures[2] = EnderIO.blockVat.getIcon(world, x, y, z, ForgeDirection.UP.ordinal()); - textures[3] = EnderIO.blockVat.getIcon(world, x, y, z, ForgeDirection.DOWN.ordinal()); - textures[4] = EnderIO.blockVat.getIcon(world, x, y, z, ForgeDirection.NORTH.ordinal()); - textures[5] = EnderIO.blockVat.getIcon(world, x, y, z, ForgeDirection.NORTH.ordinal()); - } else { - textures[0] = EnderIO.blockVat.getIcon(3, 0); - textures[1] = EnderIO.blockVat.getIcon(3, 0); - textures[2] = EnderIO.blockVat.getIcon(1, 0); - textures[3] = EnderIO.blockVat.getIcon(0, 0); - textures[4] = EnderIO.blockVat.getIcon(3, 0); - textures[5] = EnderIO.blockVat.getIcon(3, 0); - } - - Tessellator.instance.setBrightness(15 << 20 | 15 << 4); - float b = 1; - if(world != null) { - b = RenderUtil.claculateTotalBrightnessForLocation(Minecraft.getMinecraft().theWorld, x, y, z); - } - - float[] cols = new float[6]; - for (int i = 0; i < 6; i++) { - float m = RenderUtil.getColorMultiplierForFace(ForgeDirection.values()[i]); - cols[i] = b * m; - } - float fudge = 1f; //-x side - BoundingBox bb = BoundingBox.UNIT_CUBE.scale(0.333, fudge,fudge); - bb = bb.translate(0.5f - (0.333f/2),0,0); - xform.set(x, y, z); - CubeRenderer.render(bb, textures, xform, cols); + BoundingBox bb = BoundingBox.UNIT_CUBE.scale(0.334, fudge,fudge); + bb = bb.translate(0.5f - (0.334f/2),0,0); + TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform); - bb = BoundingBox.UNIT_CUBE.scale(0.4, fudge,fudge); - xform.set(x, y, z); - CubeRenderer.render(bb, textures, xform, cols); + bb = BoundingBox.UNIT_CUBE.scale(0.334, fudge,fudge); + TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform); - bb = BoundingBox.UNIT_CUBE.scale(0.333, fudge,fudge); - bb = bb.translate(-0.5f + (0.333f/2),0,0); - xform.set(x, y, z); - CubeRenderer.render(bb, textures, xform, cols); + bb = BoundingBox.UNIT_CUBE.scale(0.334, fudge,fudge); + bb = bb.translate(-0.5f + (0.334f/2),0,0); + TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform); if(vat != null) { ccr.renderBlock(world, block, x, y, z, overlayRenderer); @@ -116,9 +83,11 @@ public class VatRenderer implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { Tessellator tes = Tessellator.instance; + GL11.glDisable(GL11.GL_LIGHTING); tes.startDrawingQuads(); renderWorldBlock(null, 0, 0, 0, block, 0, renderer); tes.draw(); + GL11.glEnable(GL11.GL_LIGHTING); } @Override @@ -128,28 +97,21 @@ public class VatRenderer implements ISimpleBlockRenderingHandler { private static class VertXForm implements VertexTransform { - int x; - int y; - int z; - public VertXForm() { } - void set(int x, int y, int z) { - this.x = x; - this.y = y; - this.z = z; + @Override + public void apply(Vertex vertex) { + apply(vertex.xyz); } @Override public void apply(Vector3d vec) { if(vec.x > 0.9 || vec.x < 0.1) { - vec.z -= 0.5; - vec.z *= 0.4; + vec.z *= 0.42; vec.z += 0.5; } - vec.add(x, y, z); } @Override @@ -173,7 +135,6 @@ public class VatRenderer implements ISimpleBlockRenderingHandler { if(tex != null) { ccr.getCustomRenderBlocks().doDefaultRenderFace(face,par1Block,x,y,z, tex); } - Tessellator.instance.addTranslation(-(float)offset.x, -(float)offset.y, -(float)offset.z); } diff --git a/src/main/java/crazypants/render/VertexRotation.java b/src/main/java/crazypants/render/VertexRotation.java index de8f1708..26ae0be4 100644 --- a/src/main/java/crazypants/render/VertexRotation.java +++ b/src/main/java/crazypants/render/VertexRotation.java @@ -3,6 +3,7 @@ package crazypants.render; import crazypants.vecmath.Quat4d; import crazypants.vecmath.Vector3d; import crazypants.vecmath.Vector3f; +import crazypants.vecmath.Vertex; public class VertexRotation implements VertexTransform { @@ -18,6 +19,11 @@ public class VertexRotation implements VertexTransform { quat = Quat4d.makeRotate(angle, axis); } + @Override + public void apply(Vertex vertex) { + apply(vertex.xyz); + } + @Override public void apply(Vector3d vec) { vec.sub(center); diff --git a/src/main/java/crazypants/render/VertexTransform.java b/src/main/java/crazypants/render/VertexTransform.java index f0593ca8..bb1a6ee0 100644 --- a/src/main/java/crazypants/render/VertexTransform.java +++ b/src/main/java/crazypants/render/VertexTransform.java @@ -2,9 +2,12 @@ package crazypants.render; import crazypants.vecmath.Vector3d; import crazypants.vecmath.Vector3f; +import crazypants.vecmath.Vertex; public interface VertexTransform { + public abstract void apply(Vertex vertex); + public abstract void apply(Vector3d vec); public abstract void applyToNormal(Vector3f vec); diff --git a/src/main/java/crazypants/render/VertexTransformComposite.java b/src/main/java/crazypants/render/VertexTransformComposite.java index 1d90e4b2..d2ac72e7 100644 --- a/src/main/java/crazypants/render/VertexTransformComposite.java +++ b/src/main/java/crazypants/render/VertexTransformComposite.java @@ -4,6 +4,7 @@ import java.util.Collection; import crazypants.vecmath.Vector3d; import crazypants.vecmath.Vector3f; +import crazypants.vecmath.Vertex; public class VertexTransformComposite implements VertexTransform { @@ -22,12 +23,18 @@ public class VertexTransformComposite implements VertexTransform { } } + @Override + public void apply(Vertex vertex) { + for (VertexTransform xform : xforms) { + xform.apply(vertex); + } + } + @Override public void apply(Vector3d vec) { for (VertexTransform xform : xforms) { xform.apply(vec); } - } @Override diff --git a/src/main/java/crazypants/render/VertexTranslation.java b/src/main/java/crazypants/render/VertexTranslation.java index e6eb4efe..9a0cff90 100644 --- a/src/main/java/crazypants/render/VertexTranslation.java +++ b/src/main/java/crazypants/render/VertexTranslation.java @@ -2,6 +2,7 @@ package crazypants.render; import crazypants.vecmath.Vector3d; import crazypants.vecmath.Vector3f; +import crazypants.vecmath.Vertex; public class VertexTranslation implements VertexTransform { @@ -29,6 +30,11 @@ public class VertexTranslation implements VertexTransform { this(trans.x, trans.y, trans.z); } + @Override + public void apply(Vertex vertex) { + apply(vertex.xyz); + } + @Override public void apply(Vector3d vec) { vec.x += x;