Extract MechJebLib as separate project/dll

MechJebLib.dll has no references to MJ/Unity/KSP (pure C#) MechJebLibBindings.dll has references to Unity/KSP (conversion glue) alglib.dll is extracted so that MJLib+MJ can both reference it Jetbrains.Annotations is included so MJLib can use it without referencing Unity and MJ now uses the updated nuget package as well (Unity version is old and now will never get updated) The TARGET_DIR now contains: ``` JetBrains.Annotations.dll JetBrains.Annotations.xml MechJeb2.dll MechJeb2.pdb MechJebLib.dll MechJebLib.pdb MechJebLibBindings.dll MechJebLibBindings.pdb System.Core.dll System.dll alglib.dll alglib.pdb mscorlib.dll ``` System.Core.dll, System.dll, mscorlib.dll shouldn't ship with the zip file, but everything else should go into the MechJeb/Plugins directory System.Buffers.dll can be removed it hasn't been necessary for quite some time. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
MuMech · Nov 16, 2023 · 7d329fd · 7d329fd
1 parent a3a9ff8
commit 7d329fd
Show file tree

Hide file tree

Showing 205 changed files with 795 additions and 401 deletions.
diff --git a/MechJeb2.sln b/MechJeb2.sln
@@ -15,6 +15,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MechJebLibTest", "MechJebLibTest\MechJebLibTest.csproj", "{D21C9231-4F36-494F-988A-8352CFE7CCCE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MechJebLib", "MechJebLib\MechJebLib.csproj", "{BA86665B-A72E-41FB-858A-C0FF29E05768}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "alglib", "alglib\alglib.csproj", "{E8CBCDDD-BCFC-4F03-9309-F58395CA4762}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MechJebLibBindings", "MechJebLibBindings\MechJebLibBindings.csproj", "{DA770208-1300-4C86-8996-C1790B945999}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -29,6 +35,18 @@ Global
 		{D21C9231-4F36-494F-988A-8352CFE7CCCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D21C9231-4F36-494F-988A-8352CFE7CCCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D21C9231-4F36-494F-988A-8352CFE7CCCE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA86665B-A72E-41FB-858A-C0FF29E05768}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA86665B-A72E-41FB-858A-C0FF29E05768}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA86665B-A72E-41FB-858A-C0FF29E05768}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA86665B-A72E-41FB-858A-C0FF29E05768}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E8CBCDDD-BCFC-4F03-9309-F58395CA4762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8CBCDDD-BCFC-4F03-9309-F58395CA4762}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E8CBCDDD-BCFC-4F03-9309-F58395CA4762}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E8CBCDDD-BCFC-4F03-9309-F58395CA4762}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA770208-1300-4C86-8996-C1790B945999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA770208-1300-4C86-8996-C1790B945999}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA770208-1300-4C86-8996-C1790B945999}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA770208-1300-4C86-8996-C1790B945999}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/MechJeb2/AttitudeControllers/BetterController.cs b/MechJeb2/AttitudeControllers/BetterController.cs
@@ -1,5 +1,6 @@
-using System;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 using MechJebLib.Control;
 using UnityEngine;

diff --git a/MechJeb2/AttitudeControllers/HybridController.cs b/MechJeb2/AttitudeControllers/HybridController.cs
@@ -1,5 +1,6 @@
-using System;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
 

diff --git a/MechJeb2/AttitudeControllers/KosAttitudeController.cs b/MechJeb2/AttitudeControllers/KosAttitudeController.cs
@@ -1,5 +1,7 @@
-using System;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+
+using System;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using UnityEngine;
 
 namespace MuMech.AttitudeControllers

