From f8e6590b0ac31f7a5550d3a6db26bfea25ca34d7 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sat, 4 Dec 2021 16:05:21 +0900 Subject: [PATCH] another iforgot commit --- .../net/torvald/tsvm/peripheral/CharacterLCDdisplay.kt | 2 +- .../src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt | 10 ++++------ .../src/net/torvald/tsvm/peripheral/TexticsAdapter.kt | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tsvm_core/src/net/torvald/tsvm/peripheral/CharacterLCDdisplay.kt b/tsvm_core/src/net/torvald/tsvm/peripheral/CharacterLCDdisplay.kt index 12742cc..db64cab 100644 --- a/tsvm_core/src/net/torvald/tsvm/peripheral/CharacterLCDdisplay.kt +++ b/tsvm_core/src/net/torvald/tsvm/peripheral/CharacterLCDdisplay.kt @@ -7,7 +7,7 @@ import net.torvald.terrarum.modulecomputers.virtualcomputer.tvd.toUlong import net.torvald.tsvm.TsvmTextureRegionPack import net.torvald.tsvm.VM -class CharacterLCDdisplay(assetsRoot: String, vm: VM) : GraphicsAdapter(vm, AdapterConfig( +class CharacterLCDdisplay(assetsRoot: String, vm: VM) : GraphicsAdapter(assetsRoot, vm, AdapterConfig( "pmlcd_inverted", 240, 64, 40, 8, 253, 255, 262144L, "lcd2.png", 0.7f, TEXT_TILING_SHADER_LCD, DRAW_SHADER_FRAG_LCD, 2f ) ) { diff --git a/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt b/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt index 500e99e..5330ccc 100644 --- a/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt +++ b/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt @@ -40,13 +40,13 @@ data class SuperGraphicsAddonConfig( val hasSecondBank: Boolean = false ) -class ReferenceGraphicsAdapter(vm: VM) : GraphicsAdapter(vm, GraphicsAdapter.DEFAULT_CONFIG_COLOR_CRT) -class ReferenceLikeLCD(vm: VM) : GraphicsAdapter(vm, GraphicsAdapter.DEFAULT_CONFIG_PMLCD) +class ReferenceGraphicsAdapter(assetsRoot: String, vm: VM) : GraphicsAdapter(assetsRoot, vm, GraphicsAdapter.DEFAULT_CONFIG_COLOR_CRT) +class ReferenceLikeLCD(assetsRoot: String, vm: VM) : GraphicsAdapter(assetsRoot, vm, GraphicsAdapter.DEFAULT_CONFIG_PMLCD) /** * NOTE: if TTY size is greater than 80*32, SEGFAULT will occur because text buffer is fixed in size */ -open class GraphicsAdapter(val vm: VM, val config: AdapterConfig, val sgr: SuperGraphicsAddonConfig = SuperGraphicsAddonConfig()) : +open class GraphicsAdapter(private val assetsRoot: String, val vm: VM, val config: AdapterConfig, val sgr: SuperGraphicsAddonConfig = SuperGraphicsAddonConfig()) : GlassTty(config.textRows, config.textCols), PeriBase { override val typestring = VM.PERITYPE_GPU_AND_TERM @@ -71,7 +71,7 @@ open class GraphicsAdapter(val vm: VM, val config: AdapterConfig, val sgr: Super val channel = it % 4 rgba.shr((3 - channel) * 8).and(255) / 255f } - protected fun getOriginalChrrom() = Pixmap(Gdx2DPixmap(Gdx.files.internal("./assets/"+config.chrRomPath).read(), Gdx2DPixmap.GDX2D_FORMAT_ALPHA)) + protected fun getOriginalChrrom() = Pixmap(Gdx2DPixmap(Gdx.files.internal("$assetsRoot/"+config.chrRomPath).read(), Gdx2DPixmap.GDX2D_FORMAT_ALPHA)) protected var chrrom: Pixmap = getOriginalChrrom() protected var chrrom0 = Texture(1,1,Pixmap.Format.RGBA8888) protected val faketex: Texture @@ -909,8 +909,6 @@ open class GraphicsAdapter(val vm: VM, val config: AdapterConfig, val sgr: Super } - //private val testTex = Texture("./assets/pal.png"); - private fun blendNormal(batch: SpriteBatch) { Gdx.gl.glEnable(GL20.GL_TEXTURE_2D) Gdx.gl.glEnable(GL20.GL_BLEND) diff --git a/tsvm_core/src/net/torvald/tsvm/peripheral/TexticsAdapter.kt b/tsvm_core/src/net/torvald/tsvm/peripheral/TexticsAdapter.kt index 6c23d09..6825df5 100644 --- a/tsvm_core/src/net/torvald/tsvm/peripheral/TexticsAdapter.kt +++ b/tsvm_core/src/net/torvald/tsvm/peripheral/TexticsAdapter.kt @@ -8,7 +8,7 @@ import net.torvald.tsvm.VM import net.torvald.tsvm.kB import kotlin.math.absoluteValue -open class TexticsAdapterBase(assetsRoot: String, vm: VM, config: AdapterConfig) : GraphicsAdapter(vm, config) { +open class TexticsAdapterBase(assetsRoot: String, vm: VM, config: AdapterConfig) : GraphicsAdapter(assetsRoot, vm, config) { private val crtGradTex = Texture("$assetsRoot/crt_grad.png")