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

Fixed bug in 3D view developer tool.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2021-11-29 22:47:28 +01:00
parent 9653a982c0
commit ed0db920d1
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,8 @@
package world.phantasmal.web.questEditor.loading package world.phantasmal.web.questEditor.loading
import org.khronos.webgl.ArrayBuffer import org.khronos.webgl.ArrayBuffer
import world.phantasmal.core.* import world.phantasmal.core.asJsArray
import world.phantasmal.core.isBitSet
import world.phantasmal.core.unsafe.UnsafeSet import world.phantasmal.core.unsafe.UnsafeSet
import world.phantasmal.core.unsafe.unsafeSetOf import world.phantasmal.core.unsafe.unsafeSetOf
import world.phantasmal.psolib.Endianness import world.phantasmal.psolib.Endianness
@ -19,10 +20,11 @@ import world.phantasmal.web.externals.three.*
import world.phantasmal.web.questEditor.models.AreaVariantModel import world.phantasmal.web.questEditor.models.AreaVariantModel
import world.phantasmal.web.questEditor.models.SectionModel import world.phantasmal.web.questEditor.models.SectionModel
import world.phantasmal.webui.DisposableContainer import world.phantasmal.webui.DisposableContainer
import kotlin.collections.set
import kotlin.math.PI import kotlin.math.PI
import kotlin.math.cos import kotlin.math.cos
class AreaUserData(val section: SectionModel?) class AreaUserData(val section: SectionModel?, val areaObject: AreaObject)
/** /**
* Loads and caches area assets. * Loads and caches area assets.
@ -184,8 +186,8 @@ class AreaAssetLoader(private val assetLoader: AssetLoader) : DisposableContaine
} }
} }
if (renderSection.id >= 0) { val sectionModel = if (renderSection.id >= 0) {
val sectionModel = sections.getOrPut(renderSection.id) { sections.getOrPut(renderSection.id) {
SectionModel( SectionModel(
renderSection.id, renderSection.id,
vec3ToThree(renderSection.position), vec3ToThree(renderSection.position),
@ -193,9 +195,14 @@ class AreaAssetLoader(private val assetLoader: AssetLoader) : DisposableContaine
areaVariant, areaVariant,
) )
} }
} else {
mesh.userData = AreaUserData(sectionModel) null
} }
mesh.userData = AreaUserData(
sectionModel,
mesh.userData.unsafeCast<AreaObjectUserData>().areaObject,
)
} }
return Pair(group, sections.values.toList()) return Pair(group, sections.values.toList())
@ -774,7 +781,9 @@ class AreaAssetLoader(private val assetLoader: AssetLoader) : DisposableContaine
), ),
// Central Control Area // Central Control Area
Pair(Episode.II, 5) to Fix( Pair(Episode.II, 5) to Fix(
renderOnTopTextures = unsafeSetOf(*((0..59).toSet() + setOf(69, 77)).toTypedArray()), renderOnTopTextures = unsafeSetOf(
*((0..59).toSet() + setOf(69, 77)).toTypedArray(),
),
), ),
// Jungle Area East // Jungle Area East
Pair(Episode.II, 6) to Fix( Pair(Episode.II, 6) to Fix(

7
web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/state/StateContext.kt
View File

@ -2,13 +2,12 @@ package world.phantasmal.web.questEditor.rendering.input.state
import mu.KotlinLogging import mu.KotlinLogging
import world.phantasmal.core.asJsArray import world.phantasmal.core.asJsArray
import world.phantasmal.psolib.fileFormats.ninja.XjObject
import world.phantasmal.observable.cell.Cell import world.phantasmal.observable.cell.Cell
import world.phantasmal.psolib.fileFormats.ninja.XjObject
import world.phantasmal.web.core.dot import world.phantasmal.web.core.dot
import world.phantasmal.web.core.minusAssign import world.phantasmal.web.core.minusAssign
import world.phantasmal.web.core.plusAssign import world.phantasmal.web.core.plusAssign
import world.phantasmal.web.core.rendering.OrbitalCameraInputManager import world.phantasmal.web.core.rendering.OrbitalCameraInputManager
import world.phantasmal.web.core.rendering.conversion.AreaObjectUserData
import world.phantasmal.web.core.rendering.conversion.fingerPrint import world.phantasmal.web.core.rendering.conversion.fingerPrint
import world.phantasmal.web.externals.three.* import world.phantasmal.web.externals.three.*
import world.phantasmal.web.questEditor.actions.CreateEntityAction import world.phantasmal.web.questEditor.actions.CreateEntityAction
@ -264,7 +263,7 @@ class StateContext(
if (mesh != null) { if (mesh != null) {
logger.info { logger.info {
val userData = mesh.userData.unsafeCast<AreaObjectUserData>() val userData = mesh.userData.unsafeCast<AreaUserData>()
val areaObj = userData.areaObject val areaObj = userData.areaObject
val textureIds = mutableSetOf<Int>() val textureIds = mutableSetOf<Int>()
@ -278,7 +277,7 @@ class StateContext(
buildString { buildString {
append("Section ") append("Section ")
append(userData.sectionId) append(userData.section?.id ?: 0)
append(" (finger print: ") append(" (finger print: ")
append(areaObj.fingerPrint()) append(areaObj.fingerPrint())
append(", texture IDs: ") append(", texture IDs: ")