From a190e37f595f844704872864e180fbecfc7ded2c Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 5 Dec 2021 10:19:43 +0900 Subject: [PATCH] internalising more global functions --- TerranBASICexecutable/src/net/torvald/tsvm/VMGUI.kt | 4 ++-- tsvm_core/src/net/torvald/tsvm/VM.kt | 2 +- .../src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TerranBASICexecutable/src/net/torvald/tsvm/VMGUI.kt b/TerranBASICexecutable/src/net/torvald/tsvm/VMGUI.kt index 4564d97..5018753 100644 --- a/TerranBASICexecutable/src/net/torvald/tsvm/VMGUI.kt +++ b/TerranBASICexecutable/src/net/torvald/tsvm/VMGUI.kt @@ -67,8 +67,8 @@ class VMGUI(val loaderInfo: EmulInstance, val viewportWidth: Int, val viewportHe private fun init() { if (loaderInfo.display != null) { val loadedClass = Class.forName(loaderInfo.display) - val loadedClassConstructor = loadedClass.getConstructor(vm::class.java) - val loadedClassInstance = loadedClassConstructor.newInstance(vm) + val loadedClassConstructor = loadedClass.getConstructor(String::class.java, vm::class.java) + val loadedClassInstance = loadedClassConstructor.newInstance("./assets", vm) gpu = (loadedClassInstance as GraphicsAdapter) vm.getIO().blockTransferPorts[0].attachDevice(TestDiskDrive(vm, 0, File(loaderInfo.diskPath))) diff --git a/tsvm_core/src/net/torvald/tsvm/VM.kt b/tsvm_core/src/net/torvald/tsvm/VM.kt index 3d03b3c..f86ce39 100644 --- a/tsvm_core/src/net/torvald/tsvm/VM.kt +++ b/tsvm_core/src/net/torvald/tsvm/VM.kt @@ -212,4 +212,4 @@ class PeripheralEntry2( vararg val args: Any ) -fun Int.kB() = this * 1024L +internal fun Int.kB() = this * 1024L diff --git a/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt b/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt index 5330ccc..58de29f 100644 --- a/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt +++ b/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt @@ -1748,17 +1748,17 @@ void main() { } } -infix fun Int.fmod(other: Int): Int { +internal infix fun Int.fmod(other: Int): Int { return Math.floorMod(this, other) } -fun FrameBuffer.inUse(action: () -> Unit) { +internal fun FrameBuffer.inUse(action: () -> Unit) { this.begin() action() this.end() } -fun SpriteBatch.inUse(action: () -> Unit) { +internal fun SpriteBatch.inUse(action: () -> Unit) { this.begin() action() this.end()