Bugfix: FramingTransposer with a dead zone would sometimes drift (#1031)

glabute · web-flow · commit 0cb1aa8578d1 · 2025-01-08T07:58:24.000-05:00
diff --git a/com.unity.cinemachine/CHANGELOG.md b/com.unity.cinemachine/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Bugfixes
 - CameraDeactivated events were not sent consistently when a blend interrupted another blend before completion.
 - CameraActivated events were not sent consistently when activation was due to timeline blends.
+- Bugfix: FramingTransposer with a dead zone would sometimes drift.
 
 ### Changed
 - Added delayed processing to near and far clip plane inspector fields for the CinemachineCamera lens.
diff --git a/com.unity.cinemachine/Runtime/Components/CinemachinePositionComposer.cs b/com.unity.cinemachine/Runtime/Components/CinemachinePositionComposer.cs
@@ -319,7 +319,7 @@ public override void MutateCameraState(ref CameraState curState, float deltaTime
                         realTargetPos - cameraOffset, hardGuideOrtho);
                 }
             }
-            curState.RawPosition = localToWorld * (cameraPos + cameraOffset);
+            curState.RawPosition = camPosWorld + localToWorld * cameraOffset;
             m_PreviousCameraPosition = curState.RawPosition;
 
             m_InheritingPosition = false;
diff --git a/com.unity.cinemachine/Runtime/Deprecated/CinemachineFramingTransposer.cs b/com.unity.cinemachine/Runtime/Deprecated/CinemachineFramingTransposer.cs
@@ -549,7 +549,7 @@ public override void MutateCameraState(ref CameraState curState, float deltaTime
                         realTargetPos - cameraOffset, hardGuideOrtho);
                 }
             }
-            curState.RawPosition = localToWorld * (cameraPos + cameraOffset);
+            curState.RawPosition = camPosWorld + localToWorld * cameraOffset;
             m_PreviousCameraPosition = curState.RawPosition;
 
             // Adjust lens for group framing

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ public override void MutateCameraState(ref CameraState curState, float deltaTime`
`319`	`319`	`realTargetPos - cameraOffset, hardGuideOrtho);`
`320`	`320`	`}`
`321`	`321`	`}`
`322`		`- curState.RawPosition = localToWorld * (cameraPos + cameraOffset);`
	`322`	`+ curState.RawPosition = camPosWorld + localToWorld * cameraOffset;`
`323`	`323`	`m_PreviousCameraPosition = curState.RawPosition;`
`324`	`324`
`325`	`325`	`m_InheritingPosition = false;`
Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,7 @@ public override void MutateCameraState(ref CameraState curState, float deltaTime`
`549`	`549`	`realTargetPos - cameraOffset, hardGuideOrtho);`
`550`	`550`	`}`
`551`	`551`	`}`
`552`		`- curState.RawPosition = localToWorld * (cameraPos + cameraOffset);`
	`552`	`+ curState.RawPosition = camPosWorld + localToWorld * cameraOffset;`
`553`	`553`	`m_PreviousCameraPosition = curState.RawPosition;`
`554`	`554`
`555`	`555`	`// Adjust lens for group framing`