From ca52ec37a68fba67b2f34392be097f5cc2c320fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Fri, 27 Dec 2013 17:50:05 +0100
Subject: [PATCH] option for clients to select whether text on screens should
 be anti-aliased or not

---
 .../textures/font/chars_aliased.png              | Bin 0 -> 3155 bytes
 li/cil/oc/Settings.scala                         |   1 +
 .../client/renderer/MonospaceFontRenderer.scala  |   6 +++++-
 li/cil/oc/server/component/Computer.scala        |   4 ++--
 reference.conf                                   |   4 ++++
 5 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 assets/opencomputers/textures/font/chars_aliased.png

diff --git a/assets/opencomputers/textures/font/chars_aliased.png b/assets/opencomputers/textures/font/chars_aliased.png
new file mode 100644
index 0000000000000000000000000000000000000000..10574315b0d9bc934f7629beefe860d517263aa3
GIT binary patch
literal 3155
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

literal 0
HcmV?d00001

diff --git a/li/cil/oc/Settings.scala b/li/cil/oc/Settings.scala
index cbb2c0cbf..bd3072bc6 100644
--- a/li/cil/oc/Settings.scala
+++ b/li/cil/oc/Settings.scala
@@ -21,6 +21,7 @@ class Settings(config: Config) {
   val screenTextFadeStartDistance = config.getDouble("client.screenTextFadeStartDistance")
   val maxScreenTextRenderDistance = config.getDouble("client.maxScreenTextRenderDistance")
   val textLinearFiltering = config.getBoolean("client.textLinearFiltering")
+  val textAntiAlias = config.getBoolean("client.textAntiAlias")
   val rTreeDebugRenderer = false // *Not* to be configurable via config file.
 
   // ----------------------------------------------------------------------- //
diff --git a/li/cil/oc/client/renderer/MonospaceFontRenderer.scala b/li/cil/oc/client/renderer/MonospaceFontRenderer.scala
index fe04ea64e..32ad3448e 100644
--- a/li/cil/oc/client/renderer/MonospaceFontRenderer.scala
+++ b/li/cil/oc/client/renderer/MonospaceFontRenderer.scala
@@ -11,6 +11,7 @@ import scala.io.Source
 
 object MonospaceFontRenderer {
   val font = new ResourceLocation(Settings.resourceDomain, "textures/font/chars.png")
+  val fontAliased = new ResourceLocation(Settings.resourceDomain, "textures/font/chars_aliased.png")
 
   private val chars = Source.fromInputStream(MonospaceFontRenderer.getClass.getResourceAsStream("/assets/" + Settings.resourceDomain + "/textures/font/chars.txt"))("UTF-8").mkString
 
@@ -71,7 +72,10 @@ object MonospaceFontRenderer {
     def drawString(x: Int, y: Int, value: Array[Char], color: Array[Short], depth: PackedColor.Depth.Value) = {
       if (color.length != value.length) throw new IllegalArgumentException("Color count must match char count.")
 
-      textureManager.bindTexture(MonospaceFontRenderer.font)
+      if (Settings.get.textAntiAlias)
+        textureManager.bindTexture(MonospaceFontRenderer.font)
+      else
+        textureManager.bindTexture(MonospaceFontRenderer.fontAliased)
       GL11.glPushMatrix()
       GL11.glPushAttrib(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT | GL11.GL_TEXTURE_BIT)
       GL11.glTranslatef(x, y, 0)
diff --git a/li/cil/oc/server/component/Computer.scala b/li/cil/oc/server/component/Computer.scala
index 716836462..148335cf2 100644
--- a/li/cil/oc/server/component/Computer.scala
+++ b/li/cil/oc/server/component/Computer.scala
@@ -1351,7 +1351,7 @@ class Computer(val owner: tileentity.Computer) extends ManagedComponent with Con
     catch {
       case e: LuaRuntimeException =>
         OpenComputers.log.warning("Kernel crashed. This is a bug!\n" + e.toString + "\tat " + e.getLuaStackTrace.mkString("\n\tat "))
-        crash("kernel panic")
+        crash("kernel panic: this is a bug, check your log file and report it")
       case e: LuaGcMetamethodException =>
         if (e.getMessage != null) crash("kernel panic:\n" + e.getMessage)
         else crash("kernel panic:\nerror in garbage collection metamethod")
@@ -1361,7 +1361,7 @@ class Computer(val owner: tileentity.Computer) extends ManagedComponent with Con
         crash("not enough memory")
       case e: Throwable =>
         OpenComputers.log.log(Level.WARNING, "Unexpected error in kernel. This is a bug!\n", e)
-        crash("kernel panic")
+        crash("kernel panic: this is a bug, check your log file and report it")
     }
   }
 }
diff --git a/reference.conf b/reference.conf
index 957cda471..c3b173510 100644
--- a/reference.conf
+++ b/reference.conf
@@ -43,6 +43,10 @@ opencomputers {
       # anymore (for example for box drawing characters. Look it up on
       # Wikipedia.)
       textLinearFiltering: false
+
+      # If you prefer the text on the screens to be aliased (you know, *not*
+      # anti-aliased / smoothed) turn this option off.
+      textAntiAlias: true
   }
 
   # Computer related settings, concerns server performance and security.