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

better trajectory view

Browse Source
This commit is contained in:
minjaesong
2024-02-29 14:22:16 +09:00
parent 91bf11a3e0
commit 902a086a4f
1 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
View File

@@ -22,6 +22,7 @@ import net.torvald.terrarum.gameactors.ActorWithBody.Companion.SI_TO_GAME_ACC
import net.torvald.terrarum.gamecontroller.KeyToggler import net.torvald.terrarum.gamecontroller.KeyToggler
import net.torvald.terrarum.gameitems.GameItem import net.torvald.terrarum.gameitems.GameItem
import net.torvald.terrarum.gameitems.ItemID import net.torvald.terrarum.gameitems.ItemID
import net.torvald.terrarum.gameitems.mouseInInteractableRange
import net.torvald.terrarum.gameparticles.ParticleBase import net.torvald.terrarum.gameparticles.ParticleBase
import net.torvald.terrarum.gameworld.GameWorld import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.gameworld.fmod import net.torvald.terrarum.gameworld.fmod
@@ -769,33 +770,49 @@ object IngameRenderer : Disposable {
} }
private val cubeSize = 7.0 private val cubeSize = 7.0
private val externalV = Vector2() private val externalV = Vector2()
private val maxStep = 56
private fun drawAimGuideForThrowable(frameBuffer: FrameBuffer, batch: SpriteBatch, frameDelta: Float, player: ActorWithBody, world: GameWorld, item: ItemThrowable) { private fun drawAimGuideForThrowable(frameBuffer: FrameBuffer, batch: SpriteBatch, frameDelta: Float, player: ActorWithBody, world: GameWorld, item: ItemThrowable) {
val (throwPos, throwVector) = getThrowPosAndVector(player) mouseInInteractableRange(player) { mx, my, mtx, mty ->
val grav = world.gravitation val (throwPos, throwVector) = getThrowPosAndVector(player)
externalV.set(throwVector) val grav = world.gravitation
externalV.set(throwVector)
batch.color = Color.WHITE // TODO get better colour
var c = 0 var c = 0
while (c < 100) { while (c < maxStep) {
// plot a dot batch.color = Color(0.9f, 0.9f, 0.9f, 0.9f * (1f - (c.toFloat() / maxStep).sqr()))
Toolkit.fillArea(batch, throwPos.x.toFloat(), throwPos.y.toFloat() - cubeSize.toFloat() / 2f, 2f, 2f)
// simulate physics // plot a dot
applyGravitation(grav, cubeSize) // TODO use actual value instead of `cubeSize` if (c > 0) Toolkit.fillArea(
// move the point batch,
throwPos += externalV throwPos.x.toFloat(),
// more physics throwPos.y.toFloat() - cubeSize.toFloat() / 2f,
setHorizontalFriction() 2f,
setVerticalFriction() 2f
)
// simulate physics
applyGravitation(grav, cubeSize) // TODO use actual value instead of `cubeSize`
// move the point
throwPos += externalV
// more physics
setHorizontalFriction()
setVerticalFriction()
// break if colliding with a tile // break if colliding with a tile
if (BlockCodex[world.getTileFromTerrain(throwPos.x.div(TILE_SIZED).toInt(), (throwPos.y - cubeSize/2).div(TILE_SIZED).toInt())].isSolid) if (BlockCodex[world.getTileFromTerrain(
break throwPos.x.div(TILE_SIZED).toInt(),
(throwPos.y - cubeSize / 2).div(TILE_SIZED).toInt()
)].isSolid
)
break
c++ c++
}
1L
} }
} }