Skip to content

Commit

Permalink
Update 2.2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@KoraLyn
KoraLyn committed Aug 8, 2020
2 parents 9072b92 + 4c9dac5 commit ff287df
Show file tree
Hide file tree
Showing 76 changed files with 7,926 additions and 1,798 deletions.
43 changes: 43 additions & 0 deletions FFXIV_TexTools/Custom/CustomBoneSkinMeshGeometry3D.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// FFXIV TexTools
// Copyright © 2020 Rafael Gonzalez - All Rights Reserved
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

using HelixToolkit.Wpf.SharpDX;
using HelixToolkit.Wpf.SharpDX.Model.Scene;
using System.Collections.Generic;

namespace FFXIV_TexTools.Custom
{
public class CustomBoneSkinMeshGeometry3D : BoneSkinMeshGeometryModel3D
{
public bool IsBody { get; set; }

public string ItemType { get; set; }

public List<string> BoneList { get; set; }

protected override SceneNode OnCreateSceneNode()
{
var node = new BoneSkinMeshNode();

node.OnSetRenderTechnique = host =>
{
return host.EffectsManager[CustomEffectsManager.CustomShaderNames.CustomShader];
};

return node;
}
}
}
305 changes: 305 additions & 0 deletions FFXIV_TexTools/Custom/CustomEffectsManager.cs
View file

Large diffs are not rendered by default.

