From a6d61206d9142e7592696bfcd0108e2695ce096f Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 19 Dec 2015 03:05:28 +0000 Subject: [PATCH] Rainbow! --- .../botania/client/lib/LibResources.java | 1 + .../render/world/SkyblockRenderEvents.java | 2 +- .../render/world/SkyblockSkyRenderer.java | 168 +++++++++++------- .../assets/botania/textures/misc/rainbow.png | Bin 0 -> 18526 bytes 4 files changed, 109 insertions(+), 62 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/misc/rainbow.png diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 5ff6c0c9e..b65387acf 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -147,6 +147,7 @@ public final class LibResources { public static final String MISC_GLOW_CYAN = PREFIX_MISC + "glow1.png"; public static final String MISC_BABYLON = PREFIX_MISC + "babylon.png"; public static final String MISC_SKYBOX = PREFIX_MISC + "skybox.png"; + public static final String MISC_RAINBOW = PREFIX_MISC + "rainbow.png"; public static final String MISC_PLANET = PREFIX_MISC + "planet"; public static final String OBJ_MODEL_PYLON = PREFIX_OBJ_MODEL + "pylon.obj"; diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java index 93da99337..04cde0d03 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -21,7 +21,7 @@ public final class SkyblockRenderEvents { @SubscribeEvent public void onRender(RenderWorldLastEvent event) { World world = Minecraft.getMinecraft().theWorld; - if(world.provider.dimensionId == 0 && WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().theWorld)) { + if(world.provider.dimensionId == 0/* && WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().theWorld)*/) { if(!(world.provider.getSkyRenderer() instanceof SkyblockSkyRenderer)) world.provider.setSkyRenderer(new SkyblockSkyRenderer()); } diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index 57b1e8f91..f8e252e78 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -10,6 +10,8 @@ */ package vazkii.botania.client.render.world; +import java.util.Random; + import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.OpenGlHelper; @@ -31,6 +33,7 @@ import cpw.mods.fml.relauncher.ReflectionHelper; public class SkyblockSkyRenderer extends IRenderHandler { private static final ResourceLocation textureSkybox = new ResourceLocation(LibResources.MISC_SKYBOX); + private static final ResourceLocation textureRainbow = new ResourceLocation(LibResources.MISC_RAINBOW); private static final ResourceLocation textureMoonPhases = new ResourceLocation("textures/environment/moon_phases.png"); private static final ResourceLocation textureSun = new ResourceLocation("textures/environment/sun.png"); private static final ResourceLocation[] planetTextures = new ResourceLocation[] { @@ -167,72 +170,114 @@ public class SkyblockSkyRenderer extends IRenderHandler { // === Rays mc.renderEngine.bindTexture(textureSkybox); - if(a > 0) { - f10 = 20F; - GL11.glPushMatrix(); - OpenGlHelper.glBlendFunc(770, 1, 1, 0); - GL11.glTranslatef(0F, -1F, 0F); - GL11.glColor4f(1F, 1F, 1F, a); - GL11.glRotatef(220F, 1F, 0F, 0F); - int angles = 90; - float s = 3F; - float m = 1F; - float y = 2F; - float y0 = 0F; - float uPer = 1F / 360F; - float anglePer = 360F / angles; - double fuzzPer = (Math.PI * 10) / angles; - float rotSpeed = 1F; - - for(int p = 0; p < 3; p++) { - float baseAngle = rotSpeed * (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks); - GL11.glRotatef((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.25F * rotSpeed, 0F, 1F, 0F); - - tessellator1.startDrawingQuads(); - for(int i = 0; i < angles; i++) { - int j = i; - if(i % 2 == 0) - j--; - - float ang = j * anglePer + baseAngle; - double xp = Math.cos(ang * Math.PI / 180F) * f10; - double zp = Math.sin(ang * Math.PI / 180F) * f10; - double yo = Math.sin(fuzzPer * j) * 1; - - float ut = ang * uPer; - if(i % 2 == 0) { - tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); - tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); - } else { - tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); - tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); - } + f10 = 20F; + GL11.glPushMatrix(); + OpenGlHelper.glBlendFunc(770, 1, 1, 0); + GL11.glTranslatef(0F, -1F, 0F); + GL11.glRotatef(220F, 1F, 0F, 0F); + GL11.glColor4f(1F, 1F, 1F, a); + int angles = 90; + float s = 3F; + float m = 1F; + float y = 2F; + float y0 = 0F; + float uPer = 1F / 360F; + float anglePer = 360F / angles; + double fuzzPer = (Math.PI * 10) / angles; + float rotSpeed = 1F; + float rotSpeedMod = 0.4F; + + for(int p = 0; p < 3; p++) { + float baseAngle = rotSpeed * rotSpeedMod * (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks); + GL11.glRotatef((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.25F * rotSpeed * rotSpeedMod, 0F, 1F, 0F); + + tessellator1.startDrawingQuads(); + for(int i = 0; i < angles; i++) { + int j = i; + if(i % 2 == 0) + j--; + + float ang = j * anglePer + baseAngle; + double xp = Math.cos(ang * Math.PI / 180F) * f10; + double zp = Math.sin(ang * Math.PI / 180F) * f10; + double yo = Math.sin(fuzzPer * j) * 1; + + float ut = ang * uPer; + if(i % 2 == 0) { + tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); + tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + } else { + tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); + } - } - tessellator1.draw(); + } + tessellator1.draw(); - switch(p) { - case 0: - GL11.glRotatef(20F, 1F, 0F, 0F); - GL11.glColor4f(1F, 0.4F, 0.4F, a); - fuzzPer = (Math.PI * 14) / angles; - rotSpeed = 0.2F; - break; - case 1: - GL11.glRotatef(50F, 1F, 0F, 0F); - GL11.glColor4f(0.4F, 1F, 0.7F, a); - fuzzPer = (Math.PI * 6) / angles; - rotSpeed = 2F; - break; - } - } - - GL11.glPopMatrix(); - } + switch(p) { + case 0: + GL11.glRotatef(20F, 1F, 0F, 0F); + GL11.glColor4f(1F, 0.4F, 0.4F, a); + fuzzPer = (Math.PI * 14) / angles; + rotSpeed = 0.2F; + break; + case 1: + GL11.glRotatef(50F, 1F, 0F, 0F); + GL11.glColor4f(0.4F, 1F, 0.7F, a); + fuzzPer = (Math.PI * 6) / angles; + rotSpeed = 2F; + break; + } + } + GL11.glPopMatrix(); + + // === Rainbow + GL11.glPushMatrix(); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + mc.renderEngine.bindTexture(textureRainbow); + f10 = 10F; + float effCelAng1 = celAng; + if(effCelAng1 > 0.25F) + effCelAng1 = 1F - effCelAng1; + effCelAng1 = 0.25F - Math.min(0.25F, effCelAng1); + + long time = world.getWorldTime() + 1000; + int day = (int) (time / 24000L); + Random rand = new Random(("" + day).hashCode()); + float angle1 = rand.nextFloat() * 360F; + float angle2 = rand.nextFloat() * 360F; + GL11.glColor4f(1F, 1F, 1F, effCelAng1); + GL11.glRotatef(angle1, 0F, 1F, 0F); + GL11.glRotatef(angle2, 0F, 0F, 1F); - GL11.glColor4f(1F, 1F, 1F, 1F - insideVoid); + tessellator1.startDrawingQuads(); + for(int i = 0; i < angles; i++) { + int j = i; + if(i % 2 == 0) + j--; + + float ang = j * anglePer; + double xp = Math.cos(ang * Math.PI / 180F) * f10; + double zp = Math.sin(ang * Math.PI / 180F) * f10; + double yo = 0; + + float ut = ang * uPer; + if(i % 2 == 0) { + tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); + tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + } else { + tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); + } + + } + tessellator1.draw(); + GL11.glPopMatrix(); + + GL11.glColor4f(1F, 1F, 1F, 1F - insideVoid); OpenGlHelper.glBlendFunc(770, 1, 1, 0); + // === Sun GL11.glRotatef(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F); f10 = 60.0F; @@ -257,6 +302,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { tessellator1.draw(); // === Stars + f6 *= Math.max(0.1F, effCelAng * 2); float t = (ClientTickHandler.ticksInGame + partialTicks + 2000) * 0.005F; GL11.glPushMatrix(); GL11.glDisable(GL11.GL_TEXTURE_2D); diff --git a/src/main/resources/assets/botania/textures/misc/rainbow.png b/src/main/resources/assets/botania/textures/misc/rainbow.png new file mode 100644 index 0000000000000000000000000000000000000000..32366c2e30830242948c326c0a666ecc1a3e2c27 GIT binary patch literal 18526 zcmeI42UJr@+s7}0R1xe2aYIoMNiUEXLJ3uxK#*W1B$p5&B#@Di zK~V%05wQZIYXcM&5YYwS6)2-cOIR- zWJ#bvED!|>ga{`(9U%-81n`1E0ElSJ^x`tSI;UIoK6z*3oFLilEbyGBitx1ACYhQv z-$YMMdvSu^fk)FkE={ttQ_{JXouIg5hh+OS57P--)gP*~=^fm$@le9n8=sy<9}2o( z-ut4q|I7ngM?p_!alJ~V>V&K{VQJ;YV z@F9juU8rBFasg0?xT~QGRJvwVV&-ff(0XN)wn9O&Nug4lWbUjgnF?4%?XWotSlKH` zGE?V!0oh7`-%YlEE3gC!_!<53;w~V`{E!x{04(3FH%%cs2|!E%6KsLNML}0Awdk zgGSra7g0B{sIHE*qh#W0s);pIYbLw}gZSrq^k?8RGtj54+-MjkLPX47#lc}v9lS6md zrf=`T9ns%nvunYXd3Odl&s$7CDbiYqz=<_9h3F*Yv6XDaKb?)Vnc~Xly#VmGOmOKp zV^u{-;Kpb5;RA0h`y8_80g?cxU7-N5%GMCYxKV6*RTThivtvz8SnIsIG}E+FdCsNr z&6hMj`;j);7*@64Q0WmEpDdh+s`5TJ(L$*8 zk)@h-$+$dLP09M2>J*k>Mqn@R_)GEmNssr;bxXPJ zbLVEK!^@PHitoZFXvR<5cr}4*JS$_S%1rL8@R`R`U5?JWyKUB02F48gI<+HBD^1|d zG$}Fpd0Ns9^*xLC%-^G9f@b9A9nE`^r{Ue>eUp)xyUJ^Qk-azGt2I~cx4rq^d6`RI zd+B&_a~B=koX0&TU|1fG@$K89?0ebevOE2-NA}6pt>rZc4fd?!2vfZv&HVVavBc{6 zCu<-5yw0R7wNJNfn?+vk0WuxG81GZ;*|R&qQl&LD^us=}n_7o)PD)SA)+bZnEO@>^ z=P1FY6br5h%G;Z=mznRF?~(8Dx`I^Hm6Lh2!miBsQ|v_RtBZ|R7&&kg>&9nxcs=rZ zoTHvI-PMBfz6g~UbVTPsnQi#Rkeu$+tP86oSuTQ{Cy^B$ALpz`_c8kTA9LP2OkgS( zPcT$&nou{BdW9G&pz5NpHvQp2UwPSzeuTA$mGW#;QfUMA&^`NK?X|Y^YF4xww(@KE zHHYRa&)1vp?E1>JJKfW@^yq@4i(D4DT&=xTd$9I?8ZpBH`vBLG(UI{WqvfpMvWR7- zCC5t6fljB|mL2u&E-4R*TSoRh!t`FYve>>bvvA)1vcj^QNjar%$!_^s_qmr({84hf zB=_vB6YUR`n~F;KCF@yS{~6q~SBfroCs!n|KfnIhJ_{Ai&5tJL>n_uc5uFa3N?A&I zl3us3+j9MtcY8b0TxPv?{X=|f$&{N5s(G1S8FwAHGq|OqjXeq5wm5INiAtfNGIVMl zU#n$fK_n8^R8C6}!nvQpqx_RB3oA=)$>|c=Oix=I#e2xCpqrJgWWB(pZ zP)k9KJKa5&d#1wx%|<8r6h1g{_DFbMFYC<=+Ml$r{jIcCs@W6V6W`Uh%qq`bJA2dp zvLI`9Tnqgdg8|M!)IbA}BblebRooJ59lLzorw>s->s{PoNofNAJoTu{dV6-M^)&0m z4TT%pFBR$qUi*D#pf}8p7e_3mr9Gkv<-rFhR z^LD65R_Ru8_0bKahJ=Uo6()1t-a4ANM(z4Nshk*Tcm;pNw7qnbQSQ!i7fqMP8I-K) z>FW@DoCT!fQz+TZjkrpXDzJlx>bCmX{Xt~H~R;=CRa^;67h4D+33#jL|mYDGGx#xHJq!h(e%#U&nid}W-#)eC06oOuBc&oR^ zt$*G8plhW&6Ybk_hV?N%Q-?Nf%hsZ)O*2xa{qoSbIig)>v*5`h_NM1#j1T0r$X9PM?Z8upNhf6k_V-~-P65e!SGDHzwoug#H&AD=+Ar;j?^S+djGnw z=DC5;HnOd=SFNRYt|p~%-S+5$XDWApTBpm^MX#|*f17Tf;g$Yrx&QL>?zd3!ca{c%i~QD5E7vPa=Y-G$}u<*VOWby+{6 zKi+)La(RFA!#B;ptf>so?rCUt=v9u}Sl^%YK2eK4J~1uvX1r$n>nw8`nf%-`tgrKP z4!xdJKR;_m|H1y7MKh+OV?Nw_{h+QPwc$X@+mz&s{GX5Xy{ddY>v&U5Rn6QB*CX)Q zRqvL5>bex(9IpH3P>Ys(+s}w!j0Xb$I{Dt~cFw2dS;@%*N{XpHpV@e1697;T^B7Dq z)76E-7VuFlj=Mev2tg(&2+j1aQeL7*7n4{~`S7W!|>F6twA91DFPqASK#NCyLX zj!|KtSCkur9TmhTbM!4~>eL7d6o3zkS%?UJaEOQ!VWB@5mjZp47NhkMgH^;q7W&rG z1`$lxB?!783`7u7BqSR{GDDb=QCOmx8NtjHfx}>lXbc{W#~^Wd3IRhQ;1I(veVRJ- zjT*)Ypm^Ha4>t!{7W#o=v5)RW{F85qI)flTTdk`1Q9&T;RwP-3#e$gWMsZaqJg$7F-VgtkysoO zYtFzBD0mVDOI$WeKU4`OcZJfP!xFQ`1|TyqI0_z5!H|aojHw0>A>i-=BLBAlBbCO= zU0o?oAtEs=gbg~`(xAbjcsvfp+@HY0o3qW3W*{CK5Sze3nuB;UlFh=AappKIp5<>g zIJB|yZ$jG&*lVSk1BD)1=^OzY3jZ}9C>%ln3r}X5Az8!#b0iiE5|Jz{hk!Kaa7Y+) z3M1gJ46IFgLP;Yt4f z7%U4%_|n98!hF+|BTodSPvoeyf|6@+tMLLu$CiF^1oH;B3?VB_1WH$;h5nbN_;ru@ zx`jwJgDaZCVoNt08e5vLAcu+`Q##VEugYN=@7wA8dkBW&kCOkmjqpG)D{;^3LT7P3V!7m%@x0@!F!=?lX!uTvPjmKwkL9{T0OGS?qjwA|omfJ#`$u%SVM=U^b8P< z-Dw8T02>x}Y^fCQ@V@keBhcTRh-GuI&=E+$3>|^~=422__BUq}KmwaZB132G_qMj7 z(y=X$9*?a4Ql-~b6zIHzHelA^IRl~irfd|3K_63kZUwI$tZ#OOOjwta^{{~wd6pnHX3x{TH)a}Gzz6_N@H!IM668h_n(l@E}^|1dZzl@CN zpNtBNC2s@sy|%5lMf$TsD;Wb=V} z<+xx#WSeqaviZQga$GPVvQ0TI*?eGLIW8Cw*`^$qY(6lr92X3TY*UU)HXoQ*jtd4v zwkgLYn-9z@#{~l-+mz#y%?IX{F0|2l50DzJT05b%;R$sA)>OOL^wPr*#{{HxY<~R>+ zyN0t$SN6spR8_aqHr=X>HCFEFKv=H-SKR_ub?q&8=25J@#7)Bh`oBC%fHsg_ zMVNeCvSdwKp`Mih*bxs@7**a?1I{Q!Xevk=r#xMwe7j8HcRp}iN8$@)n*pl63bpi02mlh1hg0nZ+$W%LJx2QfRmk@ KZIO-NhW`Pp6F#{B literal 0 HcmV?d00001