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

修改模拟飞行时降落不能多次双击模拟bug

Browse Source 
修改前一个是返航点时，双击模拟时飞机位置不正确bug
3d地面飞机改为白色
修改启动界面更好看点
This commit is contained in:
xu 2020-01-31 02:18:28 +08:00
parent 6f33c3867c
commit 8990d57212
5 changed files with 62 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Plane.FormationCreator/Formation/FlightTaskManager.cs
View File

@ -492,10 +492,19 @@ namespace Plane.FormationCreator.Formation
} }
else else
{ {
//用前一个任务目标位置 //返航点直接设置起飞位置
lat = Tasks[SelectedTaskIndex-1].SingleCopterInfos[j].TargetLat; if (Tasks[SelectedTaskIndex - 1].SingleCopterInfos[j].IsLandWaypoint)
lng = Tasks[SelectedTaskIndex-1].SingleCopterInfos[j].TargetLng; {
lat = Tasks[0].SingleCopterInfos[j].TargetLat;
lng = Tasks[0].SingleCopterInfos[j].TargetLng;
}
else
{
//用前一个任务目标位置
lat = Tasks[SelectedTaskIndex - 1].SingleCopterInfos[j].TargetLat;
lng = Tasks[SelectedTaskIndex - 1].SingleCopterInfos[j].TargetLng;
}
//如果前一个是起飞任务,没有目标高度，用当前的 //如果前一个是起飞任务,没有目标高度，用当前的
if (Tasks[SelectedTaskIndex - 1].TaskType == FlightTaskType.TakeOff) if (Tasks[SelectedTaskIndex - 1].TaskType == FlightTaskType.TakeOff)
@ -529,7 +538,7 @@ namespace Plane.FormationCreator.Formation
public async Task ResetTasks() public async Task ResetTasks()
{ {
var copters = _copterManager.Copters; var copters = _copterManager.Copters;
if (Tasks.Count == 0) return;
if (TaskState == TasksStatus.Running) if (TaskState == TasksStatus.Running)
{ {

28
Plane.FormationCreator/Formation/FlightTask_Land.cs
View File

@ -36,8 +36,34 @@ namespace Plane.FormationCreator.Formation
DateTime dtLastTime = DateTime.Now; DateTime dtLastTime = DateTime.Now;
TimeSpan ts = dtNow - dtLastTime; TimeSpan ts = dtNow - dtLastTime;
int waittime = (int)info.LandWaitTime * 1000; int waittime = (int)info.LandWaitTime * 1000;
await Task.Delay(waittime).ConfigureAwait(false);
while (ts.TotalMilliseconds < waittime)
{
if (_flightTaskManager.IsPaused == true)
{
await info.Copter.HoverAsync();
return;
}
await Task.Delay(100).ConfigureAwait(true);
dtNow = DateTime.Now;
ts = dtNow - dtLastTime;
}
await info.Copter.LandAsync(); await info.Copter.LandAsync();
while ((info.Copter.Altitude>0.0f))
{
if (_flightTaskManager.IsPaused == true)
{
await info.Copter.HoverAsync();
return;
}
await Task.Delay(100).ConfigureAwait(true);
}
} }
} }
} }

BIN
Plane.FormationCreator/SplashScreen1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 274 KiB

After

Width:  |  Height:  |  Size: 238 KiB

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

@ -133,6 +133,7 @@ namespace Plane.FormationCreator.ViewModels
var meshBuilderwaypoint = new MeshBuilder(false, false); var meshBuilderwaypoint = new MeshBuilder(false, false);
//meshBuilderwaypoint.AddTriangle(new Point3D(-0.1, -0.1, 0), new Point3D(0.1, -0.1, 0), new Point3D(0, 0.2, 0)); //meshBuilderwaypoint.AddTriangle(new Point3D(-0.1, -0.1, 0), new Point3D(0.1, -0.1, 0), new Point3D(0, 0.2, 0));
//飞机点的大小形状
meshBuilderwaypoint.AddSphere(new Point3D(0, 0, 0), 0.3); meshBuilderwaypoint.AddSphere(new Point3D(0, 0, 0), 0.3);
var meshwaypoint = meshBuilderwaypoint.ToMesh(true); var meshwaypoint = meshBuilderwaypoint.ToMesh(true);
@ -178,7 +179,13 @@ namespace Plane.FormationCreator.ViewModels
if (copter.LEDColor != null && copter.LEDColor != "") if (copter.LEDColor != null && copter.LEDColor != "")
{ {
Color color = (Color)ColorConverter.ConvertFromString("#" + copter.LEDColor);
Color color;
//3D在地面不能显示黑色，要不看不清楚
if (copter.Altitude==0.0f)
color = (Color)ColorConverter.ConvertFromString("#FFFFFF");
else
color = (Color)ColorConverter.ConvertFromString("#" + copter.LEDColor);
panle3D.Material = MaterialHelper.CreateMaterial(color); panle3D.Material = MaterialHelper.CreateMaterial(color);
panle3D.BackMaterial = MaterialHelper.CreateMaterial(color); panle3D.BackMaterial = MaterialHelper.CreateMaterial(color);
} }

28
Plane.FormationCreator/Views/TaskBarView.xaml
View File

@ -21,15 +21,15 @@
Command="{Binding RunTasksCommand}"> Command="{Binding RunTasksCommand}">
<Button.Template> <Button.Template>
<ControlTemplate> <ControlTemplate>
<Grid Width="30" <Grid Width="40"
Height="30" Height="40"
Background="#00FFFFFF" Background="#00FFFFFF"
VerticalAlignment="Bottom"> VerticalAlignment="Bottom">
<ed:RegularPolygon Fill="Black" <ed:RegularPolygon Fill="MidnightBlue"
InnerRadius="1" InnerRadius="1"
PointCount="3" PointCount="3"
Width="30" Width="40"
Height="30" Height="40"
Stretch="Fill" Stretch="Fill"
Stroke="Gray"> Stroke="Gray">
<ed:RegularPolygon.RenderTransform> <ed:RegularPolygon.RenderTransform>
@ -37,7 +37,7 @@
<ScaleTransform /> <ScaleTransform />
<SkewTransform /> <SkewTransform />
<RotateTransform Angle="90" /> <RotateTransform Angle="90" />
<TranslateTransform X="30" /> <TranslateTransform X="40" />
</TransformGroup> </TransformGroup>
</ed:RegularPolygon.RenderTransform> </ed:RegularPolygon.RenderTransform>
</ed:RegularPolygon> </ed:RegularPolygon>
@ -51,20 +51,20 @@
Command="{Binding PauseTasksCommand}"> Command="{Binding PauseTasksCommand}">
<Button.Template> <Button.Template>
<ControlTemplate> <ControlTemplate>
<Grid Width="30" <Grid Width="40"
Height="30" Height="40"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Background="#00FFFFFF"> Background="#00FFFFFF">
<Rectangle Fill="Black" <Rectangle Fill="Red"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Width="10" Width="15"
Height="30" Height="40"
Stroke="Gray" /> Stroke="Gray" />
<Rectangle Fill="Black" <Rectangle Fill="Red"
Margin="0,0,3,0" Margin="0,0,3,0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Width="10" Width="15"
Height="30" Height="40"
Stroke="Gray" /> Stroke="Gray" />
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>