diff --git a/src/main/java/com/minelittlepony/unicopia/model/ModelSphere.java b/src/main/java/com/minelittlepony/unicopia/model/ModelSphere.java index 2efe3446..b0d426cf 100644 --- a/src/main/java/com/minelittlepony/unicopia/model/ModelSphere.java +++ b/src/main/java/com/minelittlepony/unicopia/model/ModelSphere.java @@ -65,12 +65,9 @@ public class ModelSphere { GlStateManager.disableTexture2D(); GlStateManager.enableAlpha(); - GlStateManager.enableColorMaterial(); - GlStateManager.colorMaterial(1032, 5634); drawShape(); - GlStateManager.disableColorMaterial(); GlStateManager.disableAlpha(); GlStateManager.enableTexture2D(); diff --git a/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleSphere.java b/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleSphere.java index afc65c79..8e52836a 100644 --- a/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleSphere.java +++ b/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleSphere.java @@ -5,6 +5,9 @@ import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.world.World; + +import org.lwjgl.opengl.GL11; + import com.minelittlepony.unicopia.model.ModelSphere; import com.minelittlepony.unicopia.particle.IAttachableParticle; import com.minelittlepony.unicopia.spell.ICaster; @@ -71,12 +74,22 @@ public class ParticleSphere extends Particle implements IAttachableParticle { return; } + GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); + + GlStateManager.depthMask(false); + GlStateManager.shadeModel(GL11.GL_SMOOTH); + GlStateManager.tryBlendFuncSeparate( + GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, + GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); Color.glColor(tint, alpha); model.setPosition(posX, posY, posZ); model.render(radius); + GlStateManager.color(1, 1, 1, 1); + + GL11.glPopAttrib(); } @Override