Skip to content

Consolidated the camera transform api to use TransformSystem api #949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
untoldengine merged 1 commit into from
Jan 20, 2026
Merged

Consolidated the camera transform api to use TransformSystem api #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 60 additions & 62 deletions Sources/UntoldEngine/Systems/CameraSystem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,26 +64,11 @@ public func resetCameraToDefaultTransform(entityId: EntityID) {
}

public func moveCameraTo(entityId: EntityID, _ translationX: Float, _ translationY: Float, _ translationZ: Float) {
guard let cameraComponent = scene.get(component: CameraComponent.self, for: entityId) else {
return
}

cameraComponent.localPosition.x = translationX
cameraComponent.localPosition.y = translationY
cameraComponent.localPosition.z = translationZ

updateCameraViewMatrix(entityId: entityId)
translateTo(entityId: entityId, position: simd_float3(translationX, translationY, translationZ))
}

public func moveCameraBy(entityId: EntityID, delU: Float, delV: Float, delN: Float) {
guard let cameraComponent = scene.get(component: CameraComponent.self, for: entityId) else {
return
}

cameraComponent.localPosition.x += delU * cameraComponent.xAxis.x + delV * cameraComponent.yAxis.x + delN * cameraComponent.zAxis.x
cameraComponent.localPosition.y += delU * cameraComponent.xAxis.y + delV * cameraComponent.yAxis.y + delN * cameraComponent.zAxis.y
cameraComponent.localPosition.z += delU * cameraComponent.xAxis.z + delV * cameraComponent.yAxis.z + delN * cameraComponent.zAxis.z
updateCameraViewMatrix(entityId: entityId)
translateBy(entityId: entityId, position: simd_float3(delU, delV, delN))
}

