small render tweaks

This commit is contained in:
MachineMuse 2013-05-18 19:56:09 -06:00
parent a866afa628
commit 2033586390
3 changed files with 2 additions and 5 deletions

View file

@ -32,9 +32,7 @@ object GlowBuffer {
pushDualIdentityMatrix() pushDualIdentityMatrix()
MuseRenderer.glowOn() MuseRenderer.glowOn()
MuseRenderer.blendingOn() MuseRenderer.blendingOn()
glPushAttrib(GL_ENABLE_BIT)
glDisable(GL_CULL_FACE) glDisable(GL_CULL_FACE)
glDisable(GL_ALPHA_TEST)
Colour.WHITE.doGL() Colour.WHITE.doGL()
glActiveTexture(GL_TEXTURE0) glActiveTexture(GL_TEXTURE0)
@ -104,7 +102,6 @@ object GlowBuffer {
}.run() }.run()
glPopAttrib()
MuseRenderer.blendingOff() MuseRenderer.blendingOff()
MuseRenderer.glowOff() MuseRenderer.glowOff()
popDualIdentityMatrix() popDualIdentityMatrix()

View file

@ -227,6 +227,7 @@ public abstract class MuseRenderer {
GL11.glPushAttrib(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT); GL11.glPushAttrib(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
if (Minecraft.isFancyGraphicsEnabled()) { if (Minecraft.isFancyGraphicsEnabled()) {
GL11.glShadeModel(GL11.GL_SMOOTH); GL11.glShadeModel(GL11.GL_SMOOTH);
GL11.glDisable(GL11.GL_ALPHA_TEST);
// GL11.glEnable(GL11.GL_LINE_SMOOTH); // GL11.glEnable(GL11.GL_LINE_SMOOTH);
// GL11.glEnable(GL11.GL_POLYGON_SMOOTH); // GL11.glEnable(GL11.GL_POLYGON_SMOOTH);
GL11.glEnable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_BLEND);

View file

@ -7,7 +7,7 @@ import net.minecraft.client.renderer.{GLAllocation, RenderHelper, OpenGlHelper}
* Library for working with rendering. * Library for working with rendering.
* *
* (c) 2013 Byron Shelden * (c) 2013 Byron Shelden
* See COPYING for details * Edited by Claire Semple
*/ */
trait Render[A] { trait Render[A] {
def run(): A def run(): A
@ -109,7 +109,6 @@ object Render {
} }
a <- r a <- r
a <- GlowBuffer.draw(r) a <- GlowBuffer.draw(r)
_ <- Render { _ <- Render {
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, saved._1, saved._2) OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, saved._1, saved._2)
GL11.glPopAttrib() GL11.glPopAttrib()