111 changes: 102 additions & 9 deletions FFXIV_TexTools/FFXIV_TexTools.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@
<Compile Include="Controls\FeedbackControl.xaml.cs">
<DependentUpon>FeedbackControl.xaml</DependentUpon>
</Compile>
<Compile Include="Custom\CustomBoneSkinMeshGeometry3D.cs" />
<Compile Include="Custom\CustomEffectsManager.cs" />
<Compile Include="Custom\CustomMeshGeometryModel3D.cs" />
<Compile Include="Helpers\FlexibleMessageBox.cs" />
Expand All @@ -249,7 +250,6 @@
<Compile Include="Helpers\RelayCommand.cs" />
<Compile Include="Helpers\Wpf32Window.cs" />
<Compile Include="Models\Category.cs" />
<Compile Include="Models\ItemsList.cs" />
<Compile Include="Models\SimpleModpackEntry.cs" />
<Compile Include="Properties\Annotations.cs" />
<Compile Include="Resources\CommonInstallDirectories.Designer.cs">
Expand Down Expand Up @@ -290,16 +290,18 @@
<Compile Include="Textures\ColorChannels.cs" />
<Compile Include="ViewModels\BaseViewPortViewModel.cs" />
<Compile Include="ViewModels\CustomizeViewModel.cs" />
<Compile Include="ViewModels\FullModelViewModel.cs" />
<Compile Include="ViewModels\FullModelViewport3DViewModel.cs" />
<Compile Include="ViewModels\IconSearchViewModel.cs" />
<Compile Include="ViewModels\ImportModelEditViewModel.cs" />
<Compile Include="ViewModels\ImportModelViewModel.cs" />
<Compile Include="ViewModels\MainViewModel.cs" />
<Compile Include="ViewModels\MaterialEditorViewModel.cs" />
<Compile Include="ViewModels\ModConverterViewModel.cs" />
<Compile Include="ViewModels\ModelSearchViewModel.cs" />
<Compile Include="ViewModels\ModelViewModel.cs" />
<Compile Include="ViewModels\ModListViewModel.cs" />
<Compile Include="ViewModels\SharedItemsViewModel.cs" />
<Compile Include="ViewModels\StandardModpackViewModel.cs" />
<Compile Include="ViewModels\TextureViewModel.cs" />
<Compile Include="ViewModels\Viewport3DViewModel.cs" />
<Compile Include="Views\AboutView.xaml.cs">
Expand All @@ -309,9 +311,21 @@
<Compile Include="Views\AutoCompleteTextBox.xaml.cs">
<DependentUpon>AutoCompleteTextBox.xaml</DependentUpon>
</Compile>
<Compile Include="Views\Controls\DescribedButton.xaml.cs">
<DependentUpon>DescribedButton.xaml</DependentUpon>
</Compile>
<Compile Include="Views\Controls\FileList.xaml.cs">
<DependentUpon>FileList.xaml</DependentUpon>
</Compile>
<Compile Include="Views\Controls\ItemSelectControl.xaml.cs">
<DependentUpon>ItemSelectControl.xaml</DependentUpon>
</Compile>
<Compile Include="Views\CustomizeSettingsView.xaml.cs">
<DependentUpon>CustomizeSettingsView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\DependencyInfoView.xaml.cs">
<DependentUpon>DependencyInfoView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\IconSearchView.xaml.cs">
<DependentUpon>IconSearchView.xaml</DependentUpon>
</Compile>
Expand All @@ -321,6 +335,12 @@
<Compile Include="Views\ModConverterView.xaml.cs">
<DependentUpon>ModConverterView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\Models\FullModelExportDialogView.xaml.cs">
<DependentUpon>FullModelExportDialogView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\Models\FullModelView.xaml.cs">
<DependentUpon>FullModelView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\Models\ImportModelEditView.xaml.cs">
<DependentUpon>ImportModelEditView.xaml</DependentUpon>
</Compile>
Expand All @@ -333,9 +353,33 @@
<Compile Include="Views\Models\ModelInspector.xaml.cs">
<DependentUpon>ModelInspector.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ModPack\Standard\StandardModpackCreatorItemSelect.xaml.cs">
<DependentUpon>StandardModpackCreatorItemSelect.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ModPack\Standard\StandardModpackEntryControl.xaml.cs">
<DependentUpon>StandardModpackEntryControl.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ModPack\Standard\StandardModpackCreator.xaml.cs">
<DependentUpon>StandardModpackCreator.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ModPack\Standard\StandardModpackFileSelect.xaml.cs">
<DependentUpon>StandardModpackFileSelect.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ModPack\Standard\StandardModpackFilesReview.xaml.cs">
<DependentUpon>StandardModpackFilesReview.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ModPack\Standard\StandardModpackFinalize.xaml.cs">
<DependentUpon>StandardModpackFinalize.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ModPack\Standard\StandardModpackLevelSelect.xaml.cs">
<DependentUpon>StandardModpackLevelSelect.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ModPack\ImportModPackWizard.xaml.cs">
<DependentUpon>ImportModPackWizard.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ModPack\Standard\StandardModpackSharedItems.xaml.cs">
<DependentUpon>StandardModpackSharedItems.xaml</DependentUpon>
</Compile>
<Compile Include="Views\Textures\ImportTextureOptionsView.xaml.cs">
<DependentUpon>ImportTextureOptionsView.xaml</DependentUpon>
</Compile>
Expand All @@ -345,9 +389,6 @@
<Compile Include="Views\LanguageOptionsView.xaml.cs">
<DependentUpon>LanguageOptionsView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ModelSearchView.xaml.cs">
<DependentUpon>ModelSearchView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\Models\ModelView.xaml.cs">
<DependentUpon>ModelView.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -418,10 +459,26 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\Controls\DescribedButton.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\Controls\FileList.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\Controls\ItemSelectControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\CustomizeSettingsView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\DependencyInfoView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Views\IconSearchView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand All @@ -434,6 +491,14 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\Models\FullModelExportDialogView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\Models\FullModelView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Views\Models\ImportModelEditView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand All @@ -450,23 +515,51 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\ModPack\Standard\StandardModpackCreatorItemSelect.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\ModPack\Standard\StandardModpackEntryControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\ModPack\Standard\StandardModpackCreator.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\ModPack\Standard\StandardModpackFileSelect.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\ModPack\Standard\StandardModpackFilesReview.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\ModPack\Standard\StandardModpackFinalize.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\ModPack\Standard\StandardModpackLevelSelect.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\ModPack\ImportModPackWizard.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\Textures\ImportTextureOptionsView.xaml">
<Page Include="Views\ModPack\Standard\StandardModpackSharedItems.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\ModPack\ImportWizardModPackControl.xaml">
<Page Include="Views\Textures\ImportTextureOptionsView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\LanguageOptionsView.xaml">
<Page Include="Views\ModPack\ImportWizardModPackControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\ModelSearchView.xaml">
<Page Include="Views\LanguageOptionsView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
Expand Down
44 changes: 20 additions & 24 deletions FFXIV_TexTools/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:views ="clr-namespace:FFXIV_TexTools.Views"
xmlns:resx="clr-namespace:FFXIV_TexTools.Resources"
mc:Ignorable="d"
xmlns:resx="clr-namespace:FFXIV_TexTools.Resources"
xmlns:items="clr-namespace:FFXIV_TexTools.Views.Controls"
mc:Ignorable="d"
Title="FFXIV TexTools" Height="720" Width="1280" WindowStartupLocation="CenterScreen" Closing="MetroWindow_Closing" Loaded="MetroWindow_Loaded">
<Controls:MetroWindow.RightWindowCommands>
<Controls:WindowCommands>
Expand Down Expand Up @@ -44,6 +45,7 @@
<MenuItem x:Name="Menu_ModList" Header="{Binding Source={x:Static resx:UIStrings.Mod_List}}" Click="Menu_ModList_Click"/>
<MenuItem x:Name="Menu_CreateModPack" Header="{Binding Source={x:Static resx:UIStrings.Create_Modpack}}">
<MenuItem x:Name="Menu_MakeModpackWizard" Header="{Binding Source={x:Static resx:UIStrings.ModPack_Wizard}}" Click="Menu_MakeModpackWizard_Click"/>
<MenuItem x:Name="Menu_MakeStandardModpack" Header="{Binding Source={x:Static resx:UIStrings.Standard_Modpack}}" Click="Menu_MakeStandardModpack_Click"/>
<MenuItem x:Name="Menu_MakeSimpleModpack" Header="{Binding Source={x:Static resx:UIStrings.Simple_ModPack}}" Click="Menu_MakeSimpleModpack_Click"/>
</MenuItem>
<MenuItem x:Name="Menu_ImportModpack" Header="{Binding Source={x:Static resx:UIStrings.Import_ModPacks}}" Click="Menu_ImportModpack_Click"/>
Expand All @@ -54,7 +56,6 @@
<MenuItem x:Name="Menu_ModConverter" IsEnabled="False" Header="{Binding Source={x:Static resx:UIStrings.Mod_Converter}}" Click="Menu_ModConverter_Click"/>
</MenuItem>
<MenuItem Header="{Binding Source={x:Static resx:UIStrings.Search}}" StaysOpenOnClick="True">
<MenuItem x:Name="Menu_ModelIDSearch" Header="{Binding Source={x:Static resx:UIStrings.Model_ID}}" Click="Menu_ModelIDSearch_Click"/>
<MenuItem x:Name="Menu_IconSearch" Header="{Binding Source={x:Static resx:UIStrings.Icon_ID}}" Click="Menu_IconIDSearch_Click"/>
</MenuItem>
<MenuItem Header="{Binding Source={x:Static resx:UIStrings.Options}}" StaysOpenOnClick="True">
Expand All @@ -63,12 +64,19 @@
<MenuItem x:Name="MenuLightTheme" Header="Light" Click="MenuLightTheme_Click"/>
<MenuItem x:Name="MenuDarkTheme" Header="Dark" Click="MenuDarkTheme_Click"/>
</MenuItem>
<MenuItem x:Name="Menu_FullModelViewer" Header="Full Model Viewer" Click="FullModelViewer_Click"/>
</MenuItem>
<MenuItem Header="{Binding Source={x:Static resx:UIStrings.Help}}">
<MenuItem x:Name="Menu_Backup" Header="{Binding Source={x:Static resx:UIStrings.Backup_Index_Files}}" Click="Menu_Backup_Click"/>
<MenuItem x:Name="Menu_ProblemCheck" Header="{Binding Source={x:Static resx:UIStrings.Check_For_Problems}}" Click="Menu_ProblemCheck_Click"/>
<MenuItem x:Name="Menu_StartOver" Header="{Binding Source={x:Static resx:UIStrings.Start_Over}}" Click="Menu_StartOver_Click" />
<MenuItem x:Name="Menu_BugReport" Header="{Binding Source={x:Static resx:UIStrings.Report_Bug}}" Click="Menu_BugReport_Click"/>
<MenuItem x:Name="Menu_Backup" Header="{Binding Source={x:Static resx:UIStrings.Backup_Index_Files}}" Click="Menu_Backup_Click"/>

