Skip to content

Commit

Permalink
Adjustments to UniversalTextureSets.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebane1 committed Sep 7, 2024
1 parent a1dd950 commit 33b9006
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 7 deletions.
14 changes: 13 additions & 1 deletion FFXIVLooseTextureCompiler/FFXIVLooseTextureCompiler.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@
<RepositoryUrl>https://github.com/Sebane1/FFXIVLooseTextureCompiler</RepositoryUrl>
<ApplicationIcon>FFXIVTP.ico</ApplicationIcon>
<TargetFrameworks>net8.0-windows</TargetFrameworks>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<PublishSingleFile>true</PublishSingleFile>
<SelfContained>true</SelfContained>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<DebugType>embedded</DebugType>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand All @@ -25,6 +29,14 @@
<DebugType>portable</DebugType>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-windows|AnyCPU'">
<DefineConstants>$(DefineConstants);dotnet build --self-contained;dotnet publish --self-contained;dotnet publish -r win-x64</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-windows|AnyCPU'">
<DefineConstants>$(DefineConstants);dotnet build --self-contained;dotnet publish --self-contained;dotnet build -r win-x64</DefineConstants>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Penumbra\**" />
<EmbeddedResource Remove="Penumbra\**" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_LastSelectedProfileId>C:\Users\stel9\source\repos\FFXIVLooseTextureCompiler\FFXIVLooseTextureCompiler\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
</PropertyGroup>
<ItemGroup>
<Compile Update="Configuration Dialogues\BulkNameReplacement.cs">
<SubType>Form</SubType>
Expand Down
11 changes: 6 additions & 5 deletions FFXIVLooseTextureCompiler/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,11 @@ public void StartedProcessing() {
private async void processGeneration_RunWorkerCompleted(object sender, System.ComponentModel.RunWorkerCompletedEventArgs e) {
ExportJson();
ExportMeta();
Thread.Sleep(1000);
Thread.Sleep(100);
await PenumbraHttpApi.Reload(modPath, modNameTextBox.Text);
Thread.Sleep(1000);
Thread.Sleep(100);
await PenumbraHttpApi.Redraw(0);
Thread.Sleep(1000);
Thread.Sleep(100);
await PenumbraHttpApi.Redraw(0);
hasDoneReload = true;
textureSetList_SelectedIndexChanged(this, EventArgs.Empty);
Expand Down Expand Up @@ -301,8 +301,8 @@ public void generateButton_Click(object sender, EventArgs e) {
SaveProject(Path.Combine(penumbraModPath, modNameTextBox.Text + ".ffxivtp"), true);
textureSets = new List<TextureSet>();
foreach (TextureSet item in textureList.Items) {
UniversalTextureSetCreator.ConfigureTextureSet(item);
if (item.OmniExportMode) {
UniversalTextureSetCreator.ConfigureOmniConfiguration(item);
exportProgress.Maximum += (item.ChildSets.Count * 4);
}
textureSets.Add(item);
Expand Down Expand Up @@ -690,7 +690,8 @@ private void omniExportModeToolStripMenuItem_Click(object sender, EventArgs e) {
TextureSet textureSet = (textureList.Items[textureList.SelectedIndex] as TextureSet);
if (textureSet != null) {
if (!textureSet.OmniExportMode) {
UniversalTextureSetCreator.ConfigureOmniConfiguration(textureSet);
textureSet.OmniExportMode = true;
UniversalTextureSetCreator.ConfigureTextureSet(textureSet);
MessageBox.Show("Enabling universal compatibility mode allows your currently selected body or face textures to be compatible with other body/face configurations on a best effort basis.\r\n\r\nWarning: this slows down the generation process, so you will need to click the finalize button to update changes on bodies that arent this one.", VersionText);
} else {
textureSet.OmniExportMode = false;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\net8.0-windows\win-x64\publish\win-x64\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<_TargetId>Folder</_TargetId>
<TargetFramework>net8.0-windows</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishReadyToRun>false</PublishReadyToRun>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<History>True|2024-09-07T06:40:42.5424271Z||;True|2024-09-07T01:39:58.4210271-05:00||;False|2024-09-07T01:39:09.1259007-05:00||;False|2024-09-07T01:38:56.0747659-05:00||;False|2024-09-07T01:28:47.9707688-05:00||;True|2024-09-07T01:17:05.3097530-05:00||;False|2024-09-07T01:15:47.3445988-05:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>

0 comments on commit 33b9006

Please sign in to comment.