AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 03:44:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

don't collide with blocks in own hit box

Browse Source
This commit is contained in:
Bixilon 2021-06-27 23:12:29 +02:00
parent ddcf3fd7f5
commit 7982b19577
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/de/bixilon/minosoft/data/physics/CollisionDetector.kt
View File

@ -19,13 +19,11 @@ import de.bixilon.minosoft.gui.rendering.chunk.VoxelShape
import de.bixilon.minosoft.gui.rendering.chunk.models.AABB import de.bixilon.minosoft.gui.rendering.chunk.models.AABB
import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY
import de.bixilon.minosoft.gui.rendering.util.VecUtil.chunkPosition import de.bixilon.minosoft.gui.rendering.util.VecUtil.chunkPosition
import de.bixilon.minosoft.gui.rendering.util.VecUtil.floor
import de.bixilon.minosoft.gui.rendering.util.VecUtil.inChunkPosition import de.bixilon.minosoft.gui.rendering.util.VecUtil.inChunkPosition
import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.network.connection.PlayConnection
import glm_.vec3.Vec3 import glm_.vec3.Vec3
import glm_.vec3.Vec3bool import glm_.vec3.Vec3bool
import glm_.vec3.Vec3d import glm_.vec3.Vec3d
import glm_.vec3.Vec3i
import kotlin.math.abs import kotlin.math.abs
class CollisionDetector(val connection: PlayConnection) { class CollisionDetector(val connection: PlayConnection) {
@ -34,11 +32,7 @@ class CollisionDetector(val connection: PlayConnection) {
// also look at blocks further down to also cover blocks with a higher than normal hitbox (for example fences) // also look at blocks further down to also cover blocks with a higher than normal hitbox (for example fences)
val blockPositions = (aabb extend deltaPosition grow 1.0 + COLLISION_BOX_MARGIN).blockPositions.toMutableList() val blockPositions = (aabb extend deltaPosition grow 1.0 + COLLISION_BOX_MARGIN).blockPositions.toMutableList()
// check if already in block val aabbBlockPositions = aabb.shrink().blockPositions
if (!connection.world.isSpaceEmpty(aabb)) {
val center = aabb.center.floor
blockPositions.remove(Vec3i(center.x, aabb.min.y, center.z))
}
val result = VoxelShape() val result = VoxelShape()
for (blockPosition in blockPositions) { for (blockPosition in blockPositions) {
@ -49,7 +43,15 @@ class CollisionDetector(val connection: PlayConnection) {
continue continue
} }
val blockState = chunk?.get(blockPosition.inChunkPosition) ?: continue val blockState = chunk?.get(blockPosition.inChunkPosition) ?: continue
result.add(blockState.collisionShape + blockPosition) val blockShape = blockState.collisionShape + blockPosition
// remove position if not already in it and not colliding with it
if (blockPosition in aabbBlockPositions) {
if (blockShape.intersect(aabb)) {
continue
}
}
result.add(blockShape)
} }
return result return result
} }