<MenuItem Header="{Binding Source={x:Static resx:UIStrings.Cache}}">
<MenuItem x:Name="Menu_RebuildCache" Header="{Binding Source={x:Static resx:UIStrings.Rebuild_Cache}}" Click="Menu_RebuildCache_Click" />
<MenuItem x:Name="Menu_LoadSets" Header="{Binding Source={x:Static resx:UIStrings.Load_Sets}}" Click="Menu_LoadSets_Click" />
<MenuItem x:Name="Menu_ScanForSets" Header="{Binding Source={x:Static resx:UIStrings.Scan_For_Sets}}" Click="Menu_ScanForSets_Click" />
</MenuItem>
</MenuItem>
<MenuItem Header="{Binding Source={x:Static resx:UIStrings.About}}">
<MenuItem x:Name="Menu_About" Header="{Binding Source={x:Static resx:UIStrings.About_TexTools}}" Click="Menu_About_Click"/>
Expand All @@ -89,26 +97,14 @@
<ColumnDefinition Width="3*"/>
</Grid.ColumnDefinitions>

<GroupBox Header="{Binding Source={x:Static resx:UIStrings.Item_List}}" Margin="5">
<Grid Grid.Column="0">
<TextBox x:Name="ItemSearchTextBox" Controls:TextBoxHelper.Watermark="{Binding Source={x:Static resx:UIStrings.Search_dot}}" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" TextChanged="ItemSearchTextBox_TextChanged"/>
<TreeView x:Name="ItemTreeView" Margin="0,26,0,0" ItemsSource="{Binding Categories,Mode=TwoWay}" SelectedItemChanged="TreeView_SelectedItemChanged" Style="{StaticResource VirtualisedMetroTreeView}">
<TreeView.ItemContainerStyle>
<Style BasedOn="{StaticResource MetroTreeViewItem}" TargetType="{x:Type TreeViewItem}">
<Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
<Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
</Style>
</TreeView.ItemContainerStyle>
<TreeView.Resources>
<HierarchicalDataTemplate ItemsSource="{Binding Categories}" DataType="{x:Type models:Category}">
<StackPanel>
<TextBlock Text="{Binding Name}"/>
</StackPanel>
</HierarchicalDataTemplate>
</TreeView.Resources>
</TreeView>
<Controls:MetroProgressBar x:Name="ListProgressBar" VerticalAlignment="Bottom" Margin="5" Value="{Binding ProgressValue}" Visibility="{Binding ProgressBarVisible}"/>
<Label x:Name="ProgressLabel" VerticalAlignment="Bottom" Margin="5" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="{Binding ProgressLabel}" Visibility="{Binding ProgressLabelVisible}"/>
<GroupBox Header="{Binding Source={x:Static resx:UIStrings.Item_List}}" Margin="5,5,5,5">
<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<items:ItemSelectControl x:Name="ItemSelect" Height="Auto" Width="Auto" DeferLoading="True" MainMenuMode="True" Margin="0,0,0,0"/>
<TextBlock x:Name="StatusTextBox" Margin="0" TextWrapping="Wrap" Text="Status Text Goes Here" TextAlignment="Center" Grid.Row="1"/>
</Grid>
</GroupBox>

Expand Down
Loading

0 comments on commit ff287df

Please sign in to comment.