Skip to content

Commit 7affea7

Browse files
IsaacMarovitzIsaacMarovitz
authored
SplitTools Cleanup (#281)
* SplitTools Cleanup * Remove SACompGC DLLs * Remove SACompGC BuildEvent * Do sequential copy to fix overlapping slice issues * use var
1 parent 3181292 commit 7affea7

File tree

58 files changed

+1004
-510
lines changed

Some content is hidden

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

58 files changed

+1004
-510
lines changed

‎CommandLine/AnimJSONConverter/AnimJSONConverter.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1010
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
1111
<DebugType>embedded</DebugType>
12-
<Platforms>x64;x86</Platforms>
1312
</PropertyGroup>
1413
<ItemGroup>
1514
<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj" />

‎CommandLine/ArchiveTool/ArchiveTool.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\..\Libraries\ArchiveLib\ArchiveLib.csproj" />

‎CommandLine/BuildEvent/BuildEvent.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />

‎CommandLine/BuildMDL/BuildMDL.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />

‎CommandLine/BuildMTN/BuildMTN.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />

‎CommandLine/BuildShapeMotion/BuildShapeMotion.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\..\Libraries\SplitTools\SplitTools.csproj" />

‎CommandLine/LevelConverter/LevelConverter.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\..\Libraries\SAEditorCommon\SAEditorCommon.csproj" />

‎CommandLine/ModelConverter/ModelConverter.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\..\Libraries\SAEditorCommon\SAEditorCommon.csproj" />

‎CommandLine/ModelFixes/ModelFixes.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj" />

‎CommandLine/ModelRelabeler/ModelRelabeler.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj" />

‎CommandLine/OptimizeAnim/OptimizeAnim.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1010
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
1111
<DebugType>embedded</DebugType>
12-
<Platforms>x64;x86</Platforms>
1312
</PropertyGroup>
1413
<ItemGroup>
1514
<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj" />

‎CommandLine/PAKtool/PAKtool.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\..\Libraries\ArchiveLib\ArchiveLib.csproj" />

‎CommandLine/SplitShapeMotion/SplitShapeMotion.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\..\Libraries\SplitTools\SplitTools.csproj" />

‎CommandLine/TextureRemap/TextureRemap.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj" />

‎CommandLine/WeldConverter/WeldConverter.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<DebugType>embedded</DebugType>
99
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1010
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
11-
<Platforms>x64;x86</Platforms>
1211
</PropertyGroup>
1312

1413
<ItemGroup>

‎CommandLine/buildSATools/buildSATools.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
</Project>

‎CommandLine/split/split.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
1010
<DebugType>embedded</DebugType>
11-
<Platforms>x64;x86</Platforms>
1211
</PropertyGroup>
1312
<ItemGroup>
1413
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />

‎CommandLine/splitEvent/Program.cs

+26-13
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,14 @@ namespace splitEvent
77
{
88
static class Program
99
{
10-
public class Wildcard : Regex
10+
private class Wildcard : Regex
1111
{
12-
/// <summary>
13-
/// Initializes a wildcard with the given search pattern.
14-
/// </summary>
15-
/// <param name="pattern">The wildcard pattern to match.</param>
16-
public Wildcard(string pattern)
17-
: base(WildcardToRegex(pattern))
18-
{
19-
}
20-
2112
/// <summary>
2213
/// Initializes a wildcard with the given search pattern and options.
2314
/// </summary>
2415
/// <param name="pattern">The wildcard pattern to match.</param>
2516
/// <param name="options">A combination of one or more
26-
/// <see cref="System.Text.RegexOptions"/>.</param>
17+
/// <see cref="System.Text.RegularExpressions.RegexOptions"/>.</param>
2718
public Wildcard(string pattern, RegexOptions options)
2819
: base(WildcardToRegex(pattern), options)
2920
{
@@ -45,19 +36,23 @@ static void Main(string[] args)
4536
{
4637
string fullpath_out;
4738
string fullpath_bin;
39+
4840
if (args.Length == 0)
4941
{
5042
Console.Write("Filename: ");
51-
args = new string[] { Console.ReadLine().Trim('"') };
43+
args = [Console.ReadLine().Trim('"')];
5244
}
45+
5346
fullpath_bin = Path.GetFullPath(args[0]);
5447
string name = Path.GetFileName(fullpath_bin);
48+
5549
Wildcard evwcard = new Wildcard("e*", RegexOptions.IgnoreCase);
5650
Wildcard mevwcard = new Wildcard("me*", RegexOptions.IgnoreCase);
5751
Wildcard evxwcard = new Wildcard("e*_*", RegexOptions.IgnoreCase);
5852
Wildcard mevxwcard = new Wildcard("me*_*", RegexOptions.IgnoreCase);
5953
Wildcard exfwcard = new Wildcard("e*_*.*", RegexOptions.IgnoreCase);
6054
Wildcard mexfwcard = new Wildcard("me*_*.*", RegexOptions.IgnoreCase);
55+
6156
if (!name.EndsWith("texlist.prs", StringComparison.OrdinalIgnoreCase))
6257
{
6358
if (mevwcard.IsMatch(name))
@@ -111,22 +106,40 @@ static void Main(string[] args)
111106
if (args.Length > 1)
112107
{
113108
fullpath_out = args[1];
114-
if (fullpath_out[fullpath_out.Length - 1] != '/') fullpath_out = string.Concat(fullpath_out, '/');
109+
if (fullpath_out[fullpath_out.Length - 1] != '/')
110+
{
111+
fullpath_out = string.Concat(fullpath_out, '/');
112+
}
113+
115114
fullpath_out = Path.GetFullPath(fullpath_out);
116115
}
116+
117117
Console.WriteLine("Output folder: {0}", fullpath_out);
118+
118119
if (name.Contains("tailsplain", StringComparison.OrdinalIgnoreCase))
120+
{
119121
sa2EventTailsPlane.Split(fullpath_bin, fullpath_out);
122+
}
120123
else if (name.EndsWith("texlist.prs", StringComparison.OrdinalIgnoreCase))
124+
{
121125
SA2Event.SplitExternalTexList(fullpath_bin, fullpath_out);
126+
}
122127
else if (mexfwcard.IsMatch(name))
128+
{
123129
sa2EventExtra.SplitMini(fullpath_bin, fullpath_out);
130+
}
124131
else if (exfwcard.IsMatch(name))
132+
{
125133
sa2EventExtra.Split(fullpath_bin, fullpath_out);
134+
}
126135
else if (name.StartsWith("me", StringComparison.OrdinalIgnoreCase))
136+
{
127137
SA2MiniEvent.Split(fullpath_bin, fullpath_out);
138+
}
128139
else
140+
{
129141
SA2Event.Split(fullpath_bin, fullpath_out);
142+
}
130143
}
131144
}
132145
}

‎CommandLine/splitEvent/splitEvent.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />

‎CommandLine/splitMDL/splitMDL.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
1010
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
1111
<DebugType>embedded</DebugType>
12-
<Platforms>x64;x86</Platforms>
1312
</PropertyGroup>
1413
<ItemGroup>
1514
<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />

‎CommandLine/splitMTN/Program.cs

+9-7
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,26 @@
44

55
namespace splitMTN
66
{
7-
class Program
7+
internal static class Program
88
{
9-
static void Main(string[] args)
9+
private static void Main(string[] args)
1010
{
11-
Queue<string> argq = new Queue<string>(args);
11+
var argQueue = new Queue<string>(args);
12+
1213
string filename;
13-
if (argq.Count > 0)
14+
15+
if (argQueue.Count > 0)
1416
{
15-
filename = argq.Dequeue();
17+
filename = argQueue.Dequeue();
1618
Console.WriteLine("File: {0}", filename);
17-
SA2MTN.Split(filename);
1819
}
1920
else
2021
{
2122
Console.Write("File: ");
2223
filename = Console.ReadLine();
23-
SA2MTN.Split(filename);
2424
}
25+
26+
SA2MTN.Split(filename);
2527
}
2628
}
2729
}

‎CommandLine/splitMTN/splitMTN.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />

‎DataToolbox/DataToolbox.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
99
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
1010
<DebugType>embedded</DebugType>
11-
<Platforms>x64;x86</Platforms>
1211
<ApplicationIcon>datatoolbox.ico</ApplicationIcon>
1312
</PropertyGroup>
1413
<ItemGroup>

‎Dependencies/SACompGC_x64.dll

-13.5 KB
Binary file not shown.

‎Dependencies/SACompGC_x86.dll

-10 KB
Binary file not shown.

‎Libraries/ArchiveLib/ArchiveLib.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
1010
<DebugType>embedded</DebugType>
11-
<Platforms>x64;x86</Platforms>
1211
</PropertyGroup>
1312
<ItemGroup>
1413
<ProjectReference Include="..\SplitTools\SplitTools.csproj" />

‎Libraries/FraGag.Compression.Prs/FraGag.Compression.Prs.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
<DebugType>embedded</DebugType>
88
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
99
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
</Project>

‎Libraries/NvTriStripDotNet/NvTriStripDotNet.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
88
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
99
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
10-
<Platforms>x64;x86</Platforms>
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />

‎Libraries/SAEditorCommon/SAEditorCommon.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1010
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
1111
<DebugType>embedded</DebugType>
12-
<Platforms>x64;x86</Platforms>
1312
</PropertyGroup>
1413
<ItemGroup>
1514
<Compile Update="UI\GCMaterialEditor.cs">

‎Libraries/SAModel.Direct3D/SAModel.Direct3D.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<DebugType>embedded</DebugType>
99
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1010
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
11-
<Platforms>x64;x86</Platforms>
1211
</PropertyGroup>
1312
<ItemGroup>
1413
<ProjectReference Include="..\ArchiveLib\ArchiveLib.csproj" />

‎Libraries/SAModel/SAModel.csproj

-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
43
<TargetFramework>net8.0-windows7.0</TargetFramework>
54
<OutputType>Library</OutputType>
65
<UseWindowsForms>true</UseWindowsForms>
76
<OutputPath>..\..\build\lib\</OutputPath>
87
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
98
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
109
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
11-
<Platforms>x64;x86</Platforms>
1210
</PropertyGroup>
1311
<ItemGroup>
1412
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

0 commit comments

Comments
 (0)