Skip to content

Simplify camera retrieval #25

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
mateuszstompor merged 1 commit into from
Jan 23, 2026
Merged

Simplify camera retrieval #25

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
38 changes: 16 additions & 22 deletions Chess/macOS/ViewControllers/GameViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ class GameViewController: NSViewController, GameDelegate, NSGestureRecognizerDel
if (distance < 1e-3) {
return
}
nodeInteractor.forEach(node: engine.scene.rootNode, { node in
guard let node = node.data as? PNAnimatedCameraNode else {
return
}
if let camera = getCameraNode() {
let arc = rotateArcball(from: end, to: start)
cameraController.rotate(camera: node, quatf: arc)
})
cameraController.rotate(camera: camera, quatf: arc)
}
last = tNormalized
}
private func getCameraNode() -> PNAnimatedCameraNode? {
return nodeInteractor.firstCasting(from: engine.scene.rootNode)
}
override func viewDidLoad() {
super.viewDidLoad()

Expand Down Expand Up @@ -107,22 +107,18 @@ class GameViewController: NSViewController, GameDelegate, NSGestureRecognizerDel
view.window?.toggleFullScreen(self)
case "d", "a":
let minus = event.charactersIgnoringModifiers == "a"
nodeInteractor.forEach(node: engine.scene.rootNode, { node in
guard let node = node.data as? PNAnimatedCameraNode else {
return
}
cameraController.rotate(camera: node, angleDegress: minus ? -45 : 45)
})
if let camera = getCameraNode() {
cameraController.rotate(camera: camera,
angleDegress: minus ? -45 : 45)
}
case "r":
let rotation = simd_quatf(angle: Float(45).radians, axis: [0, 1, 0]) *
simd_quatf(angle: Float(45).radians, axis: [-1, 0, 0])
let translation = simd_float4x4.translation(vector: [0, 0.41, 5])
nodeInteractor.forEach(node: engine.scene.rootNode, { node in
guard let node = node.data as? PNAnimatedCameraNode else {
return
}
cameraController.set(camera: node, transformation: translation * rotation.rotationMatrix)
})
if let camera = getCameraNode() {
cameraController.set(camera: camera,
transformation: translation * rotation.rotationMatrix)
}
default:
return false
}
Expand All @@ -140,10 +136,7 @@ class GameViewController: NSViewController, GameDelegate, NSGestureRecognizerDel
guard state.checkState != .stalemate && state.checkState != .checkmate else {
return
}
let camera = engine.scene.rootNode.all().compactMap({
$0.data as? PNAnimatedCameraNode
}).first
guard let camera = camera else {
guard let camera = getCameraNode() else {
return
}
let frame = view.frame
Expand Down Expand Up @@ -215,3 +208,4 @@ class GameViewController: NSViewController, GameDelegate, NSGestureRecognizerDel
return action[alert.runModal().rawValue - 1000]
}
}