Merge branch 'revert-698a7453' into 'master'

Revert "Merge branch '3-design-buttons-where-user-jumps-slides' into 'master'"

See merge request !3

core/src/tdt4240/netrunner/Netrunner.kt

 package tdt4240.netrunner
 
-import com.badlogic.gdx.Gdx
-import com.badlogic.gdx.InputMultiplexer
 import com.badlogic.gdx.Game
+import com.badlogic.gdx.Gdx
 import org.slf4j.LoggerFactory
 import com.badlogic.gdx.graphics.Texture
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import com.badlogic.gdx.math.Vector2
-import com.badlogic.gdx.scenes.scene2d.ui.Skin
-import com.badlogic.gdx.utils.ScreenUtils
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer
+import com.badlogic.gdx.scenes.scene2d.ui.Skin
 import com.badlogic.gdx.utils.viewport.ExtendViewport
 import com.badlogic.gdx.utils.viewport.Viewport
 import tdt4240.netrunner.game.Client
@@ -18,17 +15,15 @@ import tdt4240.netrunner.view.LoadingScreen
 import java.util.*
 
 class Netrunner : Game() {
+
     lateinit var skin: Skin
     lateinit var batch: SpriteBatch
-    private lateinit var img: Texture
-    private var position: Vector2 = Vector2(300f, 0f)
-    private var speed: Float = 10.0f
-    private lateinit var buttonUp: SimpleButton
-    private lateinit var buttonDown: SimpleButton
-    private var inputMultiplexer = InputMultiplexer()
     lateinit var shapeRenderer: ShapeRenderer
+
     lateinit var uiViewport: Viewport
     var characterTextures = mutableMapOf<PlayerColor, Texture>()
+    //private var position: Vector2 = Vector2(300f, 0f)
+    //private var speed: Float = 10.0f;
 
     override fun create() {
         val localProps = Gdx.files.internal("local-game.properties")
@@ -46,6 +41,7 @@ class Netrunner : Game() {
         batch = SpriteBatch()
         shapeRenderer = ShapeRenderer()
 
+
         skin = Skin(Gdx.files.internal("uiskin.json"))
 
         uiViewport = ExtendViewport(MIN_WIDTH, MIN_HEIGHT)
@@ -55,23 +51,6 @@ class Netrunner : Game() {
         for (color in PlayerColor.values()) {
             characterTextures[color] = Texture(Gdx.files.internal(color.graphic))
         }
-
-        Gdx.input.inputProcessor = inputMultiplexer
-        img = Texture("whiteball.png")
-        buttonUp = SimpleButton(inputMultiplexer, Texture("up.png"), 550f, 100f,60f,60f)
-        { moveUp() }
-        buttonDown = SimpleButton(inputMultiplexer, Texture("down.png"), 550f, 20f,60f,60f)
-        { moveDown() }
-    }
-
-    override fun render() {
-        ScreenUtils.clear(1f, 0f, 0f, 1f)
-        batch.begin()
-        batch.draw(img, position.x, position.y)
-        buttonUp.update(batch)
-        buttonDown.update(batch)
-
-        batch.end()
     }
 
     override fun dispose() {
@@ -84,12 +63,6 @@ class Netrunner : Game() {
             tex.value.dispose()
         }
     }
-    fun moveUp() {
-        position.y += speed
-    }
-    fun moveDown() {
-        position.y -= speed
-    }
 
     companion object {
         const val MIN_WIDTH = 720f;
@@ -97,4 +70,5 @@ class Netrunner : Game() {
 
         private val logger = LoggerFactory.getLogger(Netrunner::class.java)
     }
+
 }

core/src/tdt4240/netrunner/SimpleButton.kt

-package tdt4240.netrunner
-
-import com.badlogic.gdx.Gdx
-import com.badlogic.gdx.InputMultiplexer
-import com.badlogic.gdx.InputProcessor
-import com.badlogic.gdx.graphics.Texture
-import com.badlogic.gdx.graphics.g2d.Sprite
-import com.badlogic.gdx.graphics.g2d.SpriteBatch
-
-class SimpleButton(inputMultiplexer: InputMultiplexer, texture: Texture, x: Float, y: Float, width: Float, height: Float, callback: () -> Unit) : InputProcessor {
-
-    private var sprite = Sprite(texture)
-    private var callback = callback
-
-    init {
-        sprite.setPosition(x, y)
-        sprite.setSize(width, height)
-        inputMultiplexer.addProcessor(this)
-    }
-
-    public fun update(batch: SpriteBatch) {
-        sprite.draw(batch);
-    }
-
-    override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean {
-        val fixedScreenY = Gdx.graphics.height - screenY
-        println("$screenX,$screenY,$fixedScreenY")
-        if (screenX >= sprite.x && screenX <= sprite.x + sprite.width
-                && fixedScreenY >= sprite.y && fixedScreenY <= sprite.y + sprite.height) {
-            callback()
-            return true
-        }
-        return false
-    }
-
-    override fun touchUp(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean {
-        return false
-    }
-
-    override fun touchDragged(screenX: Int, screenY: Int, pointer: Int): Boolean {
-        return false
-    }
-
-    override fun keyDown(keycode: Int): Boolean {
-        return false
-    }
-
-    override fun keyUp(keycode: Int): Boolean {
-        return false
-    }
-
-    override fun keyTyped(character: Char): Boolean {
-        return false
-    }
-
-    override fun mouseMoved(screenX: Int, screenY: Int): Boolean {
-        return false
-    }
-
-    override fun scrolled(amountX: Float, amountY: Float): Boolean {
-        return false
-    }
-}
\ No newline at end of file