diff --git a/MechJeb2/AttitudeControllers/KosPIDLoop.cs b/MechJeb2/AttitudeControllers/KosPIDLoop.cs
@@ -1,5 +1,6 @@
-using System;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System;
+using JetBrainsAnnotations::JetBrains.Annotations;
 
 namespace MuMech.AttitudeControllers
 {

diff --git a/MechJeb2/AttitudeControllers/MJAttitudeController.cs b/MechJeb2/AttitudeControllers/MJAttitudeController.cs
@@ -1,5 +1,6 @@
-using System;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
 

diff --git a/MechJeb2/CelestialBodyExtensions.cs b/MechJeb2/CelestialBodyExtensions.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using JetBrainsAnnotations::JetBrains.Annotations;
 
 namespace MuMech
 {

diff --git a/MechJeb2/ComputerModule.cs b/MechJeb2/ComputerModule.cs
@@ -1,7 +1,8 @@
-using System;
+extern alias JetBrainsAnnotations;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using UnityEngine;
 using UnityEngine.Profiling;
 

diff --git a/MechJeb2/DisplayModule.cs b/MechJeb2/DisplayModule.cs
@@ -1,5 +1,6 @@
-using System;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using UnityEngine;
 using UnityEngine.Profiling;
 

diff --git a/MechJeb2/GuiUtils.cs b/MechJeb2/GuiUtils.cs
@@ -1,9 +1,10 @@
-using System;
+extern alias JetBrainsAnnotations;
+using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using JetBrains.Annotations;
 using UnityEngine;
 using UnityEngine.Profiling;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using Object = UnityEngine.Object;
 
 namespace MuMech

diff --git a/MechJeb2/Maneuver/OperationAdvancedTransfer.cs b/MechJeb2/Maneuver/OperationAdvancedTransfer.cs
@@ -1,6 +1,7 @@
-using System;
+extern alias JetBrainsAnnotations;
+using System;
 using System.Collections.Generic;
-using JetBrains.Annotations;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
 using static MechJebLib.Utils.Statics;

diff --git a/MechJeb2/Maneuver/OperationApoapsis.cs b/MechJeb2/Maneuver/OperationApoapsis.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 
 namespace MuMech

diff --git a/MechJeb2/Maneuver/OperationCircularize.cs b/MechJeb2/Maneuver/OperationCircularize.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 
 namespace MuMech

diff --git a/MechJeb2/Maneuver/OperationCourseCorrection.cs b/MechJeb2/Maneuver/OperationCourseCorrection.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
 

diff --git a/MechJeb2/Maneuver/OperationEccentricity.cs b/MechJeb2/Maneuver/OperationEccentricity.cs
@@ -1,5 +1,6 @@
+extern alias JetBrainsAnnotations;
 using System.Collections.Generic;
-using JetBrains.Annotations;
+using JetBrainsAnnotations::JetBrains.Annotations;
 
 namespace MuMech
 {

diff --git a/MechJeb2/Maneuver/OperationEllipticize.cs b/MechJeb2/Maneuver/OperationEllipticize.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 using static MechJebLib.Utils.Statics;
 

diff --git a/MechJeb2/Maneuver/OperationInclination.cs b/MechJeb2/Maneuver/OperationInclination.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 
 namespace MuMech

diff --git a/MechJeb2/Maneuver/OperationInterplanetaryTransfer.cs b/MechJeb2/Maneuver/OperationInterplanetaryTransfer.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
 

diff --git a/MechJeb2/Maneuver/OperationKillRelVel.cs b/MechJeb2/Maneuver/OperationKillRelVel.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 
 namespace MuMech

diff --git a/MechJeb2/Maneuver/OperationLambert.cs b/MechJeb2/Maneuver/OperationLambert.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 
 namespace MuMech

diff --git a/MechJeb2/Maneuver/OperationLan.cs b/MechJeb2/Maneuver/OperationLan.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
 

diff --git a/MechJeb2/Maneuver/OperationLongitude.cs b/MechJeb2/Maneuver/OperationLongitude.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
 

diff --git a/MechJeb2/Maneuver/OperationMoonReturn.cs b/MechJeb2/Maneuver/OperationMoonReturn.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
 

diff --git a/MechJeb2/Maneuver/OperationPeriapsis.cs b/MechJeb2/Maneuver/OperationPeriapsis.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 using static MechJebLib.Utils.Statics;
 

diff --git a/MechJeb2/Maneuver/OperationPlane.cs b/MechJeb2/Maneuver/OperationPlane.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 
 namespace MuMech

diff --git a/MechJeb2/Maneuver/OperationResonantOrbit.cs b/MechJeb2/Maneuver/OperationResonantOrbit.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
 

diff --git a/MechJeb2/Maneuver/OperationSemiMajor.cs b/MechJeb2/Maneuver/OperationSemiMajor.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 using static MechJebLib.Utils.Statics;
 

diff --git a/MechJeb2/Maneuver/OperationTransfer.cs b/MechJeb2/Maneuver/OperationTransfer.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System.Collections.Generic;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
 

diff --git a/MechJeb2/Maneuver/Porkchop.cs b/MechJeb2/Maneuver/Porkchop.cs
@@ -1,9 +1,10 @@
 // #define DEBUG
 
+extern alias JetBrainsAnnotations;
 using System;
 using System.IO;
 using System.Reflection;
-using JetBrains.Annotations;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using UnityEngine;
 
 namespace MuMech

diff --git a/MechJeb2/Maneuver/TimeSelector.cs b/MechJeb2/Maneuver/TimeSelector.cs
@@ -1,5 +1,6 @@
-using System;
-using JetBrains.Annotations;
+extern alias JetBrainsAnnotations;
+using System;
+using JetBrainsAnnotations::JetBrains.Annotations;
 using KSP.Localization;
 using UnityEngine;
 

diff --git a/MechJeb2/Maneuver/TransferCalculator.cs b/MechJeb2/Maneuver/TransferCalculator.cs
@@ -8,6 +8,7 @@
 using MechJebLib.Functions;
 using MechJebLib.Lambert;
 using MechJebLib.Primitives;
+using MechJebLibBindings;
 using UnityEngine;
 using UnityToolbag;
 

diff --git a/MechJeb2/MathExtensions.cs b/MechJeb2/MathExtensions.cs
@@ -107,31 +107,5 @@ public static double NextGaussian(this Random r, double mu = 0, double sigma = 1
 
             return rand_normal;
         }
-
-        public static V3 WorldToV3Rotated(this Vector3d vector) => (QuaternionD.Inverse(Planetarium.fetch.rotation) * vector).xzy.ToV3();
-
-        public static V3 WorldToV3(this Vector3d vector) => vector.xzy.ToV3();
-
-        public static V3 ToV3(this Vector3d vector) => new V3(vector.x, vector.y, vector.z);
-
-        public static Vector3d ToVector3d(this V3 vector) => new Vector3d(vector.x, vector.y, vector.z);
-
-        public static Vector3d V3ToWorld(this V3 vector) => vector.ToVector3d().xzy;
-
-        public static Vector3d V3ToWorldRotated(this V3 vector) => Planetarium.fetch.rotation * vector.ToVector3d().xzy;
-
-        public static void LoadH1(this H1 h, FloatCurve f)
-        {
-            h.Clear();
-
-            if (f == null) return;
-
-            foreach (Keyframe frame in f.Curve.keys)
-                h.Add(frame.time, frame.value, frame.inTangent, frame.outTangent);
-        }
-
-        public static Q3 ToQ3(this QuaternionD q) => new Q3(q.z, q.y, q.x, -q.w);
-
-        public static QuaternionD ToQuaternionD(this Q3 q) => new QuaternionD(q.z, q.y, q.x, -q.w);
     }
 }