Move some stuff around

main
idylls 1 year ago
parent 5697fb3ea9
commit e70dce298b
Signed by: idylls
GPG Key ID: 52D7502B0C319049

@ -16,8 +16,6 @@ import net.runelite.client.ui.overlay.OverlayPosition
import net.runelite.client.ui.overlay.OverlayPriority
import net.runelite.client.ui.overlay.OverlayUtil
import net.runelite.api.coords.LocalPoint
import net.runelite.api.CollisionDataFlag
import net.runelite.api.Tile
import kotlin.math.min
@ -30,291 +28,6 @@ import kotlin.math.min
const val SCENE_WIDTH = 128
const val SCENE_BUF_LEN = SCENE_WIDTH * SCENE_WIDTH
typealias ScenePoint = Point
typealias CollisionFlags = Int
fun buildPath(
backEdges: Map<ScenePoint, ScenePoint>,
end: ScenePoint
): List<ScenePoint> {
val list = mutableListOf<ScenePoint>()
var current: ScenePoint? = end
while (current != null) {
list.add(current)
current = backEdges.get(current)
}
list.reverse()
return list
}
fun findPath(
from: ScenePoint,
to: ScenePoint,
collisionFlags: Array<IntArray>,
tiles: Array<Array<Tile?>>,
): List<ScenePoint>? {
// A basic breadth-first search, taking into account OSRS movement
// rules
val seen = mutableSetOf<ScenePoint>(from)
val queue = ArrayDeque<ScenePoint>()
queue.add(from)
val backEdges = mutableMapOf<ScenePoint, ScenePoint>()
while (!queue.isEmpty()) {
val current = queue.removeFirst()
if (current == to) {
return buildPath(backEdges, current)
}
val unvisitedNeighbors = neighbors(
current,
{ sp ->
if (
(sp.getX() < 0)
|| (sp.getY() < 0)
|| (sp.getX() >= SCENE_WIDTH)
|| (sp.getY() >= SCENE_WIDTH)
) {
return@neighbors null
}
if (tiles[sp.getX()][sp.getY()] == null) {
return@neighbors null
}
return@neighbors collisionFlags[sp.getX()][sp.getY()]
},
).filter({ n -> !seen.contains(n) })
for (n in unvisitedNeighbors) {
backEdges.put(n, current)
queue.add(n)
seen.add(n)
}
}
return null
}
fun sceneX(t: Tile) = t.sceneLocation.x
fun sceneY(t: Tile) = t.sceneLocation.y
fun sceneCoords(t: Tile) = ScenePoint(t.sceneLocation.getX(), t.sceneLocation.getY())
fun canMoveCardinal(
from: CollisionFlags,
to: CollisionFlags,
direction: Direction,
): Boolean {
if ((to and (
CollisionDataFlag.BLOCK_MOVEMENT_FULL
or CollisionDataFlag.BLOCK_MOVEMENT_OBJECT
)) > 0) {
return false
}
if ((from and direction.collisionFlag) > 0) {
return false
}
return true
}
/**
* the adjDir params should be the direction to move from the adjacent
* tile into the diagonal tile. e.g. If you are trying to move south-west
* and adj1 params the southern tile, adjDir1 should be west (because you
* move south, then west)
*/
fun canMoveDiagonal(
from: CollisionFlags,
to: CollisionFlags,
direction: Direction,
adjOk1: Boolean,
adjFlags1: CollisionFlags,
adjDir1: Direction,
adjOk2: Boolean,
adjFlags2: CollisionFlags,
adjDir2: Direction,
): Boolean {
return (
adjOk1
and adjOk2
and canMoveCardinal(adjFlags1, to, adjDir1)
and canMoveCardinal(adjFlags2, to, adjDir2)
and canMoveCardinal(from, to, direction)
)
}
enum class Direction(
val dx: Int,
val dy: Int,
val collisionFlag: CollisionFlags,
) {
WEST(-1, 0, CollisionDataFlag.BLOCK_MOVEMENT_WEST),
EAST(1, 0, CollisionDataFlag.BLOCK_MOVEMENT_EAST),
SOUTH(0, -1, CollisionDataFlag.BLOCK_MOVEMENT_SOUTH),
NORTH(0, 1, CollisionDataFlag.BLOCK_MOVEMENT_NORTH),
SOUTH_WEST(-1, -1, CollisionDataFlag.BLOCK_MOVEMENT_SOUTH_WEST),
SOUTH_EAST(1, -1, CollisionDataFlag.BLOCK_MOVEMENT_SOUTH_EAST),
NORTH_WEST(-1, 1, CollisionDataFlag.BLOCK_MOVEMENT_NORTH_WEST),
NORTH_EAST(1, 1, CollisionDataFlag.BLOCK_MOVEMENT_NORTH_EAST),
}
fun neighbors(
current: ScenePoint,
collisionFlags: (ScenePoint) -> CollisionFlags?,
): Sequence<ScenePoint> {
val spd = { sp: ScenePoint, d: Direction ->
ScenePoint(sp.getX() + d.dx, sp.getY() + d.dy)
}
val cf = { d: Direction -> collisionFlags(spd(current, d)) }
val currentFlags = collisionFlags(current)!!
data class CanMoveCardinal(
val canMove: Boolean,
val flags: CollisionFlags,
)
val checkCardinal = c@{ d: Direction ->
val flags = when (val f = cf(d)) {
null -> return@c null
else -> f
}
return@c CanMoveCardinal(
canMoveCardinal(currentFlags, flags, d),
flags,
)
}
val west = checkCardinal(Direction.WEST)
val east = checkCardinal(Direction.EAST)
val south = checkCardinal(Direction.SOUTH)
val north = checkCardinal(Direction.NORTH)
val checkDiagonal = c@{
d: Direction,
cmc1: CanMoveCardinal?,
cmc1Dir: Direction,
cmc2: CanMoveCardinal?,
cmc2Dir: Direction,
->
if (cmc1 == null) {
return@c false
}
if (cmc2 == null) {
return@c false
}
val diagonalFlags = when (val f = cf(d)) {
null -> return@c false
else -> f
}
return@c canMoveDiagonal(
currentFlags,
diagonalFlags,
d,
cmc1.canMove,
cmc1.flags,
cmc1Dir,
cmc2.canMove,
cmc2.flags,
cmc2Dir,
)
}
val southWest = checkDiagonal(
Direction.SOUTH_WEST,
south, Direction.WEST,
west, Direction.SOUTH,
)
val southEast = checkDiagonal(
Direction.SOUTH_EAST,
south, Direction.EAST,
east, Direction.SOUTH,
)
val northWest = checkDiagonal(
Direction.NORTH_WEST,
north, Direction.WEST,
west, Direction.NORTH,
)
val northEast = checkDiagonal(
Direction.NORTH_EAST,
north, Direction.EAST,
east, Direction.NORTH,
)
val e = { b: Boolean, d: Direction ->
if (b) { spd(current, d) } else { null }
}
return sequenceOf(
e(west?.canMove ?: false, Direction.WEST),
e(east?.canMove ?: false, Direction.EAST),
e(south?.canMove ?: false, Direction.SOUTH),
e(north?.canMove ?: false, Direction.NORTH),
e(southWest, Direction.SOUTH_WEST),
e(southEast, Direction.SOUTH_EAST),
e(northWest, Direction.NORTH_WEST),
e(northEast, Direction.NORTH_EAST),
).filter({ n -> n != null }).map({ n -> n!! })
}
fun checkpointTiles(tiles: List<ScenePoint>): Set<ScenePoint> {
when (tiles.size) {
0 -> return emptySet()
1 -> return setOf(tiles[0])
2 -> {
return setOf(tiles[0], tiles[1])
}
}
val delta = { a: ScenePoint, b: ScenePoint ->
Pair(a.getX() - b.getX(), a.getY() - b.getY())
}
val checkpoints = mutableSetOf<ScenePoint>()
var idx = 0
var currentDelta = Pair(0, 0)
while (idx < tiles.size) {
val a = tiles[idx - 1]
val b = tiles[idx]
val d = delta(a, b)
if (!d.equals(currentDelta)) {
checkpoints.add(a)
currentDelta = d
}
idx += 1
}
return checkpoints
}
fun runningPath(tiles: List<ScenePoint>): List<ScenePoint> {
val list = mutableListOf<ScenePoint>()
var current: Int = 0
while (current < tiles.size) {
list.add(tiles[current])
current += 2
}
if ((tiles.size > 1) && ((tiles.size % 2) == 0)) {
list.add(tiles.last())
}
return list
}
class Overlay
@Inject constructor(

@ -0,0 +1,264 @@
package net.idylls.pathos
import net.runelite.api.Point
import net.runelite.api.CollisionDataFlag
import net.runelite.api.Tile as RLTile
import kotlin.math.abs
typealias ScenePoint = Point
typealias CollisionFlags = Int
fun sceneCoords(t: RLTile) = ScenePoint(t.sceneLocation.getX(), t.sceneLocation.getY())
fun buildPath(
backEdges: Map<ScenePoint, ScenePoint>,
end: ScenePoint
): List<ScenePoint> {
val list = mutableListOf<ScenePoint>()
var current: ScenePoint? = end
while (current != null) {
list.add(current)
current = backEdges.get(current)
}
list.reverse()
return list
}
fun findPath(
from: ScenePoint,
to: ScenePoint,
collisionFlags: Array<IntArray>,
tiles: Array<Array<RLTile?>>,
): List<ScenePoint>? {
// A basic breadth-first search, taking into account OSRS movement
// rules
val seen = mutableSetOf<ScenePoint>(from)
val queue = ArrayDeque<ScenePoint>()
queue.add(from)
val backEdges = mutableMapOf<ScenePoint, ScenePoint>()
while (!queue.isEmpty()) {
val current = queue.removeFirst()
if (current == to) {
return buildPath(backEdges, current)
}
val unvisitedNeighbors = neighbors(
current,
{ sp ->
if (
(sp.getX() < 0)
|| (sp.getY() < 0)
|| (sp.getX() >= SCENE_WIDTH)
|| (sp.getY() >= SCENE_WIDTH)
) {
return@neighbors null
}
if (tiles[sp.getX()][sp.getY()] == null) {
return@neighbors null
}
return@neighbors collisionFlags[sp.getX()][sp.getY()]
},
).filter({ n -> !seen.contains(n) })
for (n in unvisitedNeighbors) {
backEdges.put(n, current)
queue.add(n)
seen.add(n)
}
}
// TODO: Add out-of-bounds pathfinding
return null
}
fun sceneX(t: RLTile) = t.sceneLocation.x
fun sceneY(t: RLTile) = t.sceneLocation.y
fun canMoveCardinal(
from: CollisionFlags,
to: CollisionFlags,
direction: Direction,
): Boolean {
if ((to and (
CollisionDataFlag.BLOCK_MOVEMENT_FULL
or CollisionDataFlag.BLOCK_MOVEMENT_OBJECT
)) > 0) {
return false
}
if ((from and direction.collisionFlag) > 0) {
return false
}
return true
}
/**
* the adjDir params should be the direction to move from the adjacent
* tile into the diagonal tile. e.g. If you are trying to move south-west
* and adj1 params the southern tile, adjDir1 should be west (because you
* move south, then west)
*/
fun canMoveDiagonal(
from: CollisionFlags,
to: CollisionFlags,
direction: Direction,
adjOk1: Boolean,
adjFlags1: CollisionFlags,
adjDir1: Direction,
adjOk2: Boolean,
adjFlags2: CollisionFlags,
adjDir2: Direction,
): Boolean {
return (
adjOk1
and adjOk2
and canMoveCardinal(adjFlags1, to, adjDir1)
and canMoveCardinal(adjFlags2, to, adjDir2)
and canMoveCardinal(from, to, direction)
)
}
enum class Direction(
val dx: Int,
val dy: Int,
val collisionFlag: CollisionFlags,
) {
WEST(-1, 0, CollisionDataFlag.BLOCK_MOVEMENT_WEST),
EAST(1, 0, CollisionDataFlag.BLOCK_MOVEMENT_EAST),
SOUTH(0, -1, CollisionDataFlag.BLOCK_MOVEMENT_SOUTH),
NORTH(0, 1, CollisionDataFlag.BLOCK_MOVEMENT_NORTH),
SOUTH_WEST(-1, -1, CollisionDataFlag.BLOCK_MOVEMENT_SOUTH_WEST),
SOUTH_EAST(1, -1, CollisionDataFlag.BLOCK_MOVEMENT_SOUTH_EAST),
NORTH_WEST(-1, 1, CollisionDataFlag.BLOCK_MOVEMENT_NORTH_WEST),
NORTH_EAST(1, 1, CollisionDataFlag.BLOCK_MOVEMENT_NORTH_EAST),
}
fun neighbors(
current: ScenePoint,
collisionFlags: (ScenePoint) -> CollisionFlags?,
): Sequence<ScenePoint> {
val spd = { sp: ScenePoint, d: Direction ->
ScenePoint(sp.getX() + d.dx, sp.getY() + d.dy)
}
val cf = { d: Direction -> collisionFlags(spd(current, d)) }
val currentFlags = collisionFlags(current)!!
data class CanMoveCardinal(
val canMove: Boolean,
val flags: CollisionFlags,
)
val checkCardinal = c@{ d: Direction ->
val flags = when (val f = cf(d)) {
null -> return@c null
else -> f
}
return@c CanMoveCardinal(
canMoveCardinal(currentFlags, flags, d),
flags,
)
}
val west = checkCardinal(Direction.WEST)
val east = checkCardinal(Direction.EAST)
val south = checkCardinal(Direction.SOUTH)
val north = checkCardinal(Direction.NORTH)
val checkDiagonal = c@{
d: Direction,
cmc1: CanMoveCardinal?,
cmc1Dir: Direction,
cmc2: CanMoveCardinal?,
cmc2Dir: Direction,
->
if (cmc1 == null) {
return@c false
}
if (cmc2 == null) {
return@c false
}
val diagonalFlags = when (val f = cf(d)) {
null -> return@c false
else -> f
}
return@c canMoveDiagonal(
currentFlags,
diagonalFlags,
d,
cmc1.canMove,
cmc1.flags,
cmc1Dir,
cmc2.canMove,
cmc2.flags,
cmc2Dir,
)
}
val southWest = checkDiagonal(
Direction.SOUTH_WEST,
south, Direction.WEST,
west, Direction.SOUTH,
)
val southEast = checkDiagonal(
Direction.SOUTH_EAST,
south, Direction.EAST,
east, Direction.SOUTH,
)
val northWest = checkDiagonal(
Direction.NORTH_WEST,
north, Direction.WEST,
west, Direction.NORTH,
)
val northEast = checkDiagonal(
Direction.NORTH_EAST,
north, Direction.EAST,
east, Direction.NORTH,
)
val e = { b: Boolean, d: Direction ->
if (b) { spd(current, d) } else { null }
}
return sequenceOf(
e(west?.canMove ?: false, Direction.WEST),
e(east?.canMove ?: false, Direction.EAST),
e(south?.canMove ?: false, Direction.SOUTH),
e(north?.canMove ?: false, Direction.NORTH),
e(southWest, Direction.SOUTH_WEST),
e(southEast, Direction.SOUTH_EAST),
e(northWest, Direction.NORTH_WEST),
e(northEast, Direction.NORTH_EAST),
).filter({ n -> n != null }).map({ n -> n!! })
}
fun runningPath(tiles: List<ScenePoint>): List<ScenePoint> {
val list = mutableListOf<ScenePoint>()
var current: Int = 0
while (current < tiles.size) {
list.add(tiles[current])
current += 2
}
if ((tiles.size > 1) && ((tiles.size % 2) == 0)) {
list.add(tiles.last())
}
return list
}
Loading…
Cancel
Save