Skip to content

Commit 563de0c

Browse files
committed
Update for .9, bug fixes. folder regex, config move
1 parent 21f2e51 commit 563de0c

82 files changed

Lines changed: 4 additions & 6 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ActiveTextureManagement/ActiveTextureManagement.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<PostBuildEvent>xcopy $(TargetFileName) "$(SolutionDir)Pack\GameData\ActiveTextureManagement\Plugins\" /e /y /i /r
107107
xcopy "$(SolutionDir)Content\aggressive\GameData\*" "$(SolutionDir)Pack\GameData\" /e /y /i /r
108108
xcopy "$(SolutionDir)Content\common\GameData\*" "$(SolutionDir)Pack\GameData" /e /y /i /r
109-
xcopy "$(SolutionDir)Pack\GameData\*" "C:\Users\Ryan\Documents\ksp\ksp-$(PlatformName)-0-25\GameData" /e /y /i /r
109+
xcopy "$(SolutionDir)Pack\GameData\*" "C:\Users\Ryan\Documents\ksp\ksp-$(PlatformName)-0-90\GameData" /e /y /i /r
110110
7za a -tzip "$(SolutionDir)$(PlatformName)-Aggressive-Release.zip" "$(SolutionDir)Pack\GameData"
111111
xcopy "$(SolutionDir)Content\basic\GameData\*" "$(SolutionDir)Pack\GameData" /e /y /i /r
112112
7za a -tzip "$(SolutionDir)$(PlatformName)-Basic-Release.zip" "$(SolutionDir)Pack\GameData"</PostBuildEvent>

ActiveTextureManagement/DatabaseLoaderTexture_ATM.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,28 +175,27 @@ static public TextureInfoWrapper UpdateTexture(TexInfo texture)
175175

176176
string overrideName = overridesList.Find(n => texture.name.Length == Regex.Match(texture.name, n).Length);
177177
bool mipmaps = true;
178-
bool compress = texture.isNormalMap ? false : true;
178+
bool compress = texture.isNormalMap ? DatabaseLoaderTexture_ATM.config_compress :
179+
DatabaseLoaderTexture_ATM.config_compress_normals;
179180
int scale = 1;
180181
int maxSize = 0;
181182
int minSize = 64;
182183
FilterMode filterMode = FilterMode.Bilinear;
183184
bool makeNotReadable = false;
184185

185-
if (foldersList.Exists(n => texture.name.StartsWith(n)))
186+
if (foldersList.Exists(n => Regex.Match(texture.name, n).Success))
186187
{
187188

188189
if (texture.isNormalMap)
189190
{
190191
mipmaps = DatabaseLoaderTexture_ATM.config_mipmaps_normals;
191-
compress = DatabaseLoaderTexture_ATM.config_compress_normals;
192192
scale = DatabaseLoaderTexture_ATM.config_scale_normals;
193193
maxSize = DatabaseLoaderTexture_ATM.config_max_size_normals;
194194
minSize = DatabaseLoaderTexture_ATM.config_min_size_normals;
195195
}
196196
else
197197
{
198198
mipmaps = DatabaseLoaderTexture_ATM.config_mipmaps;
199-
compress = DatabaseLoaderTexture_ATM.config_compress;
200199
scale = DatabaseLoaderTexture_ATM.config_scale;
201200
maxSize = DatabaseLoaderTexture_ATM.config_max_size;
202201
minSize = DatabaseLoaderTexture_ATM.config_min_size;

Content/aggressive/GameData/BoulderCo/ActiveTextureManagerConfig.cfg renamed to Content/aggressive/GameData/ActiveTextureManagement/ActiveTextureManagerConfig.cfg

File renamed without changes.

Content/basic/GameData/BoulderCo/ActiveTextureManagerConfig.cfg renamed to Content/basic/GameData/ActiveTextureManagement/ActiveTextureManagerConfig.cfg

File renamed without changes.

Content/common/GameData/BoulderCo/ActiveTextureManagerConfigs/000_Toolbar.cfg renamed to Content/common/GameData/ActiveTextureManagement/ActiveTextureManagerConfigs/000_Toolbar.cfg

File renamed without changes.

Content/common/GameData/BoulderCo/ActiveTextureManagerConfigs/AIES_Aerospace.cfg renamed to Content/common/GameData/ActiveTextureManagement/ActiveTextureManagerConfigs/AIES_Aerospace.cfg

File renamed without changes.

Content/common/GameData/BoulderCo/ActiveTextureManagerConfigs/ASET.cfg renamed to Content/common/GameData/ActiveTextureManagement/ActiveTextureManagerConfigs/ASET.cfg

File renamed without changes.

Content/common/GameData/BoulderCo/ActiveTextureManagerConfigs/AlchemyTechnologies.cfg renamed to Content/common/GameData/ActiveTextureManagement/ActiveTextureManagerConfigs/AlchemyTechnologies.cfg

File renamed without changes.

Content/common/GameData/BoulderCo/ActiveTextureManagerConfigs/AmericanPack.cfg renamed to Content/common/GameData/ActiveTextureManagement/ActiveTextureManagerConfigs/AmericanPack.cfg

File renamed without changes.

Content/common/GameData/BoulderCo/ActiveTextureManagerConfigs/B9_Aerospace.cfg renamed to Content/common/GameData/ActiveTextureManagement/ActiveTextureManagerConfigs/B9_Aerospace.cfg

File renamed without changes.

0 commit comments

Comments
 (0)