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

Updated FreeBSD native library.

Browse Source
This commit is contained in:
Florian Nücke 2014-06-12 00:24:17 +02:00
parent 149ade42ff
commit 78b40a57dd
3 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/main/resources/assets/opencomputers/lib/native.32.bsd.so
View File

Binary file not shown.

BIN
src/main/resources/assets/opencomputers/lib/native.64.bsd.so
View File

Binary file not shown.

52
src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala
View File

@ -31,35 +31,41 @@ object TextBufferRenderCache extends Callable[Int] with RemovalListener[TileEnti
compileOrDraw(cache.get(currentBuffer, this)) compileOrDraw(cache.get(currentBuffer, this))
} }
private def compileOrDraw(list: Int) = if (currentBuffer.proxy.dirty) { private def compileOrDraw(list: Int) = {
RenderState.checkError(getClass.getName + ".compileOrDraw: entering (aka: wasntme)") if (currentBuffer.proxy.dirty) {
RenderState.checkError(getClass.getName + ".compileOrDraw: entering (aka: wasntme)")
val doCompile = !RenderState.compilingDisplayList val doCompile = !RenderState.compilingDisplayList
if (doCompile) { if (doCompile) {
currentBuffer.proxy.dirty = false currentBuffer.proxy.dirty = false
GL11.glNewList(list, GL11.GL_COMPILE_AND_EXECUTE) GL11.glNewList(list, GL11.GL_COMPILE_AND_EXECUTE)
RenderState.checkError(getClass.getName + ".compileOrDraw: glNewList") RenderState.checkError(getClass.getName + ".compileOrDraw: glNewList")
}
for (((line, color), i) <- currentBuffer.data.buffer.zip(currentBuffer.data.color).zipWithIndex) {
MonospaceFontRenderer.drawString(0, i * MonospaceFontRenderer.fontHeight, line, color, currentBuffer.data.format)
}
RenderState.checkError(getClass.getName + ".compileOrDraw: drawString")
if (doCompile) {
GL11.glEndList()
RenderState.checkError(getClass.getName + ".compileOrDraw: glEndList")
}
RenderState.checkError(getClass.getName + ".compileOrDraw: leaving")
true
} }
else {
GL11.glCallList(list)
for (((line, color), i) <- currentBuffer.data.buffer.zip(currentBuffer.data.color).zipWithIndex) { RenderState.checkError(getClass.getName + ".compileOrDraw: glCallList")
MonospaceFontRenderer.drawString(0, i * MonospaceFontRenderer.fontHeight, line, color, currentBuffer.data.format)
} }
RenderState.checkError(getClass.getName + ".compileOrDraw: drawString")
if (doCompile) {
GL11.glEndList()
RenderState.checkError(getClass.getName + ".compileOrDraw: glEndList")
}
RenderState.checkError(getClass.getName + ".compileOrDraw: leaving")
true
} }
else GL11.glCallList(list)
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
// Cache // Cache