From 5dffa1e739383794210ed0e035cb537c7da30a02 Mon Sep 17 00:00:00 2001 From: MOARdV Date: Sat, 29 Dec 2018 08:23:44 -0600 Subject: [PATCH 1/2] Submit some forgotten updates Replace obsolete RequestResource calls --- .../Auxiliary modules/JSIActionGroupSwitch.cs | 6 +++--- RasterPropMonitor/Auxiliary modules/JSIRadar.cs | 6 +++--- .../Auxiliary modules/JSIVariableAnimator.cs | 8 ++++---- RasterPropMonitor/Handlers/JSISteerableCamera.cs | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/RasterPropMonitor/Auxiliary modules/JSIActionGroupSwitch.cs b/RasterPropMonitor/Auxiliary modules/JSIActionGroupSwitch.cs index 8b348c3c..126e94e0 100644 --- a/RasterPropMonitor/Auxiliary modules/JSIActionGroupSwitch.cs +++ b/RasterPropMonitor/Auxiliary modules/JSIActionGroupSwitch.cs @@ -784,8 +784,8 @@ public override void OnUpdate() if (consumingWhileActive && currentState && !forcedShutdown) { - float requesting = (consumeWhileActiveAmount * TimeWarp.deltaTime); - float extracted = part.RequestResource(consumeWhileActiveName, requesting); + double requesting = (consumeWhileActiveAmount * TimeWarp.deltaTime); + double extracted = part.RequestResource(consumeWhileActiveName, requesting); if (Math.Abs(extracted - requesting) > Math.Abs(requesting / 2)) { // We don't have enough of the resource or can't produce more negative resource, so we should shut down... @@ -893,7 +893,7 @@ public override void OnUpdate() // If we're consuming resources on toggle, do that now. if ((consumingOnToggleUp && newState) || (consumingOnToggleDown && !newState)) { - float extracted = part.RequestResource(consumeOnToggleName, consumeOnToggleAmount); + double extracted = part.RequestResource(consumeOnToggleName, (double)consumeOnToggleAmount); if (Math.Abs(extracted - consumeOnToggleAmount) > Math.Abs(consumeOnToggleAmount / 2)) { // We don't have enough of the resource, so we force a shutdown on the next loop. diff --git a/RasterPropMonitor/Auxiliary modules/JSIRadar.cs b/RasterPropMonitor/Auxiliary modules/JSIRadar.cs index afefd6f7..6b3a2962 100644 --- a/RasterPropMonitor/Auxiliary modules/JSIRadar.cs +++ b/RasterPropMonitor/Auxiliary modules/JSIRadar.cs @@ -160,9 +160,9 @@ public void FixedUpdate() // Resources check if (resourceAmount > 0.0f) { - float requested = resourceAmount * TimeWarp.fixedDeltaTime; - float supplied = part.RequestResource(resourceId, requested); - if (supplied < requested * 0.5f) + double requested = resourceAmount * TimeWarp.fixedDeltaTime; + double supplied = part.RequestResource(resourceId, requested); + if (supplied < requested * 0.5) { powered = false; } diff --git a/RasterPropMonitor/Auxiliary modules/JSIVariableAnimator.cs b/RasterPropMonitor/Auxiliary modules/JSIVariableAnimator.cs index 387abf17..14a354ac 100644 --- a/RasterPropMonitor/Auxiliary modules/JSIVariableAnimator.cs +++ b/RasterPropMonitor/Auxiliary modules/JSIVariableAnimator.cs @@ -661,11 +661,11 @@ private void TurnOn(double universalTime) if (resourceAmount > 0.0f) { - float requesting = (resourceAmount * TimeWarp.deltaTime); - if (requesting > 0.0f) + double requesting = (resourceAmount * TimeWarp.deltaTime); + if (requesting > 0.0) { - float extracted = part.RequestResource(resourceName, requesting); - if (extracted < 0.5f * requesting) + double extracted = part.RequestResource(resourceName, requesting); + if (extracted < 0.5 * requesting) { // Insufficient power - shut down TurnOff(universalTime, true); diff --git a/RasterPropMonitor/Handlers/JSISteerableCamera.cs b/RasterPropMonitor/Handlers/JSISteerableCamera.cs index 71adc6a1..12fc18ff 100644 --- a/RasterPropMonitor/Handlers/JSISteerableCamera.cs +++ b/RasterPropMonitor/Handlers/JSISteerableCamera.cs @@ -160,7 +160,7 @@ private static Vector2 ClampToEdge(Vector2 position) private Vector2 GetNormalizedScreenPosition(SteerableCameraParameters activeCamera, Vector3 directionVector, float cameraAspect) { // Transform direction using the active camera's rotation. - var targetTransformed = cameraObject.CameraRotation(activeCamera.currentYaw, -activeCamera.currentPitch).Inverse() * directionVector; + var targetTransformed = Quaternion.Inverse(cameraObject.CameraRotation(activeCamera.currentYaw, -activeCamera.currentPitch)) * directionVector; // (x, y) provided the lateral displacement. (z) provides the "in front of / behind" var targetDisp = new Vector2(targetTransformed.x, -targetTransformed.y); From 2d0090b693da29646d674c305accf768b4a12b24 Mon Sep 17 00:00:00 2001 From: MOARdV Date: Sat, 29 Dec 2018 08:24:09 -0600 Subject: [PATCH 2/2] RPM v0.30.6 --- .../RasterPropMonitor.version | 6 +++--- RasterPropMonitor.sln | 2 +- RasterPropMonitor/RasterPropMonitor.csproj | 21 +++++-------------- SharedAssemblyInfo.cs | 2 +- 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/GameData/JSI/RasterPropMonitor/RasterPropMonitor.version b/GameData/JSI/RasterPropMonitor/RasterPropMonitor.version index 3874014f..aa425b98 100644 --- a/GameData/JSI/RasterPropMonitor/RasterPropMonitor.version +++ b/GameData/JSI/RasterPropMonitor/RasterPropMonitor.version @@ -6,12 +6,12 @@ { "MAJOR": 0, "MINOR": 30, - "PATCH": 5 + "PATCH": 6 }, "KSP_VERSION": { "MAJOR": 1, - "MINOR": 5, + "MINOR": 6, "PATCH": 0 }, "KSP_VERSION_MIN": @@ -23,7 +23,7 @@ "KSP_VERSION_MAX": { "MAJOR": 1, - "MINOR": 5, + "MINOR": 6, "PATCH": 99 } } diff --git a/RasterPropMonitor.sln b/RasterPropMonitor.sln index a62b6dca..05012a21 100644 --- a/RasterPropMonitor.sln +++ b/RasterPropMonitor.sln @@ -195,6 +195,6 @@ Global $36.inheritsSet = Mono $36.inheritsScope = text/plain $36.scope = text/plain - version = 0.30.5 + version = 0.30.6 EndGlobalSection EndGlobal diff --git a/RasterPropMonitor/RasterPropMonitor.csproj b/RasterPropMonitor/RasterPropMonitor.csproj index 6ab32a4d..5cf9754e 100644 --- a/RasterPropMonitor/RasterPropMonitor.csproj +++ b/RasterPropMonitor/RasterPropMonitor.csproj @@ -40,27 +40,16 @@ - - ..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_Data\Managed\KSPAssets.dll - False - - - ..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_Data\Managed\Assembly-CSharp.dll - False - - - ..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_Data\Managed\UnityEngine.dll - False + ..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\Assembly-CSharp.dll + - - ..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_Data\Managed\Assembly-CSharp-firstpass.dll - False + + ..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.dll - ..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_Data\Managed\UnityEngine.UI.dll - False + ..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.UI.dll diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index 0a48652e..2ec46940 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -12,7 +12,7 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. // Revision number is altered automatically. -[assembly: AssemblyVersion("0.30.5.*")] +[assembly: AssemblyVersion("0.30.6.*")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing.