curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-13 15:16:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

VT redraw on request

Browse Source 
Former-commit-id: 3ada71215d9291760704a982cc3952061dbc7afe
Former-commit-id: ca1495e668e88bc7214429472ad918621a650189
This commit is contained in:
Song Minjae
2017-01-24 00:50:12 +09:00
parent 92cc8ff94b
commit f46991ffbb
9 changed files with 189 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt
View File

@@ -2,9 +2,7 @@ package net.torvald.terrarum.virtualcomputer.terminal
import net.torvald.aa.AAFrame
import net.torvald.aa.ColouredFastFont
import net.torvald.terrarum.blendNormal
import net.torvald.terrarum.blendMul
import net.torvald.terrarum.blendScreen
import net.torvald.terrarum.*
import net.torvald.terrarum.gameactors.abs
import net.torvald.terrarum.virtualcomputer.computer.BaseTerrarumComputer
import org.lwjgl.BufferUtils
@@ -178,13 +176,11 @@ open class SimpleTextTerminal(
}
}
redrawSemaphore = false
}
// cursor
/*if (cursorBlinkOn) {
g.color = getColor(if (cursorBlink) foreDefault else backDefault)
if (cursorBlinkOn) {
g.color = getColor(if (cursorBlink) foreDefault else backDefault) screen colourScreen mul phosphor
g.fillRect(
fontW * cursorX.toFloat() + borderSize,
@@ -192,8 +188,40 @@ open class SimpleTextTerminal(
fontW.toFloat(),
fontH.toFloat()
)
}*/
}
else {
val x = cursorX
val y = cursorY
val ch = screenBuffer.getChar(x, y)
// background
g.color = getColor(screenBuffer.getBackgroundColour(x, y)) screen colourScreen mul phosphor
g.fillRect(fontW * x.toFloat() + borderSize, fontH * y.toFloat() + borderSize,
fontW.toFloat(), fontH.toFloat())
// foreground
if (ch.toInt() != 0 && ch.toInt() != 32) {
g.color = getColor(screenBuffer.getForegroundColour(x, y)) screen colourScreen mul phosphor
g.drawString(
Character.toString(ch),
fontW * x.toFloat() + borderSize, fontH * y.toFloat() + borderSize)
}
}
if (redrawSemaphore) {
// colour base
g.color = colourScreen
blendScreen()
g.fillRect(0f, 0f, fontW * width.toFloat() + 2 * borderSize, fontH * height.toFloat() + 2 * borderSize)
// colour overlay
g.color = phosphor
blendMul()
g.fillRect(0f, 0f, fontW * width.toFloat() + 2 * borderSize, fontH * height.toFloat() + 2 * borderSize)
redrawSemaphore = false
}
blendNormal()