public func cameraMoveBy(entityId: EntityID, delta: simd_float3, space: CameraMoveSpace = .local) {
Expand All @@ -95,11 +80,10 @@ public func cameraMoveBy(entityId: EntityID, delta: simd_float3, space: CameraMo
case .local:
moveCameraBy(entityId: entityId, delU: delta.x, delV: delta.y, delN: delta.z)
case .world:
guard let cameraComponent = scene.get(component: CameraComponent.self, for: entityId) else {
guard let localTransformComponent = scene.get(component: LocalTransformComponent.self, for: entityId) else {
return
}
cameraComponent.localPosition += delta
updateCameraViewMatrix(entityId: entityId)
applyCameraLocalTransform(entityId: entityId, position: localTransformComponent.position + delta)
}
}

Expand Down Expand Up @@ -128,6 +112,29 @@ public func updateCameraViewMatrix(entityId: EntityID) {
cameraComponent.localOrientation = cameraComponent.zAxis
}

private func applyCameraLocalTransform(entityId: EntityID, position: simd_float3? = nil, rotation: simd_quatf? = nil) {
guard let localTransformComponent = scene.get(component: LocalTransformComponent.self, for: entityId) else {
handleError(.noLocalTransformComponent, entityId)
return
}

if let position {
localTransformComponent.position = position
}

if let rotation {
localTransformComponent.rotation = simd_normalize(rotation)
}

guard let cameraComponent = scene.get(component: CameraComponent.self, for: entityId) else {
return
}

cameraComponent.localPosition = localTransformComponent.position
cameraComponent.rotation = localTransformComponent.rotation
updateCameraViewMatrix(entityId: entityId)
}

public func orbitAround(entityId: EntityID, uPosition: simd_float2) {
guard let cameraComponent = scene.get(component: CameraComponent.self, for: entityId) else {
return
Expand Down Expand Up @@ -159,10 +166,10 @@ public func orbitAround(entityId: EntityID, uPosition: simd_float2) {
direction = simd_normalize(direction)
newUpAxis = simd_normalize(newUpAxis)

cameraComponent.localPosition = cameraComponent.orbitTarget + direction * length
let newPosition = cameraComponent.orbitTarget + direction * length

// compute the matrix
cameraLookAt(entityId: entityId, eye: cameraComponent.localPosition, target: cameraComponent.orbitTarget, up: newUpAxis)
cameraLookAt(entityId: entityId, eye: newPosition, target: cameraComponent.orbitTarget, up: newUpAxis)
}

// Returns a right-handed matrix which looks from a point (the "eye") at a target point, given the up vector.
Expand All @@ -177,11 +184,7 @@ public func cameraLookAt(entityId: EntityID, eye: simd_float3, target: simd_floa

let q0 = quaternion_lookAt(eye: eye, target: target, up: up)
let q1 = simd_conjugate(q0)
cameraComponent.rotation = simd_normalize(q1)

cameraComponent.localPosition = eye

updateCameraViewMatrix(entityId: entityId)
applyCameraLocalTransform(entityId: entityId, position: eye, rotation: simd_normalize(q1))
}

public func getCameraEye(entityId: EntityID) -> simd_float3 {
Expand Down Expand Up @@ -228,9 +231,7 @@ public func cameraLookAboutAxis(entityId: EntityID, uDelta: simd_float2) {

let newRotation: simd_quatf = simd_mul(rotationY, cameraComponent.rotation)

cameraComponent.rotation = simd_mul(newRotation, rotationX)

updateCameraViewMatrix(entityId: entityId)
applyCameraLocalTransform(entityId: entityId, rotation: simd_mul(newRotation, rotationX))
}

public func moveCameraAlongAxis(entityId: EntityID, uDelta: simd_float3) {
Expand Down Expand Up @@ -259,11 +260,15 @@ public func orbitCameraAround(entityId: EntityID, uDelta: simd_float2) {
}

public func getCameraPosition(entityId: EntityID) -> simd_float3 {
if let localTransformComponent = scene.get(component: LocalTransformComponent.self, for: entityId) {
return localTransformComponent.position
}

guard let cameraComponent = scene.get(component: CameraComponent.self, for: entityId) else {
return .zero
}

return simd_float3(cameraComponent.viewSpace.columns.3.x, cameraComponent.viewSpace.columns.3.y, cameraComponent.viewSpace.columns.3.z)
return cameraComponent.localPosition
}

public func moveCameraWithInput(entityId: EntityID, input: (w: Bool, a: Bool, s: Bool, d: Bool, q: Bool, e: Bool), speed: Float, deltaTime: Float) {
Expand Down Expand Up @@ -326,10 +331,7 @@ public func rotateCamera(entityId: EntityID, pitch: Float, yaw: Float, sensitivi

let newRotation: simd_quatf = simd_mul(rotationY, cameraComponent.rotation)

cameraComponent.rotation = simd_mul(newRotation, rotationX)

// Recompute view matrix to update the orientation vectors
updateCameraViewMatrix(entityId: entityId)
applyCameraLocalTransform(entityId: entityId, rotation: simd_mul(newRotation, rotationX))
}

public func cameraFollow(entityId: EntityID,
Expand All @@ -338,24 +340,25 @@ public func cameraFollow(entityId: EntityID,
smoothFactor: Float = 0.0,
deltaTime: Float = 0.0)
{
guard let cameraComponent = scene.get(component: CameraComponent.self, for: entityId) else {
guard scene.get(component: CameraComponent.self, for: entityId) != nil else {
return
}
guard let localTransformComponent = scene.get(component: LocalTransformComponent.self, for: entityId) else {
return
}
guard let targetTransform = scene.get(component: LocalTransformComponent.self, for: targetEntity) else {
return
}

let desiredPosition = targetTransform.position + offset
let currentPosition = cameraComponent.localPosition
let currentPosition = localTransformComponent.position

if smoothFactor > 0, deltaTime > 0 {
let t = min(smoothFactor * deltaTime, 1.0)
cameraComponent.localPosition = currentPosition + (desiredPosition - currentPosition) * t
applyCameraLocalTransform(entityId: entityId, position: currentPosition + (desiredPosition - currentPosition) * t)
} else {
cameraComponent.localPosition = desiredPosition
applyCameraLocalTransform(entityId: entityId, position: desiredPosition)
}

updateCameraViewMatrix(entityId: entityId)
}

public func cameraFollowLocal(entityId: EntityID,
Expand All @@ -364,7 +367,10 @@ public func cameraFollowLocal(entityId: EntityID,
smoothFactor: Float = 0.0,
deltaTime: Float = 0.0)
{
guard let cameraComponent = scene.get(component: CameraComponent.self, for: entityId) else {
guard scene.get(component: CameraComponent.self, for: entityId) != nil else {
return
}
guard let localTransformComponent = scene.get(component: LocalTransformComponent.self, for: entityId) else {
return
}
guard let targetTransform = scene.get(component: LocalTransformComponent.self, for: targetEntity) else {
Expand All @@ -375,16 +381,14 @@ public func cameraFollowLocal(entityId: EntityID,
let rotationMatrix = transformQuaternionToMatrix3x3(q: targetTransform.rotation)
let rotatedOffset = rotationMatrix * localOffset
let desiredPosition = targetTransform.position + rotatedOffset
let currentPosition = cameraComponent.localPosition
let currentPosition = localTransformComponent.position

if smoothFactor > 0, deltaTime > 0 {
let t = min(smoothFactor * deltaTime, 1.0)
cameraComponent.localPosition = currentPosition + (desiredPosition - currentPosition) * t
applyCameraLocalTransform(entityId: entityId, position: currentPosition + (desiredPosition - currentPosition) * t)
} else {
cameraComponent.localPosition = desiredPosition
applyCameraLocalTransform(entityId: entityId, position: desiredPosition)
}

updateCameraViewMatrix(entityId: entityId)
}

public func cameraFollowDeadZone(entityId: EntityID,
Expand All @@ -397,11 +401,14 @@ public func cameraFollowDeadZone(entityId: EntityID,
guard let cameraComponent = scene.get(component: CameraComponent.self, for: entityId) else {
return
}
guard let localTransformComponent = scene.get(component: LocalTransformComponent.self, for: entityId) else {
return
}
guard let targetTransform = scene.get(component: LocalTransformComponent.self, for: targetEntity) else {
return
}

let cameraPosition = cameraComponent.localPosition
let cameraPosition = localTransformComponent.position
let targetPosition = targetTransform.position + offset
let toTarget = targetPosition - cameraPosition

Expand Down Expand Up @@ -445,12 +452,10 @@ public func cameraFollowDeadZone(entityId: EntityID,

if smoothFactor > 0, deltaTime > 0 {
let t = min(smoothFactor * deltaTime, 1.0)
cameraComponent.localPosition = cameraPosition + (desiredPosition - cameraPosition) * t
applyCameraLocalTransform(entityId: entityId, position: cameraPosition + (desiredPosition - cameraPosition) * t)
} else {
cameraComponent.localPosition = desiredPosition
applyCameraLocalTransform(entityId: entityId, position: desiredPosition)
}

updateCameraViewMatrix(entityId: entityId)
}

public func cameraOrbitTarget(entityId: EntityID,
Expand Down Expand Up @@ -479,11 +484,11 @@ public func cameraOrbitTarget(entityId: EntityID,
// New position on orbit
let newX = cos(angle) * radius
let newZ = sin(angle) * radius
cameraComponent.localPosition = simd_float3(newX, center.y, newZ) + center
let newPosition = simd_float3(newX, center.y, newZ) + center

// Aim at the center entity
cameraLookAt(entityId: entityId,
eye: cameraComponent.localPosition,
eye: newPosition,
target: centerTransform.position,
up: simd_float3(0, 1, 0))
}
Expand Down Expand Up @@ -786,12 +791,5 @@ public func updateCameraPath(deltaTime: Float) {

/// Applies position and rotation to a camera entity
private func applyCameraTransform(entityId: EntityID, position: simd_float3, rotation: simd_quatf) {
guard let cameraComponent = scene.get(component: CameraComponent.self, for: entityId) else {
return
}

cameraComponent.localPosition = position
cameraComponent.rotation = simd_normalize(rotation)

updateCameraViewMatrix(entityId: entityId)
applyCameraLocalTransform(entityId: entityId, position: position, rotation: simd_normalize(rotation))
}
26 changes: 26 additions & 0 deletions Sources/UntoldEngine/Systems/TransformSystem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@
import Foundation
import simd

private func syncCameraTransformIfNeeded(entityId: EntityID, localTransformComponent: LocalTransformComponent) {
guard let cameraComponent = scene.get(component: CameraComponent.self, for: entityId) else {
return
}

cameraComponent.localPosition = localTransformComponent.position
cameraComponent.rotation = localTransformComponent.rotation
updateCameraViewMatrix(entityId: entityId)
}

public func getLocalPosition(entityId: EntityID) -> simd_float3 {
guard let localTransformComponent = scene.get(component: LocalTransformComponent.self, for: entityId) else {
handleError(.noLocalTransformComponent, entityId)
Expand Down Expand Up @@ -156,6 +166,7 @@ public func translateTo(entityId: EntityID, position: simd_float3) {
}

localTransformComponent.position = position
syncCameraTransformIfNeeded(entityId: entityId, localTransformComponent: localTransformComponent)
}

public func translateBy(entityId: EntityID, position: simd_float3) {
Expand All @@ -169,6 +180,16 @@ public func translateBy(entityId: EntityID, position: simd_float3) {
return
}

if scene.get(component: CameraComponent.self, for: entityId) != nil {
let xAxis = rightDirectionVector(from: localTransformComponent.rotation)
let yAxis = upDirectionVector(from: localTransformComponent.rotation)
let zAxis = forwardDirectionVector(from: localTransformComponent.rotation)

localTransformComponent.position += position.x * xAxis + position.y * yAxis + position.z * zAxis
syncCameraTransformIfNeeded(entityId: entityId, localTransformComponent: localTransformComponent)
return
}

localTransformComponent.position.x += position.x
localTransformComponent.position.y += position.y
localTransformComponent.position.z += position.z
Expand Down Expand Up @@ -200,6 +221,7 @@ public func rotateTo(entityId: EntityID, angle: Float, axis: simd_float3) {
n.columns.2 = m.columns.2

localTransformComponent.rotation = transformMatrix3nToQuaternion(m: n)
syncCameraTransformIfNeeded(entityId: entityId, localTransformComponent: localTransformComponent)
}

/// Orient an entity so its forward axis points at a target position.
Expand Down Expand Up @@ -231,6 +253,7 @@ public func lookAt(entityId: EntityID,
rotationMatrix = simd_float3x3(columns: (r, u, f))

localTransformComponent.rotation = transformMatrix3nToQuaternion(m: rotationMatrix)
syncCameraTransformIfNeeded(entityId: entityId, localTransformComponent: localTransformComponent)
}

public func rotateBy(entityId: EntityID, angle: Float, axis: simd_float3) {
Expand Down Expand Up @@ -262,6 +285,7 @@ public func rotateBy(entityId: EntityID, angle: Float, axis: simd_float3) {
let newQ = simd_normalize(simd_mul(q, pq))

localTransformComponent.rotation = newQ
syncCameraTransformIfNeeded(entityId: entityId, localTransformComponent: localTransformComponent)
}

public func rotateTo(entityId: EntityID, rotation: simd_float4x4) {
Expand All @@ -274,6 +298,7 @@ public func rotateTo(entityId: EntityID, rotation: simd_float4x4) {
let q = simd_normalize(simd_quatf(rotUpperLeft))

localTransformComponent.rotation = q
syncCameraTransformIfNeeded(entityId: entityId, localTransformComponent: localTransformComponent)
}

public func rotateTo(entityId: EntityID, pitch: Float, yaw: Float, roll: Float) {
Expand All @@ -285,6 +310,7 @@ public func rotateTo(entityId: EntityID, pitch: Float, yaw: Float, roll: Float)
let q = simd_normalize(transformEulerAnglesToQuaternion(pitch: pitch, yaw: yaw, roll: roll))

localTransformComponent.rotation = q
syncCameraTransformIfNeeded(entityId: entityId, localTransformComponent: localTransformComponent)
}

public func scaleTo(entityId: EntityID, scale: simd_float3) {
Expand Down
29 changes: 29 additions & 0 deletions Tests/UntoldEngineTests/CameraTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,41 @@ final class CameraTests: XCTestCase {
XCTAssertEqual(cameraComponent.localPosition, simd_float3(10, 20, 30))
}

func testTranslateToSyncsLocalTransform() {
translateTo(entityId: camera, position: simd_float3(2, 4, 6))
guard let localTransform = scene.get(component: LocalTransformComponent.self, for: camera) else {
return
}
guard let cameraComponent = scene.get(component: CameraComponent.self, for: camera) else {
return
}
XCTAssertEqual(localTransform.position, simd_float3(2, 4, 6))
XCTAssertEqual(cameraComponent.localPosition, simd_float3(2, 4, 6))
XCTAssertEqual(getCameraPosition(entityId: camera), simd_float3(2, 4, 6))
}

func testTranslateBy() {
moveCameraTo(entityId: camera, 0, 0, 0)
moveCameraBy(entityId: camera, delU: 1, delV: 2, delN: 3)
XCTAssertNotEqual(getCameraPosition(entityId: camera), simd_float3(0, 0, 0))
}

func testTranslateByUsesCameraAxes() {
translateTo(entityId: camera, position: .zero)
rotateTo(entityId: camera, angle: 90, axis: simd_float3(0, 1, 0))

translateBy(entityId: camera, position: simd_float3(0, 0, 1))

guard let localTransform = scene.get(component: LocalTransformComponent.self, for: camera) else {
return
}

let forward = forwardDirectionVector(from: localTransform.rotation)
XCTAssertEqual(localTransform.position.x, forward.x, accuracy: 0.0001)
XCTAssertEqual(localTransform.position.y, forward.y, accuracy: 0.0001)
XCTAssertEqual(localTransform.position.z, forward.z, accuracy: 0.0001)
}

// MARK: - View Matrix Update

func testViewMatrixUpdate() {
Expand Down
Loading