From 293e4c3ff7286e364be249a3c63ec05ec4c9e40c Mon Sep 17 00:00:00 2001 From: kujuman Date: Mon, 21 Jul 2014 04:02:51 -0400 Subject: [PATCH] endofday7-20 break from 0.4.1 added: GS flag implimentation fine LocNeedle Mode remove ADI when in fine loc mode --- .../NavInstruments/NavUtilGUI.dll | Bin 11264 -> 11264 bytes .../NavInstruments/NavUtilLib.dll | Bin 29696 -> 30208 bytes .../hsi_course_deviation_needle.png | Bin 2829 -> 2829 bytes .../NavInstruments/RPMHSI.dll | Bin 7680 -> 7680 bytes .../NavUtilLib/GlobalV_DisplayData.cs | 70 ++++++++++++++++-- KSP Navigation/NavUtilLib/GlobalVariables.cs | 2 + .../NavUtilLib/Properties/AssemblyInfo.cs | 10 +-- KSP Navigation/RPM/Properties/AssemblyInfo.cs | 6 +- .../StandAlone/Properties/AssemblyInfo.cs | 11 +-- 9 files changed, 78 insertions(+), 21 deletions(-) diff --git a/GameData/KerbalScienceFoundation/NavInstruments/NavUtilGUI.dll b/GameData/KerbalScienceFoundation/NavInstruments/NavUtilGUI.dll index 9b4533bd49f8cbb4a6b68186157c9a551cd41f2a..b055fb27e4749a6a83007c89c86ad698ca8e1869 100644 GIT binary patch delta 4487 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 delta 4295 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

