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

Reducing hierarchy by merging ActorWithBody with ActorWBMovable

Browse Source
This commit is contained in:
minjaesong
2020-03-20 19:30:17 +09:00
parent 5cafe16f20
commit 07b9e76090
26 changed files with 1844 additions and 1864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt
View File

@@ -13,7 +13,6 @@ import net.torvald.terrarum.blockproperties.Block
import net.torvald.terrarum.blockproperties.BlockCodex
import net.torvald.terrarum.blockproperties.Fluid
import net.torvald.terrarum.concurrent.sliceEvenly
import net.torvald.terrarum.gameactors.ActorWBMovable
import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gameactors.Luminous
import net.torvald.terrarum.gameworld.BlockAddress
@@ -334,7 +333,7 @@ object LightmapRenderer {
lanternMap.clear()
actorContainers.forEach { actorContainer ->
actorContainer?.forEach {
if (it is Luminous && it is ActorWBMovable) {
if (it is Luminous && it is ActorWithBody) {
// put lanterns to the area the luminantBox is occupying
for (lightBox in it.lightBoxList) {
val lightBoxX = it.hitbox.startX + lightBox.startX

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

@@ -5,7 +5,6 @@ import net.torvald.terrarum.AppLoader
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.ceilInt
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
@@ -73,7 +72,7 @@ object WorldCamera {
// some hacky equation to position player at the dead centre
// implementing the "lag behind" camera the right way
val pVecSum = if (player is ActorWBMovable)
val pVecSum = if (player is ActorWithBody)
player.externalV + (player.controllerV ?: nullVec)
else
nullVec