From 155c38536f1d1a7272366436970b220f0b724695 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sat, 27 Jul 2019 14:45:19 +0900 Subject: [PATCH] correct impl for RNG of joise lib --- lib/Terrarum_Joise.jar | Bin 313692 -> 313459 bytes .../worldgenerator/WorldGenerator.kt | 30 +++++++++++----- src/net/torvald/terrarum/tests/RNGTest.kt | 32 ++++++++++++++++++ .../terrarum/worlddrawer/WorldCamera.kt | 6 +++- 4 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 src/net/torvald/terrarum/tests/RNGTest.kt diff --git a/lib/Terrarum_Joise.jar b/lib/Terrarum_Joise.jar index f0ed0d0d810d7c6c5d7421827802549ae514194a..ecef95babe80013efda38813a24ba91a0c2255e0 100644 GIT binary patch delta 9665 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 { + val rng = HQRNG() + + /*repeat(512) { + println(rng.nextDouble()) + }*/ + + println() + + val rng2 = com.sudoplay.joise.generator.HQRNG() + + repeat(512) { + println(rng2.getRange(0, 10)) + } + + // getTarget: 0..(t-1) (exclusive) + // getRange: low..high (inclusive) + // get01: 0.0 until 1.0 (exclusive) +} diff --git a/src/net/torvald/terrarum/worlddrawer/WorldCamera.kt b/src/net/torvald/terrarum/worlddrawer/WorldCamera.kt index 3cf8a0e62..a78094345 100644 --- a/src/net/torvald/terrarum/worlddrawer/WorldCamera.kt +++ b/src/net/torvald/terrarum/worlddrawer/WorldCamera.kt @@ -4,6 +4,7 @@ import com.jme3.math.FastMath import net.torvald.terrarum.AppLoader import net.torvald.terrarum.Terrarum import net.torvald.terrarum.floorInt +import net.torvald.terrarum.gameactors.ActorWBMovable import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gameworld.GameWorld import org.dyn4j.geometry.Vector2 @@ -47,7 +48,10 @@ object WorldCamera { // some hacky equation to position player at the dead centre // implementing the "lag behind" camera the right way - val pVecSum = Vector2(0.0, 0.0)//player.externalV + (player.controllerV ?: nullVec) + val pVecSum = if (player is ActorWBMovable) + player.externalV + (player.controllerV ?: nullVec) + else + nullVec x = ((player.hitbox.centeredX - pVecSum.x).toFloat() - (width / 2)).floorInt() // X only: ROUNDWORLD implementation