curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-03-11 21:51:50 +09:00
Code Issues Packages Projects Releases Wiki Activity

graphics: fixed bad screen fill command impl; added clearPixels cmd

Browse Source
This commit is contained in:
minjaesong
2021-04-27 14:02:38 +09:00
parent 62e115a32e
commit e031f0d256
4 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/tsvm/AppLoader.java
View File

@@ -38,7 +38,7 @@ public class AppLoader {
EmulInstance term = new EmulInstance(appConfig, vm, "net.torvald.tsvm.peripheral.TexticsAdapter", "assets/disk0");
EmulInstance portable = new EmulInstance(appConfig, vm, "net.torvald.tsvm.peripheral.CharacterLCDdisplay", "assets/disk0");
new LwjglApplication(new VMGUI(portable), appConfig);
new LwjglApplication(new VMGUI(reference), appConfig);
}
public static ShaderProgram loadShaderFromFile(String vert, String frag) {

5
src/net/torvald/tsvm/GraphicsJSR223Delegate.kt
View File

@@ -79,6 +79,11 @@ class GraphicsJSR223Delegate(val vm: VM) {
}
}
fun clearPixels(col: Int) {
getFirstGPU()?.poke(250884L, col.toByte())
getFirstGPU()?.poke(250883L, 2)
}
/**
* prints a char as-is; won't interpret them as an escape sequence
*/

14
src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt
View File

@@ -14,6 +14,7 @@ import net.torvald.tsvm.peripheral.GraphicsAdapter.Companion.DRAW_SHADER_FRAG
import java.io.InputStream
import java.io.OutputStream
import kotlin.experimental.and
import kotlin.math.roundToInt
data class AdapterConfig(
val theme: String,
@@ -262,12 +263,7 @@ open class GraphicsAdapter(val vm: VM, val config: AdapterConfig, val sgr: Super
}
}
2 -> {
framebuffer.setColor(
paletteOfFloats[arg1 * 4],
paletteOfFloats[arg1 * 4 + 1],
paletteOfFloats[arg1 * 4 + 2],
paletteOfFloats[arg1 * 4 + 3]
)
framebuffer.setColor(0f,0f,0f,arg1 / 255f)
framebuffer.fill()
}
}
@@ -767,9 +763,7 @@ open class GraphicsAdapter(val vm: VM, val config: AdapterConfig, val sgr: Super
}
private fun peekPalette(offset: Int): Byte {
if (offset == 255) return 0 // palette 255 is always transparent
// FIXME always return zero?
if (offset >= 255 * 2) return 0 // palette 255 is always transparent
val highvalue = paletteOfFloats[offset * 2] // R, B
val lowvalue = paletteOfFloats[offset * 2 + 1] // G, A
@@ -778,7 +772,7 @@ open class GraphicsAdapter(val vm: VM, val config: AdapterConfig, val sgr: Super
private fun pokePalette(offset: Int, byte: Byte) {
// palette 255 is always transparent
if (offset < 255) {
if (offset < 255 * 2) {
val highvalue = byte.toInt().and(0xF0).ushr(4) / 15f
val lowvalue = byte.toInt().and(0x0F) / 15f