curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-09 18:14:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

generalised things so that they would work outside of ingame.world; title screen wip

Browse Source
This commit is contained in:
minjaesong
2017-07-21 19:59:51 +09:00
parent cb8d3fd8b9
commit f1391bea6f
68 changed files with 1141 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/virtualcomputer/peripheral/PeripheralVideoCard.kt
View File

@@ -155,7 +155,7 @@ import org.luaj.vm2.lib.*
private val spriteBuffer = ImageBuffer(VSprite.width * 2, VSprite.height)
fun render(g: Graphics) {
cursorBlinkTimer += Gdx.graphics.deltaTime
cursorBlinkTimer += Terrarum.deltaTime
if (cursorBlinkTimer > cursorBlinkTime) {
cursorBlinkTimer -= cursorBlinkTime
cursorBlinkOn = !cursorBlinkOn

3
src/net/torvald/terrarum/virtualcomputer/worldobject/FixtureBasicTerminal.kt
View File

@@ -3,6 +3,7 @@ package net.torvald.terrarum.virtualcomputer.worldobject
import com.badlogic.gdx.graphics.Color
import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.gameactors.FixtureBase
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.virtualcomputer.computer.TerrarumComputer
import net.torvald.terrarum.virtualcomputer.terminal.Terminal
import net.torvald.terrarum.virtualcomputer.worldobject.ui.UITextTerminal
@@ -11,7 +12,7 @@ import java.util.*
/**
* Created by minjaesong on 16-09-08.
*/
class FixtureBasicTerminal(phosphor: Color) : FixtureBase() {
class FixtureBasicTerminal(world: GameWorld, phosphor: Color) : FixtureBase(world) {
/*val computer = TerrarumComputer(8)
val vt: Terminal = SimpleTextTerminal(phosphor, 80, 25, computer)

3
src/net/torvald/terrarum/virtualcomputer/worldobject/FixtureComputerBase.kt
View File

@@ -1,6 +1,7 @@
package net.torvald.terrarum.virtualcomputer.worldobject
import net.torvald.terrarum.gameactors.FixtureBase
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.virtualcomputer.computer.TerrarumComputer
import net.torvald.terrarum.virtualcomputer.terminal.Terminal
import java.io.PrintStream
@@ -10,7 +11,7 @@ import java.util.*
/**
* Created by minjaesong on 16-09-08.
*/
open class FixtureComputerBase() : FixtureBase() {
open class FixtureComputerBase(world: GameWorld) : FixtureBase(world) {
/** Connected terminal */
var terminal: FixtureBasicTerminal? = null

13
src/net/torvald/terrarum/virtualcomputer/worldobject/ui/UITextTerminal.kt
View File

@@ -15,12 +15,7 @@ class UITextTerminal(val terminal: Terminal) : UICanvas() {
override var width: Int = terminal.displayW// + some
override var height: Int = terminal.displayH// + frame
/**
* Usage: (in StateInGame:) uiHandlerField.ui.handler = uiHandlerField
*/
override var handler: UIHandler? = null
/**
* In milliseconds
@@ -38,25 +33,25 @@ class UITextTerminal(val terminal: Terminal) : UICanvas() {
}
/**
* Do not modify handler!!.openCloseCounter here.
* Do not modify handler.openCloseCounter here.
*/
override fun doOpening(delta: Float) {
}
/**
* Do not modify handler!!.openCloseCounter here.
* Do not modify handler.openCloseCounter here.
*/
override fun doClosing(delta: Float) {
}
/**
* Do not modify handler!!.openCloseCounter here.
* Do not modify handler.openCloseCounter here.
*/
override fun endOpening(delta: Float) {
}
/**
* Do not modify handler!!.openCloseCounter here.
* Do not modify handler.openCloseCounter here.
*/
override fun endClosing(delta: Float) {
}