AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-19 04:06:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added setting to control hologram flicker frequency.

Browse Source
This commit is contained in:
Florian Nücke 2014-06-09 21:05:49 +02:00
parent 9d430b1869
commit f288a02296
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/resources/reference.conf
View File

@ -66,6 +66,11 @@ opencomputers {
# hologram projector when at maximum scale. Render distance is scaled # hologram projector when at maximum scale. Render distance is scaled
# down with the actual scale of the hologram. # down with the actual scale of the hologram.
hologramRenderDistance: 64 hologramRenderDistance: 64
# This controls how often holograms 'flicker'. This is the chance that it
# flickers for *each frame*, meaning if you're running at high FPS you
# may want to lower this a bit, to avoid it flickering too much.
hologramFlickerFrequency: 0.025
} }
# Computer related settings, concerns server performance and security. # Computer related settings, concerns server performance and security.

1
src/main/scala/li/cil/oc/Settings.scala
View File

@ -32,6 +32,7 @@ class Settings(config: Config) {
val soundVolume = config.getDouble("client.soundVolume").toFloat max 0 min 2 val soundVolume = config.getDouble("client.soundVolume").toFloat max 0 min 2
val fontCharScale = config.getDouble("client.fontCharScale") max 0.5 min 2 val fontCharScale = config.getDouble("client.fontCharScale") max 0.5 min 2
val hologramRenderDistance = config.getDouble("client.hologramRenderDistance") max 0 val hologramRenderDistance = config.getDouble("client.hologramRenderDistance") max 0
val hologramFlickerFrequency = config.getDouble("client.hologramFlickerFrequency") max 0
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
// computer // computer

4
src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala
View File

@ -12,7 +12,7 @@ import net.minecraft.client.renderer.{GLAllocation, Tessellator}
import net.minecraft.tileentity.TileEntity import net.minecraft.tileentity.TileEntity
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import scala.util.Random import scala.util.Random
import org.lwjgl.input.Keyboard import li.cil.oc.Settings
object HologramRenderer extends TileEntitySpecialRenderer with Callable[Int] with RemovalListener[TileEntity, Int] with ITickHandler { object HologramRenderer extends TileEntitySpecialRenderer with Callable[Int] with RemovalListener[TileEntity, Int] with ITickHandler {
val random = new Random() val random = new Random()
@ -41,7 +41,7 @@ object HologramRenderer extends TileEntitySpecialRenderer with Callable[Int] wit
GL11.glTranslated(-1.5 * hologram.scale, 0, -1.5 * hologram.scale) GL11.glTranslated(-1.5 * hologram.scale, 0, -1.5 * hologram.scale)
// Do a bit of flickering, because that's what holograms do! // Do a bit of flickering, because that's what holograms do!
if (random.nextDouble() < 0.025) { if (Settings.get.hologramFlickerFrequency > 0 && random.nextDouble() < Settings.get.hologramFlickerFrequency) {
GL11.glScaled(1 + random.nextGaussian() * 0.01, 1 + random.nextGaussian() * 0.001, 1 + random.nextGaussian() * 0.01) GL11.glScaled(1 + random.nextGaussian() * 0.01, 1 + random.nextGaussian() * 0.001, 1 + random.nextGaussian() * 0.01)
GL11.glTranslated(random.nextGaussian() * 0.01, random.nextGaussian() * 0.01, random.nextGaussian() * 0.01) GL11.glTranslated(random.nextGaussian() * 0.01, random.nextGaussian() * 0.01, random.nextGaussian() * 0.01)
} }