AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-10 16:01:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

wip: improve entity hit box frustum culling

Browse Source
This commit is contained in:
Bixilon 2021-06-10 12:53:59 +02:00 committed by Lukas
parent 52f750ba9a
commit b2ff0e7a27
2 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/gui/rendering/entities/EntityHitBoxMesh.kt
View File

@ -24,6 +24,8 @@ import glm_.vec3.Vec3d
class EntityHitBoxMesh( class EntityHitBoxMesh(
val entity: Entity, val entity: Entity,
) : LineMesh() { ) : LineMesh() {
var needsUpdate = true
var visible = false
val aabb = entity.aabb val aabb = entity.aabb
init { init {

54
src/main/java/de/bixilon/minosoft/gui/rendering/entities/EntityHitBoxRenderer.kt
View File

@ -19,6 +19,8 @@ import de.bixilon.minosoft.data.mappings.ResourceLocation
import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.gui.rendering.RenderWindow
import de.bixilon.minosoft.gui.rendering.Renderer import de.bixilon.minosoft.gui.rendering.Renderer
import de.bixilon.minosoft.gui.rendering.RendererBuilder import de.bixilon.minosoft.gui.rendering.RendererBuilder
import de.bixilon.minosoft.gui.rendering.chunk.models.AABB
import de.bixilon.minosoft.gui.rendering.modding.events.FrustumChangeEvent
import de.bixilon.minosoft.modding.event.CallbackEventInvoker import de.bixilon.minosoft.modding.event.CallbackEventInvoker
import de.bixilon.minosoft.modding.event.events.EntityDestroyEvent import de.bixilon.minosoft.modding.event.events.EntityDestroyEvent
import de.bixilon.minosoft.modding.event.events.EntitySpawnEvent import de.bixilon.minosoft.modding.event.events.EntitySpawnEvent
@ -35,12 +37,37 @@ class EntityHitBoxRenderer(
private val meshes: SynchronizedMap<Entity, EntityHitBoxMesh> = synchronizedMapOf() private val meshes: SynchronizedMap<Entity, EntityHitBoxMesh> = synchronizedMapOf()
private fun createMesh(entity: Entity): EntityHitBoxMesh? { private fun updateMesh(entity: Entity, mesh: EntityHitBoxMesh? = meshes[entity]): EntityHitBoxMesh? {
val aabb = entity.aabb
val visible = renderWindow.inputHandler.camera.frustum.containsAABB(aabb)
if (!visible) {
return mesh
}
var nextMesh = mesh
if (aabb != mesh?.aabb) {
this.meshes.remove(entity)
mesh?.unload()
nextMesh = createMesh(entity, aabb, visible)
}
return nextMesh
}
private fun createMesh(entity: Entity, aabb: AABB = entity.aabb, visible: Boolean = renderWindow.inputHandler.camera.frustum.containsAABB(aabb)): EntityHitBoxMesh? {
if (entity.isInvisible && !Minosoft.config.config.game.entities.hitBox.renderInvisibleEntities) { if (entity.isInvisible && !Minosoft.config.config.game.entities.hitBox.renderInvisibleEntities) {
return null return null
} }
val mesh = EntityHitBoxMesh(entity) val mesh = EntityHitBoxMesh(entity)
if (visible) {
mesh.load() mesh.load()
}
mesh.needsUpdate = !visible
mesh.visible = visible
this.meshes[entity] = mesh this.meshes[entity] = mesh
return mesh return mesh
@ -59,6 +86,12 @@ class EntityHitBoxRenderer(
mesh.unload(false) mesh.unload(false)
} }
}) })
connection.registerEvent(CallbackEventInvoker.of<FrustumChangeEvent> {
for ((_, mesh) in this.meshes.toSynchronizedMap()) {
mesh.visible = renderWindow.inputHandler.camera.frustum.containsAABB(mesh.aabb)
}
})
} }
override fun draw() { override fun draw() {
@ -70,24 +103,19 @@ class EntityHitBoxRenderer(
fun draw(mesh: EntityHitBoxMesh?) { fun draw(mesh: EntityHitBoxMesh?) {
mesh ?: return mesh ?: return
// ToDo: Improve this
if (!renderWindow.inputHandler.camera.frustum.containsAABB(mesh.aabb)) { if (!mesh.visible) {
return return
} }
if (mesh.needsUpdate) {
mesh.load()
mesh.needsUpdate = false
}
mesh.draw() mesh.draw()
} }
for ((entity, mesh) in meshes.toSynchronizedMap()) { for ((entity, mesh) in meshes.toSynchronizedMap()) {
val aabb = entity.aabb draw(updateMesh(entity, mesh))
if (aabb != mesh.aabb) {
this.meshes.remove(entity)
mesh.unload()
draw(createMesh(entity))
continue
}
draw(mesh)
} }