Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SplitTools Cleanup #280

Merged
merged 3 commits into from
Dec 19, 2024
Merged

SplitTools Cleanup #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edc901f
SplitTools Cleanup
IsaacMarovitz Dec 18, 2024
9773d98
Remove SACompGC DLLs
IsaacMarovitz Dec 19, 2024
e9ba4e1
Remove SACompGC BuildEvent
IsaacMarovitz Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CommandLine/AnimJSONConverter/AnimJSONConverter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<DebugType>embedded</DebugType>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj" />
Expand Down
1 change: 0 additions & 1 deletion CommandLine/ArchiveTool/ArchiveTool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\ArchiveLib\ArchiveLib.csproj" />
Expand Down
1 change: 0 additions & 1 deletion CommandLine/BuildEvent/BuildEvent.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />
Expand Down
1 change: 0 additions & 1 deletion CommandLine/BuildMDL/BuildMDL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />
Expand Down
1 change: 0 additions & 1 deletion CommandLine/BuildMTN/BuildMTN.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />
Expand Down
1 change: 0 additions & 1 deletion CommandLine/BuildShapeMotion/BuildShapeMotion.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\SplitTools\SplitTools.csproj" />
Expand Down
1 change: 0 additions & 1 deletion CommandLine/LevelConverter/LevelConverter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\SAEditorCommon\SAEditorCommon.csproj" />
Expand Down
1 change: 0 additions & 1 deletion CommandLine/ModelConverter/ModelConverter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\SAEditorCommon\SAEditorCommon.csproj" />
Expand Down
1 change: 0 additions & 1 deletion CommandLine/ModelFixes/ModelFixes.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj" />
Expand Down
1 change: 0 additions & 1 deletion CommandLine/ModelRelabeler/ModelRelabeler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj" />
Expand Down
1 change: 0 additions & 1 deletion CommandLine/OptimizeAnim/OptimizeAnim.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<DebugType>embedded</DebugType>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj" />
Expand Down
1 change: 0 additions & 1 deletion CommandLine/PAKtool/PAKtool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\ArchiveLib\ArchiveLib.csproj" />
Expand Down
1 change: 0 additions & 1 deletion CommandLine/SplitShapeMotion/SplitShapeMotion.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\SplitTools\SplitTools.csproj" />
Expand Down
1 change: 0 additions & 1 deletion CommandLine/TextureRemap/TextureRemap.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj" />
Expand Down
1 change: 0 additions & 1 deletion CommandLine/WeldConverter/WeldConverter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion CommandLine/buildSATools/buildSATools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
</Project>
1 change: 0 additions & 1 deletion CommandLine/split/split.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<DebugType>embedded</DebugType>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
Expand Down
39 changes: 26 additions & 13 deletions CommandLine/splitEvent/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,14 @@ namespace splitEvent
{
static class Program
{
public class Wildcard : Regex
private class Wildcard : Regex
{
/// <summary>
/// Initializes a wildcard with the given search pattern.
/// </summary>
/// <param name="pattern">The wildcard pattern to match.</param>
public Wildcard(string pattern)
: base(WildcardToRegex(pattern))
{
}

/// <summary>
/// Initializes a wildcard with the given search pattern and options.
/// </summary>
/// <param name="pattern">The wildcard pattern to match.</param>
/// <param name="options">A combination of one or more
/// <see cref="System.Text.RegexOptions"/>.</param>
/// <see cref="System.Text.RegularExpressions.RegexOptions"/>.</param>
public Wildcard(string pattern, RegexOptions options)
: base(WildcardToRegex(pattern), options)
{
Expand All @@ -45,19 +36,23 @@ static void Main(string[] args)
{
string fullpath_out;
string fullpath_bin;

if (args.Length == 0)
{
Console.Write("Filename: ");
args = new string[] { Console.ReadLine().Trim('"') };
args = [Console.ReadLine().Trim('"')];
}

fullpath_bin = Path.GetFullPath(args[0]);
string name = Path.GetFileName(fullpath_bin);

Wildcard evwcard = new Wildcard("e*", RegexOptions.IgnoreCase);
Wildcard mevwcard = new Wildcard("me*", RegexOptions.IgnoreCase);
Wildcard evxwcard = new Wildcard("e*_*", RegexOptions.IgnoreCase);
Wildcard mevxwcard = new Wildcard("me*_*", RegexOptions.IgnoreCase);
Wildcard exfwcard = new Wildcard("e*_*.*", RegexOptions.IgnoreCase);
Wildcard mexfwcard = new Wildcard("me*_*.*", RegexOptions.IgnoreCase);

if (!name.EndsWith("texlist.prs", StringComparison.OrdinalIgnoreCase))
{
if (mevwcard.IsMatch(name))
Expand Down Expand Up @@ -111,22 +106,40 @@ static void Main(string[] args)
if (args.Length > 1)
{
fullpath_out = args[1];
if (fullpath_out[fullpath_out.Length - 1] != '/') fullpath_out = string.Concat(fullpath_out, '/');
if (fullpath_out[fullpath_out.Length - 1] != '/')
{
fullpath_out = string.Concat(fullpath_out, '/');
}

fullpath_out = Path.GetFullPath(fullpath_out);
}

Console.WriteLine("Output folder: {0}", fullpath_out);

if (name.Contains("tailsplain", StringComparison.OrdinalIgnoreCase))
{
sa2EventTailsPlane.Split(fullpath_bin, fullpath_out);
}
else if (name.EndsWith("texlist.prs", StringComparison.OrdinalIgnoreCase))
{
SA2Event.SplitExternalTexList(fullpath_bin, fullpath_out);
}
else if (mexfwcard.IsMatch(name))
{
sa2EventExtra.SplitMini(fullpath_bin, fullpath_out);
}
else if (exfwcard.IsMatch(name))
{
sa2EventExtra.Split(fullpath_bin, fullpath_out);
}
else if (name.StartsWith("me", StringComparison.OrdinalIgnoreCase))
{
SA2MiniEvent.Split(fullpath_bin, fullpath_out);
}
else
{
SA2Event.Split(fullpath_bin, fullpath_out);
}
}
}
}
1 change: 0 additions & 1 deletion CommandLine/splitEvent/splitEvent.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />
Expand Down
1 change: 0 additions & 1 deletion CommandLine/splitMDL/splitMDL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<DebugType>embedded</DebugType>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />
Expand Down
16 changes: 9 additions & 7 deletions CommandLine/splitMTN/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,26 @@

namespace splitMTN
{
class Program
internal static class Program
{
static void Main(string[] args)
private static void Main(string[] args)
{
Queue<string> argq = new Queue<string>(args);
var argQueue = new Queue<string>(args);

string filename;
if (argq.Count > 0)

if (argQueue.Count > 0)
{
filename = argq.Dequeue();
filename = argQueue.Dequeue();
Console.WriteLine("File: {0}", filename);
SA2MTN.Split(filename);
}
else
{
Console.Write("File: ");
filename = Console.ReadLine();
SA2MTN.Split(filename);
}

SA2MTN.Split(filename);
}
}
}
1 change: 0 additions & 1 deletion CommandLine/splitMTN/splitMTN.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\FraGag.Compression.Prs\FraGag.Compression.Prs.csproj" />
Expand Down
1 change: 0 additions & 1 deletion DataToolbox/DataToolbox.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<DebugType>embedded</DebugType>
<Platforms>x64;x86</Platforms>
<ApplicationIcon>datatoolbox.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
Expand Down
Binary file removed Dependencies/SACompGC_x64.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Dependencies/SACompGC_x86.dll
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion Libraries/ArchiveLib/ArchiveLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<DebugType>embedded</DebugType>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\SplitTools\SplitTools.csproj" />
Expand Down
1 change: 0 additions & 1 deletion Libraries/FraGag.Compression.Prs/FraGag.Compression.Prs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
</Project>
1 change: 0 additions & 1 deletion Libraries/NvTriStripDotNet/NvTriStripDotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
Expand Down
1 change: 0 additions & 1 deletion Libraries/SAEditorCommon/SAEditorCommon.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<DebugType>embedded</DebugType>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<Compile Update="UI\GCMaterialEditor.cs">
Expand Down
1 change: 0 additions & 1 deletion Libraries/SAModel.Direct3D/SAModel.Direct3D.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<DebugType>embedded</DebugType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\ArchiveLib\ArchiveLib.csproj" />
Expand Down
2 changes: 0 additions & 2 deletions Libraries/SAModel/SAModel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>

<TargetFramework>net8.0-windows7.0</TargetFramework>
<OutputType>Library</OutputType>
<UseWindowsForms>true</UseWindowsForms>
<OutputPath>..\..\build\lib\</OutputPath>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Platforms>x64;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
Expand Down
Loading