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

hitboxes: don't render invisible, render through walls

Browse Source
This commit is contained in:
Moritz Zwerger 2023-10-28 16:16:11 +02:00
parent 6f10bce914
commit 926198e18e
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/bixilon/minosoft/gui/rendering/entities/hitbox/HitboxFeature.kt
View File

@ -21,6 +21,7 @@ import de.bixilon.minosoft.data.text.formatting.color.ChatColors
import de.bixilon.minosoft.data.text.formatting.color.ColorUtil import de.bixilon.minosoft.data.text.formatting.color.ColorUtil
import de.bixilon.minosoft.gui.rendering.entities.feature.EntityRenderFeature import de.bixilon.minosoft.gui.rendering.entities.feature.EntityRenderFeature
import de.bixilon.minosoft.gui.rendering.entities.renderer.EntityRenderer import de.bixilon.minosoft.gui.rendering.entities.renderer.EntityRenderer
import de.bixilon.minosoft.gui.rendering.system.base.DepthFunctions
import de.bixilon.minosoft.gui.rendering.util.mesh.LineMesh import de.bixilon.minosoft.gui.rendering.util.mesh.LineMesh
import de.bixilon.minosoft.gui.rendering.util.mesh.Mesh import de.bixilon.minosoft.gui.rendering.util.mesh.Mesh
import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util
@ -47,6 +48,7 @@ class HitboxFeature(renderer: EntityRenderer<*>) : EntityRenderFeature(renderer)
override fun update(millis: Long, delta: Float) { override fun update(millis: Long, delta: Float) {
if (!manager.enabled) return unload() if (!manager.enabled) return unload()
if (!enabled) return unload() if (!enabled) return unload()
if (!manager.profile.showInvisible && renderer.entity.isInvisible) return unload()
if (!visible) return if (!visible) return
val offset = renderer.renderer.context.camera.offset.offset val offset = renderer.renderer.context.camera.offset.offset
@ -121,6 +123,12 @@ class HitboxFeature(renderer: EntityRenderer<*>) : EntityRenderFeature(renderer)
override fun draw() { override fun draw() {
val mesh = this.mesh ?: return val mesh = this.mesh ?: return
if (mesh.state != Mesh.MeshStates.LOADED) mesh.load() if (mesh.state != Mesh.MeshStates.LOADED) mesh.load()
val system = renderer.renderer.context.system
if (manager.profile.showThroughWalls) {
system.reset(depth = DepthFunctions.ALWAYS)
} else {
system.reset()
}
manager.shader.use() manager.shader.use()
mesh.draw() mesh.draw()
} }