Feature/better dots (#32)

* WIP * WIP * ignores .DS_Store files * adds fogged check, fixes red color problem * in before adding settings, added ColorBed shader * color picker wip * color picker proto done * restructured settings * cleanup * wip * renaming * hickup? * wip * wip * working implementation * works! * almost done * near release * v3.0.0.0
pardeike · May 12, 2024 · 943e279 · 943e279
1 parent a1dbd65
commit 943e279
Show file tree

Hide file tree

Showing 96 changed files with 4,866 additions and 631 deletions.
diff --git a/.gitignore b/.gitignore
@@ -140,7 +140,7 @@ publish/
 *.[Pp]ublish.xml
 *.azurePubxml
 
-# TODO: Un-comment the next line if you do not want to checkin
+# Un-comment the next line if you do not want to checkin
 # your web deploy settings because they may include unencrypted
 # passwords
 #*.pubxml
@@ -239,4 +239,7 @@ ModelManifest.xml
 .paket/paket.exe
 
 # FAKE - F# Make
-.fake/
+.fake/
+
+# macOS
+.DS_Store
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+  "files.exclude": {
+    "Source/obj": true
+  }
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,37 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"label": "build debug",
+			"presentation": {
+				"reveal": "silent",
+				"close": true
+			},
+			"command": "dotnet",
+			"type": "process",
+			"args": [
+				"build"
+			],
+			"problemMatcher": "$msCompile"
+		},
+		{
+			"label": "build release",
+			"presentation": {
+				"reveal": "silent",
+				"close": true
+			},
+			"command": "dotnet",
+			"type": "process",
+			"args": [
+				"build",
+				"-c",
+				"Release"
+			],
+			"problemMatcher": "$msCompile",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		}
+	]
+}
diff --git a/1.5/Assemblies/CameraPlus.dll b/1.5/Assemblies/CameraPlus.dll
diff --git a/1.5/Assemblies/CrossPromotion.dll b/1.5/Assemblies/CrossPromotion.dll
diff --git a/About/About.xml b/About/About.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ModMetaData>
-  <name>Camera+</name>
-  <author>Andreas Pardeike</author>
-  <supportedVersions>
-    <li>1.0</li>
-    <li>1.1</li>
-    <li>1.2</li>
-    <li>1.3</li>
-    <li>1.4</li>
-    <li>1.5</li>
-  </supportedVersions>
-  <modDependencies>
-    <li>
-      <packageId>brrainz.harmony</packageId>
-      <displayName>Harmony</displayName>
-      <steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
-      <downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
-    </li>
-  </modDependencies>
-  <packageId>brrainz.cameraplus</packageId>
-  <modVersion>2.7.5.0</modVersion>
-  <steamAppId>867467808</steamAppId>
-  <url>https://github.com/pardeike/CameraPlus</url>
+<?xml version="1.0" encoding="utf-8"?>
+<ModMetaData>
+  <name>Camera+</name>
+  <author>Andreas Pardeike</author>
+  <supportedVersions>
+    <li>1.0</li>
+    <li>1.1</li>
+    <li>1.2</li>
+    <li>1.3</li>
+    <li>1.4</li>
+    <li>1.5</li>
+  </supportedVersions>
+  <modDependencies>
+    <li>
+      <packageId>brrainz.harmony</packageId>
+      <displayName>Harmony</displayName>
+      <steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
+      <downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
+    </li>
+  </modDependencies>
+  <packageId>brrainz.cameraplus</packageId>
+  <modVersion>3.0.0.0</modVersion>
+  <steamAppId>867467808</steamAppId>
+  <url>https://github.com/pardeike/CameraPlus</url>
   <description>You want more zoom and different paning?
 
 Powered by Harmony Patch Library
 
 Andreas Pardeike
 Email: [email protected]
 Steam: pardeike
