Trivernis
/
gamejam-22
mirror of https://github.com/Trivernis/gamejam-22.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove noisy logs

Browse Source
main
Matthias 1 year ago
parent f768723d88
commit f6a7cfaafb
4 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File

2
assets/tiled/level_fruehling.tmx
Unescape Escape View File

@ -497,7 +497,7 @@
<point/> <point/>
</object> </object>
</objectgroup> </objectgroup>
<objectgroup id="12" name="SFX" visible="0"> <objectgroup id="12" name="SFX">
<object id="6" x="1536" y="3008" width="384" height="704"> <object id="6" x="1536" y="3008" width="384" height="704">
<properties> <properties>
<property name="ground" value="indoor"/> <property name="ground" value="indoor"/>

9
core/src/main/kotlin/com/last/commit/audio/SoundEngine.kt
Unescape Escape View File

@ -7,17 +7,16 @@ import com.badlogic.gdx.audio.Sound
public class SoundEngine { public class SoundEngine {
private val sounds: ThreadLocal<HashMap<String, Sound>> = private val sounds: ThreadLocal<HashMap<String, Sound>> =
ThreadLocal.withInitial() { HashMap() } ThreadLocal.withInitial() { HashMap() }
private val musicTracks: ThreadLocal<HashMap<String, Music>> = private val musicTracks: ThreadLocal<HashMap<String, Music>> =
ThreadLocal.withInitial() { HashMap() } ThreadLocal.withInitial() { HashMap() }
lateinit var backgroundMusic : Music lateinit var backgroundMusic: Music
fun play(gameSound: GameSound, volume: Float = 1f) { fun play(gameSound: GameSound, volume: Float = 1f) {
if (gameSound is GameSoundEffect) { if (gameSound is GameSoundEffect) {
val sound = loadEffect(gameSound.name) val sound = loadEffect(gameSound.name)
sound.play(volume) sound.play(volume)
println("Playing sound ${gameSound.name}")
} else if (gameSound is GameMusic) { } else if (gameSound is GameMusic) {
backgroundMusic = loadMusic(gameSound.name) backgroundMusic = loadMusic(gameSound.name)
backgroundMusic.volume = volume backgroundMusic.volume = volume
@ -30,7 +29,7 @@ public class SoundEngine {
backgroundMusic.pause() backgroundMusic.pause()
} }
fun resume() { fun resume() {
backgroundMusic.play() backgroundMusic.play()
} }

15
core/src/main/kotlin/com/last/commit/map/TimeMap.kt
Unescape Escape View File

@ -1,23 +1,19 @@
package com.last.commit.map package com.last.commit.map
import GameState
import com.badlogic.gdx.Gdx import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.OrthographicCamera import com.badlogic.gdx.graphics.OrthographicCamera
import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.badlogic.gdx.maps.objects.RectangleMapObject
import com.badlogic.gdx.maps.tiled.TiledMap import com.badlogic.gdx.maps.tiled.TiledMap
import com.badlogic.gdx.maps.tiled.TiledMapTileLayer
import com.badlogic.gdx.maps.tiled.TmxMapLoader import com.badlogic.gdx.maps.tiled.TmxMapLoader
import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer
import com.badlogic.gdx.math.Rectangle import com.badlogic.gdx.math.Rectangle
import com.badlogic.gdx.math.Vector2 import com.badlogic.gdx.math.Vector2
import com.badlogic.gdx.utils.Array
import com.badlogic.gdx.scenes.scene2d.ui.Image import com.badlogic.gdx.scenes.scene2d.ui.Image
import com.last.commit.Collidable import com.last.commit.Collidable
import com.last.commit.Player import com.last.commit.Player
import com.last.commit.Wall
import com.last.commit.audio.GameSoundEffect import com.last.commit.audio.GameSoundEffect
import com.last.commit.inventory.InventoryItemTextureLoader import com.last.commit.inventory.InventoryItemTextureLoader
import GameState
class TimeMap(fileName: String, val state: GameState) { class TimeMap(fileName: String, val state: GameState) {
@ -33,7 +29,7 @@ class TimeMap(fileName: String, val state: GameState) {
val gridWidth: Int val gridWidth: Int
get() = mapState.gridSize.x.toInt() get() = mapState.gridSize.x.toInt()
val gridHeight: Int val gridHeight: Int
get() = mapState.gridSize.y.toInt() get() = mapState.gridSize.y.toInt()
val width: Int val width: Int
@ -56,12 +52,12 @@ class TimeMap(fileName: String, val state: GameState) {
mapRenderer = OrthogonalTiledMapRenderer(map) mapRenderer = OrthogonalTiledMapRenderer(map)
this.textureLoader.parse() this.textureLoader.parse()
} }
fun teleport(player: Player) { fun teleport(player: Player) {
val teleporter = mapState.teleporters.find { val teleporter = mapState.teleporters.find {
it.rectangle.contains(player.getX(), player.getY()) it.rectangle.contains(player.getX(), player.getY())
} }
if (teleporter != null) { if (teleporter != null) {
state.soundEngine.play(GameSoundEffect.TIME_TRAVEL) state.soundEngine.play(GameSoundEffect.TIME_TRAVEL)
val targetMap = teleporter.properties.get("target", String::class.java) val targetMap = teleporter.properties.get("target", String::class.java)
@ -120,7 +116,6 @@ class TimeMap(fileName: String, val state: GameState) {
fun interactWith(x: Float, y: Float, blockingCollider: Rectangle) { fun interactWith(x: Float, y: Float, blockingCollider: Rectangle) {
val gridX = x.toInt() / CELL_SIZE val gridX = x.toInt() / CELL_SIZE
val gridY = y.toInt() / CELL_SIZE val gridY = y.toInt() / CELL_SIZE
println("Interacting with element at $gridX:$gridY")
//if no door is found return //if no door is found return
val interactable: Interactable = this.findInteractableAtPosition(gridX, gridY) ?: return val interactable: Interactable = this.findInteractableAtPosition(gridX, gridY) ?: return
@ -141,7 +136,7 @@ class TimeMap(fileName: String, val state: GameState) {
fun render(batch: SpriteBatch, camera: OrthographicCamera, delta: Float) { fun render(batch: SpriteBatch, camera: OrthographicCamera, delta: Float) {
mapRenderer.setView(camera) mapRenderer.setView(camera)
mapRenderer.render() mapRenderer.render()
this.mapState.collectibles.forEach { coll -> this.mapState.collectibles.forEach { coll ->
val image = Image(textureLoader.getTexture(coll.name)) val image = Image(textureLoader.getTexture(coll.name))
image.x = coll.pos.x + this.getTileWidth() * 0.1f image.x = coll.pos.x + this.getTileWidth() * 0.1f
image.y = coll.pos.y + this.getTileHeight() * 0.1f image.y = coll.pos.y + this.getTileHeight() * 0.1f

50
core/src/main/kotlin/com/last/commit/screen/FirstScreen.kt
Unescape Escape View File

@ -1,7 +1,6 @@
package com.last.commit.screen package com.last.commit.screen
import com.badlogic.gdx.Gdx import com.badlogic.gdx.Gdx
import com.badlogic.gdx.Input
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.GL20 import com.badlogic.gdx.graphics.GL20
import com.badlogic.gdx.graphics.OrthographicCamera import com.badlogic.gdx.graphics.OrthographicCamera
@ -65,18 +64,20 @@ class FirstScreen(private val parent: Game) : TimeTravelScreen() {
gameState.soundEngine.play(GameMusic.WORLD_MUSIC, 0.25f) gameState.soundEngine.play(GameMusic.WORLD_MUSIC, 0.25f)
} }
override fun handleKeyInput(action: ActionCommand) { override fun handleKeyInput(action: ActionCommand) {
if (!pause) { if (!pause) {
when (action) { when (action) {
ActionCommand.INTERACT -> { ActionCommand.INTERACT -> {
openDoor() openDoor()
} }
ActionCommand.TIME_TRAVEL -> { ActionCommand.TIME_TRAVEL -> {
map.teleport(player) map.teleport(player)
} }
else -> {} else -> {}
} }
println(action)
if (action == ActionCommand.OPEN_MENU) { if (action == ActionCommand.OPEN_MENU) {
//Gdx.app.exit() //Gdx.app.exit()
parent.changeScreen(Screens.MAIN_MENU) parent.changeScreen(Screens.MAIN_MENU)
@ -89,10 +90,8 @@ class FirstScreen(private val parent: Game) : TimeTravelScreen() {
if (!pause) { if (!pause) {
val mouseCoordinates: Vector2 = toWorldCoordinates(screenX.toFloat(), screenY.toFloat()) val mouseCoordinates: Vector2 = toWorldCoordinates(screenX.toFloat(), screenY.toFloat())
println("Mouse World coordinates is ${mouseCoordinates.x}:${mouseCoordinates.y}")
val playerDirection: Vector2 = player.getAbsoluteDirection() val playerDirection: Vector2 = player.getAbsoluteDirection()
println("Player interactor is ${playerDirection.x}:${playerDirection.y}")
map.interactWith(playerDirection.x, playerDirection.y, player.getCollider()) map.interactWith(playerDirection.x, playerDirection.y, player.getCollider())
} }
} }
@ -140,10 +139,10 @@ class FirstScreen(private val parent: Game) : TimeTravelScreen() {
shapeRenderer.begin(ShapeRenderer.ShapeType.Filled) shapeRenderer.begin(ShapeRenderer.ShapeType.Filled)
for (interactable in interactables) { for (interactable in interactables) {
shapeRenderer.rect( shapeRenderer.rect(
interactable.getCollider().x, interactable.getCollider().x,
interactable.getCollider().y, interactable.getCollider().y,
interactable.getCollider().width, interactable.getCollider().width,
interactable.getCollider().height interactable.getCollider().height
) )
} }
shapeRenderer.end() shapeRenderer.end()
@ -152,7 +151,7 @@ class FirstScreen(private val parent: Game) : TimeTravelScreen() {
private fun getMousePosition(): Vector2 { private fun getMousePosition(): Vector2 {
val unprojectedMousePosition = val unprojectedMousePosition =
camera.unproject(Vector3(Gdx.input.x.toFloat(), Gdx.input.y.toFloat(), 0f)) camera.unproject(Vector3(Gdx.input.x.toFloat(), Gdx.input.y.toFloat(), 0f))
return Vector2(unprojectedMousePosition.x, unprojectedMousePosition.y) return Vector2(unprojectedMousePosition.x, unprojectedMousePosition.y)
} }
@ -165,7 +164,7 @@ class FirstScreen(private val parent: Game) : TimeTravelScreen() {
this.player.setPosition(playerX, playerY) this.player.setPosition(playerX, playerY)
} }
private fun handleInput(delta : Float) { private fun handleInput(delta: Float) {
val horizontalMovement = Vector2() val horizontalMovement = Vector2()
if (isKeyPressed(gameState.settings.getKeyCode(ActionCommand.LEFT))) { if (isKeyPressed(gameState.settings.getKeyCode(ActionCommand.LEFT))) {
horizontalMovement.sub(Vector2.X) horizontalMovement.sub(Vector2.X)
@ -199,7 +198,7 @@ class FirstScreen(private val parent: Game) : TimeTravelScreen() {
} }
} }
private fun isKeyPressed(keyCodes: List<Int>): Boolean{ private fun isKeyPressed(keyCodes: List<Int>): Boolean {
for (key in keyCodes) { for (key in keyCodes) {
if (Gdx.input.isKeyPressed(key)) { if (Gdx.input.isKeyPressed(key)) {
return true return true
@ -229,20 +228,20 @@ class FirstScreen(private val parent: Game) : TimeTravelScreen() {
val mapHeight: Int = map.height val mapHeight: Int = map.height
cX = if (playerXPosition < halfScreenWidth) { cX = if (playerXPosition < halfScreenWidth) {
halfScreenWidth halfScreenWidth
} else if (playerXPosition > mapWidth - halfScreenWidth) { } else if (playerXPosition > mapWidth - halfScreenWidth) {
mapWidth - halfScreenWidth mapWidth - halfScreenWidth
} else { } else {
playerXPosition playerXPosition
} }
cY = if (playerYPosition < halfScreenHeight) { cY = if (playerYPosition < halfScreenHeight) {
halfScreenHeight halfScreenHeight
} else if (playerYPosition > mapHeight - halfScreenHeight) { } else if (playerYPosition > mapHeight - halfScreenHeight) {
mapHeight - halfScreenHeight mapHeight - halfScreenHeight
} else { } else {
playerYPosition playerYPosition
} }
camera.position[cX, cY] = 0f camera.position[cX, cY] = 0f
camera.update() camera.update()
@ -295,15 +294,14 @@ class FirstScreen(private val parent: Game) : TimeTravelScreen() {
fun openDoor() { fun openDoor() {
println("Attempt to toggle door") println("Attempt to toggle door")
val playerDirection: Vector2 = player.getAbsoluteDirection() val playerDirection: Vector2 = player.getAbsoluteDirection()
println("Player interactor is ${playerDirection.x}:${playerDirection.y}")
map.interactWith(playerDirection.x, playerDirection.y, player.getCollider()) map.interactWith(playerDirection.x, playerDirection.y, player.getCollider())
} }
fun toWorldCoordinates(x: Float, y: Float): Vector2 { fun toWorldCoordinates(x: Float, y: Float): Vector2 {
val mouseInWorldPosition = camera.unproject(Vector3(x, y, 0f)) val mouseInWorldPosition = camera.unproject(Vector3(x, y, 0f))
return Vector2( return Vector2(
floor(mouseInWorldPosition.x.toDouble() / this.map.getTileWidth()).toFloat(), floor(mouseInWorldPosition.x.toDouble() / this.map.getTileWidth()).toFloat(),
floor(mouseInWorldPosition.y.toDouble() / this.map.getTileHeight()).toFloat() floor(mouseInWorldPosition.y.toDouble() / this.map.getTileHeight()).toFloat()
) )
} }

Write Preview
Loading…
Cancel
Save