From b53fa88b7d1da33c654701ce28a20eafe59d271a Mon Sep 17 00:00:00 2001 From: szdot Date: Wed, 17 Jan 2024 20:25:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E6=95=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FlightRouteV2/FlightRouteV2.cs | 14 ++++++-------- FlightRouteV2/bin/Debug/FlightRouteV2.dll | Bin 33280 -> 33280 bytes FlightRouteV2/bin/Debug/FlightRouteV2.pdb | Bin 87552 -> 87552 bytes FlightRouteV2/obj/Debug/FlightRouteV2.dll | Bin 33280 -> 33280 bytes FlightRouteV2/obj/Debug/FlightRouteV2.pdb | Bin 87552 -> 87552 bytes FlyCube/MainWindow.xaml.cs | 20 +++++++++++--------- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/FlightRouteV2/FlightRouteV2.cs b/FlightRouteV2/FlightRouteV2.cs index c019c3a..0c1bbb6 100644 --- a/FlightRouteV2/FlightRouteV2.cs +++ b/FlightRouteV2/FlightRouteV2.cs @@ -1984,7 +1984,6 @@ namespace FlightRouteV2 int planeCou = new_aVecs.Length; //获取飞机总数 ///a图b图 中心 Vector3 aCenterPos = GetPosCenter(new_aVecs, false); - Vector3 bCenterPos = GetPosCenter(new_bVecs, false); ///判断bVec 矩阵的数量长宽 for (int i = 0; i < planeCou; i++)//把矩阵高度压平 { @@ -2000,20 +1999,18 @@ namespace FlightRouteV2 } } int ran = (int)Math.Ceiling((double)planeCou/(double)row);//行 + StrPrint($"{ran}行{row}列"); if (ran > 2) { for (int i = 0; i < ran - 2; i++) { - if (!(IsVecsOnLine(new_bVecs[1 + i * row], new_bVecs[1 + (i + 1) * row], new_bVecs[1 + (i + 2) * row]))) + if (!(IsVecsOnLine(new_bVecs[i * row], new_bVecs[(i + 1) * row], new_bVecs[(i + 2) * row]))) { + StrPrint("-------降落航点非常规矩阵,故不能做拉散图案操作-------"); return null; } } } - else - { - return null; - } ///计算a图的法线标量 Vector3 side1 = new_aVecs[1] - new_aVecs[0]; Vector3 side2 = new_aVecs[2] - new_aVecs[0]; @@ -2033,7 +2030,7 @@ namespace FlightRouteV2 for (int i = 0; i < ran; i++) { int cou = i * row + k; - if (cou > planeCou) break;// 溢出跳出 + if (cou >= planeCou) break;// 溢出跳出 ///判断图在矩阵的左方 还是右方 if (GageLength(aCenterPos, new_bVecs[0]) > GageLength(aCenterPos, new_bVecs[row - 1])) { @@ -2075,7 +2072,8 @@ namespace FlightRouteV2 for (int i = 0; i < row; i++) { int cou = k * row + i; - if (cou > planeCou) break;// 溢出跳出 + //StrPrint($"{cou}"); + if (cou >= planeCou) break;// 溢出跳出 ///判断图在矩阵的上方 还是下方 if (GageLength(aCenterPos, new_bVecs[0]) > GageLength(aCenterPos, new_bVecs[row * (ran - 1)])) { diff --git a/FlightRouteV2/bin/Debug/FlightRouteV2.dll b/FlightRouteV2/bin/Debug/FlightRouteV2.dll index 351877c09c62b819747c2593cdfb3b9711ce394b..53a40a88627a0dca5796f51095ab4bee593a0bfd 100644 GIT binary patch delta 3598 zcmZ{n4Nz3q701te`<8p(?(%VYu)B)H1zcFzUA~nCL&U)HA%0Md4l6=c)WpUQqK)6_ z5-|=Y#z>zu`A!)np z```OJ=bn4dJNLfbrDLbuu~XjHr9@7h_(k`gN%Hp&bst|C=Q;#15Af9s&|&FL(;OE7 z9LU=b0)+H5IiN?REV+G)zC-%KgnAs!U$uD2V1XTbS!AxC;A$EN?lBn4hcOmN24($6xQH=hl9m`cYXyh`!)Pr5r?ZOeG^PcA z3NbD*b&OLqJ`I!5Vq)C?Z6qv)5#PhyPZMc|*crGz!UOA(ox zJl*HQ&UhnMD2XKn9DrWo)Kt7%#kkdR`7l*~y~-C=edRcTu}sIpiiocPtA=wVv*gkR zGUnsdoS`c`FQ?`T9pfG5!fG*Rljde_++e<86WD}+HS}Y2ej`B@7j{LA8t{a16DG2W zfkI5(EzXVC{uDn9Ol1ml>MdbUf@vQ$JM|aClY%ZRu?v^AVqz&QrL6YBg9pHzXmv6t zQ_wnzO)ASqD=w(t32W52T>(iBW%QsaXkgVT7Nbo{WTr>;RbX~nDofQDR2NwuVh`yr zRC^01J2j6#9h3DK$r?#b7TftO&l{KrbMP<^Kj&#IO}|zhSf1|GGDK9y_^9;pQ5hJO z!7_N%6gDOJ0oE@6wR+*J~MRC7n_VVIpWnwa!EK`&*hvk%oMRC1o_2S~Zyoo%P$LpNW^7-zR7dW*-5mh)os$hInAx0IlLLODbip1{3 zXo-GciTbN`jdH40|94%=H<}6h+*#GBKKwk$STG+#Qveb$;f$IEbye8bA~*G)o|P;| z*N_-^1-O1Cbdk^_LM4gYTSfnM1`9sZ6e2s4Qj;!>7fzn6mh_Ilhz43 zWzutkJ`u$8dILuSRt%tr*3iKyiHE8&yo7hTd5ngL2B%Dlqk|+FM#kt8ae>ckOcO_k z$OKqo(%F@Si zBnXrIe5A1(b@Ni9Uy@w7BWyi1M+TY;_e^pqR*GNX0Y1KmW+*BWHK`tb`4Df?GW6wx z+aS0i#nA%TFQ^;-NSw3~E|~Nyl1hug5#)1r!+!geD4hm3O?*TR(h}&(HJml_bQ*$$ ze1qzwIkXh^ndG%SPRn7?q*U8x`Uun(7$aNMJ@io+FzKN5GOdEug@*5x^coGrev^Ql zq0w3xFtJQILuY}f$QU|E&(PVh+@yXy26JIpP!H_Izy>HT<|BLHZOhxV5%vk{hP#%_ zbRi^7HD-}*@6!kjPc!H@^e?m(0wo3wTmDMF8->kf28PLP+6J$gbOoI&plUkz^}q=I zoUVd%_Kbt1ZyfIX2hr5EFfvBzYC8;9jQUE{^>Ah8DAlRo zhv>kg1_EtXH^O6;qqI`p0$+^LCUrX;tQz$_r$*u7FsB|^W!Kdm&{uDer1q&@(AQv4 znKY>Gg~KhJx?zvys`?`cv>J56{+W6J9GOcv_P}}RuKEfTFEyx*P}@-`#-ETF=+0N2 zy0tMoexmK?+yEB1EY(=NdU<1ZTflZ^yv_Cow2CPH$V>1hJT9mcDxt*oCTtz&I}4qr zuNW$9XQ9`ml}P8{yh#_KqW_)7Fo~v;w}4L>3z!&*g=45P3_&^Shp4fTD$T(DF^OAF z3r&{G@sn(VT#K42&%rTMQHj<7jCXmNubJ!mrV?0dAshgL}40=!Dt!HlZEx0xr`j7V8!L3qps5 zUKa`yA7c^f5qiW_9V+cBE(*9PakwV>*F;~Ed6*<~dz$E{iT+H{pDFso3LgVjt{$Nk zLYD~b5bB|JSgJqOysA8G16V56qiz!VqR?$*9$H$Y$51y2-7Pd%j-Vw=X+d47wCJwI zr?dU!C5fL3MH~%7{GVC`Ce`j$qi?VHy56{5tu5D0&t*cQA2l318>%TcY5gf6kX+LF(rC zkB-_Z&#w51OMdyJ4J;mz6ptiPtEYeV+IM5p!lXErIq*&KjhFF9Wh%>fp delta 3393 zcmZ{n4RBP|701te`*H7kyZN~LHoJ+NnB9bs-RveL5MT)=5|WUGR7itp7RrYPPzpxA zjL1hfe8{9NMb;NrYK4(62WqDcU5b?I6b3~q*l}bWJA*n=W~61%T1ksK0zLP>m&|JG zPWJ!K@0@$iJNMj|&8Byo+`CQQ)n|R}={;{GcNEH7b|-&*U-p>Y0J8vJF97sfk^#+m z3c!in|13aM56BTcE|trD>+~(sPYSwlHGjqMErSi(9|mY110dPT&+iTfxJPxVBU=d)^Z-+dnLP=Ssd+&!UNe2zKrYLTIB}^F)KuJ*?SO^x zU1i*wsd{ZoP*U~zE#3rUY*L4e6Z2@U=<9rZ9!-nB$PK13+g#@A)ZENXZ^>F7%Zu2e z&tXIvF2{RO@Fw24u`|xN(!)HFvDl?soJ`p&K3AqP8*{})+y00IAS``mEI0Q%%UpVQ ztgu|e$!gew9rxvB-nzEiw{HV;q1VM+%!b~4mR}dqkH)$ zO$%8ee`bnUk^bY>Na9Y9RxGlLGqdi@%qqsLVphzv{LEi@5$6`|G$tL0o~(mijBfa@4?9bOq$uf@wo>^^TvYaw98nTn09GqD=M?IfZh=E=YGc> z;L}Z%U~?s`M9gtC8(kL@(+!|EfX(okm$UM^5PAu-uP~oQ_Z0KF=H1$iBmbVT`9NUw z|D?y+c-vfYCf^t5^*hZP=D7t~P@G$cg~Yj4c(kxMfpF%wD>6?YjN1vbFh79^i|})+ zuk>hDBC9Ght1>gI3bU$M70(*O#)xyXYt><3)%v&@9rEi|{q&3i>+03tHWn7WjUPaz zb7sRJPAeCWuC#T|^k%$%j(l&rzAaBqEGKr@16*$kohx*oP)Xwc1;Rcg)FwO+3j23L z74%53Q|7u)=rL3VZ^+%KmxWC%%ZUdPmQ`5o1GO8q64s(-$(w_u-H#2y_WTN^4@-Pw z5bY-Y#0JmfClA0`xM+V)|LPuJ(OyhiS;BqWX_s`wPGFr$%cQ+}%}ifnFQL$H`nt&h zqQEti9w Ni8Aq-b3FEpfs|lO7c`VA7Lt>acLe5jnEn5gO|7N}Eyf5%9c+^Xz9HQksaXb9OF{m$@6~g(1U{}cS{YSb&Dj-^6 z(3|vA5{5pLu1VKP1TL8Lh2v9F358+4Qk({>35(cLX$HptG;auY|wJK}j*i?gn#+4qpw`rIbD^I|ei4lBE*$BIv zhl5*{1l-laDFw?MNo5NhY%@qw_A7mGu-%|K>7=p~o}bSt2|Fy8lxHBaz@XnaK2e?p z=ORuicvZTt?19<`4C*3w^$;9>Na2{wuU6c8vLlp}ufD_`V1ctztEE)`OGl`yLj8TF zPyGYD^ALCNPXY;!!zDpmp$W#T$KkV#*voLkjMYMe`ZBojYb3x{Sc-H4YD_u}4e2?v zTS&r3{s_Ee794`HBnyt9%J3FUMtv7G3yP$Aw2w&Kb5v-aJQ+XW3gl_1MRFUi885dJ z7yM9;lWa)J3-H&?0SnbC&|opD4<11+g&nA2cm{PG>_?pp`xAI+63`|Bv*9p$<_S-i z(B*InJ!{}9>IS%>HsM}oIJ$)P!q4$GTgA;@5cVmdgF-J01&Ob*2=xoyXQ~d3jwPoB zoR&CzBtQYo_Sum7t?5VeU7H-?0;&+kp-G%Q9_z%p5C-l_%lH5Ke8G7u!)YQ%8U$*wF y|KO&6Zv8CR{pSBNJZBZR{mFnw?%J(4Zg@-g_x?Sdz42>{ye*n$z5kSw)#Sh0j%{@S diff --git a/FlightRouteV2/bin/Debug/FlightRouteV2.pdb b/FlightRouteV2/bin/Debug/FlightRouteV2.pdb index dfc1ef066c601ba4c400dffa36e98b95d5ddd0e1..d63f998ecd6932c1a0874d316d827c481b50e3fd 100644 GIT binary patch delta 3312 zcmb`}dsI}%9S89F4Z9amFg%y1vTJy#AR_S*qZlA3sTv{>jaoJ8`e+_%ZFne6PuztC z0RdU|f-4F>fTBqgJ!X$3$C?%kNi{@`CPvd!AJtGrv0zGCG@|{^byWI)_w4wY-|sgw zckcCa_gX*HTR+s><2>s)(>@=#Og28)o~lNVoCjPRM>Z2TBaD2Tzn7{yBHyN3bs%z%$Zd=YRo6uMi2TN= zF}zmGxZ0yWdC?L=TTW7C1l1p6Jb#XXc)@#!f6_)ct8*O@x7j0BFRzDw0bbviNxM$*o&CzL9|+&wU9?A~h9spimKtM~#`mf5eWhs%HBI47 zXL)l6-&@Q-n8tT@@ZV+8N106L&fJ1=WhN3)#dKa*$Ukzp($=);Q@^2t<=ooN^Jnpb zd@49awg9qi<+ck{7^4(sQDGLhRq%q(4TR~ODJ+qV@fFwDCqw+pSf84i6{~+XUG(y^ z%Jc?i^wp{3vx7qPsKzm-jTR%b%)exzs4A*CJ4{`c9iZB?J@g)8l$vP{(tB#XwPs_$ zEXKZnnXws2yfT$BacF~jFx%ge;}aO1h9nZ(9u=^nmwG!pA}|e=6{w7uCa0j{qgAe> zatW1nNlz*U^+aw^NCqn3qqU-%H>etfdH!l^qAtXW>SeS>jIa(G5v-0~ALBb0TbYlF z$MX+Y4ppmi{ncOPdWCdjP6n!psK&{vxHd+t9Hb`adIh$kx(HSCqq(S#RL!|z-V0DU zBIlN>ruAWt91m^E;@ON{!Ibtv3r1-t(vIN^P;Eo?#Gq>Q;}hw_h`AWij1gxCjffE^ z5_k+1aUyS~$P>Y4;>Bh{mZ8#)CQhVWR>g^odwe1j@SiVE@~@C>2o+7GqFgFEKt-LDpUm?oQvv4%(|P_K zZu>Ra4scs9{tRu+eA9cpcp;U%L?z`^a+a48FMW%b*my}2FME@h*HgtSRMEgIYH3R| zRr>Nu53r=1>J_pc}J=8z9 z#ar6lnRNuhfA-wB8sTS%P4IJ=3I77ck;S+L(xp(07kBwF?At7koXGjhGHRcZwSRc#erP#G~%Q147?1#hS#8|--O>F?uKV! zkIdhO-y;42o`WWOI6exVM;uKS#=b)*5sAOT=iuMqR45iok-iMYfzsgx#SA3z;qreh3Gacd}4U>FqROwv(M95@cTBR^J)E%&YC(D6hf0SB8T!C7=m*PXy$S{(c0hv#of=u# z4ucTyfWdI5%s0Xi#7!_1?uX&<6InkZU!((R*VjYZyiBPOF zNx|QL91@d}7z-D|c=);;uoR9%ybLD5cj0*W8z{!*OG}_wupA~LUm@d4I03O8PJ}IR z5^l=wlpOMQ3&pB+(m2{Gq4D)@5}sHAbUsa2O=AS*NqSsh1V57Jn6?XlX!Q*2XoZe z<8wU6YEe9!pcWs$>isyvoDFK(@fXy?Uu^P>P8C0%#73*89)H*3jwbH9Y>XtA?xa^z zXaHWA+*tgI6*=pcV6T6;AL$Y>celFD}tI}wXL`QRzW%&E?cMheBt>qBcb4bC_d1<;|E6cf4YxvtqcE1E*}Dkiu& z*G5wWIa*4i=@NP3k<9YZtj>2v(bKf~V9ILJS0ho=;`=K7L=NLJ?S;B!WgN8*`=9Mj zr6u0~|LwN%;H^gvoEGOc&u3Qe@;e7+@6}DRd0G0sTEZjgI`M7XsYFxiYr1AUeR0#b z4`(cGi1yma3UQsZ-DCP*G;z6hqU}c8gVuo7h}MMmTQn>o9%Z;i@EAdJw$#t27IJ2c lBHi$9NYtWjN85o`hlXEKCVoJlT(38X_8lC5imEaa{tFdqJ4pZl delta 3079 zcmb`}dr(x@9S899JM1p3u*gGRyCTbD5fF)yF=i@87wu>hRE$nybU;mFLkv}61sz-2 zgO`_EFdzNdZ{kuDR{M_H~ zch0@%T#omy?Wo#zR9&5{Zs3eDH!Y_NRLg^?(-qCHk(kE)YgOaDi)dsHVd@c90RMGHRubM;555AuRE?dAsR@bgh=6Vq{Od=g!O z0ZRf@7qi*Nu2+qn#JkKQKIR4BDvD_%-j6VDJ-=%fwQ=i7Cu-tCM3CtjnJ+TwMXo78 z){0C?s4X=aT&GRPe{2n-%JWneNlopH7cUDXUh*rlPvrJsa+Gt2ol2MS9YvbbLc+If zrl#x`mEGcRzRY(m;5(M`-P@`B0ad-utJY9W1F!DV)SM)IYdc7+)YN5BU6!V9km?3` zeI9oP^S74s>OH)17ww%xP2cmTJ4>ngEZ;Y*Y5ptWyZ;6qsGx&0H7zD;F=<*_sHH{I zno6yyy!8TaJHrnZ^LL-(`#$AIa_PP2n97@Zh2zf5Afk#izSqXzD|cn&cB#_`sAN62 zo#w@hdC5*Hxr{ZDeIK`fO^zotj&0=F#_jdIq$iXxoHGrZ&XNMxa7SeidY z9fv4K6zA_YO=8AC74pf9dHTsdFV9=IVe`8D%#9YtLQz+XKucJJ=6`zSuie1(sCo;t z#UQp?0z{@oB{o@nM4cs6R9ZCZadL$C*;-@xvy7=S7+Z+M3$qxLlanX*6}^_Ikf%{u zgv^046`iMY36%j!g<>_t?p&y1c`F2W$T7aAhIz?d{tr=!}UROLJ;iuS_TkfW%qLgkAw<0g5=%}3?1 zGLGSY#G~~^dB!bV%-A)In>D5qEmslpKE}*PwG-9(kE$ZCAXpd+eRS7Ror`J4Ej604o6H%4p zvc`-{!8n63u2Rt_f>Kkh4XBfz7Sk`tc7cimsU(E#v&r5@_Uq)(lOvOgExdR=mCWEJ zdAuZPuj=QOcX{OzUNgW&bPS1Js*C4!kyM{V_4T~I9J^fZ@f2l`FBg$p!+4|F z_0-lC=@jLvIuS+S*vVBuRGl!m;!hpa=*zvaR?l7|mLqpHKFw%0Z}C-EinYs|+2RnM zfs^6wp@+6a_zB`9_$gcoKZEjy%6@AVbD->>3(q3I5q86TCBGS-LtFsQ!(S?SdHLTW z-j7|$dT`KX5_QH3dJkc@5<4|7cLwFJSZg>e^gZ*$A{to^CFT+5>zJ)RHOSllq z@fq+Bh!?>D_##;uyMluiNL+=-l#aiK*ATnmAUvVue*?cl+zD^ME+zjN{3GJC@N3uy z{{+8O>Q|Nc2E2*93hx;?As;IazCl6@{{m;iTkvV6!;j$K5YLh^{3#rQufaPo2g-?T zP%MP<#M|Lr$b6WsceI184-(=_ki*;1 z3l2fq@1Eialow!lzN?TYsD>PRLoevLF+kd=?BwoDCe2pN;3ULbVH9jr^6x^c5s4!>h=x5d2KFi)`d}>L zOE3=Jh9)=!WxsohBhYi}@py?xo}i4qU;<(lOoUTl5=>F*(=;rHO+n&GB$DBCa4O7D zIzF%X5|k&*f+?tH!zbWsI1R3WPr`L@I@GdpOvh4{HWix18)sJw|L#m}GPVt_!cxU+ z-8XdqiC6^NBHrkpCmPR{Y8%b+eL^fzMBfc|rJZl(9iIox)(_*g;l)y3d1doP`G~_y zJ<;j~{p*N$0#0Lt)P3SeihIZgVVot9jhp&Sw)yudPLYIewS(^#qD?mnYBw zX>Ca0k;aOhc}W!8K0lY#0%4siuxE&BGW}|eYdpU^-LIxlr~iM=cQ$3~{_pec;^C_u z2lvRey{WB9EV#TUy?F9>3ktVg`ImcQJl!N-$DNu4N}n3{HXdl$N2eq4`o~Wx`G;}f zK6$2(<2E$8+$OYUXI>^5blB$1A8kC^9(PkFxhdL-WBKNO3#}1NzH;`W?L!-TV{%A+ R2&u!K8{;zeT*uu>{x=@k1*`x7 diff --git a/FlightRouteV2/obj/Debug/FlightRouteV2.dll b/FlightRouteV2/obj/Debug/FlightRouteV2.dll index 351877c09c62b819747c2593cdfb3b9711ce394b..53a40a88627a0dca5796f51095ab4bee593a0bfd 100644 GIT binary patch delta 3598 zcmZ{n4Nz3q701te`<8p(?(%VYu)B)H1zcFzUA~nCL&U)HA%0Md4l6=c)WpUQqK)6_ z5-|=Y#z>zu`A!)np z```OJ=bn4dJNLfbrDLbuu~XjHr9@7h_(k`gN%Hp&bst|C=Q;#15Af9s&|&FL(;OE7 z9LU=b0)+H5IiN?REV+G)zC-%KgnAs!U$uD2V1XTbS!AxC;A$EN?lBn4hcOmN24($6xQH=hl9m`cYXyh`!)Pr5r?ZOeG^PcA z3NbD*b&OLqJ`I!5Vq)C?Z6qv)5#PhyPZMc|*crGz!UOA(ox zJl*HQ&UhnMD2XKn9DrWo)Kt7%#kkdR`7l*~y~-C=edRcTu}sIpiiocPtA=wVv*gkR zGUnsdoS`c`FQ?`T9pfG5!fG*Rljde_++e<86WD}+HS}Y2ej`B@7j{LA8t{a16DG2W zfkI5(EzXVC{uDn9Ol1ml>MdbUf@vQ$JM|aClY%ZRu?v^AVqz&QrL6YBg9pHzXmv6t zQ_wnzO)ASqD=w(t32W52T>(iBW%QsaXkgVT7Nbo{WTr>;RbX~nDofQDR2NwuVh`yr zRC^01J2j6#9h3DK$r?#b7TftO&l{KrbMP<^Kj&#IO}|zhSf1|GGDK9y_^9;pQ5hJO z!7_N%6gDOJ0oE@6wR+*J~MRC7n_VVIpWnwa!EK`&*hvk%oMRC1o_2S~Zyoo%P$LpNW^7-zR7dW*-5mh)os$hInAx0IlLLODbip1{3 zXo-GciTbN`jdH40|94%=H<}6h+*#GBKKwk$STG+#Qveb$;f$IEbye8bA~*G)o|P;| z*N_-^1-O1Cbdk^_LM4gYTSfnM1`9sZ6e2s4Qj;!>7fzn6mh_Ilhz43 zWzutkJ`u$8dILuSRt%tr*3iKyiHE8&yo7hTd5ngL2B%Dlqk|+FM#kt8ae>ckOcO_k z$OKqo(%F@Si zBnXrIe5A1(b@Ni9Uy@w7BWyi1M+TY;_e^pqR*GNX0Y1KmW+*BWHK`tb`4Df?GW6wx z+aS0i#nA%TFQ^;-NSw3~E|~Nyl1hug5#)1r!+!geD4hm3O?*TR(h}&(HJml_bQ*$$ ze1qzwIkXh^ndG%SPRn7?q*U8x`Uun(7$aNMJ@io+FzKN5GOdEug@*5x^coGrev^Ql zq0w3xFtJQILuY}f$QU|E&(PVh+@yXy26JIpP!H_Izy>HT<|BLHZOhxV5%vk{hP#%_ zbRi^7HD-}*@6!kjPc!H@^e?m(0wo3wTmDMF8->kf28PLP+6J$gbOoI&plUkz^}q=I zoUVd%_Kbt1ZyfIX2hr5EFfvBzYC8;9jQUE{^>Ah8DAlRo zhv>kg1_EtXH^O6;qqI`p0$+^LCUrX;tQz$_r$*u7FsB|^W!Kdm&{uDer1q&@(AQv4 znKY>Gg~KhJx?zvys`?`cv>J56{+W6J9GOcv_P}}RuKEfTFEyx*P}@-`#-ETF=+0N2 zy0tMoexmK?+yEB1EY(=NdU<1ZTflZ^yv_Cow2CPH$V>1hJT9mcDxt*oCTtz&I}4qr zuNW$9XQ9`ml}P8{yh#_KqW_)7Fo~v;w}4L>3z!&*g=45P3_&^Shp4fTD$T(DF^OAF z3r&{G@sn(VT#K42&%rTMQHj<7jCXmNubJ!mrV?0dAshgL}40=!Dt!HlZEx0xr`j7V8!L3qps5 zUKa`yA7c^f5qiW_9V+cBE(*9PakwV>*F;~Ed6*<~dz$E{iT+H{pDFso3LgVjt{$Nk zLYD~b5bB|JSgJqOysA8G16V56qiz!VqR?$*9$H$Y$51y2-7Pd%j-Vw=X+d47wCJwI zr?dU!C5fL3MH~%7{GVC`Ce`j$qi?VHy56{5tu5D0&t*cQA2l318>%TcY5gf6kX+LF(rC zkB-_Z&#w51OMdyJ4J;mz6ptiPtEYeV+IM5p!lXErIq*&KjhFF9Wh%>fp delta 3393 zcmZ{n4RBP|701te`*H7kyZN~LHoJ+NnB9bs-RveL5MT)=5|WUGR7itp7RrYPPzpxA zjL1hfe8{9NMb;NrYK4(62WqDcU5b?I6b3~q*l}bWJA*n=W~61%T1ksK0zLP>m&|JG zPWJ!K@0@$iJNMj|&8Byo+`CQQ)n|R}={;{GcNEH7b|-&*U-p>Y0J8vJF97sfk^#+m z3c!in|13aM56BTcE|trD>+~(sPYSwlHGjqMErSi(9|mY110dPT&+iTfxJPxVBU=d)^Z-+dnLP=Ssd+&!UNe2zKrYLTIB}^F)KuJ*?SO^x zU1i*wsd{ZoP*U~zE#3rUY*L4e6Z2@U=<9rZ9!-nB$PK13+g#@A)ZENXZ^>F7%Zu2e z&tXIvF2{RO@Fw24u`|xN(!)HFvDl?soJ`p&K3AqP8*{})+y00IAS``mEI0Q%%UpVQ ztgu|e$!gew9rxvB-nzEiw{HV;q1VM+%!b~4mR}dqkH)$ zO$%8ee`bnUk^bY>Na9Y9RxGlLGqdi@%qqsLVphzv{LEi@5$6`|G$tL0o~(mijBfa@4?9bOq$uf@wo>^^TvYaw98nTn09GqD=M?IfZh=E=YGc> z;L}Z%U~?s`M9gtC8(kL@(+!|EfX(okm$UM^5PAu-uP~oQ_Z0KF=H1$iBmbVT`9NUw z|D?y+c-vfYCf^t5^*hZP=D7t~P@G$cg~Yj4c(kxMfpF%wD>6?YjN1vbFh79^i|})+ zuk>hDBC9Ght1>gI3bU$M70(*O#)xyXYt><3)%v&@9rEi|{q&3i>+03tHWn7WjUPaz zb7sRJPAeCWuC#T|^k%$%j(l&rzAaBqEGKr@16*$kohx*oP)Xwc1;Rcg)FwO+3j23L z74%53Q|7u)=rL3VZ^+%KmxWC%%ZUdPmQ`5o1GO8q64s(-$(w_u-H#2y_WTN^4@-Pw z5bY-Y#0JmfClA0`xM+V)|LPuJ(OyhiS;BqWX_s`wPGFr$%cQ+}%}ifnFQL$H`nt&h zqQEti9w Ni8Aq-b3FEpfs|lO7c`VA7Lt>acLe5jnEn5gO|7N}Eyf5%9c+^Xz9HQksaXb9OF{m$@6~g(1U{}cS{YSb&Dj-^6 z(3|vA5{5pLu1VKP1TL8Lh2v9F358+4Qk({>35(cLX$HptG;auY|wJK}j*i?gn#+4qpw`rIbD^I|ei4lBE*$BIv zhl5*{1l-laDFw?MNo5NhY%@qw_A7mGu-%|K>7=p~o}bSt2|Fy8lxHBaz@XnaK2e?p z=ORuicvZTt?19<`4C*3w^$;9>Na2{wuU6c8vLlp}ufD_`V1ctztEE)`OGl`yLj8TF zPyGYD^ALCNPXY;!!zDpmp$W#T$KkV#*voLkjMYMe`ZBojYb3x{Sc-H4YD_u}4e2?v zTS&r3{s_Ee794`HBnyt9%J3FUMtv7G3yP$Aw2w&Kb5v-aJQ+XW3gl_1MRFUi885dJ z7yM9;lWa)J3-H&?0SnbC&|opD4<11+g&nA2cm{PG>_?pp`xAI+63`|Bv*9p$<_S-i z(B*InJ!{}9>IS%>HsM}oIJ$)P!q4$GTgA;@5cVmdgF-J01&Ob*2=xoyXQ~d3jwPoB zoR&CzBtQYo_Sum7t?5VeU7H-?0;&+kp-G%Q9_z%p5C-l_%lH5Ke8G7u!)YQ%8U$*wF y|KO&6Zv8CR{pSBNJZBZR{mFnw?%J(4Zg@-g_x?Sdz42>{ye*n$z5kSw)#Sh0j%{@S diff --git a/FlightRouteV2/obj/Debug/FlightRouteV2.pdb b/FlightRouteV2/obj/Debug/FlightRouteV2.pdb index dfc1ef066c601ba4c400dffa36e98b95d5ddd0e1..d63f998ecd6932c1a0874d316d827c481b50e3fd 100644 GIT binary patch delta 3312 zcmb`}dsI}%9S89F4Z9amFg%y1vTJy#AR_S*qZlA3sTv{>jaoJ8`e+_%ZFne6PuztC z0RdU|f-4F>fTBqgJ!X$3$C?%kNi{@`CPvd!AJtGrv0zGCG@|{^byWI)_w4wY-|sgw zckcCa_gX*HTR+s><2>s)(>@=#Og28)o~lNVoCjPRM>Z2TBaD2Tzn7{yBHyN3bs%z%$Zd=YRo6uMi2TN= zF}zmGxZ0yWdC?L=TTW7C1l1p6Jb#XXc)@#!f6_)ct8*O@x7j0BFRzDw0bbviNxM$*o&CzL9|+&wU9?A~h9spimKtM~#`mf5eWhs%HBI47 zXL)l6-&@Q-n8tT@@ZV+8N106L&fJ1=WhN3)#dKa*$Ukzp($=);Q@^2t<=ooN^Jnpb zd@49awg9qi<+ck{7^4(sQDGLhRq%q(4TR~ODJ+qV@fFwDCqw+pSf84i6{~+XUG(y^ z%Jc?i^wp{3vx7qPsKzm-jTR%b%)exzs4A*CJ4{`c9iZB?J@g)8l$vP{(tB#XwPs_$ zEXKZnnXws2yfT$BacF~jFx%ge;}aO1h9nZ(9u=^nmwG!pA}|e=6{w7uCa0j{qgAe> zatW1nNlz*U^+aw^NCqn3qqU-%H>etfdH!l^qAtXW>SeS>jIa(G5v-0~ALBb0TbYlF z$MX+Y4ppmi{ncOPdWCdjP6n!psK&{vxHd+t9Hb`adIh$kx(HSCqq(S#RL!|z-V0DU zBIlN>ruAWt91m^E;@ON{!Ibtv3r1-t(vIN^P;Eo?#Gq>Q;}hw_h`AWij1gxCjffE^ z5_k+1aUyS~$P>Y4;>Bh{mZ8#)CQhVWR>g^odwe1j@SiVE@~@C>2o+7GqFgFEKt-LDpUm?oQvv4%(|P_K zZu>Ra4scs9{tRu+eA9cpcp;U%L?z`^a+a48FMW%b*my}2FME@h*HgtSRMEgIYH3R| zRr>Nu53r=1>J_pc}J=8z9 z#ar6lnRNuhfA-wB8sTS%P4IJ=3I77ck;S+L(xp(07kBwF?At7koXGjhGHRcZwSRc#erP#G~%Q147?1#hS#8|--O>F?uKV! zkIdhO-y;42o`WWOI6exVM;uKS#=b)*5sAOT=iuMqR45iok-iMYfzsgx#SA3z;qreh3Gacd}4U>FqROwv(M95@cTBR^J)E%&YC(D6hf0SB8T!C7=m*PXy$S{(c0hv#of=u# z4ucTyfWdI5%s0Xi#7!_1?uX&<6InkZU!((R*VjYZyiBPOF zNx|QL91@d}7z-D|c=);;uoR9%ybLD5cj0*W8z{!*OG}_wupA~LUm@d4I03O8PJ}IR z5^l=wlpOMQ3&pB+(m2{Gq4D)@5}sHAbUsa2O=AS*NqSsh1V57Jn6?XlX!Q*2XoZe z<8wU6YEe9!pcWs$>isyvoDFK(@fXy?Uu^P>P8C0%#73*89)H*3jwbH9Y>XtA?xa^z zXaHWA+*tgI6*=pcV6T6;AL$Y>celFD}tI}wXL`QRzW%&E?cMheBt>qBcb4bC_d1<;|E6cf4YxvtqcE1E*}Dkiu& z*G5wWIa*4i=@NP3k<9YZtj>2v(bKf~V9ILJS0ho=;`=K7L=NLJ?S;B!WgN8*`=9Mj zr6u0~|LwN%;H^gvoEGOc&u3Qe@;e7+@6}DRd0G0sTEZjgI`M7XsYFxiYr1AUeR0#b z4`(cGi1yma3UQsZ-DCP*G;z6hqU}c8gVuo7h}MMmTQn>o9%Z;i@EAdJw$#t27IJ2c lBHi$9NYtWjN85o`hlXEKCVoJlT(38X_8lC5imEaa{tFdqJ4pZl delta 3079 zcmb`}dr(x@9S899JM1p3u*gGRyCTbD5fF)yF=i@87wu>hRE$nybU;mFLkv}61sz-2 zgO`_EFdzNdZ{kuDR{M_H~ zch0@%T#omy?Wo#zR9&5{Zs3eDH!Y_NRLg^?(-qCHk(kE)YgOaDi)dsHVd@c90RMGHRubM;555AuRE?dAsR@bgh=6Vq{Od=g!O z0ZRf@7qi*Nu2+qn#JkKQKIR4BDvD_%-j6VDJ-=%fwQ=i7Cu-tCM3CtjnJ+TwMXo78 z){0C?s4X=aT&GRPe{2n-%JWneNlopH7cUDXUh*rlPvrJsa+Gt2ol2MS9YvbbLc+If zrl#x`mEGcRzRY(m;5(M`-P@`B0ad-utJY9W1F!DV)SM)IYdc7+)YN5BU6!V9km?3` zeI9oP^S74s>OH)17ww%xP2cmTJ4>ngEZ;Y*Y5ptWyZ;6qsGx&0H7zD;F=<*_sHH{I zno6yyy!8TaJHrnZ^LL-(`#$AIa_PP2n97@Zh2zf5Afk#izSqXzD|cn&cB#_`sAN62 zo#w@hdC5*Hxr{ZDeIK`fO^zotj&0=F#_jdIq$iXxoHGrZ&XNMxa7SeidY z9fv4K6zA_YO=8AC74pf9dHTsdFV9=IVe`8D%#9YtLQz+XKucJJ=6`zSuie1(sCo;t z#UQp?0z{@oB{o@nM4cs6R9ZCZadL$C*;-@xvy7=S7+Z+M3$qxLlanX*6}^_Ikf%{u zgv^046`iMY36%j!g<>_t?p&y1c`F2W$T7aAhIz?d{tr=!}UROLJ;iuS_TkfW%qLgkAw<0g5=%}3?1 zGLGSY#G~~^dB!bV%-A)In>D5qEmslpKE}*PwG-9(kE$ZCAXpd+eRS7Ror`J4Ej604o6H%4p zvc`-{!8n63u2Rt_f>Kkh4XBfz7Sk`tc7cimsU(E#v&r5@_Uq)(lOvOgExdR=mCWEJ zdAuZPuj=QOcX{OzUNgW&bPS1Js*C4!kyM{V_4T~I9J^fZ@f2l`FBg$p!+4|F z_0-lC=@jLvIuS+S*vVBuRGl!m;!hpa=*zvaR?l7|mLqpHKFw%0Z}C-EinYs|+2RnM zfs^6wp@+6a_zB`9_$gcoKZEjy%6@AVbD->>3(q3I5q86TCBGS-LtFsQ!(S?SdHLTW z-j7|$dT`KX5_QH3dJkc@5<4|7cLwFJSZg>e^gZ*$A{to^CFT+5>zJ)RHOSllq z@fq+Bh!?>D_##;uyMluiNL+=-l#aiK*ATnmAUvVue*?cl+zD^ME+zjN{3GJC@N3uy z{{+8O>Q|Nc2E2*93hx;?As;IazCl6@{{m;iTkvV6!;j$K5YLh^{3#rQufaPo2g-?T zP%MP<#M|Lr$b6WsceI184-(=_ki*;1 z3l2fq@1Eialow!lzN?TYsD>PRLoevLF+kd=?BwoDCe2pN;3ULbVH9jr^6x^c5s4!>h=x5d2KFi)`d}>L zOE3=Jh9)=!WxsohBhYi}@py?xo}i4qU;<(lOoUTl5=>F*(=;rHO+n&GB$DBCa4O7D zIzF%X5|k&*f+?tH!zbWsI1R3WPr`L@I@GdpOvh4{HWix18)sJw|L#m}GPVt_!cxU+ z-8XdqiC6^NBHrkpCmPR{Y8%b+eL^fzMBfc|rJZl(9iIox)(_*g;l)y3d1doP`G~_y zJ<;j~{p*N$0#0Lt)P3SeihIZgVVot9jhp&Sw)yudPLYIewS(^#qD?mnYBw zX>Ca0k;aOhc}W!8K0lY#0%4siuxE&BGW}|eYdpU^-LIxlr~iM=cQ$3~{_pec;^C_u z2lvRey{WB9EV#TUy?F9>3ktVg`ImcQJl!N-$DNu4N}n3{HXdl$N2eq4`o~Wx`G;}f zK6$2(<2E$8+$OYUXI>^5blB$1A8kC^9(PkFxhdL-WBKNO3#}1NzH;`W?L!-TV{%A+ R2&u!K8{;zeT*uu>{x=@k1*`x7 diff --git a/FlyCube/MainWindow.xaml.cs b/FlyCube/MainWindow.xaml.cs index 9922407..eecfc0e 100644 --- a/FlyCube/MainWindow.xaml.cs +++ b/FlyCube/MainWindow.xaml.cs @@ -40,19 +40,21 @@ namespace FlyCube //创建一个 主画布对象 TopCanvas = new MainCanvas(this.LayerPlane); - Vector3 aVec = new Vector3(-6650, 1585.775, 3150); - Vector3 bVec = new Vector3(-3864.256, 126.145,0); - List vecs = FlyVecFun.GetRingVec(aVec,bVec,0.3,100,1,1200, 300); - string txta = ""; - for (int i = 0; i < vecs.Count; i++) + List abVecs = FileBase.TxtToPos("C:/Users/szdot/Desktop/1.txt", out string[] fightNames);//从txt文件里面读取航点 信息 + Vector3[] aVecs = abVecs[0].ToArray(); + Vector3[] bVecs = abVecs[1].ToArray(); + Vector3[] vecs = FlyVecFun.NormalPull(aVecs, bVecs, StrPrintAsync); + string txtd = ""; + for (int i = 0; i < vecs.Length; i++) { - txta += i + " 0" + " " + vecs[i].X + " " + vecs[i].Y + " " + vecs[i].Z + "\r\n"; + txtd += i + " 0" + " " + vecs[i].X + " " + vecs[i].Y + " " + vecs[i].Z + "\r\n"; } - if (File.Exists("C:/Users/szdot/Desktop/a.txt")) + string pathd = "C:/Users/szdot/Desktop/d.txt"; + if (File.Exists(pathd)) { - File.Delete("C:/Users/szdot/Desktop/a.txt"); + File.Delete(pathd); } - SaveFile("C:/Users/szdot/Desktop/a.txt", txta); + SaveFile(pathd, txtd); } /// /// 3D绕行