lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix #514

Browse source
This commit is contained in:
WayofTime 2015-12-24 20:28:39 -05:00
parent 3a59866475
commit e918b5692c
1 changed files with 29 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java
View file

@ -1,6 +1,7 @@
package WayofTime.bloodmagic.api.alchemyCrafting; package WayofTime.bloodmagic.api.alchemyCrafting;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
@ -38,7 +39,7 @@ public class AlchemyCircleRenderer {
} }
public float getSizeModifier(float craftTime) { public float getSizeModifier(float craftTime) {
if (craftTime >= 150) { if (craftTime >= 150 && craftTime <= 250) {
return (200 - craftTime) / 50f; return (200 - craftTime) / 50f;
} }
return 1.0f; return 1.0f;
@ -59,7 +60,7 @@ public class AlchemyCircleRenderer {
Tessellator tessellator = Tessellator.getInstance(); Tessellator tessellator = Tessellator.getInstance();
WorldRenderer wr = tessellator.getWorldRenderer(); WorldRenderer wr = tessellator.getWorldRenderer();
GL11.glPushMatrix(); GlStateManager.pushMatrix();
// float rot = (float)(this.worldObj.provider.getWorldTime() % (360 / // float rot = (float)(this.worldObj.provider.getWorldTime() % (360 /
// this.rotationspeed) * this.rotationspeed) + this.rotationspeed * f; // this.rotationspeed) * this.rotationspeed) + this.rotationspeed * f;
float rot = getRotation(craftTime); float rot = getRotation(craftTime);
@ -70,76 +71,68 @@ public class AlchemyCircleRenderer {
// Bind the texture to the circle // Bind the texture to the circle
Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource);
GL11.glTexParameterf(3553, 10242, 10497.0F); GlStateManager.disableCull();
GL11.glTexParameterf(3553, 10243, 10497.0F); GlStateManager.enableBlend();
GlStateManager.blendFunc(770, 1);
GL11.glDisable(2884); GlStateManager.translate(x, y, z);
GL11.glEnable(3042);
GL11.glBlendFunc(770, 1);
GL11.glTranslated(x, y, z);
EnumFacing sideHit = EnumFacing.UP; // Specify which face this "circle" EnumFacing sideHit = EnumFacing.UP; // Specify which face this "circle"
// is located on // is located on
GL11.glTranslatef(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY()
* offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace);
switch (sideHit) { switch (sideHit) {
case DOWN: case DOWN:
GL11.glTranslatef(0, 0, 1); GlStateManager.translate(0, 0, 1);
GL11.glRotatef(-90.0f, 1, 0, 0); GlStateManager.rotate(-90.0f, 1, 0, 0);
break; break;
case EAST: case EAST:
GL11.glRotatef(-90.0f, 0, 1, 0); GlStateManager.rotate(-90.0f, 0, 1, 0);
GL11.glTranslatef(0, 0, -1); GlStateManager.translate(0, 0, -1);
break; break;
case NORTH: case NORTH:
break; break;
case SOUTH: case SOUTH:
GL11.glRotatef(180.0f, 0, 1, 0); GlStateManager.rotate(180.0f, 0, 1, 0);
GL11.glTranslatef(-1, 0, -1); GlStateManager.translate(-1, 0, -1);
break; break;
case UP: case UP:
GL11.glTranslatef(0, 1, 0); GlStateManager.translate(0, 1, 0);
GL11.glRotatef(90.0f, 1, 0, 0); GlStateManager.rotate(90.0f, 1, 0, 0);
break; break;
case WEST: case WEST:
GL11.glTranslatef(0, 0, 1); GlStateManager.translate(0, 0, 1);
GL11.glRotatef(90.0f, 0, 1, 0); GlStateManager.rotate(90.0f, 0, 1, 0);
break; break;
} }
GL11.glPushMatrix(); GlStateManager.pushMatrix();
GL11.glTranslatef(0.5f, 0.5f, getVerticalOffset(craftTime)); GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime));
GL11.glRotatef(rot, 0, 0, 1); GlStateManager.rotate(rot, 0, 0, 1);
GL11.glRotatef(secondaryRot, 1, 0, 0); GlStateManager.rotate(secondaryRot, 1, 0, 0);
GL11.glRotatef(secondaryRot * 0.45812f, 0, 0, 1); GlStateManager.rotate(secondaryRot * 0.45812f, 0, 0, 1);
double var31 = 0.0D; double var31 = 0.0D;
double var33 = 1.0D; double var33 = 1.0D;
double var35 = 0; double var35 = 0;
double var37 = 1; double var37 = 1;
// GL11.glRotatef(60.0F, 0.0F, 1.0F, 0.0F); GlStateManager.color(0.5f, 1f, 1f, 1f);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
wr.begin(7, DefaultVertexFormats.POSITION_TEX); wr.begin(7, DefaultVertexFormats.POSITION_TEX);
// wr.setBrightness(200); // wr.setBrightness(200);
// wr.putColorRGB_F(1, 1, 1, 1);
// wr.putColorMultiplier(1, 1, 1, 1);
wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex(); wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex();
wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex(); wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex();
wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex(); wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex();
wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex(); wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex();
// wr.putColorMultiplier(0.5f, 1, 1, 7);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GlStateManager.popMatrix();
GL11.glDepthMask(true); // GlStateManager.depthMask(true);
GL11.glDisable(3042); GlStateManager.disableBlend();
GL11.glEnable(2884); GlStateManager.enableCull();
// GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glPopMatrix(); GlStateManager.popMatrix();
} }
} }