Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-07 08:48:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug in mesh order tweaks.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2021-04-08 21:34:07 +02:00
parent e4cbc38d4a
commit f20711296b
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
web/src/main/kotlin/world/phantasmal/web/questEditor/loading/AreaAssetLoader.kt
View File

@ -211,11 +211,12 @@ class AreaAssetLoader(private val assetLoader: AssetLoader) : DisposableContaine
episode: Episode, episode: Episode,
areaVariant: AreaVariantModel, areaVariant: AreaVariantModel,
): Pair<Object3D, List<SectionModel>> { ): Pair<Object3D, List<SectionModel>> {
val renderOnTopTextures = RENDER_ON_TOP_TEXTURES[Pair(episode, areaVariant.area.id)]
val sections = mutableMapOf<Int, SectionModel>() val sections = mutableMapOf<Int, SectionModel>()
val group = val group =
renderGeometryToGroup(renderGeometry, textures) { renderSection, xjObject, mesh -> renderGeometryToGroup(renderGeometry, textures) { renderSection, xjObject, mesh ->
if (shouldRenderOnTop(xjObject, episode, areaVariant)) { if (shouldRenderOnTop(xjObject, renderOnTopTextures)) {
mesh.renderOrder = 1 mesh.renderOrder = 1
} }
@ -236,28 +237,22 @@ class AreaAssetLoader(private val assetLoader: AssetLoader) : DisposableContaine
return Pair(group, sections.values.toList()) return Pair(group, sections.values.toList())
} }
private fun shouldRenderOnTop( private fun shouldRenderOnTop(obj: XjObject, renderOnTopTextures: Set<Int>?): Boolean {
obj: XjObject, renderOnTopTextures ?: return false
episode: Episode,
areaVariant: AreaVariantModel, obj.model?.meshes?.let { meshes ->
): Boolean { for (mesh in meshes) {
fun recurse(obj: XjObject): Boolean { mesh.material.textureId?.let { textureId ->
obj.model?.meshes?.let { meshes -> if (textureId in renderOnTopTextures) {
for (mesh in meshes) { return true
mesh.material.textureId?.let { textureId ->
RENDER_ON_TOP_TEXTURES[Pair(episode, areaVariant.id)]?.let { textureIds ->
if (textureId in textureIds) {
return true
}
}
} }
} }
} }
return obj.children.any(::recurse)
} }
return recurse(obj) return obj.children.any {
shouldRenderOnTop(it, renderOnTopTextures)
}
} }
private fun areaCollisionGeometryToObject3D( private fun areaCollisionGeometryToObject3D(