2.7.2 fixes stack labels

pardeike · Apr 11, 2024 · 0404c41 · 0404c41
1 parent 774e7a0
commit 0404c41
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/1.5/Assemblies/CameraPlus.dll b/1.5/Assemblies/CameraPlus.dll
diff --git a/About/About.xml b/About/About.xml
@@ -19,7 +19,7 @@
     </li>
   </modDependencies>
   <packageId>brrainz.cameraplus</packageId>
-  <modVersion>2.7.1.0</modVersion>
+  <modVersion>2.7.2.0</modVersion>
   <steamAppId>867467808</steamAppId>
   <url>https://github.com/pardeike/CameraPlus</url>
   <description>You want more zoom and different paning?

diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>net.pardeike.rimworld.mod.cameraplus</identifier>
-  <version>2.7.1.0</version>
+  <version>2.7.2.0</version>
   <targetVersions>
     <li>1.0.0</li>
     <li>1.1.0</li>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,7 +4,7 @@
 		<ModName>Camera+</ModName>
 		<ModFileName>CameraPlus</ModFileName>
 		<Repository>https://github.com/pardeike/CameraPlus</Repository>
-		<ModVersion>2.7.1.0</ModVersion>
+		<ModVersion>2.7.2.0</ModVersion>
 		<ProjectGuid>{AC5EE7A1-16EA-498D-B21A-83ACF78F0E5A}</ProjectGuid>
 	</PropertyGroup>
 

diff --git a/Source/Tools.cs b/Source/Tools.cs
@@ -46,46 +46,44 @@ class Tools : CameraPlusSettings
 			return isSmall && (CameraPlusMain.Settings.includeNotTamedAnimals || pawn.RaceProps.Animal == false || tamedAnimal);
 		});
 
-		static readonly QuotaCache<Thing, int, bool> shouldShowLabelCache = new(60, thing => thing.thingIDNumber, thing =>
+		static readonly QuotaCache<Pawn, int, bool> shouldShowLabelCache = new(60, pawn => pawn.thingIDNumber, pawn =>
 		{
 			var len = FastUI.CurUICellSize;
-			var isPawn = thing is Pawn;
-
-			var lower = isPawn ? CameraPlusMain.Settings.hidePawnLabelBelow : CameraPlusMain.Settings.hideThingLabelBelow;
-			if (len <= lower)
+			if (len <= CameraPlusMain.Settings.hidePawnLabelBelow)
 				return false;
 
-			var pawn = thing as Pawn;
-
 			if (InvisibilityUtility.IsHiddenFromPlayer(pawn))
 				return false;
 
 			if (pawn != null && CameraPlusMain.Settings.customNameStyle == LabelStyle.HideAnimals && pawn.RaceProps.Animal)
 				return true;
 
-			if (isPawn && len <= CameraPlusMain.Settings.dotSize)
+			if (pawn != null && len <= CameraPlusMain.Settings.dotSize)
 				return false;
 
 			return true;
 		});
 
 		public static bool ShouldShowDot(Pawn pawn)
 		{
-			if (CameraPlusMain.Settings.hideNamesWhenZoomedOut == false)
+			if (pawn == null || CameraPlusMain.Settings.hideNamesWhenZoomedOut == false)
 				return false;
 
 			return shouldShowDotCache.Get(pawn);
 		}
 
-		public static bool ShouldShowLabel(Thing thing, Vector2 screenPos = default)
+		public static bool ShouldShowLabel(Pawn pawn, Vector2 screenPos = default)
 		{
 			if (CameraPlusMain.Settings.hideNamesWhenZoomedOut == false)
 				return true;
 
-			if (CameraPlusMain.Settings.mouseOverShowsLabels && MouseDistanceSquared(thing?.DrawPos ?? screenPos, thing is Pawn) <= 2.25f)
+			if (CameraPlusMain.Settings.mouseOverShowsLabels && MouseDistanceSquared(pawn?.DrawPos ?? screenPos, pawn != null) <= 2.25f)
 				return true;
 
-			return shouldShowLabelCache.Get(thing);
+			if (pawn == null)
+				return FastUI.CurUICellSize > CameraPlusMain.Settings.hideThingLabelBelow;
+
+			return shouldShowLabelCache.Get(pawn);
 		}
 
 		public static void DrawDot(Pawn pawn, Color innerColor, Color outerColor)