From 9b5b3bb22cf547f29d4a04b0806f5f253754c00d Mon Sep 17 00:00:00 2001 From: xu Date: Tue, 28 Apr 2020 00:35:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E8=88=AA=E7=82=B9=E5=92=8C?= =?UTF-8?q?=E6=99=AE=E9=80=9A=E8=88=AA=E7=82=B9=E5=90=8C=E6=A0=B7=E5=A4=84?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=90=A6=E5=88=99=E7=81=AF=E5=85=89=E5=92=8C?= =?UTF-8?q?=E9=87=8D=E8=AE=BE=E9=83=BD=E6=9C=89bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plane.FormationCreator/Formation/FlightTask_FlyTo.cs | 2 ++ Plane.FormationCreator/ViewModels/View3DViewModel.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Plane.FormationCreator/Formation/FlightTask_FlyTo.cs b/Plane.FormationCreator/Formation/FlightTask_FlyTo.cs index e64c3d0..612f920 100644 --- a/Plane.FormationCreator/Formation/FlightTask_FlyTo.cs +++ b/Plane.FormationCreator/Formation/FlightTask_FlyTo.cs @@ -181,6 +181,7 @@ namespace Plane.FormationCreator.Formation //while (!info.Copter.ArrivedTarget(info.TargetLat, info.TargetLng, info.TargetAlt)) //按航点飞 ：所有Copter到达目标点开始飞下个航点 while (ts.TotalMilliseconds < (flyToTime + loiterTime)) //按时间轴飞：当前任务时间到达后自动飞往下个航点 { + /* //悬停时间等于0为快速航点 到达之后立即出发下个航点 切时间累积 if (loiterTime == 0 && info.Copter.ArrivedTarget(info.TargetLat, info.TargetLng, info.TargetAlt)) @@ -188,6 +189,7 @@ namespace Plane.FormationCreator.Formation task.RuningTaskRemaining = flyToTime - (int)ts.TotalMilliseconds; break; } + */ if (_flightTaskManager.IsPaused == true) { await info.Copter.HoverAsync(); diff --git a/Plane.FormationCreator/ViewModels/View3DViewModel.cs b/Plane.FormationCreator/ViewModels/View3DViewModel.cs index 11e3a13..25696ed 100644 --- a/Plane.FormationCreator/ViewModels/View3DViewModel.cs +++ b/Plane.FormationCreator/ViewModels/View3DViewModel.cs @@ -236,7 +236,7 @@ namespace Plane.FormationCreator.ViewModels //航点的大小形状 meshBuilderwaypoint.AddSphere(new Point3D(0, 0, 0), 0.2* _copterManager.scale3d); 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) {