curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 20:31:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

changed how camera smoothing works but not sure it doing what I intended

Browse Source
This commit is contained in:
minjaesong
2021-10-15 10:34:41 +09:00
parent 51fe1028e9
commit bc009a4b8d
4 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/net/torvald/terrarum/gameactors/Hitbox.kt
View File

@@ -44,21 +44,27 @@ class Hitbox {
get() = hitboxStart.x
val startY: Double
get() = hitboxStart.y
val startVec: Vector2
get() = hitboxStart.toVector()
val endX: Double
get() = hitboxStart.x + width
val endY: Double
get() = hitboxStart.y + height
val endVec: Vector2
get() = hitboxEnd.toVector()
val centeredX: Double
get() = hitboxStart.x + width * 0.5
val centeredY: Double
get() = hitboxStart.y + height * 0.5
val centerVec: Vector2
get() = Vector2(centeredX, centeredY)
/**
* @return bottom-centered point of hitbox.
*/
val canonicalX: Double
inline val canonicalX: Double
get() = centeredX
/**
@@ -67,6 +73,9 @@ class Hitbox {
inline val canonicalY: Double
get() = endY
val canonVec: Vector2
get() = Vector2(canonicalX, canonicalY)
/**
* Set to the point top left
* @param x1

4
src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
View File

@@ -319,7 +319,7 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
if (it != null) {
printdbg(this, "Found LastStatus mapping for Player ${codices.player.uuid}")
printdbg(this, "Changing XY Position (${codices.player.hitbox.canonicalX}, ${codices.player.hitbox.canonicalY}) -> ${it.physics.position}")
printdbg(this, "Changing XY Position ${codices.player.hitbox.canonVec} -> ${it.physics.position}")
codices.player.setPosition(it.physics.position)
if (isMultiplayer) {
@@ -330,7 +330,7 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
// if not, move player to the spawn point
else {
printdbg(this, "No mapping found")
printdbg(this, "Changing XY Position (${codices.player.hitbox.canonicalX},${codices.player.hitbox.canonicalY}) -> (${world.spawnX * TILE_SIZED}, ${world.spawnY * TILE_SIZED})")
printdbg(this, "Changing XY Position ${codices.player.hitbox.canonVec} -> (${world.spawnX * TILE_SIZED}, ${world.spawnY * TILE_SIZED})")
codices.player.setPosition(world.spawnX * TILE_SIZED, world.spawnY * TILE_SIZED)
}

2
src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt
View File

@@ -135,7 +135,7 @@ class UIKeyboardControlPanel : UICanvas() {
updateKeycaps()
buttonReset.clickOnceListener = { x, y, button ->
println("reset keys!")
// println("reset keys!")
resetKeyConfig()
updateKeycaps()
}

29
src/net/torvald/terrarum/worlddrawer/WorldCamera.kt
View File

@@ -1,12 +1,11 @@
package net.torvald.terrarum.worlddrawer
import com.badlogic.gdx.Gdx
import com.jme3.math.FastMath
import net.torvald.terrarum.App
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.*
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZEF
import net.torvald.terrarum.ceilInt
import net.torvald.terrarum.floorInt
import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.gameworld.fmod
@@ -98,18 +97,24 @@ object WorldCamera {
)).floorInt().clampCameraY(world)*/
val oldX = x.toFloat()
val newX1 = (player.hitbox.centeredX).toFloat() - (width / 2) +
val fpsRatio = App.UPDATE_RATE / Gdx.graphics.deltaTime // if FPS=32 & RATE=64, ratio will be 0.5
val oldX = x.toDouble()
val oldY = y.toDouble()
val newX1 = (player.hitbox.centeredX) - (width / 2) +
if (App.getConfigBoolean("fx_streamerslayout")) App.scr.chatWidth / 2 else 0
val newX2 = newX1 + worldWidth
val newX = if (Math.abs(newX1 - oldX) < Math.abs(newX2 - oldX)) newX1 else newX2
val newY = player.hitbox.centeredY - (height / 2)
x = FastMath.interpolateLinear(0.49f, oldX, newX).floorInt() fmod worldWidth
y = FastMath.interpolateLinear(0.49f, y.toFloat(), FastMath.clamp(
(player.hitbox.centeredY).toFloat() - (height / 2),
TILE_SIZEF,
worldHeight - height - TILE_SIZEF
)).floorInt().clampCameraY(world)
val pVecMagn = (player.externalV + (player.controllerV ?: nullVec)).magnitude
val cVecMagn = Math.sqrt((newX - oldX).sqr() + (newY - oldY).sqr()) * fpsRatio
// println("$cVecMagn\t$pVecMagn\t${cVecMagn / pVecMagn}")
val camSpeed = (1.0 - (1.0 / (2.0 * cVecMagn / pVecMagn))).coerceIn(0.5, 1.0).toFloat()
x = FastMath.interpolateLinear(camSpeed, oldX.toFloat(), newX.toFloat()).floorInt() fmod worldWidth
y = FastMath.interpolateLinear(camSpeed, oldY.toFloat(), newY.toFloat()).floorInt().clampCameraY(world)
xEnd = x + width
yEnd = y + height