_B)SQ~%XNkgIrFP8}?tRk`eGTs0 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 diff --git a/GameData/KerbalScienceFoundation/NavInstruments/PluginData/NavUtilLib/hsi_course_deviation_needle.png b/GameData/KerbalScienceFoundation/NavInstruments/PluginData/NavUtilLib/hsi_course_deviation_needle.png index b4bd73e13b11009965ea571f9d1a47cfe30a85d8..0cbf12ec661c800f1d4422c02c6e8d7d17dc1b2e 100644 GIT binary patch delta 76 zcmeAb>lNE@lFMZyFM|RP%SQIp|5Kg&H7-5YUK@RP?(VtnQjQ{`u delta 76 zcmeAb>lNE@lFP-A?|_29kpp`>{?}K&ROYHW_VmPMv;X^KqGo=1)gs`;p$H}HI<(Km b%&lf<<7N9kpL>cT0}yz+`njxgN@xNA0h%6I diff --git a/GameData/KerbalScienceFoundation/NavInstruments/RPMHSI.dll b/GameData/KerbalScienceFoundation/NavInstruments/RPMHSI.dll index 1c48381937cb957e66866dee3faf258d8fea6ee3..172aeebe275a2e1e6d350777108def45ce81ce7d 100644 GIT binary patch delta 2458 zcmaJ@Yitx%6#nka?4#RtptIfGZl6^~D!tO%eOGo>EoXYJj(#fi#VR8xWH!LAnP4|AQhS(RkOb(ga@c>50#2R`g2gqNy zh#ZrJZWO@W!)=}%Nj71kf%MkB z`BOYH)gvVyF+39SNU2An9*KD*?vbtDLTeJ9s@x+L_NMW2DzEPZi>mVcsy$L;?--w8 zdYW4MtkhUl&bz*by6Ns}yGGmrsxqtr+Eo#|DnkBQI&#vwW@Nfk;*U8Od{dmc{wYq8 zKb*I#6lB%?JPE?8=Ui)s8$kN!8b~uU3GuF&#p@Q5(Q_7AuFlLDNnm?^t+GhD0|Ru>@vQQ&qT_9%A3soIphW#$G0?1DAl^;X(XFmm zLl{&?SnVT31CP@ugcl`$L;CzcA3y$Js-5JNZ+)kc{3P3?$g z;JoH0OZt9SoG*hv=4W9SPIC|U5o0JwJcLShF^*xLx(tV~Oikf9)~Ks-68-90oWiiW z0q@asGtTg(zK!^bn!#5%tq#)vENeW8pVd8_by4zubsv6)k40QUnf3(H(w@Q<%-0U* zIbpH(99=tUK7^IzLYzhtMdCs2b82>Lg1C?9rvDxZ@r-t!n)kF{_(O6=+rV(2X@603 zPSZrG)YOZMT3pl%_!hIcurDsoAWGgW>WM{ik+m2`3-XPqz<_9ELKhoQPVB=w#6f&W zES8!G>d4taVha0-Ef^wh!t2DP)VHHSyo3cZXju1F73raiknGtfJfv3WIw^KI!p&g^JwBltfd5-Lm))ti^GbM6yXvehYn;N};3K%ja&(?9ON*n)Ei{`tK!FGPS zF@PZ+0I;E(`N>c=(ZkW^xRiDq8<9por4+Jco2WC^s1K>5TcRrAP|Lw7=*-VOo&1v2|Pgk=5z;2Af3&A=R5!X zod3+(O*Nz%4!k3m^qw2oQ^@`qIJ!zZSWgrqJdH$mq=Ay4zm3R`d0QP(0WXne@;ED% z{>$b&*$nB9#6M>*vGbfsL064N#Q3e8xqOABB?Cl0k`+@Iqs54N5<&33Y=D^qm`XI* zBzGI25i{P|8?qI-fWACi>$@CXVCI9(ki+|+V;OG4LWG`ScgU)=!-b*TTL_I=05|b#8#oPdo>+ok_duY%Na3f3r;Kx<(gAXBtFGF3Dy>Gv2`r@hmj(8InDdveWEBp>$VSv!O>|B0>i zgssCuU63{}v_{0dNc3U60mGh%H?5BNEEltLMKZ>dO-mxn12exB9oJ@xCZrn(Yt8YW z;*czd1RSC}B~i{=-3rGBw}qHcPMrw zCDzYEVixgJt_ohNP6;VQ%6(?sXFj!3ql9U1Kx@k60oCx7*^_vxj905hQcPM?_CQvl zL_P9e98G4HLts|eQsJDK3EGVp4W5Qsg)wEvOxS*jYCv}l;DOE-%Tk|fLKS{vx^NMx z%7ZnG8gRnr%l2WhaKd`h*=pg6qE&Mi2qkdQj8AbD`N*7Yqt!0V`IuV4=I{!4+0zQv z8%^L)U~EO!Xl%39v1vmuGSE+6qT@J|(Uur(#^sd-S#)vB(q@diFh9-*+@*Oqi1xuH zI6wH#0T1#E?ylrw$;~v{Dy^3m&>om+^sRJA(&!3Mr7=i!s*;1UPA|$H;98(YJLNvv zM+f8-Y90aVbPP5=IxYCG!e$IMDrKW?ovIbvt3~MpZV~vlz~f;IKKfEgA@OD9J4GkO zWhZL{@{687l2O`5XQ+~P0|PVwH0UFNLo`obLPu$}`~nS8ha965v_)P;Cuz65n!cxl zavPn6<$Ah6U&*fn&&l0%ovz8fu)l#yPm-$i!z&Z%ZLi&Qi>89#rP<26z=g{DNn-33 zHA=M04MHQ3}?4y0aI+_X0 z5R#zKh6O$^Fht&@*06V1P-O~3I*A1@-wV8i*W5t zc<%7I84L7BWgeXL(YG>|Oa7+b-uAAw8@Da$*w{XLI#ZQL&t@HyvaapXPpFxSQ&aIk)>n1G_BmXdW4I_RxH!A(ccu}6gf5~h0 s)}p&L_IGr4ewaO+@_4v 10 && var.FlightData.locDeviation < 170 || var.FlightData.locDeviation < -10 && var.FlightData.locDeviation > -170) locFlag = true; @@ -66,8 +69,16 @@ public static void DrawHSI(RenderTexture screen, float aspectRatio) screen = NavUtilLib.Graphics.drawCenterRotatedImage(360 - FlightGlobals.ship_heading + (float)var.FlightData.bearing, new Vector2(.5f, .5f), var.Materials.Instance.NDBneedle, screen, 0, 0); screen = NavUtilLib.Graphics.drawCenterRotatedImage(360 - FlightGlobals.ship_heading + (float)var.FlightData.selectedRwy.hdg, new Vector2(.5f, .5f), var.Materials.Instance.course, screen, 0, 0); + bool fineLoc = false; + if (!locFlag) { + + if (NavUtilLib.GlobalVariables.Settings.enableFineLoc && NavUtilLib.GlobalVariables.FlightData.dme < 7500) + { + fineLoc = true; + } + float deviationCorrection; if (bcFlag) { @@ -78,7 +89,37 @@ public static void DrawHSI(RenderTexture screen, float aspectRatio) { deviationCorrection = var.FlightData.locDeviation * -.078125f; } + //if fineLoc == false then we use course guidance mode. In this mode each tick on Loc is 1°. in fine guidance mode each tick is 0.25° + + string locMode = "Loc→Coarse Mode"; + + if (fineLoc && Mathf.Abs(NavUtilLib.GlobalVariables.FlightData.locDeviation) < 0.75f) + { + deviationCorrection *= 4; //we're magnifying the needle deflection, which increases sensetivity + + //now to inform the user that fine control is enabled + locMode = "Loc→Fine Mode"; + + //change the color of the localizer needle/font? + NavUtilLib.GlobalVariables.Materials.Instance.whiteFont.color = Color.magenta; + screen = NavUtilLib.TextWriter.addTextToRT(screen, locMode, new Vector2(380, screen.height - 570), NavUtilLib.GlobalVariables.Materials.Instance.whiteFont, 0.5f); + NavUtilLib.GlobalVariables.Materials.Instance.whiteFont.color = Color.white; + + NavUtilLib.GlobalVariables.Materials.Instance.localizer.color = Color.yellow; + + NavUtilLib.GlobalVariables.Materials.Instance.NDBneedle.color = Color.clear; + } + else + { + fineLoc = false; + + NavUtilLib.GlobalVariables.Materials.Instance.localizer.color = Color.magenta; + screen = NavUtilLib.TextWriter.addTextToRT(screen, locMode, new Vector2(380, screen.height - 570), NavUtilLib.GlobalVariables.Materials.Instance.whiteFont, 0.5f); + } + deviationCorrection = Mathf.Clamp(deviationCorrection, -0.234375f, 0.234375f); + + screen = NavUtilLib.Graphics.drawCenterRotatedImage(360 - FlightGlobals.ship_heading + (float)var.FlightData.selectedRwy.hdg, new Vector2(.5f, .5f), var.Materials.Instance.localizer, screen, deviationCorrection, 0); } else //draw flag @@ -86,20 +127,29 @@ public static void DrawHSI(RenderTexture screen, float aspectRatio) screen = NavUtilLib.Graphics.drawMovedImagePortion(var.Materials.Instance.flag, .34375f, .65625f, 0, 1, screen, new Vector2(.821875f, 0.2046875f), false); } + if(locFlag || !fineLoc) + NavUtilLib.GlobalVariables.Materials.Instance.NDBneedle.color = Color.white; + screen = NavUtilLib.Graphics.drawMovedImage(var.Materials.Instance.overlay, screen, new Vector2(0, 0), false, false); //marker beacons //imageBox takes bottom x, - if (var.FlightData.dme < 30000) + if (var.FlightData.dme < 200000) { + var fB = NavUtilLib.Utils.CalcBearingTo(Utils.CalcRadiansFromDeg(var.FlightData.selectedRwy.gsLongitude - var.FlightData.currentVessel.longitude), + Utils.CalcRadiansFromDeg(var.FlightData.currentVessel.latitude), + Utils.CalcRadiansFromDeg(var.FlightData.selectedRwy.gsLatitude)); + + var gsHorDev = Utils.CalcLocalizerDeviation(fB,var.FlightData.selectedRwy); + + if (Math.Abs(gsHorDev) < 25) + gsFlag = false; + + //checkmkrbcn lastBcnCode = bcnCode; - var fB = NavUtilLib.Utils.CalcBearingTo(Utils.CalcRadiansFromDeg(var.FlightData.selectedRwy.gsLongitude - var.FlightData.currentVessel.longitude), - Utils.CalcRadiansFromDeg(var.FlightData.currentVessel.latitude), - Utils.CalcRadiansFromDeg(var.FlightData.selectedRwy.gsLatitude)); - - bcnCode = inBeaconArea(Utils.CalcLocalizerDeviation(fB, var.FlightData.selectedRwy), var.FlightData.currentVessel,var.FlightData.selectedRwy); + bcnCode = inBeaconArea(gsHorDev, var.FlightData.currentVessel,var.FlightData.selectedRwy); bool drawUnlit = false; @@ -189,7 +239,11 @@ public static void DrawHSI(RenderTexture screen, float aspectRatio) yO = Mathf.Clamp(yO, -0.21875f, 0.21875f); //.7 degrees either direction yO += 0.3609375f; - screen = NavUtilLib.Graphics.drawMovedImage(var.Materials.Instance.pointer, screen, new Vector2(0.5f, yO), true, false); + + if (gsFlag) + screen = NavUtilLib.Graphics.drawMovedImagePortion(var.Materials.Instance.flag, .65625f, 1, 0, 1, screen, new Vector2(.821875f, 0.2390625f), false); + else + screen = NavUtilLib.Graphics.drawMovedImage(var.Materials.Instance.pointer, screen, new Vector2(0.5f, yO), true, false); GL.PopMatrix(); } diff --git a/KSP Navigation/NavUtilLib/GlobalVariables.cs b/KSP Navigation/NavUtilLib/GlobalVariables.cs index 7b23ff2..d6209c0 100644 --- a/KSP Navigation/NavUtilLib/GlobalVariables.cs +++ b/KSP Navigation/NavUtilLib/GlobalVariables.cs @@ -26,6 +26,8 @@ public static class Settings public static bool navAidsIsLoaded = false; + public static bool enableFineLoc = true; + public static void loadNavAids() { Debug.Log("NavUtilLib: Loading NavAid database..."); diff --git a/KSP Navigation/NavUtilLib/Properties/AssemblyInfo.cs b/KSP Navigation/NavUtilLib/Properties/AssemblyInfo.cs index d16f911..f46d273 100644 --- a/KSP Navigation/NavUtilLib/Properties/AssemblyInfo.cs +++ b/KSP Navigation/NavUtilLib/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("HSI")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyTitle("NavUtilLib")] +[assembly: AssemblyDescription("A library+ of tools for land based navigation in Kerbal Space Program")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("HSI")] +[assembly: AssemblyProduct("NavUtilLib")] [assembly: AssemblyCopyright("Copyright © 2014")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("0.4.1")] +//[assembly: AssemblyFileVersion("0.4.*")] diff --git a/KSP Navigation/RPM/Properties/AssemblyInfo.cs b/KSP Navigation/RPM/Properties/AssemblyInfo.cs index 8ddd1fe..fd8224b 100644 --- a/KSP Navigation/RPM/Properties/AssemblyInfo.cs +++ b/KSP Navigation/RPM/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("RPMHSI")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("Addon for Kerbal Space Program to interface with RasterPropMonitor")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("RPMHSI")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("0.4.1")] +//[assembly: AssemblyFileVersion("0.4.*")] diff --git a/KSP Navigation/StandAlone/Properties/AssemblyInfo.cs b/KSP Navigation/StandAlone/Properties/AssemblyInfo.cs index 032125f..b73a804 100644 --- a/KSP Navigation/StandAlone/Properties/AssemblyInfo.cs +++ b/KSP Navigation/StandAlone/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("KSF_NavInstruments")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyTitle("NavUtilGUI")] +[assembly: AssemblyDescription("An addon for Kerbal Space Program to create a GUI between NavUtilLib and Toolbar")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("KSF_NavInstruments")] +[assembly: AssemblyProduct("NavUtilGUI")] [assembly: AssemblyCopyright("Copyright © 2014")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.1.0.0")] -[assembly: AssemblyFileVersion("0.1.0.0")] +[assembly: AssemblyVersion("0.4.1")] +//[assembly: AssemblyFileVersion("0.4.*")] +