From 1cf3d78eacd10217b0ef95bd51dd8e6c973f67d5 Mon Sep 17 00:00:00 2001
From: SquidDev <bonzoweb@hotmail.co.uk>
Date: Mon, 10 Jul 2017 22:20:07 +0100
Subject: [PATCH] Fix texture artifacts when rendering monitors

 - Adds a 1px margin around every glyph. This is generally empty,
   with the exception of teletext characters where it continues their
   pattern.
 - Uses GL_CLAMP with the font texture.

Closes #300
---
 .../client/gui/FixedWidthFontRenderer.java    |  25 ++++++++++++------
 .../render/TileEntityMonitorRenderer.java     |   4 +--
 .../computercraft/textures/gui/term_font.png  | Bin 2910 -> 3809 bytes
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java b/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java
index a44bc2962..4cf7fd716 100644
--- a/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java
+++ b/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 
 public class FixedWidthFontRenderer
 {
-    public static ResourceLocation font = new ResourceLocation( "computercraft", "textures/gui/term_font.png" );
+    private static ResourceLocation font = new ResourceLocation( "computercraft", "textures/gui/term_font.png" );
     public static ResourceLocation background = new ResourceLocation( "computercraft", "textures/gui/term_background.png" );
 
     public static int FONT_HEIGHT = 9;
@@ -52,12 +52,15 @@ public class FixedWidthFontRenderer
         float g = (float)colour[1];
         float b = (float)colour[2];
 
-        renderer.pos( x, y, 0.0 ).tex( (double) (column * FONT_WIDTH) / 256.0, (double) (row * FONT_HEIGHT ) / 256.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x, y + FONT_HEIGHT, 0.0 ).tex( (double) (column * FONT_WIDTH) / 256.0, (double) ((row + 1) * FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x + FONT_WIDTH, y, 0.0 ).tex( (double) ((column + 1) * FONT_WIDTH) / 256.0, (double) (row * FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x + FONT_WIDTH, y, 0.0 ).tex( (double) ((column + 1) * FONT_WIDTH) / 256.0, (double) (row * FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x, y + FONT_HEIGHT, 0.0 ).tex( (double) (column * FONT_WIDTH) / 256.0, (double) ((row + 1) * FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x + FONT_WIDTH, y + FONT_HEIGHT, 0.0 ).tex( (double) ((column + 1) * FONT_WIDTH) / 256.0, (double) ((row + 1) * FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).endVertex();
+        int xStart = 1 + column * (FONT_WIDTH + 2);
+        int yStart = 1 + row * (FONT_HEIGHT + 2);
+
+        renderer.pos( x, y, 0.0 ).tex( xStart / 256.0, yStart / 256.0 ).color( r, g, b, 1.0f ).endVertex();
+        renderer.pos( x, y + FONT_HEIGHT, 0.0 ).tex( xStart / 256.0, (yStart + FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).endVertex();
+        renderer.pos( x + FONT_WIDTH, y, 0.0 ).tex( (xStart + FONT_WIDTH) / 256.0, yStart / 256.0 ).color( r, g, b, 1.0f ).endVertex();
+        renderer.pos( x + FONT_WIDTH, y, 0.0 ).tex( (xStart + FONT_WIDTH) / 256.0, yStart / 256.0 ).color( r, g, b, 1.0f ).endVertex();
+        renderer.pos( x, y + FONT_HEIGHT, 0.0 ).tex( xStart / 256.0, (yStart + FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).endVertex();
+        renderer.pos( x + FONT_WIDTH, y + FONT_HEIGHT, 0.0 ).tex( (xStart + FONT_WIDTH) / 256.0, (yStart + FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).endVertex();
     }
 
     private void drawQuad( VertexBuffer renderer, double x, double y, int color, double width, Palette p, boolean greyscale )
@@ -164,7 +167,7 @@ public class FixedWidthFontRenderer
         if( s != null && textColour != null )
         {
             // Bind the font texture
-            m_textureManager.bindTexture( font );
+            bindFont();
             
             // Draw the quads
             drawStringTextPart( x, y, s, textColour, greyScale, p );
@@ -179,4 +182,10 @@ public class FixedWidthFontRenderer
         }
         return s.length() * FONT_WIDTH;
     }
+
+    public void bindFont()
+    {
+        m_textureManager.bindTexture( font );
+        GlStateManager.glTexParameteri( GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP );
+    }
 }
diff --git a/src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java b/src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java
index 11411664b..0a77d0db5 100644
--- a/src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java
@@ -179,7 +179,7 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
                         GlStateManager.callList( origin.m_renderDisplayList );
 
                         // Draw text
-                        mc.getTextureManager().bindTexture( FixedWidthFontRenderer.font );
+                        fontRenderer.bindFont();
                         if( redraw )
                         {
                             // Build text display list
@@ -206,7 +206,7 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
                         GlStateManager.callList( origin.m_renderDisplayList + 1 );
 
                         // Draw cursor
-                        mc.getTextureManager().bindTexture( FixedWidthFontRenderer.font );
+                        fontRenderer.bindFont();
                         if( redraw )
                         {
                             // Build cursor display list
diff --git a/src/main/resources/assets/computercraft/textures/gui/term_font.png b/src/main/resources/assets/computercraft/textures/gui/term_font.png
index 9de0691898f3578ec66ede11ac32c6ecc2186257..4620fbe11a6883e164ecd2215cf666b92d901817 100644
GIT binary patch
literal 3809
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

delta 2805
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
Hu0mjf7}<i`