From 0404c41c97ac3e18d83f30767643fc8df578bb86 Mon Sep 17 00:00:00 2001 From: Andreas Pardeike Date: Thu, 11 Apr 2024 11:37:41 +0200 Subject: [PATCH] 2.7.2 fixes stack labels --- 1.5/Assemblies/CameraPlus.dll | Bin 56320 -> 56320 bytes About/About.xml | 2 +- About/Manifest.xml | 2 +- Directory.Build.props | 2 +- Source/Tools.cs | 22 ++++++++++------------ 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/1.5/Assemblies/CameraPlus.dll b/1.5/Assemblies/CameraPlus.dll index fce5d0ac1553b2d3dd53587e3175393c98b8e716..9c4fbd3eb397ab4870cdb912e5ed26d7211e2607 100644 GIT binary patch delta 8069 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 Cff|GW delta 8358 zcmbtYd301&n*Z*5uU@_PYDuapNmcgBMkjXJvx+xqGt;rBvUB`!Hn*;;}8It)W&?eZt=0$1xc1X zsWiroAb8$DyG<~!3K0&un}OCpgVXue+Kn%1sC1qu@GhI zppN#qLYZjyXCWwJo?_>(#kv6!WemI>OZ!KmVcqK{SR)3qQS=B1rr;7xV6=0753;d! z1lPi!gJM>mag^xyqT~>4LX2kK zI0nWe_-{k7$U)pUC0~()6V$c231eXlp%)=&1$AXC-Vz7?)%Xl^tGr(iS}oQBxo5*MuWOpAQw8^w|7 zYV7Dza;G|FbYffv9yg9vNLoW~-kvj48+q z-4t{PgWB#w몖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 brrainz.cameraplus - 2.7.1.0 + 2.7.2.0 867467808 https://github.com/pardeike/CameraPlus You want more zoom and different paning? diff --git a/About/Manifest.xml b/About/Manifest.xml index cfefdfc..c8ff2d6 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@  net.pardeike.rimworld.mod.cameraplus - 2.7.1.0 + 2.7.2.0
  • 1.0.0
  • 1.1.0
  • diff --git a/Directory.Build.props b/Directory.Build.props index d4a8ccf..df0a8fc 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ Camera+ CameraPlus https://github.com/pardeike/CameraPlus - 2.7.1.0 + 2.7.2.0 {AC5EE7A1-16EA-498D-B21A-83ACF78F0E5A} diff --git a/Source/Tools.cs b/Source/Tools.cs index 911f345..1fc5fff 100644 --- a/Source/Tools.cs +++ b/Source/Tools.cs @@ -46,24 +46,19 @@ class Tools : CameraPlusSettings return isSmall && (CameraPlusMain.Settings.includeNotTamedAnimals || pawn.RaceProps.Animal == false || tamedAnimal); }); - static readonly QuotaCache shouldShowLabelCache = new(60, thing => thing.thingIDNumber, thing => + static readonly QuotaCache 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; @@ -71,21 +66,24 @@ class Tools : CameraPlusSettings 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)