group/Plane.FormationCreator
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

快速航点和普通航点同样处理，否则灯光和重设都有bug

Browse Source
This commit is contained in:
xu 2020-04-28 00:35:50 +08:00
parent 441cbe953d
commit 9b5b3bb22c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plane.FormationCreator/Formation/FlightTask_FlyTo.cs
View File

@ -181,6 +181,7 @@ namespace Plane.FormationCreator.Formation
//while (!info.Copter.ArrivedTarget(info.TargetLat, info.TargetLng, info.TargetAlt)) //按航点飞 ：所有Copter到达目标点开始飞下个航点 //while (!info.Copter.ArrivedTarget(info.TargetLat, info.TargetLng, info.TargetAlt)) //按航点飞 ：所有Copter到达目标点开始飞下个航点
while (ts.TotalMilliseconds < (flyToTime + loiterTime)) //按时间轴飞：当前任务时间到达后自动飞往下个航点 while (ts.TotalMilliseconds < (flyToTime + loiterTime)) //按时间轴飞：当前任务时间到达后自动飞往下个航点
{ {
/*
//悬停时间等于0为快速航点 到达之后立即出发下个航点 切时间累积 //悬停时间等于0为快速航点 到达之后立即出发下个航点 切时间累积
if (loiterTime == 0 && if (loiterTime == 0 &&
info.Copter.ArrivedTarget(info.TargetLat, info.TargetLng, info.TargetAlt)) info.Copter.ArrivedTarget(info.TargetLat, info.TargetLng, info.TargetAlt))
@ -188,6 +189,7 @@ namespace Plane.FormationCreator.Formation
task.RuningTaskRemaining = flyToTime - (int)ts.TotalMilliseconds; task.RuningTaskRemaining = flyToTime - (int)ts.TotalMilliseconds;
break; break;
} }
*/
if (_flightTaskManager.IsPaused == true) if (_flightTaskManager.IsPaused == true)
{ {
await info.Copter.HoverAsync(); await info.Copter.HoverAsync();

2
Plane.FormationCreator/ViewModels/View3DViewModel.cs
View File

@ -236,7 +236,7 @@ namespace Plane.FormationCreator.ViewModels
//航点的大小形状 //航点的大小形状
meshBuilderwaypoint.AddSphere(new Point3D(0, 0, 0), 0.2* _copterManager.scale3d); meshBuilderwaypoint.AddSphere(new Point3D(0, 0, 0), 0.2* _copterManager.scale3d);
var meshwaypoint = meshBuilderwaypoint.ToMesh(true); var meshwaypoint = meshBuilderwaypoint.ToMesh(true);
var greenMaterial = MaterialHelper.CreateMaterial(Color.FromRgb(0,255,0)); var greenMaterial = MaterialHelper.CreateMaterial(Color.FromRgb(50,50,255));
foreach (FlightTaskSingleCopterInfo info in _flightTaskManager.Tasks[_flightTaskManager.SelectedTaskIndex].SingleCopterInfos) foreach (FlightTaskSingleCopterInfo info in _flightTaskManager.Tasks[_flightTaskManager.SelectedTaskIndex].SingleCopterInfos)
{ {