-Twitter: @pardeike</description>
+Twitter: @pardeike</description>
 </ModMetaData>
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.5.0</version>
+  <version>3.0.0.0</version>
   <targetVersions>
     <li>1.0.0</li>
     <li>1.1.0</li>

diff --git a/CameraPlus.sln b/CameraPlus.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2042
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34728.123
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CameraPlus", "Source\CameraPlus.csproj", "{B0D46BB5-08FF-4E04-9EFD-3E32E38A9CC2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CameraPlus", "Source\CameraPlus.csproj", "{B0D46BB5-08FF-4E04-9EFD-3E32E38A9CC2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,11 +1,9 @@
 <Project>
-
-	<PropertyGroup>
-		<ModName>Camera+</ModName>
-		<ModFileName>CameraPlus</ModFileName>
-		<Repository>https://github.com/pardeike/CameraPlus</Repository>
-		<ModVersion>2.7.5.0</ModVersion>
-		<ProjectGuid>{AC5EE7A1-16EA-498D-B21A-83ACF78F0E5A}</ProjectGuid>
-	</PropertyGroup>
-
-</Project>
+    <PropertyGroup>
+        <ModName>Camera+</ModName>
+        <ModFileName>CameraPlus</ModFileName>
+        <Repository>https://github.com/pardeike/CameraPlus</Repository>
+        <ModVersion>3.0.0.0</ModVersion>
+        <ProjectGuid>{AC5EE7A1-16EA-498D-B21A-83ACF78F0E5A}</ProjectGuid>
+    </PropertyGroup>
+</Project>
diff --git a/Languages/ChineseSimplified/Keyed/Text.xml b/Languages/ChineseSimplified/Keyed/Text.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
+	<CameraPlus3>欢迎使用新版Camera+！请在设置菜单中探索改进的自定义剪影选项，以优化您的体验。</CameraPlus3>
 	<Zoom>缩放</Zoom>
 	<ZoomedInPercent>最大放大系数</ZoomedInPercent>
 	<ZoomedOutPercent>最大缩小系数</ZoomedOutPercent>
 	<ForZoomedInPercent>对于最高缩放系数</ForZoomedInPercent>
 	<ForZoomedOutPercent>对于最低缩放系数</ForZoomedOutPercent>
-	<Exponentiality>缩放指数:</Exponentiality>
+	<Exponentiality>指数变焦速度</Exponentiality>
 	<SoundNearness>使拉进后的声音更加接近</SoundNearness>
 	<HotKeys>键盘快捷键：</HotKeys>
+	<Colors>颜色</Colors>
 	<SettingsKey>显示 Camera+ 设置</SettingsKey>
 	<LoadModifier>加载视角</LoadModifier>
 	<SaveModifier>保存视角</SaveModifier>
@@ -18,13 +20,19 @@
 	<HidePawnLabelBelow>隐藏的小人标签：</HidePawnLabelBelow>
 	<HideThingLabelBelow>隐藏的堆叠标签：</HideThingLabelBelow>
 	<ShowMarkerBelow>显示的标记：</ShowMarkerBelow>
+	<DotStyle>点样式</DotStyle>
+	<VanillaDefault>原版默认</VanillaDefault>
+	<ClassicDots>Camera+ 点</ClassicDots>
+	<BetterSilhouettes>Camera+ 剪影</BetterSilhouettes>
+	<Animals>动物</Animals>
 	<IncludeAnimals>动物使用相同的标记</IncludeAnimals>
 	<AnimalsDifferent>动物使用不同的标记</AnimalsDifferent>
 	<HideAnimals>动物不使用标记</HideAnimals>
 	<IncludeNotTamedAnimals>包括未驯服的动物</IncludeNotTamedAnimals>
 	<ZoomToMouse>鼠标缩放</ZoomToMouse>
 	<DisableCameraShake>禁用相机震动</DisableCameraShake>
 	<MouseRevealsLabels>鼠标位置显示名称</MouseRevealsLabels>
+	<EdgeIndicators>边缘指示器</EdgeIndicators>
 	<KeyLeftShift>左 Shift</KeyLeftShift>
 	<KeyLeftAlt>左 Alt</KeyLeftAlt>
 	<KeyLeftControl>左 Ctrl</KeyLeftControl>
@@ -35,4 +43,11 @@
 	<KeyRightControl>右 Ctrl</KeyRightControl>
 	<KeyRightCommand>右 Cmd</KeyRightCommand>
 	<KeyRightWindows>右 Win</KeyRightWindows>
+	<DotSilhouetteSize>点/剪影大小</DotSilhouetteSize>
+	<EdgeDotSize>边缘点大小</EdgeDotSize>
+	<EdgeDistanceFactor>边缘距离</EdgeDistanceFactor>
+	<OutlineSize>轮廓宽度</OutlineSize>
+	<Line>线条</Line>
+	<Fill>填充</Fill>
+	<Player>玩家</Player>
 </LanguageData>
diff --git a/Languages/ChineseTraditional/Keyed/Text.xml b/Languages/ChineseTraditional/Keyed/Text.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
+	<CameraPlus3>歡迎使用新版Camera+！請在設置菜單中探索改進的自定義剪影選項，以優化您的體驗。</CameraPlus3>
 	<Zoom>縮放</Zoom>
 	<ZoomedInPercent>最大放大係數</ZoomedInPercent>
 	<ZoomedOutPercent>最大縮小係數</ZoomedOutPercent>
 	<ForZoomedInPercent>对于最高缩放系数</ForZoomedInPercent>
 	<ForZoomedOutPercent>對於最低縮放係數</ForZoomedOutPercent>
-	<Exponentiality>縮放指數:</Exponentiality>
+	<Exponentiality>指數變焦速度</Exponentiality>
 	<SoundNearness>使拉進後的聲音更加接近</SoundNearness>
 	<HotKeys>鍵盤快捷鍵：</HotKeys>
+	<Colors>顏色</Colors>
 	<SettingsKey>顯示 Camera+ 設置</SettingsKey>
 	<LoadModifier>加載視角</LoadModifier>
 	<SaveModifier>保存視角</SaveModifier>
@@ -18,13 +20,19 @@
 	<HidePawnLabelBelow>隱藏的小人標籤：</HidePawnLabelBelow>
 	<HideThingLabelBelow>隱藏的堆疊標籤：</HideThingLabelBelow>
 	<ShowMarkerBelow>顯示的標記：</ShowMarkerBelow>
+	<DotStyle>點樣式</DotStyle>
+	<VanillaDefault>原版默認</VanillaDefault>
+	<ClassicDots>Camera+ 點</ClassicDots>
+	<BetterSilhouettes>Camera+ 剪影</BetterSilhouettes>
+	<Animals>動物</Animals>
 	<IncludeAnimals>動物使用相同的標記</IncludeAnimals>
 	<AnimalsDifferent>動物使用不同的標記</AnimalsDifferent>
 	<HideAnimals>動物不使用標記</HideAnimals>
 	<IncludeNotTamedAnimals>包括未馴服的動物</IncludeNotTamedAnimals>
 	<ZoomToMouse>鼠標縮放</ZoomToMouse>
 	<DisableCameraShake>禁用相機震動</DisableCameraShake>
 	<MouseRevealsLabels>鼠標位置顯示名稱</MouseRevealsLabels>
+	<EdgeIndicators>邊緣指示器</EdgeIndicators>
 	<KeyLeftShift>左 Shift</KeyLeftShift>
 	<KeyLeftAlt>左 Alt</KeyLeftAlt>
 	<KeyLeftControl>左 Ctrl</KeyLeftControl>
@@ -35,4 +43,11 @@
 	<KeyRightControl>右 Ctrl</KeyRightControl>
 	<KeyRightCommand>右 Cmd</KeyRightCommand>
 	<KeyRightWindows>右 Win</KeyRightWindows>
+	<DotSilhouetteSize>點/剪影大小</DotSilhouetteSize>
+	<EdgeDotSize>邊緣點大小</EdgeDotSize>
+	<EdgeDistanceFactor>邊緣距離</EdgeDistanceFactor>
+	<OutlineSize>輪廓寬度</OutlineSize>
+	<Line>線條</Line>
+	<Fill>填充</Fill>
+	<Player>玩家</Player>
 </LanguageData>
diff --git a/Languages/English/Keyed/Text.xml b/Languages/English/Keyed/Text.xml
@@ -1,13 +1,15 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
+	<CameraPlus3>Welcome to the new version of Camera+! Explore enhanced custom silhouette options in the settings menu to improve your experience.</CameraPlus3>
 	<Zoom>Zoom</Zoom>
 	<ZoomedInPercent>Maximum zoomed in factor</ZoomedInPercent>
 	<ZoomedOutPercent>Maximum zoomed out factor</ZoomedOutPercent>
 	<ForZoomedInPercent>For highest zoom factor</ForZoomedInPercent>
 	<ForZoomedOutPercent>For lowest zoom factor</ForZoomedOutPercent>
-	<Exponentiality>Exponential scaling:</Exponentiality>
+	<Exponentiality>Exponential Zoom Speed</Exponentiality>
 	<SoundNearness>Bring local sounds closer</SoundNearness>
-	<HotKeys>Keyboard Shortcuts:</HotKeys>
+	<HotKeys>Keyboard Shortcuts</HotKeys>
+	<Colors>Colors</Colors>
 	<SettingsKey>Camera+ settings</SettingsKey>
 	<LoadModifier>Load view</LoadModifier>
 	<SaveModifier>Save view</SaveModifier>
@@ -18,13 +20,19 @@
 	<HidePawnLabelBelow>Hide pawn labels below: </HidePawnLabelBelow>
 	<HideThingLabelBelow>Hide stack labels below: </HideThingLabelBelow>
 	<ShowMarkerBelow>Show as marker below: </ShowMarkerBelow>
+	<DotStyle>Dot Style</DotStyle>
+	<VanillaDefault>Vanilla default</VanillaDefault>
+	<ClassicDots>Camera+ dots</ClassicDots>
+	<BetterSilhouettes>Camera+ silhouettes</BetterSilhouettes>
+	<Animals>Animals</Animals>
 	<IncludeAnimals>Animals have the same marker</IncludeAnimals>
 	<AnimalsDifferent>Animals have a different marker</AnimalsDifferent>
 	<HideAnimals>Animals have no marker</HideAnimals>
 	<IncludeNotTamedAnimals>Include untamed animals</IncludeNotTamedAnimals>
 	<ZoomToMouse>Zoom to mouse</ZoomToMouse>
 	<DisableCameraShake>Disable camera shake</DisableCameraShake>
 	<MouseRevealsLabels>Mouse reveals labels</MouseRevealsLabels>
+	<EdgeIndicators>Edge indicators</EdgeIndicators>
 	<KeyLeftShift>Left Shift</KeyLeftShift>
 	<KeyLeftAlt>Left Alt</KeyLeftAlt>
 	<KeyLeftControl>Left Ctrl</KeyLeftControl>
@@ -35,4 +43,11 @@
 	<KeyRightControl>Right Ctrl</KeyRightControl>
 	<KeyRightCommand>Right Cmd</KeyRightCommand>
 	<KeyRightWindows>Right Win</KeyRightWindows>
+	<DotSilhouetteSize>Dot/silhouette size</DotSilhouetteSize>
+	<EdgeDotSize>Edge dot size</EdgeDotSize>
+	<EdgeDistanceFactor>Edge distance</EdgeDistanceFactor>
+	<OutlineSize>Outline width</OutlineSize>
+	<Line>Line</Line>
+	<Fill>Fill</Fill>
+	<Player>Player</Player>
 </LanguageData>
diff --git a/Languages/French/Keyed/Text.xml b/Languages/French/Keyed/Text.xml
@@ -1,13 +1,16 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
+	<CameraPlus3>Bienvenue dans la nouvelle version de Camera+ ! Découvrez les options de silhouettes personnalisées améliorées dans le menu des paramètres pour améliorer votre expérience.</CameraPlus3>
 	<Zoom>Zoom</Zoom>
 	<ZoomedInPercent>Facteur de zoom maximal</ZoomedInPercent>
 	<ZoomedOutPercent>Facteur de zoom arrière maximal</ZoomedOutPercent>
 	<ForZoomedInPercent>Pour le facteur de zoom le plus élevé</ForZoomedInPercent>
 	<ForZoomedOutPercent>Pour le facteur de zoom le plus bas</ForZoomedOutPercent>
-	<Exponentiality>Mise à l'échelle exponentielle:</Exponentiality>
+	<Exponentiality>Vitesse de zoom exponentielle</Exponentiality>
 	<SoundNearness>Rapprocher les sons proches</SoundNearness>
-	<HotKeys>Raccourcis clavier:</HotKeys>
+	<HotKeys>Raccourcis clavier</HotKeys>
+	<Colors>Couleurs</Colors>
+	<Animals>Animaux</Animals>
 	<SettingsKey>Camera+ paramètres</SettingsKey>
 	<LoadModifier>Charger la vue</LoadModifier>
 	<SaveModifier>Sauvegarder la vue</SaveModifier>
@@ -18,13 +21,19 @@
 	<HidePawnLabelBelow>Masquer les étiquettes de personnages ci-dessous: </HidePawnLabelBelow>
 	<HideThingLabelBelow>Masquer les étiquettes de stockage ci-dessous: </HideThingLabelBelow>
 	<ShowMarkerBelow>Afficher comme marqueur ci-dessous: </ShowMarkerBelow>
+	<DotStyle>Style de point</DotStyle>
+	<VanillaDefault>Défaut vanille</VanillaDefault>
+	<ClassicDots>Points Camera+</ClassicDots>
+	<BetterSilhouettes>Silhouettes Camera+</BetterSilhouettes>
+	<Animals>Animaux</Animals>
 	<IncludeAnimals>Les animaux ont le même marqueur</IncludeAnimals>
 	<AnimalsDifferent>Les animaux ont un marqueur différent</AnimalsDifferent>
 	<HideAnimals>Les animaux n'ont pas de marqueur</HideAnimals>
 	<IncludeNotTamedAnimals>Inclure les animaux sauvages</IncludeNotTamedAnimals>
 	<ZoomToMouse>Zoom sur la souris</ZoomToMouse>
 	<DisableCameraShake>Désactiver la caméra secouer</DisableCameraShake>
 	<MouseRevealsLabels>La souris révèle les étiquettes</MouseRevealsLabels>
+	<EdgeIndicators>Indicateurs de bord</EdgeIndicators>
 	<KeyLeftShift>Left Shift</KeyLeftShift>
 	<KeyLeftAlt>Left Alt</KeyLeftAlt>
 	<KeyLeftControl>Left Ctrl</KeyLeftControl>
@@ -35,4 +44,11 @@
 	<KeyRightControl>Right Ctrl</KeyRightControl>
 	<KeyRightCommand>Right Cmd</KeyRightCommand>
 	<KeyRightWindows>Right Win</KeyRightWindows>
+	<DotSilhouetteSize>Taille du point/silhouette</DotSilhouetteSize>
+	<EdgeDotSize>Taille du point de bord</EdgeDotSize>
+	<EdgeDistanceFactor>Facteur de distance du bord</EdgeDistanceFactor>
+	<OutlineSize>Largeur du contour</OutlineSize>
+	<Line>Ligne</Line>
+	<Fill>Remplissage</Fill>
+	<Player>Joueur</Player>
 </LanguageData>