From ee1f47a4481b7478b5f0fd69236c92e7bc8e55c6 Mon Sep 17 00:00:00 2001 From: szdot Date: Wed, 3 Apr 2024 10:28:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A2=B0=E6=92=9E=E6=A3=80=E6=B5=8B=20?= =?UTF-8?q?=E8=B7=9D=E7=A6=BB=E5=8F=82=E6=95=B0=E6=94=B9=E4=B8=BA5?= =?UTF-8?q?=E7=B1=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FlightRouteV2/FlightRouteV2.cs | 7 +- FlightRouteV2/bin/Release/FlightRouteV2.dll | Bin 30720 -> 30720 bytes FlightRouteV2/bin/Release/FlightRouteV2.pdb | Bin 77312 -> 77312 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 6810 -> 1809 bytes FlightRouteV2/obj/Release/FlightRouteV2.dll | Bin 30720 -> 30720 bytes FlightRouteV2/obj/Release/FlightRouteV2.pdb | Bin 77312 -> 77312 bytes FlyCube/MainWindow.xaml | 3 +- FlyCube/MainWindow.xaml.cs | 78 ++++++++++++++++-- FlyCube/Properties/Settings.Designer.cs | 2 +- 9 files changed, 76 insertions(+), 14 deletions(-) diff --git a/FlightRouteV2/FlightRouteV2.cs b/FlightRouteV2/FlightRouteV2.cs index 484fdb5..998d59a 100644 --- a/FlightRouteV2/FlightRouteV2.cs +++ b/FlightRouteV2/FlightRouteV2.cs @@ -411,7 +411,7 @@ namespace FlightRouteV2 /// /// 飞行过程中间距 平方值 /// - public static double SpaceBetweenSquare { get; set; } = 62500; + public static double SpaceBetweenSquare { get; set; } = 250000; /// /// 算绕行时 中间取点 true在正中间取点即 一个圆盘 false在一个圆柱体内取点 /// @@ -1373,7 +1373,7 @@ namespace FlightRouteV2 /// 交换次数 /// 交叉线路数量上限 ps:超过这个数量则不进行交换 /// 新的目标点 - public static Vector3[] ContactABOut(Vector3[] aVecs, Vector3[] bVecs, SomeCalculateWay StrPrint,bool isStaticSkip = true, double staticThresholdSquare = 25 , bool isSwap = true, int swapCount = 5, int crossingLimit = 6) + public static Vector3[] ContactABOut(Vector3[] aVecs, Vector3[] bVecs, SomeCalculateWay StrPrint,bool isStaticSkip = false, double staticThresholdSquare = 25 , bool isSwap = true, int swapCount = 5, int crossingLimit = 6) { long t = DateTimeOffset.UtcNow.ToUnixTimeSeconds(); StrPrint("-------智能选择路径计算，开始-------"); @@ -1561,7 +1561,7 @@ namespace FlightRouteV2 /// 日志输出 回调函数 /// 错层层高 /// 返回一个二维向量坐标集合 middle[0]是第一个中间航点 middle[1]是第二个中间航点 返回空数组则代表两个图形不在一个平面上或者不够4个点 - public static List> CollisionLayer(Vector3[] aVecs, Vector3[] bVecs,SomeCalculateWay StrPrint, double layHight = 185) + public static List> CollisionLayer(Vector3[] aVecs, Vector3[] bVecs,SomeCalculateWay StrPrint, double layHight = 300) { long t = DateTimeOffset.UtcNow.ToUnixTimeSeconds(); StrPrint("-------错层，开始-------"); @@ -2056,6 +2056,7 @@ namespace FlightRouteV2 /// 平面图案坐标组 /// 回归矩阵坐标组 /// 日志输出 回调函数 + /// 拉散层距 /// 拉散图案的坐标组 public static Vector3[] NormalPull(Vector3[] aVecs, Vector3[] bVecs, SomeCalculateWay StrPrint,double pullingDistance = 300) { diff --git a/FlightRouteV2/bin/Release/FlightRouteV2.dll b/FlightRouteV2/bin/Release/FlightRouteV2.dll index 8b7282613586fb91b6c49f3709dfb0f46ad9a264..baaa6b15ff53b0a78b99486c0cfdfc3074e081ec 100644 GIT binary patch delta 2078 zcmY+Fc}!GC0LH(0yKiO|5ESYOSP;pA%IUR$*tMdvwZ;{K2U2W7+A5|Zph1dRgo-uV z3V8~eYSf|$*4s^*cto+O#y^zS*i>z_YVF~H(WJMccHX>U+wSK5c7ESCZ)W$s-E941 zQvaAVud_Y9+19cligdN?okLa{ggEu<9|0~SRvTr^BTn*-v6}eE0fT4}`qgBB7?&!> z`@Px`7l|;mtb7vhpPe;a*Fq;5b?!7$ZX9$+{f9#gZPL`}8Xbr$$Vc~ZpfALDT7f4= zy!Hsc?k}6vNAum%DYnDpGs!~9U6O>Dd9fVtkuU&`fTY>=5jS6WSfY zD{}l)Z~z)@Ka16ZgYO6?;hrGT{z%ZhG2#uOX;7TwnOLI7GG53WRL6!`vpa{=G|U*B z6B!*rDdrC|vnF0fa&?AMW#!_k%*u)MMNp1aDl24zr~{qKN?9}wLTH?Mb}OGx;%Ep` zl`WH&r);gXYH8;CN)R*Gt8O$;p*E z?*>gqhq6ptEt2uKv{oLbEfpO`m@`}XP_0TBS2o06CxS%XQ=sTK?$I7M$J)je@P<#+`nc0pP^i`Z!cE%CPaxgT->UNW8HWj0l zbyFwvAV*oQ-N~loGi4pz$!7R)UFi<-MVbk3sB?rm?wjrCavUmd}c?Q<*d94YmMpjj_5zyqqn>Hf2|B%UBtF4dbmcjjdvfuuWN~ zD9bV2Wp=H2$Q#*GRA*Q-AMy=s8G16U?oYafRbfk()!k$}Sv9;9dhHNf0iNA!U$Po> z2JBl_iyGfVtL$cXSsl6q_AB#Y;VZqJoj2fWz{2?&c->~#ilf0X{6q9iwd@HW&71Lo z$FfY~;hPXuU|I{BZHxIQ*re?D;N^TfymPFd3XYHl-j39{)`>IOX1))_#qz{KiH_aI z#oWZO4t~@OV8b~w-R3uRPh!|{e(Zl)wkMLDHRgFDqr3PioR=#!;%#*C)A&i*8Fcwu zJX@LXu-*r0+EHD@SZ$Bak)fRs%+@+ZK0`aJhhve}rH5j#c3C9HM3RhPJmSfSz;A+) zcqSN!C`U3zB3^Jb(gm|5CreJ3c|KespD&YA$#QsoBC0~I;QLtXn2bhTa+FHeW4+j> zQEs+Vjyol9N#2nJG3VGMV5_}*Dq@uL0YsYDs7QHkYv5AB!B?fnmS?fJ@VG;x%P{3{z* zyq0^sPt4*kM&8|FL{-cR-zDna#|d*B(-J#?9PqbREFu2T$|pAM>xuq;D;|-SRQ3;c CO3BXv delta 2088 zcmY+F4NO&40LTC5zIV?#kB5RXQ9%p@LR6k0%BKhhf($=Urie1F0G(445uF+BfhcO2 z!Y)!RP0^fRCCV!{`#`WpZebs5E^1k@Y?T9LZd#$X&OP_|s`qw(_x%3_#x^^eSsLF^VMaG4U3IAb`q0P+>Db<1SWd-Ps0Q@1wIm>dh z#Q8Vjw>)KYM`-R}b&8`f`B-wLWQ!yrX1-dEPf6-Bd0viNB^@Fm*rk~~EO|z76h72$ z3w|rd4+R5JYa0|-b2@Je#$ZU0XpblB`Jv(kp>ABb!%hhvS;ki~f2!j^nAvsX3Jo;I zX9b4@QHoWQ%&d-=k@-49iLwnO$XJpU><*$FFRN@Ndx|>HsjP%WP#=s8H&-|FRb&eF zMXa(d(v~XQE3HzR`MRcynf0oR=LysgSG<-^N1@+qIc^#NDsHa1#V|{tW02ytbUGHr zUdy55QKM|SZ#oUeNw4M55L{FC4NIp_;kMUuXc+t=tsNHlE~eqgQno@^a3rdvb|clN zkVc_LS{-Ki78`r!MT`3rjX$Hz<#o7CO6U|EnrvA+Ur(pvy0Sj9nNGvs%2IvT(-_Q- zHfPFDgSv1=S&D5ZT=+{`GxyWBiw;xFnazBnwo@2a7G!t3>2&xhjkDJZ8>_6y?xwMr zsH|Lcv6yTbJ|g>Q9GavxqJuTi8F)w8dG;Eei2-Fdoo~?uG)y(OZ$zTwG))AbW?8EC zK6NLdIL6Xk@)=D=kFo-vewv0MWqCgL=p2-aH)399xr4H2a7|g4V+_l}#OYS|Hi=-_ zh*vg1T`U(_%I4c$EDz_Do#8IF(2XCI9ur@r#mJAfF0+%l*b+1;OLiu(0^Cyet|OBb zVj#|%*=AeBRv>AHWrMbrtQg0YMfsGnHF$2O)wS{pR*ECadTl#c8Qi-Ptul`7X6tc8 zS*IvBAR@`^nlZ>!*TCWIsQN*cH~o#q0<_kJYQ?!g0}# z^Tzf0(SEJG%?w~eH_5YoVCcEgeqH?X|FX2)VA5k0Za|@1L|aiK_!15}GEs|OM~P%L z>cuv-aav^bQHJiSCZ(jR?fVQ<4^+d7Id?aVsb#by&0V@h!mti*> z-wKqW5*65n7gW_*k#VwbgFO(L=Sz>7b2M?3iGv>$hjD*%xc?W~ttaxHzOZm__l%+T v$nG9va`}?cheiG5(Q1xE8^Z!gi|0i7M$#DT>ls-wY|}oS;~BO6u5k7blup90 diff --git a/FlightRouteV2/bin/Release/FlightRouteV2.pdb b/FlightRouteV2/bin/Release/FlightRouteV2.pdb index 50fb96bc7a8f9aedc255232685d45d839de8b571..3e396ad7de842697f5083c83c89dd2a7d0efa96e 100644 GIT binary patch delta 920 zcmXZb-%C?*7{~GF*eONxSMx_QV~4RpX&e1Cv&cydhj`INp-ElzgNRX7)NC>09K_+x zVkW!j&d3xa7_AwS^g|3HFP8s+H$jCJ7~KRhir!!My*Rv{&+~lG^SwF8Sv8$i^I4?Q z$`szWyt=&Z`CE)WN`~*a$}df1y@|!5lOBlwI?!E_>v>>2-b*FgAWzy9 zYQeNNi|T?o?Q1+m4s8+{z$R0^s1|1M3^}X&bJ~}B{szx6|AOanP515Z6c=fj zW@%8VtwpuC0k1M|*0~k0kv%&5@CG@EH?ad_IEc4#1l68VOpu?VdOugvb`~hq1&i8c zbjT++i;SRyqd0|0oI$m47RSg-y8l62(DM~cG5?MC@Q>~nF->mVqWXSu+#3a7J7ySE z%YG?60ql`_3FVJWy)}&9eDU%9vm5`;{CJsh%dLxN-e?(}e9WTD!MF14>s L&bNAv&sF~cvKZY% delta 920 zcmXZbOGs346vy#%?UtcAri~BAp_z21mrRD`BPB|!sZenvVMS2cDkLP-q=*G`$W&5<6-8X@Cbgg*o)^;?diwU2z*tK@L(K6mf>p@n}ZIgnv=dy02NkA?X%cz7ticZLuD_O^+79u9FgXk1Tn{-U)MmL7ZB;x{X@@jYW z{x!{E2?kUJ$!BXpmV$$&H@q_1>ZPL@&WEiwe<+zv7suY+J92fLM$%%%%-R!w1>i_q zX(M>)_E6OI zGn_7rz6=+A298`iw=ZTE4)a|KpNW7%JmDKxe?0~bAbNs#5kQcS8)usX#Dfmk2|iwS zDN{ACnS%#+Y4_gKpLN$w*S)Q&~WQaJ1)?a zw#>lMdmbCp$Q#pWfN4>KvD01uyvy0vvuEgM{l{!fD=pVdwR9=kbW;K~u-2Al54}wA zX616dad7*VmRzAx3SbuKUfq9KQT>l=(B zL*)ENfI7-p#cDi!&L5pLqgzZM`qn3(*fakr87d^fq1cbd(sFT%Zx`h9;_}UhLj_`c E53g8*%m4rY literal 6810 zcmeHMZBH9V5VpZ=FoYCSN(dyW^HMcQ-IE>O0umom8z-mG1zs>c&nyg=H7;j3qh906-O-ZN=rDdx(A&v{v zKrWm^MdzJy4rS(2*JsxehajI_-<%VwY4a8VUY^(qu=(~xj6V!J<;wSHz0kNO47JV_ zunL}|MFTohE^BIgNzHl+3Qz+H4ywvax6uje2eRAhyM+z0Va6hnVU$DBXq4dxWn}2j zkzz|}Xc$=+_t(@EaK;C4Knm0NgwFbs+1#G_oLOC1g!H@BO6n#%?x?9@_@UBYx88Ae(dZyV!-%5bG=-u3 zj>lA=56~b$!-%0lfcEQ$vl1m193Mt87LQSNgap!oNcN&NqDi#1)j?>Or{xHc&kW3aMrZ=}-ZbYaa#Nx5s@9lbibx|B6hW zMDh5dRb6V|wvHum#59da28JhnyV(>e=#2Ur>#>FsHk-!U7`CR3h4eyZHU15LkBlYA zrSxGlB#dL>G%WTI>oLQ!Z8q!I-~6pu=JwC%WY$O1C4BPpUb9i!5qTzP~f`E&WD*t7$+2%Z3zk-^_BFKK2AX}h~ zk6O2*{~4m0VWR!ou>D>b=#y}MC$t#d-UH4t;2eE@yY4q-_kR}mFsso}BYR5x z0i%0I?erS<{2dGK*sEEGK}vxVi~pJZ2qW(Mz4?89!P>2ij>cc$t=BCH;;xixWiL_u z63P{yAZqMme20}-9@C{!qRBpYK5tBvc=MIk1kpVz2_n;EFZ&+F>}mGe{OuWgg}qa! zABCeSV@IjHO*}kj>@~K}otCaoPPWe28|?27KmP$WO`I0^F_BVAU!JiPHZ9$nvR8!@ zQ1%2daeD7yKcWa{iz_YVF~H(WJMccHX>U+wSK5c7ESCZ)W$s-E941 zQvaAVud_Y9+19cligdN?okLa{ggEu<9|0~SRvTr^BTn*-v6}eE0fT4}`qgBB7?&!> z`@Px`7l|;mtb7vhpPe;a*Fq;5b?!7$ZX9$+{f9#gZPL`}8Xbr$$Vc~ZpfALDT7f4= zy!Hsc?k}6vNAum%DYnDpGs!~9U6O>Dd9fVtkuU&`fTY>=5jS6WSfY zD{}l)Z~z)@Ka16ZgYO6?;hrGT{z%ZhG2#uOX;7TwnOLI7GG53WRL6!`vpa{=G|U*B z6B!*rDdrC|vnF0fa&?AMW#!_k%*u)MMNp1aDl24zr~{qKN?9}wLTH?Mb}OGx;%Ep` zl`WH&r);gXYH8;CN)R*Gt8O$;p*E z?*>gqhq6ptEt2uKv{oLbEfpO`m@`}XP_0TBS2o06CxS%XQ=sTK?$I7M$J)je@P<#+`nc0pP^i`Z!cE%CPaxgT->UNW8HWj0l zbyFwvAV*oQ-N~loGi4pz$!7R)UFi<-MVbk3sB?rm?wjrCavUmd}c?Q<*d94YmMpjj_5zyqqn>Hf2|B%UBtF4dbmcjjdvfuuWN~ zD9bV2Wp=H2$Q#*GRA*Q-AMy=s8G16U?oYafRbfk()!k$}Sv9;9dhHNf0iNA!U$Po> z2JBl_iyGfVtL$cXSsl6q_AB#Y;VZqJoj2fWz{2?&c->~#ilf0X{6q9iwd@HW&71Lo z$FfY~;hPXuU|I{BZHxIQ*re?D;N^TfymPFd3XYHl-j39{)`>IOX1))_#qz{KiH_aI z#oWZO4t~@OV8b~w-R3uRPh!|{e(Zl)wkMLDHRgFDqr3PioR=#!;%#*C)A&i*8Fcwu zJX@LXu-*r0+EHD@SZ$Bak)fRs%+@+ZK0`aJhhve}rH5j#c3C9HM3RhPJmSfSz;A+) zcqSN!C`U3zB3^Jb(gm|5CreJ3c|KespD&YA$#QsoBC0~I;QLtXn2bhTa+FHeW4+j> zQEs+Vjyol9N#2nJG3VGMV5_}*Dq@uL0YsYDs7QHkYv5AB!B?fnmS?fJ@VG;x%P{3{z* zyq0^sPt4*kM&8|FL{-cR-zDna#|d*B(-J#?9PqbREFu2T$|pAM>xuq;D;|-SRQ3;c CO3BXv delta 2088 zcmY+F4NO&40LTC5zIV?#kB5RXQ9%p@LR6k0%BKhhf($=Urie1F0G(445uF+BfhcO2 z!Y)!RP0^fRCCV!{`#`WpZebs5E^1k@Y?T9LZd#$X&OP_|s`qw(_x%3_#x^^eSsLF^VMaG4U3IAb`q0P+>Db<1SWd-Ps0Q@1wIm>dh z#Q8Vjw>)KYM`-R}b&8`f`B-wLWQ!yrX1-dEPf6-Bd0viNB^@Fm*rk~~EO|z76h72$ z3w|rd4+R5JYa0|-b2@Je#$ZU0XpblB`Jv(kp>ABb!%hhvS;ki~f2!j^nAvsX3Jo;I zX9b4@QHoWQ%&d-=k@-49iLwnO$XJpU><*$FFRN@Ndx|>HsjP%WP#=s8H&-|FRb&eF zMXa(d(v~XQE3HzR`MRcynf0oR=LysgSG<-^N1@+qIc^#NDsHa1#V|{tW02ytbUGHr zUdy55QKM|SZ#oUeNw4M55L{FC4NIp_;kMUuXc+t=tsNHlE~eqgQno@^a3rdvb|clN zkVc_LS{-Ki78`r!MT`3rjX$Hz<#o7CO6U|EnrvA+Ur(pvy0Sj9nNGvs%2IvT(-_Q- zHfPFDgSv1=S&D5ZT=+{`GxyWBiw;xFnazBnwo@2a7G!t3>2&xhjkDJZ8>_6y?xwMr zsH|Lcv6yTbJ|g>Q9GavxqJuTi8F)w8dG;Eei2-Fdoo~?uG)y(OZ$zTwG))AbW?8EC zK6NLdIL6Xk@)=D=kFo-vewv0MWqCgL=p2-aH)399xr4H2a7|g4V+_l}#OYS|Hi=-_ zh*vg1T`U(_%I4c$EDz_Do#8IF(2XCI9ur@r#mJAfF0+%l*b+1;OLiu(0^Cyet|OBb zVj#|%*=AeBRv>AHWrMbrtQg0YMfsGnHF$2O)wS{pR*ECadTl#c8Qi-Ptul`7X6tc8 zS*IvBAR@`^nlZ>!*TCWIsQN*cH~o#q0<_kJYQ?!g0}# z^Tzf0(SEJG%?w~eH_5YoVCcEgeqH?X|FX2)VA5k0Za|@1L|aiK_!15}GEs|OM~P%L z>cuv-aav^bQHJiSCZ(jR?fVQ<4^+d7Id?aVsb#by&0V@h!mti*> z-wKqW5*65n7gW_*k#VwbgFO(L=Sz>7b2M?3iGv>$hjD*%xc?W~ttaxHzOZm__l%+T v$nG9va`}?cheiG5(Q1xE8^Z!gi|0i7M$#DT>ls-wY|}oS;~BO6u5k7blup90 diff --git a/FlightRouteV2/obj/Release/FlightRouteV2.pdb b/FlightRouteV2/obj/Release/FlightRouteV2.pdb index 50fb96bc7a8f9aedc255232685d45d839de8b571..3e396ad7de842697f5083c83c89dd2a7d0efa96e 100644 GIT binary patch delta 920 zcmXZb-%C?*7{~GF*eONxSMx_QV~4RpX&e1Cv&cydhj`INp-ElzgNRX7)NC>09K_+x zVkW!j&d3xa7_AwS^g|3HFP8s+H$jCJ7~KRhir!!My*Rv{&+~lG^SwF8Sv8$i^I4?Q z$`szWyt=&Z`CE)WN`~*a$}df1y@|!5lOBlwI?!E_>v>>2-b*FgAWzy9 zYQeNNi|T?o?Q1+m4s8+{z$R0^s1|1M3^}X&bJ~}B{szx6|AOanP515Z6c=fj zW@%8VtwpuC0k1M|*0~k0kv%&5@CG@EH?ad_IEc4#1l68VOpu?VdOugvb`~hq1&i8c zbjT++i;SRyqd0|0oI$m47RSg-y8l62(DM~cG5?MC@Q>~nF->mVqWXSu+#3a7J7ySE z%YG?60ql`_3FVJWy)}&9eDU%9vm5`;{CJsh%dLxN-e?(}e9WTD!MF14>s L&bNAv&sF~cvKZY% delta 920 zcmXZbOGs346vy#%?UtcAri~BAp_z21mrRD`BPB|!sZenvVMS2cDkLP-q=*G`$W&5<6-8X@Cbgg*o)^;?diwU2z*tK@L(K6mf>p@n}ZIgnv=dy02NkA?X% - +