diff --git a/src/main/java/fox/spiteful/avaritia/ClientProxy.java b/src/main/java/fox/spiteful/avaritia/ClientProxy.java index 186615a..7e13332 100644 --- a/src/main/java/fox/spiteful/avaritia/ClientProxy.java +++ b/src/main/java/fox/spiteful/avaritia/ClientProxy.java @@ -4,8 +4,10 @@ import fox.spiteful.avaritia.compat.CompatClient; import fox.spiteful.avaritia.items.LudicrousItems; import fox.spiteful.avaritia.render.CosmicItemRenderer; import fox.spiteful.avaritia.render.FancyHaloRenderer; +import fox.spiteful.avaritia.render.LudicrousRenderEvents; import fox.spiteful.avaritia.render.ShaderHelper; import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.common.MinecraftForge; public class ClientProxy extends CommonProxy { @@ -22,6 +24,8 @@ public class ClientProxy extends CommonProxy { CompatClient.comprettify(); + MinecraftForge.EVENT_BUS.register(new LudicrousRenderEvents()); + ShaderHelper.initShaders(); } } diff --git a/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java b/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java index 3c4b935..6bb3b91 100644 --- a/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java +++ b/src/main/java/fox/spiteful/avaritia/render/CosmicItemRenderer.java @@ -1,11 +1,16 @@ package fox.spiteful.avaritia.render; +import java.nio.FloatBuffer; + import org.apache.logging.log4j.Level; +import org.lwjgl.BufferUtils; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL13; +import scala.actors.threadpool.Arrays; + import cpw.mods.fml.relauncher.ReflectionHelper; import fox.spiteful.avaritia.Lumberjack; @@ -29,7 +34,6 @@ public class CosmicItemRenderer implements IItemRenderer { private final ShaderCallback shaderCallback; private float[] lightlevel = new float[3]; - private ItemStack renderStack; private String[] lightmapobf = new String[] {"lightmapColors", "field_78504_Q", "U"}; @@ -39,22 +43,33 @@ public class CosmicItemRenderer implements IItemRenderer { public void call(int shader) { Minecraft mc = Minecraft.getMinecraft(); - //int x = ARBShaderObjects.glGetUniformLocationARB(shader, "yaw"); - //ARBShaderObjects.glUniform1fARB(x, (float)((mc.thePlayer.rotationYaw * 2 * Math.PI) / 360.0)); + int x = ARBShaderObjects.glGetUniformLocationARB(shader, "yaw"); + ARBShaderObjects.glUniform1fARB(x, (float)((mc.thePlayer.rotationYaw * 2 * Math.PI) / 360.0)); - //int z = ARBShaderObjects.glGetUniformLocationARB(shader, "pitch"); - //ARBShaderObjects.glUniform1fARB(z, - (float)((mc.thePlayer.rotationPitch * 2 * Math.PI) / 360.0)); + int z = ARBShaderObjects.glGetUniformLocationARB(shader, "pitch"); + ARBShaderObjects.glUniform1fARB(z, - (float)((mc.thePlayer.rotationPitch * 2 * Math.PI) / 360.0)); int l = ARBShaderObjects.glGetUniformLocationARB(shader, "lightlevel"); ARBShaderObjects.glUniform3fARB(l, lightlevel[0], lightlevel[1], lightlevel[2]); - /*if (renderStack != null && renderStack.getItem() != null && renderStack.getItem() instanceof ICosmicRenderItem) { - ICosmicRenderItem item = (ICosmicRenderItem)(renderStack.getItem()); - IIcon maskicon = item.getMaskTexture(renderStack); - - int m = ARBShaderObjects.glGetUniformLocationARB(shader, "maskUV"); - ARBShaderObjects.glUniform4fARB(m, maskicon.getMinU(), maskicon.getMinV(), maskicon.getMaxU(), maskicon.getMaxV()); - }*/ + int lightmix = ARBShaderObjects.glGetUniformLocationARB(shader, "lightmix"); + ARBShaderObjects.glUniform1fARB(lightmix, 0.2f); + + IIcon[] icons = LudicrousRenderEvents.cosmicIcons; + FloatBuffer cosmicUVs = BufferUtils.createFloatBuffer(4 * icons.length); + IIcon icon; + for (int i=0; i