From c67dee4f1162f6ae2e7330541a2fb0e6bb594793 Mon Sep 17 00:00:00 2001
From: tian <11429339@qq.com>
Date: Fri, 29 May 2026 01:44:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A6=E6=9D=9F=E4=BF=9D=E7=95=99=E9=97=A8?=
=?UTF-8?q?=E5=9E=8B=E5=81=8F=E5=A5=BD=EF=BC=8C=E8=AF=84=E4=BC=B0=E6=94=B9?=
=?UTF-8?q?=E7=94=A8=E5=9B=BA=E5=AE=9A=E5=AE=BF=E4=B8=BBX=E8=BD=B4?=
=?UTF-8?q?=E5=89=8D=E5=90=91=EF=BC=8C=E7=BB=93=E6=9E=9C=E5=8A=A0=E5=9B=9E?=
=?UTF-8?q?=E8=B7=AF=E5=BE=84yaw?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ViewModels/AnimationControlViewModel.cs | 43 +++----------------
src/UI/WPF/Views/EditRotationWindow.xaml | 2 +-
src/UI/WPF/Views/EditRotationWindow.xaml.cs | 9 ++--
.../ObjectPassageProjectionOptimizer.cs | 8 ++--
4 files changed, 15 insertions(+), 47 deletions(-)
diff --git a/src/UI/WPF/ViewModels/AnimationControlViewModel.cs b/src/UI/WPF/ViewModels/AnimationControlViewModel.cs
index 1ce96dc..7048ef8 100644
--- a/src/UI/WPF/ViewModels/AnimationControlViewModel.cs
+++ b/src/UI/WPF/ViewModels/AnimationControlViewModel.cs
@@ -2229,10 +2229,10 @@ namespace NavisworksTransport.UI.WPF.ViewModels
return ObjectPassageProjectionOptimizationResult.CreateFailure("动画物体为空，无法自动调整。");
}
- if (!TryCreatePassageProjectionAxes(request, out Vector3 hostSide, out Vector3 hostUp))
- {
- return ObjectPassageProjectionOptimizationResult.CreateFailure("路径方向退化，无法计算通行截面。");
- }
+ // 固定评估坐标系：前向=宿主X轴，截面=YZ平面
+ CoordinateSystemType hst = CoordinateSystemManager.Instance.ResolvedType;
+ var hostUp = hst == CoordinateSystemType.YUp ? Vector3.UnitY : Vector3.UnitZ;
+ var hostSide = Vector3.Cross(Vector3.UnitX, hostUp);
var originalCorrection = _objectRotationCorrection;
double originalLiftInMeters = _objectGroundLiftHeightInMeters;
@@ -2244,37 +2244,18 @@ namespace NavisworksTransport.UI.WPF.ViewModels
request,
correction =>
{
- // 从 correction 扣除路径 yaw（动画链路会在起点再次加上）
- // 这样 targetYaw = pathYaw + (correctionY - pathYaw) = correctionY
- CoordinateSystemType hst = CoordinateSystemManager.Instance.ResolvedType;
- double pyAdj = 0;
- if (PathTargetFrameResolver.TryResolvePlanarHostYaw(request.HostPathForward, hst, out double pyRad))
- {
- pyAdj = pyRad * 180.0 / Math.PI;
- }
- var corr = correction;
- var baseAdjusted = new LocalEulerRotationCorrection(
- corr.XDegrees,
- hst == CoordinateSystemType.YUp ? corr.YDegrees - pyAdj : corr.YDegrees,
- hst == CoordinateSystemType.ZUp ? corr.ZDegrees - pyAdj : corr.ZDegrees);
var placementRequest = ObjectStartPlacementRequest.CreateRotationCorrection(
- baseAdjusted,
+ correction,
originalLiftInMeters);
_pathAnimationManager.ApplyObjectStartPlacementRequest(placementRequest);
BoundingBox3D bounds = animatedObject.BoundingBox();
- var baseScore = CalculateMeasuredAabbProjectionScore(bounds, hostSide, hostUp);
- var score = new ObjectPassageProjectionScore(
- baseScore.WidthAcrossPath,
- baseScore.HeightAlongHostUp + request.VehicleHeightModelUnits);
+ var score = CalculateMeasuredAabbProjectionScore(bounds, hostSide, hostUp);
- // 按门型约束过滤：宽门要求 Width >= Height，高门要求 Height >= Width
bool meetsConstraint = request.RequireWidthLarger
? score.WidthAcrossPath >= score.HeightAlongHostUp
: score.HeightAlongHostUp >= score.WidthAcrossPath;
if (!meetsConstraint)
- {
return ObjectPassageProjectionScore.Invalid;
- }
return score;
});
@@ -2282,17 +2263,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels
// 计算上下偏移：应用最优旋转后，使物体底面贴合物流车高度
if (result.Success && CurrentPathRoute?.PathType == PathType.Ground)
{
- CoordinateSystemType hst = CoordinateSystemManager.Instance.ResolvedType;
- double pyAdj = 0;
- if (PathTargetFrameResolver.TryResolvePlanarHostYaw(request.HostPathForward, hst, out double pyRad))
- {
- pyAdj = pyRad * 180.0 / Math.PI;
- }
- var optimalBaseAdjusted = new LocalEulerRotationCorrection(
- result.Correction.XDegrees,
- hst == CoordinateSystemType.YUp ? result.Correction.YDegrees - pyAdj : result.Correction.YDegrees,
- hst == CoordinateSystemType.ZUp ? result.Correction.ZDegrees - pyAdj : result.Correction.ZDegrees);
- var measureRequest = ObjectStartPlacementRequest.CreateRotationCorrection(optimalBaseAdjusted, 0);
+ var measureRequest = ObjectStartPlacementRequest.CreateRotationCorrection(result.Correction, 0);
_pathAnimationManager.ApplyObjectStartPlacementRequest(measureRequest);
BoundingBox3D measureBounds = animatedObject.BoundingBox();
diff --git a/src/UI/WPF/Views/EditRotationWindow.xaml b/src/UI/WPF/Views/EditRotationWindow.xaml
index 283d710..e600534 100644
--- a/src/UI/WPF/Views/EditRotationWindow.xaml
+++ b/src/UI/WPF/Views/EditRotationWindow.xaml
@@ -150,7 +150,7 @@
diff --git a/src/UI/WPF/Views/EditRotationWindow.xaml.cs b/src/UI/WPF/Views/EditRotationWindow.xaml.cs
index 88071cc..86ad684 100644
--- a/src/UI/WPF/Views/EditRotationWindow.xaml.cs
+++ b/src/UI/WPF/Views/EditRotationWindow.xaml.cs
@@ -28,8 +28,8 @@ namespace NavisworksTransport.UI.WPF.Views
private readonly ObjectPassageProjectionOptimizationRequest _autoAdjustmentRequest;
private readonly Func _autoAdjustmentProvider;
private readonly bool _isGroundLiftEnabled;
- private bool _requireWidthLarger = false;
private double _vehicleHeightInMeters = 0.15;
+ private bool _requireWidthLarger = false;
///
/// 门型偏好：true=宽>高，false=高>宽（默认）
@@ -40,9 +40,6 @@ namespace NavisworksTransport.UI.WPF.Views
set => _requireWidthLarger = value;
}
- ///
- /// 物流车辆高度（米），默认 0.15m
- ///
public double VehicleHeightInMeters
{
get => _vehicleHeightInMeters;
@@ -177,8 +174,10 @@ namespace NavisworksTransport.UI.WPF.Views
return;
}
+ PathTargetFrameResolver.TryResolvePlanarHostYaw(_autoAdjustmentRequest.HostPathForward, CoordinateSystemManager.Instance.ResolvedType, out double yawRad);
+
RotationXDegrees = NormalizeDisplayDegrees(result.Correction.XDegrees);
- RotationYDegrees = NormalizeDisplayDegrees(result.Correction.YDegrees);
+ RotationYDegrees = NormalizeDisplayDegrees(result.Correction.YDegrees + yawRad * 180.0 / Math.PI);
RotationZDegrees = NormalizeDisplayDegrees(result.Correction.ZDegrees);
if (result.ComputedLiftOffsetMeters.HasValue)
{
diff --git a/src/Utils/CoordinateSystem/ObjectPassageProjectionOptimizer.cs b/src/Utils/CoordinateSystem/ObjectPassageProjectionOptimizer.cs
index a47c7fb..42d9491 100644
--- a/src/Utils/CoordinateSystem/ObjectPassageProjectionOptimizer.cs
+++ b/src/Utils/CoordinateSystem/ObjectPassageProjectionOptimizer.cs
@@ -13,8 +13,7 @@ namespace NavisworksTransport.Utils.CoordinateSystem
Vector3 hostPathForward,
Vector3 hostUp,
double areaRelativeTieTolerance = 0.01,
- Quaternion? baselineHostRotation = null,
- bool requireWidthLarger = true)
+ Quaternion? baselineHostRotation = null)
{
SizeX = sizeX;
SizeY = sizeY;
@@ -23,7 +22,6 @@ namespace NavisworksTransport.Utils.CoordinateSystem
HostUp = hostUp;
AreaRelativeTieTolerance = areaRelativeTieTolerance;
BaselineHostRotation = Quaternion.Normalize(baselineHostRotation ?? Quaternion.Identity);
- RequireWidthLarger = requireWidthLarger;
}
public double SizeX { get; }
@@ -41,12 +39,12 @@ namespace NavisworksTransport.Utils.CoordinateSystem
public Quaternion BaselineHostRotation { get; }
///
- /// 是否要求通行截面宽度 >= 高度（宽扁门）。false 表示高窄门（高度 >= 宽度）。
+ /// 门型偏好：true=宽>高，false=高>宽
///
public bool RequireWidthLarger { get; set; }
///
- /// 物体下方物流车辆高度（模型单位），自动调整时加到通行截面高度上。
+ /// 物体下方物流车辆高度（模型单位）
///
public double VehicleHeightModelUnits { get; set; }
}