From 0a7282ffb2619a8cf8f2560037630b31ff7214cf Mon Sep 17 00:00:00 2001 From: Andreas Pardeike Date: Mon, 2 Oct 2023 22:39:22 +0200 Subject: [PATCH] v2.6.1 fixes Dubs Performance Analyzer 'optimize labels' bug --- 1.4/Assemblies/CameraPlus.dll | Bin 54272 -> 54784 bytes About/About.xml | 4 +++- About/Manifest.xml | 2 +- Directory.Build.props | 4 ++-- Source/Main.cs | 27 ++++++++++++++++++++++----- Source/Tools.cs | 4 +--- 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/1.4/Assemblies/CameraPlus.dll b/1.4/Assemblies/CameraPlus.dll index 6afc8a766661a6e2e96cf5734e1d56d00b236aed..956ba5170f7c741adfae7aa3a89607fc8fca0742 100644 GIT binary patch delta 14539 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 Sc*=>6hIZnj#Q$*j!v6rBX7Zu{ diff --git a/About/About.xml b/About/About.xml index 1111e4f..908c1f0 100755 --- a/About/About.xml +++ b/About/About.xml @@ -18,7 +18,9 @@ brrainz.cameraplus - 2.6.0.0 + 2.6.1.0 + 867467808 + https://github.com/pardeike/CameraPlus You want more zoom and different paning? Powered by Harmony Patch Library diff --git a/About/Manifest.xml b/About/Manifest.xml index c70333b..090e2b5 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@  net.pardeike.rimworld.mod.cameraplus - 2.6.0.0 + 2.6.1.0
  • 1.0.0
  • 1.1.0
  • diff --git a/Directory.Build.props b/Directory.Build.props index 809c177..4d6b2f0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,10 +1,10 @@ - + Camera+ CameraPlus https://github.com/pardeike/CameraPlus - 2.6.0.0 + 2.6.1.0 {AC5EE7A1-16EA-498D-B21A-83ACF78F0E5A} diff --git a/Source/Main.cs b/Source/Main.cs index daded1a..11aba15 100644 --- a/Source/Main.cs +++ b/Source/Main.cs @@ -18,7 +18,7 @@ public static class Defs public static SoundDef SnapBack; public static SoundDef ApplySnap; } - + public class CameraPlusMain : Mod { public static CameraPlusSettings Settings; @@ -212,6 +212,20 @@ public static bool Prefix(Pawn ___pawn) return Tools.CorrectLabelRendering(___pawn); } } + // + // Dubs Performance Analyzer patch on PawnUIOverlay.DrawPawnGUIOverlay needs to be turned off + // + [HarmonyPatch] + static class Analyzer_Fixes_H_DrawNamesFix_Prefix_Patch + { + public static bool Prepare() => TargetMethod() != null; + public static MethodInfo TargetMethod() => AccessTools.Method("Analyzer.Fixes.H_DrawNamesFix:Prefix"); + public static bool Prefix(ref bool __result) + { + __result = true; + return false; + } + } [HarmonyPatch(typeof(GenMapUI), nameof(GenMapUI.DrawPawnLabel))] [HarmonyPatch(new Type[] { typeof(Pawn), typeof(Vector2), typeof(float), typeof(float), typeof(Dictionary), typeof(GameFont), typeof(bool), typeof(bool) })] @@ -451,7 +465,8 @@ static class Map_MapUpdate_Patch static FieldInfo PlanetMaterialField(string typeName) { var type = AccessTools.TypeByName($"SaveOurShip2.{typeName}"); - if (type == null) return null; + if (type == null) + return null; return AccessTools.Field(type, "PlanetMaterial"); } @@ -459,9 +474,11 @@ static void FixSoSMaterial() { done = true; var fPlanetMaterial = PlanetMaterialField("RenderPlanetBehindMap") ?? PlanetMaterialField("ResourceBank"); - if (fPlanetMaterial == null) return; + if (fPlanetMaterial == null) + return; var mat = fPlanetMaterial.GetValue(null) as Material; - if (mat == null) return; + if (mat == null) + return; mat.mainTextureOffset = new Vector2(0.3f, 0.3f); mat.mainTextureScale = new Vector2(0.4f, 0.4f); } @@ -477,7 +494,7 @@ public static void Postfix(Map __instance) FixSoSMaterial(); } } - + [HarmonyPatch(typeof(KeyBindingDef))] [HarmonyPatch(nameof(KeyBindingDef.KeyDownEvent))] [HarmonyPatch(MethodType.Getter)] diff --git a/Source/Tools.cs b/Source/Tools.cs index 57667eb..330ac53 100644 --- a/Source/Tools.cs +++ b/Source/Tools.cs @@ -3,10 +3,8 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using System.Threading; using UnityEngine; using Verse; -using Verse.Noise; using Verse.Sound; namespace CameraPlus @@ -370,7 +368,7 @@ public static void KeySettingsButton(Rect rect, bool allKeys, KeyCode setting, K static Vector3 snapbackRootPos; static float snapbackRootSize = 0; - + public static void CreateSnapback() { Defs.SnapBack.PlayOneShotOnCamera(null);