Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Chess/Common/Manipulation/SceneManipulator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class SceneManipulator {
guard let node = findPiece(scene: scene, piece: piece) else {
fatalError("Could not find piece")
}
let current = node.transform.value.translation
let current = node.transform.translation
var translation = PNAnimatedFloat3.defaultTranslation
translation = PNKeyframeAnimation(keyFrames: [simd_float3(current.x, 0, current.z),
simd_float3(current.x, 0.3, current.z)],
Expand All @@ -35,7 +35,7 @@ class SceneManipulator {
guard let node = findPiece(scene: scene, piece: piece) else {
fatalError("Could not find piece")
}
let current = node.transform.value.translation
let current = node.transform.translation
var translation = PNAnimatedFloat3.defaultTranslation
translation = PNKeyframeAnimation(keyFrames: [simd_float3(current.x, current.y, current.z),
simd_float3(current.x, 0, current.z)],
Expand All @@ -62,7 +62,7 @@ class SceneManipulator {
private func move(piece: PNAnimatedNode, from: Field?, to: Field?, delay: PNTimeInterval) {
assert(from != nil || to != nil, "Either 'from' or 'to' must be non-nil")
var translation = PNAnimatedFloat3.defaultTranslation
let currentTranslation = piece.transform.value.translation
let currentTranslation = piece.transform.translation
if let from = from, let to = to {
translation = PNKeyframeAnimation(keyFrames: [simd_float3(Float(from.row), currentTranslation.y, Float(from.column)),
simd_float3(Float(from.row), 1.5, Float(from.column)),
Expand Down
6 changes: 3 additions & 3 deletions Chess/macOS/Interaction/MouseInteractionHandler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ class MouseInteractionHandler {
}
return $0.parent?.parent?.parent?.parent
}).sorted(by: { first, second in
guard let firstBB = first.data.worldBoundingBox.value,
let secondBB = second.data.worldBoundingBox.value,
let cameraBB = camera.worldBoundingBox.value else {
guard let firstBB = first.data.worldBoundingBox,
let secondBB = second.data.worldBoundingBox,
let cameraBB = camera.worldBoundingBox else {
return false
}
let cameraCenter = bInteractor.center(bbInteractor.bound(cameraBB))
Expand Down
2 changes: 1 addition & 1 deletion Library
Submodule Library updated 32 files
+1 −1 Dependencies/ZPack
+4 −40 Engine.xcodeproj/project.pbxproj
+0 −8 Engine/Core/Aliases/Combine/CurrentValueSubject+Alias.swift
+0 −8 Engine/Core/Aliases/Porcelain/PNSubject+Alias.swift
+2 −0 Engine/Core/Engine/Workload/WorkloadManager/PNIThreadedWorkloadManager.swift
+2 −0 Engine/Core/Engine/Workload/WorkloadManager/PNIWorkloadManager.swift
+0 −11 Engine/Core/Extensions/Combine/Publisher+Extension.swift
+4 −1 Engine/Core/Extensions/ModelIO/MDLTexture+Extension.swift
+1 −1 Engine/Core/Extensions/Porcelain/PNScenePiece+Extension.swift
+1 −1 Engine/Core/Import/Translator/PNISceneTranslator.swift
+14 −17 Engine/Core/Organization/Node/Kinds/AmbientLight/PNIAmbientLightNode.swift
+15 −19 Engine/Core/Organization/Node/Kinds/Camera/PNIAnimatedCameraNode.swift
+18 −18 Engine/Core/Organization/Node/Kinds/Camera/PNICameraNode.swift
+15 −19 Engine/Core/Organization/Node/Kinds/Mesh/PNIAnimatedMeshNode.swift
+14 −17 Engine/Core/Organization/Node/Kinds/Mesh/PNIMeshNode.swift
+14 −17 Engine/Core/Organization/Node/Kinds/OmniLight/PNIOmniLightNode.swift
+14 −17 Engine/Core/Organization/Node/Kinds/Particle/PNIParticleNode.swift
+16 −20 Engine/Core/Organization/Node/Kinds/RiggedMesh/PNIAnimatedRiggedMeshNode.swift
+14 −17 Engine/Core/Organization/Node/Kinds/RiggedMesh/PNIRiggedMeshNode.swift
+15 −19 Engine/Core/Organization/Node/Kinds/SceneNode/PNIAnimatedNode.swift
+14 −17 Engine/Core/Organization/Node/Kinds/SceneNode/PNISceneNode.swift
+7 −8 Engine/Core/Organization/Node/Kinds/SceneNode/PNSceneNode.swift
+14 −17 Engine/Core/Organization/Node/Kinds/SpotLight/PNISpotLightNode.swift
+0 −147 Engine/Core/Organization/Node/Refreshing/PNIRefreshController.swift
+6 −30 Engine/Core/Organization/Node/Structure/PNNode.swift
+65 −0 Engine/Core/Organization/PNNodeUpdater.swift
+2 −2 Engine/Core/Translation/Transcriber/PNITranscriber.swift
+2 −2 Engine/Core/UI/PNIScreenInteractor.swift
+4 −0 Engine/Shaders/Common/Transformation.h
+18 −1 Engine/Shaders/Common/Transformation.metal
+2 −1 Engine/Shaders/EnvironmentMapper.metal
+105 −81 EngineTests/Engine/Scene/Organization/Node/Kinds/PNISceneNode+Tests.swift