From d63244e9d3996e557bbfd4171c3e90a0cb4ec771 Mon Sep 17 00:00:00 2001 From: cp Date: Mon, 31 Mar 2014 13:20:27 +0800 Subject: [PATCH] Combustion Gen Renderer getting there. --- .../textures/blocks/blankMachinePanel.png | Bin 0 -> 1338 bytes .../textures/blocks/combustionGenFront.png | Bin 1501 -> 1328 bytes .../textures/blocks/combustionGenFrontOn.png | Bin 1505 -> 1328 bytes .../java/crazypants/enderio/ClientProxy.java | 6 + .../redstone/RedstoneSwitchRenderer.java | 2 +- .../generator/BlockCombustionGenerator.java | 65 +++++- .../CombustionGeneratorRenderer.java | 209 ++++++++++++++++++ .../machine/light/ElectricLightRenderer.java | 4 +- .../java/crazypants/render/CubeRenderer.java | 27 ++- .../java/crazypants/vecmath/Vector3f.java | 8 + 10 files changed, 312 insertions(+), 9 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/blankMachinePanel.png create mode 100644 src/main/java/crazypants/enderio/machine/generator/CombustionGeneratorRenderer.java diff --git a/resources/assets/enderio/textures/blocks/blankMachinePanel.png b/resources/assets/enderio/textures/blocks/blankMachinePanel.png new file mode 100644 index 0000000000000000000000000000000000000000..2c1981fdfad3a45e97dc655932d81fe9209dc0bd GIT binary patch literal 1338 zcmV-A1;zS_P)N2bPDNB8 zb~7$DE-^7j^FlWO00g#4L_t(YOMRB-lH)iGg#B_mJHa!yl9jXNyzl?_J^-X7`);qQ z%YhQRfhGWH^J};J9R%-T_z^{4N&J;0+rt9>g3mYxA92JzhW98GgeyeC;I4)toNxO* z2LB{%bmVT${Ha%<)Ao=pzGc+K(df@M8EHaR9_~L(1 zmT}XheU}YGK00Jz=vhpng0u0F*0KC5vHIMRK)bg~%+G4PV60=CtpN z<5-@i%A=f)tccPuaP^={2}&xqf~>H9=vo6S$PhQ=8_dOoL)XDopHI!@(p)d{c{%fU zkvWbel#Edfc=ZG)wdZ_vSRVuY)`Ub@>AwAU*#_2pchPvlgH#?ds? zH?dCO%p4{4=~zyd_rwYsyDWoT1cI_)iFk$me(P>G5x87j1}Xr%!8DY2fEQt?xve^# z#DKHp%?d$q3|j;^bk2nP@C54K3A}{w*dcZ7LM>4*)R%L6xv-JXnqA{a5kkHQ!00nj zf6nJ8b~DEd%WWJE&%l_?{j8h;fKi&VqO2>8nhH>cB~ZGUXoAz+UL zW~x4Ia?wzkxULcorft%$C8C@%8;5dr22O)dg{-hXP31U7RYeKOxPII3-ot=n;Hh95 zDj*rewF^J9@P~n;L!fd39!kmz-3v9y`#vg5CLPbp&D%}{v>W6YoPheH;d^t0eUSb1 zun35T;t20dUGPBc`?PJtqTm4JiN8B$?B;&jb!v{VTlgYi8uo(~PhD_l*MURR z1e6eu%phSu~FdoFVX8 z;9uq_FEy^z!mExuUZn;J0<1U9jy9e%z#`h3>1r0q@vknDvC9bZaqu7kg!1+=5fC(z>yuv04 z;mf^L?hb9vNbkHCV wE&%R8Y=-Vx!M~&9zzp^-fLddR{nu{y51AfICxGfEegFUf07*qoM6N<$f?z;+)Bpeg literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/combustionGenFront.png b/resources/assets/enderio/textures/blocks/combustionGenFront.png index 41e10fa6fad602bb0ee970aff099e376c9a0d34a..dd9f721640d8bff42481d3f460285fc0193ce51d 100644 GIT binary patch delta 1248 zcmV<61Rwj|3$O~1JPN%401mwYNBfYikwz$g1guF!K~zXfjh1P0<2VdPeXE?H(@E@% z_LUN~T3(c#r2q7ddmcc^OHWN=*HK=k9x&qFs`#ig&ty z4uoIU2VOAB*f0cnm!@7(1jb;-woa@~8k;tasMTxJ$e^`xUB^`wA!EX_bPCEM;PImP z8Th^|Mes22wqXb$OAE>}sw+%9W^J2yUEX&^-#hVNM%tEJ89ZQhEvhPbDia$+GT;d# zO-UUlfPkP#2y4U(CXU4E(3ittMl`B_223Qklq9gG$*e{2(z-^hPsXkFvW(p#2#LS} zh@I8R3B)< zf?k5-xxjiVr{GBL=5rE;=8pnn4?0f$Ocv3}wN$eMS zSW!iuR1qb_R(I{w)6<{teiFx;F6t7@U5Xfb34?7CQ(J*4F-g>g@esh}N*Np@Fn0hs zd*M<@epz4=$A$3-;C4$`9~g>?GqJsmfMe_cn8e{2iLC+r{`Kn%0a*55F=UufC|^zk z2b<)(J&+VpNM4a+3c#3%gHsECV4i0j{ofTpz2Bn>jUzPz1_tMx!%X=stzw%bc$Wx# zUjY&XMfFGocAA{(Y2tBUFz6-pD-M8`X%x|md|C>d?EAQu6ls1%MEv0x!+R)#^QoK9cppAKNIE2vMg;VK0q6++~x0F97DXXITQ*YY>_! z*$*dnevsES{~2Vf*szKwahM!N5^y}$JSAmX2;eqFECEviC(FFUBpa@b1u$xLIRLKx0Flc`|QLRz9>&nQB!j8K-+DgbDi=4mTs z3LF#HET52<2-XyT;Z6=<-*Esh!Vz*jV4PE~jPSDJ{Nl}>_Ea#kx+zNLW=YA8)SNu?_Sh3mH?R7HKx5XW-X4rK5y(MbizCxsi5w zoNBkP7-0kOj<@Br1qN}@GcehbRR!}%Ami`3eD?16=;X6YH%+!Exf6rj;+4)7lUD%V z@wR+jV*sRY>kKzrZ@hl+V-8}+lH?-<-Vw!ogj5r*NZZNqu9UPHd%=gziac?kT+FkHvcI*vy~s|bXwKZL*v`j6S;kGRHf=IOwGAtxR8>6nwUURD7MnpQg_?D>-dms%2#zw5kh_yfN}Id$7j1;d7fe49gn-?^Bn#0*#C8e9cs(>4K*K@ zFyK9wHH{U=A}|jTkc`s~?7$9!vhS-s*z+gHdoA!_ z1Wb~N25#yS8ri-7XIB*hRa#enSyR9M{AmS&9fnRA)`xw4IG}+;N!t<_5zu8Ck#s^K z0Ub+oW_vM%2pIE?K;AT`U%wEjG<$P6)cbw$L4Zl%=CxOT#RCC(yQM?F8nNWV%6@=_tUIUaMH9 zikWCxy4mleEED7cSH(tP@IVWMc_sqwRRG%oGHBqzI*O!|8QhH4$1q?VnpwydfiO!a z4FtrAnE(kG1O_K0)pP)VsQR93Se7y>m_@Q5I1awx5e)%QYWIDZVy4#kOn@jgLzDpZ zO8FBUGMsHTex5&?VTXX(5}2uaw~5eb`yQf53&f0K9U?zb!8}Am8fv-L_3PVP%FJk6 zpz7L9Q%Xq2_04*9Yg?p&C=sX;3YH}l+%V-g@c8vC*qkUSf9 zaxhepm|tMNRHp{!f8doB*30tce2&X9Dhl9dnMDb)Wm?wY0U;s>!meVeqQia)4(5N# zuBqi|QM{Z^P=`!^1O(D_9fscq0m*^Aq!pr2Dm6)Hh3(Vf@6+q|)9L&9^l~}BTrNbw z;KvBLJ)bcgY6GYV4jLZ>r-(gW;3FAHmVQ)VQV=ULEm)S5pHI0oJo@MH^2Z z5F*-|=}P^W^OMPe36ufEpRD$nW-fP2>TBX5j1wX zchKuRm3KJga^M}{E?t+tH6Y-G1a``YCKCa4(7+EK0Ny}sg8pWP@r+IcCh+YQP;1*^ c|FT;B2W8e$HeblIPyhe`07*qoM6N<$f`I{>#{d8T diff --git a/resources/assets/enderio/textures/blocks/combustionGenFrontOn.png b/resources/assets/enderio/textures/blocks/combustionGenFrontOn.png index f89510b7576aafea5bc7df72d6337839200b25a3..798f297a2422c7201cfd124fb4c0fe42fc132383 100644 GIT binary patch delta 1248 zcmV<61Rwk13$O~1JPN%401mwYNBfYikwz$g1guF!K~zXfjh1P0<2VdPeXE?H(@E@% z_LUN~T3(d=>x1--dmcc^OHWN=*HK=k9x&qFs`#ig&ty z4uoIU2VOAB*f0cnm!@7(1jb;-woa@~8k;tasMTxJ$e^`xUB^`wA!EX_bPCEM;PImP z8Th^|Mes22wqXb$OAE>}sw+%9W^J2yUEX&^-#hVNM%tEJ89ZQhEvhPbDia$+GT;d# zO-UUlfPkP#2y4U(CXU4E(3ittMl`B_223Qklq9gG$*e{2(z-^hPsXkFvW(p#2#LS} zh@I8R3B)< zf?k5-xxjiVr{GBL=5rE;=8pnn4?0f$Ocv3}wN$eMS zSW!iuR1qb_R(I{w)6<{teiFx;F6t7@U5Xfb34?7CQ(J*4F-g>g@esh}N*Np@Fn0hs zd*M<@epz4=$A$3-;C4$`9~g>?GqJsmfMe_cn8e{2iLC+r{`Kn%0a*55F=UufC|^zk z2b<)(J&+VpNM4a+3c#3%gHsECV4i0j{ofTpz2Bn>jUzPz1_tMx!%X=stzw%bc$Wx# zUjY&XMfFGocAA{(Y2tBUFz6-pD-M8`X%x|md|C>d?EAQu6ls1%MEv0x!+R)#^QoK9cppAKNIE2vMg;VK0q6++~x0F97DXXITQ*YY>_! z*$*dnevsES{~2Vf*szKwahM!N5^y}$JSAmX2;eqFECEviC(FFUBpa@b1u$xLIRLKx0Flc`|QLRz9>&nQB!j8K-+DgbDi=4mTs z3LF#HET52<2-XyT;Z6=<-*Esh!Vz*jV4PE~jPSDJ{Nl}>_Ea#kx+zNLW=YA8)SNu?_Sh3mH?R7HKx5XW-X4rK5y(MbizCxsi5w zoNBkP7-0kOj<@Br1qN}@GcehbRR!}%Ami`3eD?16=;X6YH%+!Exf6rj;+4)7lUD%V z@wR+jV*sRY>kKzr?XTMa0000< KMNUMnLSTabK1yH! delta 1426 zcmV;D1#SAU3gHWoJPN-601m$aI0aKAkwz$g1zkx*K~zXfb(RTpqF5A#{d1kpVxk}j zvWmE%VtUEuR8KE8G3g||%}<{1-p67xm8w$;4>;%U?{(hvdT%Z3(6)~TgA>;|aoz5) z1-IbXalnx?;2nd*fi1B2Fc607scpk~(Cm6%>5$uFM`R%H@W;IshE9@r+1Q^qGqh!rd|u5|drc0Ts9ESToud=}LRXH!;0X)@vIP?cPiRBR8j z!uoKW8nA*4c0=AFxCCK19>Wzc=1Eb1B+Ej6iv_o>%rwU#4~HhA)Byj~?+mElVvsnU zCWI974myMz8{tZq#dx&@>2iroTr8r+9G?Qwm>La@n}kkK1v3}dXVY+I{GPFbM$h*l z7Xd2_Si)XmU$4fil?W6?<$(&oZeTQ&cLFcMQ1eZ}rYVSdF9X~izoVs%ShEYhOjLw;kv%5#bk@>T%G+5?TxVv(?}>|eLruiKk1HMst^ z-G2LP3%mFoMTVLWGZ^q5%cfH+2t;5%L_|gtAm*o0h(Hnqu)kX_8@yM1Sb^2g`+L|k z5XaeSHCcl-7b)JWz^M^1NhTV9xTz&nvxhI)D*b>$etcA*MBs9>`SbXQ`O{4aS^*Ox?PQM`KnK!9rpCYA+`KD_^BP=#!ybnrNQhn( zseqVo1g_3E|30BnHX&-0%(yUxMAI_~Os{{wzCK?p1cgDxZp=p@jiP4)wG)_6lIaF5 z(^`Nj-46qqDrTZ3@!yx1oB3R@n4goCFfam*2MDBbBm$dO0NVjFXy8GAG?Gqca5GxZ ze2;NxW+A^SFf$rPfGF*M3y^?HpmIV|O$UINCQzKYK?$;AnYW6xiSBPCb?$UN(EGu zb~W7#H5g^tAPkvw?3JB^o(O0+c&!J7s4`#JO$TUiSLPeief+q)gF0YC%rY-c?I0il zvZJvttAOO$u#*E*MVK$_g|Lh5O^ZE4_2|cL7i8IJJO;xgu_z(7Ov|b~AVlOq*uy}o z=<2cw&iiHY8hf>W4vOMww}aYeA|MdQecwN>1SAJ`msS}0QmIiyD}27bdbs`Pad*pS zPj@@qZ}78*-0pS;^4je!)C32O7Xor@;m~0PBPSMiD$K(c{MBuio($PrNT5P8$*m-F zVj^zBBDV7(N0TIRqo@^lt9`)1g5bDJi_{!mU>9oHwrXB~rB-OEz}^Jiu)iW;^-YGU zTnuLrsqHO$#J&jj*yT}eJ7L+UCOBL_3sEyFhzy1|0{;t+@>1hUExa1>idU(Diva6M z(xZ(V4+s%$&2*)H%=yXWzy!*GYgyrA<%JP00YyKm)#Q g0kzr=`pF07*qoM6N<$f{^c { + public static int renderId; + + protected IIcon frontOn; + protected IIcon frontOff; + public static BlockCombustionGenerator create() { BlockCombustionGenerator gen = new BlockCombustionGenerator(); gen.init(); return gen; } + + + @Override + public void registerBlockIcons(IIconRegister iIconRegister) { + super.registerBlockIcons(iIconRegister); + frontOn = iIconRegister.registerIcon("enderio:combustionGenFrontOn"); + frontOff = iIconRegister.registerIcon("enderio:combustionGenFront"); + } + + + protected BlockCombustionGenerator() { super(ModObject.blockCombustionGenerator, TileCombustionGenerator.class); } @@ -34,11 +52,48 @@ public class BlockCombustionGenerator extends AbstractMachineBlock 0.9 || vec.y < 0.1) { + if(transX) { + vec.x -= 0.5; + vec.x *= 0.6; + vec.x += 0.5; + } else { + vec.z -= 0.5; + vec.z *= 0.6; + vec.z += 0.5; + } + } + + vec.y -= 0.5; + vec.y *= 0.8; + vec.y += 0.5; + + vec.add(x, y, z); + } + + @Override + public void applyToNormal(Vector3f vec) { + } + + } + +} diff --git a/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java b/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java index dd90c0cc..ae423e57 100644 --- a/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java +++ b/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java @@ -28,7 +28,7 @@ public class ElectricLightRenderer implements ISimpleBlockRenderingHandler { textures[3] = block.getBlockTextureFromSide(ForgeDirection.UP.ordinal()); textures[4] = block.getBlockTextureFromSide(ForgeDirection.WEST.ordinal()); textures[5] = block.getBlockTextureFromSide(ForgeDirection.EAST.ordinal()); - CubeRenderer.render(bb, textures, null); + CubeRenderer.render(bb, textures, null, null); Tessellator.instance.draw(); } @@ -50,7 +50,7 @@ public class ElectricLightRenderer implements ISimpleBlockRenderingHandler { textures[4] = block.getIcon(world, x, y, z, ForgeDirection.WEST.ordinal()); textures[5] = block.getIcon(world, x, y, z, ForgeDirection.EAST.ordinal()); - CubeRenderer.render(bb, textures, null); + CubeRenderer.render(bb, textures, null, null); return true; } diff --git a/src/main/java/crazypants/render/CubeRenderer.java b/src/main/java/crazypants/render/CubeRenderer.java index 06fdbafb..13055377 100644 --- a/src/main/java/crazypants/render/CubeRenderer.java +++ b/src/main/java/crazypants/render/CubeRenderer.java @@ -166,7 +166,7 @@ public final class CubeRenderer { addVecWithUV(verts[3], minU, maxV); } - public static void render(BoundingBox bb, IIcon[] faceTextures, VertexTransform xForm) { + public static void render(BoundingBox bb, IIcon[] faceTextures, VertexTransform xForm, float[] brightnessPerSide) { setupVertices(bb, xForm); float minU; float maxU; @@ -177,6 +177,11 @@ public final class CubeRenderer { Tessellator tessellator = Tessellator.instance; tessellator.setNormal(0, 0, -1); + if(brightnessPerSide != null) { + float cm = brightnessPerSide[ForgeDirection.NORTH.ordinal()]; + tessellator.setColorOpaque_F(cm, cm, cm); + } + tex = faceTextures[0]; minU = tex.getMinU(); maxU = tex.getMaxU(); @@ -188,6 +193,10 @@ public final class CubeRenderer { addVecWithUV(verts[2], minU, maxV); tessellator.setNormal(0, 0, 1); + if(brightnessPerSide != null) { + float cm = brightnessPerSide[ForgeDirection.SOUTH.ordinal()]; + tessellator.setColorOpaque_F(cm, cm, cm); + } tex = faceTextures[1]; minU = tex.getMinU(); maxU = tex.getMaxU(); @@ -199,6 +208,10 @@ public final class CubeRenderer { addVecWithUV(verts[7], minU, maxV); tessellator.setNormal(0, 1, 0); + if(brightnessPerSide != null) { + float cm = brightnessPerSide[ForgeDirection.UP.ordinal()]; + tessellator.setColorOpaque_F(cm, cm, cm); + } tex = faceTextures[2]; minU = tex.getMinU(); maxU = tex.getMaxU(); @@ -210,6 +223,10 @@ public final class CubeRenderer { addVecWithUV(verts[7], maxU, minV); tessellator.setNormal(0, -1, 0); + if(brightnessPerSide != null) { + float cm = brightnessPerSide[ForgeDirection.UP.ordinal()]; + tessellator.setColorOpaque_F(cm, cm, cm); + } tex = faceTextures[3]; minU = tex.getMinU(); maxU = tex.getMaxU(); @@ -221,6 +238,10 @@ public final class CubeRenderer { addVecWithUV(verts[4], maxU, minV); tessellator.setNormal(1, 0, 0); + if(brightnessPerSide != null) { + float cm = brightnessPerSide[ForgeDirection.EAST.ordinal()]; + tessellator.setColorOpaque_F(cm, cm, cm); + } tex = faceTextures[4]; minU = tex.getMinU(); maxU = tex.getMaxU(); @@ -232,6 +253,10 @@ public final class CubeRenderer { addVecWithUV(verts[1], minU, minV); tessellator.setNormal(-1, 0, 0); + if(brightnessPerSide != null) { + float cm = brightnessPerSide[ForgeDirection.WEST.ordinal()]; + tessellator.setColorOpaque_F(cm, cm, cm); + } tex = faceTextures[5]; minU = tex.getMinU(); maxU = tex.getMaxU(); diff --git a/src/main/java/crazypants/vecmath/Vector3f.java b/src/main/java/crazypants/vecmath/Vector3f.java index 348cc101..de77c27e 100644 --- a/src/main/java/crazypants/vecmath/Vector3f.java +++ b/src/main/java/crazypants/vecmath/Vector3f.java @@ -55,6 +55,12 @@ public class Vector3f { y += vec.y; z += vec.z; } + + public void add(int x2, int y2, int z2) { + x += x2; + y += y2; + z += z2; + } public void sub(Vector3f vec) { x -= vec.x; @@ -108,4 +114,6 @@ public class Vector3f { return new Vector3d(x, y, z); } + + }