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

fluid viscosity on phys sim

Browse Source
This commit is contained in:
minjaesong
2024-07-16 17:32:56 +09:00
parent 6399f609a9
commit e77aa0c33f
12 changed files with 248 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ 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.blockproperties.Block
import net.torvald.terrarum.blockproperties.FluidCodex
import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gameactors.ActorWithBody.Companion.METER
import net.torvald.terrarum.gameactors.ActorWithBody.Companion.SI_TO_GAME_ACC
@@ -865,7 +866,7 @@ object IngameRenderer : Disposable {
}
private val bodyFriction = BlockCodex[Block.AIR].friction.frictionToMult()
private val bodyViscosity = BlockCodex[Block.AIR].viscosity.viscosityToMult()
private val bodyViscosity = FluidCodex[Block.AIR].viscosity.viscosityToMult()
private fun applyGravitation(gravitation: Vector2, hitboxWidth: Double) {

2
src/net/torvald/terrarum/modulebasegame/console/SpawnPhysTestBall.kt
View File

@@ -25,7 +25,7 @@ internal object SpawnPhysTestBall : ConsoleCommand {
val ball = PhysTestBall()
ball.setPosition(mouseX, mouseY)
ball.elasticity = elasticity
ball.applyForce(Vector2(xvel, yvel))
ball.applyAcceleration(Vector2(xvel, yvel))
INGAME.queueActorAddition(ball)
}