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

better title screen camera smoothing

Browse Source
This commit is contained in:
minjaesong
2023-06-29 22:50:44 +09:00
parent 57a9f7febc
commit 07cbcbe79b
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/jme3/math/FastMath.java
View File

@@ -316,7 +316,7 @@ final public class FastMath {
public static float interpolateHermite(float scale, float p0, float p1, float p2, float p3) { public static float interpolateHermite(float scale, float p0, float p1, float p2, float p3) {
return interpolateHermite(scale, p0, p1, p2, p3, 1f, 0f); return interpolateHermite(scale, p0, p1, p2, p3, 0f, 0f);
} }
public static float interpolateHermite(float scale, float p0, float p1, float p2, float p3, float tension, float bias) { public static float interpolateHermite(float scale, float p0, float p1, float p2, float p3, float tension, float bias) {
float mu2 = scale * scale; float mu2 = scale * scale;

33
src/net/torvald/terrarum/modulebasegame/TitleScreen.kt
View File

@@ -68,7 +68,7 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) {
private lateinit var demoWorld: GameWorld private lateinit var demoWorld: GameWorld
private lateinit var cameraNodes: FloatArray // camera Y-pos private lateinit var cameraNodes: FloatArray // camera Y-pos
private val cameraNodeWidth = 10 private val cameraNodeWidth = 15
private val lookaheadDist = cameraNodeWidth * TILE_SIZED private val lookaheadDist = cameraNodeWidth * TILE_SIZED
private fun getPointAt(px: Double): Double { private fun getPointAt(px: Double): Double {
val ww = TILE_SIZEF * demoWorld.width val ww = TILE_SIZEF * demoWorld.width
@@ -80,7 +80,13 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) {
val xw: Double = xwend - xwstart val xw: Double = xwend - xwstart
val xperc: Double = (x - xwstart) / xw val xperc: Double = (x - xwstart) / xw
return FastMath.interpolateLinear(xperc.toFloat(), cameraNodes[indexThis fmod cameraNodes.size], cameraNodes[(indexThis + 1) fmod cameraNodes.size]).toDouble() // return FastMath.interpolateLinear(xperc.toFloat(), cameraNodes[indexThis fmod cameraNodes.size], cameraNodes[(indexThis + 1) fmod cameraNodes.size]).toDouble()
return FastMath.interpolateHermite(xperc.toFloat(),
cameraNodes[(indexThis - 1) fmod cameraNodes.size],
cameraNodes[(indexThis - 0) fmod cameraNodes.size],
cameraNodes[(indexThis + 1) fmod cameraNodes.size],
cameraNodes[(indexThis + 2) fmod cameraNodes.size]
).toDouble()
} }
private val cameraAI = object : ActorAI { private val cameraAI = object : ActorAI {
private var firstTime = true private var firstTime = true
@@ -90,12 +96,14 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) {
val ww = TILE_SIZEF * demoWorld.width val ww = TILE_SIZEF * demoWorld.width
val actor = actor as CameraPlayer val actor = actor as CameraPlayer
val x1 = actor.hitbox.startX val stride = cos(actor.bearing1A) * actor.actorValue.getAsDouble(AVKey.SPEED)!!
val x1 = actor.hitbox.startX// + stride
val y1 = actor.hitbox.startY val y1 = actor.hitbox.startY
val px1L = x1 - lookaheadDist// * cos(actor.bearing1A) val px1L = x1 - lookaheadDist
val px1C = x1 val px1C = x1
val px1R = x1 + lookaheadDist// * cos(actor.bearing1B) val px1R = x1 + lookaheadDist
val py1L = getPointAt(px1L) val py1L = getPointAt(px1L)
val py1C = getPointAt(px1C) val py1C = getPointAt(px1C)
val py1R = getPointAt(px1R) val py1R = getPointAt(px1R)
@@ -119,6 +127,7 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) {
actor.bearing1B = atan2(py1R - py1C, px1R - px1C) actor.bearing1B = atan2(py1R - py1C, px1R - px1C)
actor.bearing2A = atan2(py2R - py2L, px2R - px2L) actor.bearing2A = atan2(py2R - py2L, px2R - px2L)
actor.moveTo(theta) actor.moveTo(theta)
// actor.hitbox.setPosition(x2, y2) // there is no reason it would work -- speed is wildly inconsistent as the angle reaches 90deg
} }
if (actor.hitbox.startX > ww) { if (actor.hitbox.startX > ww) {
@@ -355,12 +364,20 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) {
it.color = secondOrderSlopeCol it.color = secondOrderSlopeCol
drawLineOnWorld(px2L, py2L, px2R, py2R) drawLineOnWorld(px2L, py2L, px2R, py2R)
it.color = baseSlopeCol
(1..cameraNodes.lastIndex + 16).forEach { index0 -> /*(1..cameraNodes.lastIndex + 16).forEach { index0 ->
it.color = baseSlopeCol
val x1 = (index0 - 1) * cameraNodeWidth * TILE_SIZEF; val x2 = (index0 - 0) * cameraNodeWidth * TILE_SIZEF val x1 = (index0 - 1) * cameraNodeWidth * TILE_SIZEF; val x2 = (index0 - 0) * cameraNodeWidth * TILE_SIZEF
val y1 = cameraNodes[(index0 - 1) fmod cameraNodes.size]; val y2 = cameraNodes[index0 fmod cameraNodes.size] val y1 = cameraNodes[(index0 - 1) fmod cameraNodes.size]; val y2 = cameraNodes[index0 fmod cameraNodes.size]
drawLineOnWorld(x1, y1, x2, y2) drawLineOnWorld(x1, y1, x2, y2)
}*/
val points = (0..App.scr.width).map { x ->
val worldX = (WorldCamera.x + x).toDouble()
worldX to getPointAt(worldX)
}
points.forEachIndexed { index, (x, y) ->
if (index > 0) {
drawLineOnWorld(points[index - 1].first, points[index - 1].second, x, y)
}
} }
} }