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

Added world position to the entity info widget.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2024-07-14 12:51:29 +02:00
parent 62a49b067c
commit 22d01776d0
5 changed files with 71 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/src/main/kotlin/world/phantasmal/web/questEditor/commands/TranslateEntityCommand.kt
View File

@ -12,14 +12,23 @@ class TranslateEntityCommand(
private val oldSection: Int?,
private val newPosition: Vector3,
private val oldPosition: Vector3,
private val world: Boolean,
) : Command {
override val description: String = "Move ${entity.type.simpleName}"
override fun execute() {
questEditorStore.setEntityPosition(entity, newSection, newPosition)
if (world) {
questEditorStore.setEntityWorldPosition(entity, newSection, newPosition)
} else {
questEditorStore.setEntityPosition(entity, newSection, newPosition)
}
}
override fun undo() {
questEditorStore.setEntityPosition(entity, oldSection, oldPosition)
if (world) {
questEditorStore.setEntityWorldPosition(entity, oldSection, oldPosition)
} else {
questEditorStore.setEntityPosition(entity, oldSection, oldPosition)
}
}
}

44
web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityInfoController.kt
View File

@ -117,6 +117,12 @@ class EntityInfoController(
val posY: Cell<Double> = pos.map { it.y }
val posZ: Cell<Double> = pos.map { it.z }
private val worldPos: Cell<Vector3> =
questEditorStore.selectedEntity.flatMap { it?.worldPosition ?: DEFAULT_POSITION }
val worldPosX: Cell<Double> = worldPos.map { it.x }
val worldPosY: Cell<Double> = worldPos.map { it.y }
val worldPosZ: Cell<Double> = worldPos.map { it.z }
private val rot: Cell<Euler> =
questEditorStore.selectedEntity.flatMap { it?.rotation ?: DEFAULT_ROTATION }
val rotX: Cell<Double> = rot.map { radToDeg(it.x) }
@ -207,6 +213,44 @@ class EntityInfoController(
oldSection = null,
newPosition = Vector3(x, y, z),
oldPosition = entity.position.value,
world = false,
)
)
}
fun setWorldPosX(x: Double) {
questEditorStore.selectedEntity.value?.let { entity ->
val pos = entity.worldPosition.value
setWorldPos(entity, x, pos.y, pos.z)
}
}
fun setWorldPosY(y: Double) {
questEditorStore.selectedEntity.value?.let { entity ->
val pos = entity.worldPosition.value
setWorldPos(entity, pos.x, y, pos.z)
}
}
fun setWorldPosZ(z: Double) {
questEditorStore.selectedEntity.value?.let { entity ->
val pos = entity.worldPosition.value
setWorldPos(entity, pos.x, pos.y, z)
}
}
private fun setWorldPos(entity: QuestEntityModel<*, *>, x: Double, y: Double, z: Double) {
if (!enabled.value) return
questEditorStore.executeAction(
TranslateEntityCommand(
questEditorStore,
entity,
newSection = null,
oldSection = null,
newPosition = Vector3(x, y, z),
oldPosition = entity.worldPosition.value,
world = true,
)
)
}

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

@ -135,6 +135,7 @@ class StateContext(
oldSection?.id,
newPosition,
oldPosition,
world = false,
))
}

10
web/src/main/kotlin/world/phantasmal/web/questEditor/stores/QuestEditorStore.kt
View File

@ -302,6 +302,14 @@ class QuestEditorStore(
}
}
fun setEntityWorldPosition(entity: QuestEntityModel<*, *>, sectionId: Int?, position: Vector3) {
mutate {
setSelectedEntity(entity)
sectionId?.let { setEntitySection(entity, it) }
entity.setWorldPosition(position)
}
}
fun setEntityRotation(entity: QuestEntityModel<*, *>, rotation: Euler) {
mutate {
setSelectedEntity(entity)
@ -359,7 +367,7 @@ class QuestEditorStore(
* Sets [QuestEntityModel.sectionId] and [QuestEntityModel.section] if there's a section with
* [sectionId] as ID.
*/
fun setEntitySection(entity: QuestEntityModel<*, *>, sectionId: Int) {
private fun setEntitySection(entity: QuestEntityModel<*, *>, sectionId: Int) {
currentQuest.value?.let { quest ->
val variant = quest.areaVariants.value.find { it.area.id == entity.areaId }

6
web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EntityInfoWidget.kt
View File

@ -68,6 +68,12 @@ class EntityInfoWidget(private val ctrl: EntityInfoController) : Widget(enabled
createCoordRow("X:", ctrl.posX, ctrl::setPosX)
createCoordRow("Y:", ctrl.posY, ctrl::setPosY)
createCoordRow("Z:", ctrl.posZ, ctrl::setPosZ)
tr {
th { colSpan = 2; textContent = "World Position:" }
}
createCoordRow("X:", ctrl.worldPosX, ctrl::setWorldPosX)
createCoordRow("Y:", ctrl.worldPosY, ctrl::setWorldPosY)
createCoordRow("Z:", ctrl.worldPosZ, ctrl::setWorldPosZ)
tr {
th { colSpan = 2; textContent = "Rotation:" }
}