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

LibGDX, here I am.

Browse Source
This commit is contained in:
minjaesong
2017-06-22 02:31:07 +09:00
parent 1ecbc57f83
commit ad481853bb
356 changed files with 3125 additions and 21138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,11 @@
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.virtualcomputer.computer.TerrarumComputer
import net.torvald.terrarum.virtualcomputer.terminal.SimpleTextTerminal
import net.torvald.terrarum.virtualcomputer.terminal.Terminal
import net.torvald.terrarum.virtualcomputer.worldobject.ui.UITextTerminal
import org.newdawn.slick.Color
import java.util.*
/**
@@ -14,7 +13,7 @@ import java.util.*
*/
class FixtureBasicTerminal(phosphor: Color) : FixtureBase() {
val computer = TerrarumComputer(8)
/*val computer = TerrarumComputer(8)
val vt: Terminal = SimpleTextTerminal(phosphor, 80, 25, computer)
val ui = UITextTerminal(vt)
@@ -24,6 +23,6 @@ class FixtureBasicTerminal(phosphor: Color) : FixtureBase() {
collisionFlag = COLLISION_PLATFORM
actorValue[AVKey.UUID] = UUID.randomUUID().toString()
}
}*/
}

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

@@ -2,9 +2,7 @@ package net.torvald.terrarum.virtualcomputer.worldobject
import net.torvald.terrarum.gameactors.FixtureBase
import net.torvald.terrarum.virtualcomputer.computer.TerrarumComputer
import net.torvald.terrarum.virtualcomputer.terminal.SimpleTextTerminal
import net.torvald.terrarum.virtualcomputer.terminal.Terminal
import org.newdawn.slick.GameContainer
import java.io.PrintStream
import java.security.SecureRandom
import java.util.*
@@ -52,15 +50,15 @@ open class FixtureComputerBase() : FixtureBase() {
// game codes //
////////////////
override fun update(gc: GameContainer, delta: Int) {
super.update(gc, delta)
if (terminal != null) terminal!!.update(gc, delta)
override fun update(delta: Float) {
super.update(delta)
if (terminal != null) terminal!!.update(delta)
}
fun keyPressed(key: Int, c: Char) {
if (terminal != null) {
/*if (terminal != null) {
terminal!!.vt.keyPressed(key, c)
computerInside!!.keyPressed(key, c)
}
}*/
}
}

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

@@ -1,13 +1,10 @@
package net.torvald.terrarum.virtualcomputer.worldobject.ui
import net.torvald.terrarum.Millisec
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.gameactors.Second
import net.torvald.terrarum.ui.*
import net.torvald.terrarum.ui.UICanvas.Companion.OPENCLOSE_GENERIC
import net.torvald.terrarum.virtualcomputer.terminal.Terminal
import org.newdawn.slick.GameContainer
import org.newdawn.slick.Graphics
import org.newdawn.slick.Image
import org.newdawn.slick.Input
/**
* Created by minjaesong on 16-09-08.
@@ -37,7 +34,6 @@ class UITextTerminal(val terminal: Terminal) : UICanvas, KeyControlled, MouseCon
override var width: Int = terminal.displayW// + some
override var height: Int = terminal.displayH// + frame
private var terminalDisplay = Image(terminal.displayW, terminal.displayH)
override fun mousePressed(button: Int, x: Int, y: Int) {
// monitor on/off, reset switch
@@ -59,40 +55,40 @@ class UITextTerminal(val terminal: Terminal) : UICanvas, KeyControlled, MouseCon
*
* Timer itself is implemented in the handler.
*/
override var openCloseTime: Millisec = OPENCLOSE_GENERIC
override var openCloseTime: Second = OPENCLOSE_GENERIC
override fun update(gc: GameContainer, delta: Int) {
terminal.update(gc, delta)
override fun update(delta: Float) {
terminal.update(delta)
}
override fun render(gc: GameContainer, g: Graphics) {
terminal.render(gc, terminalDisplay.graphics)
override fun render(batch: SpriteBatch) {
//terminal.render(gc, terminalDisplay.graphics)
}
override fun processInput(gc: GameContainer, delta: Int, input: Input) {
override fun processInput(delta: Float) {
}
/**
* Do not modify handler!!.openCloseCounter here.
*/
override fun doOpening(gc: GameContainer, delta: Int) {
override fun doOpening(delta: Float) {
}
/**
* Do not modify handler!!.openCloseCounter here.
*/
override fun doClosing(gc: GameContainer, delta: Int) {
override fun doClosing(delta: Float) {
}
/**
* Do not modify handler!!.openCloseCounter here.
*/
override fun endOpening(gc: GameContainer, delta: Int) {
override fun endOpening(delta: Float) {
}
/**
* Do not modify handler!!.openCloseCounter here.
*/
override fun endClosing(gc: GameContainer, delta: Int) {
override fun endClosing(delta: Float) {
}
}