merge delta change

.gitignore

@@ -274,6 +274,7 @@ FakesAssemblies/
 #ThirdParty/DXDecompiler
 # Include libreborb dll and hlsl exe
 !Charm/ThirdParty/*.dll
+!Charm/ThirdParty/Alkahest/*.dll
 !Charm/ThirdParty/*.exe
 .vscode/tasks.json
 .vscode/launch.json

AtlasSharp/AtlasView.xaml.cs

@@ -262,7 +262,7 @@ private bool InitStaticMesh(FileHash staticHash)
 
     public struct InputSignature
     {
-        public InputSemantic Semantic;
+        public DXBCSemantic Semantic;
         public int SemanticIndex;
         public int DxgiFormat;
         public int BufferIndex;
@@ -301,18 +301,18 @@ public PartMaterial(IMaterial material, List<int> strides)
                 throw new Exception();
             }
 
-            Tiger.Schema.InputSignature[] inputSignatures = material.VertexShader.InputSignatures.ToArray();
+            DXBCIOSignature[] inputSignatures = material.VertexShader.InputSignatures.ToArray();
             Helpers.DecorateSignaturesWithBufferIndex(ref inputSignatures, strides); // absorb into the getter probs
 
-            foreach (Tiger.Schema.InputSignature signature in inputSignatures)
+            foreach (DXBCIOSignature signature in inputSignatures)
             {
                 InputSignatures[sigIndex].Semantic = signature.Semantic;
                 InputSignatures[sigIndex].SemanticIndex = (int)signature.SemanticIndex;
                 InputSignatures[sigIndex].BufferIndex = signature.BufferIndex;
                 switch (signature.Mask)
                 {
                     case ComponentMask.XYZW:
-                        if (signature.Semantic == InputSemantic.Colour)
+                        if (signature.Semantic == DXBCSemantic.Colour)
                         {
                             InputSignatures[sigIndex].DxgiFormat = (int)DXGI_FORMAT.R8G8B8A8_UNORM;
                             break;

Charm.sln

@@ -17,13 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RevorbStd", "ThirdParty\rev
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CharmDepotDownloader", "CharmDepotDownloader\CharmDepotDownloader.csproj", "{D22CC98B-DE19-460A-B661-3155C55024AE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AtlasSharp", "AtlasSharp\AtlasSharp.csproj", "{161DFC33-8147-4BD1-B72C-A08D53D831A3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1132E6A9-9AD9-405D-936A-7643392B0202} = {1132E6A9-9AD9-405D-936A-7643392B0202}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Atlas", "Atlas\Atlas.vcxproj", "{1132E6A9-9AD9-405D-936A-7643392B0202}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -58,14 +51,6 @@ Global
 		{D22CC98B-DE19-460A-B661-3155C55024AE}.Debug|x64.Build.0 = Debug|Any CPU
 		{D22CC98B-DE19-460A-B661-3155C55024AE}.Release|x64.ActiveCfg = Release|Any CPU
 		{D22CC98B-DE19-460A-B661-3155C55024AE}.Release|x64.Build.0 = Release|Any CPU
-		{161DFC33-8147-4BD1-B72C-A08D53D831A3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{161DFC33-8147-4BD1-B72C-A08D53D831A3}.Debug|x64.Build.0 = Debug|Any CPU
-		{161DFC33-8147-4BD1-B72C-A08D53D831A3}.Release|x64.ActiveCfg = Release|Any CPU
-		{161DFC33-8147-4BD1-B72C-A08D53D831A3}.Release|x64.Build.0 = Release|Any CPU
-		{1132E6A9-9AD9-405D-936A-7643392B0202}.Debug|x64.ActiveCfg = Debug|x64
-		{1132E6A9-9AD9-405D-936A-7643392B0202}.Debug|x64.Build.0 = Debug|x64
-		{1132E6A9-9AD9-405D-936A-7643392B0202}.Release|x64.ActiveCfg = Release|x64
-		{1132E6A9-9AD9-405D-936A-7643392B0202}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Charm/App.xaml.cs

@@ -65,7 +65,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
                     // {
                     //     var dynamicParts = entity.Load(ExportDetailLevel.MostDetailed);
                     //     fbxHandler.AddEntityToScene(entity, dynamicParts, ExportDetailLevel.MostDetailed);
-                    //     entity.SaveMaterialsFromParts(savePath, dynamicParts, ConfigSubsystem.GetUnrealInteropEnabled() || ConfigSubsystem.GetS2ShaderExportEnabled());
+                    //     entity.SaveMaterialsFromParts(savePath, dynamicParts, ConfigSubsystem.GetUnrealInteropEnabled() || ConfigSubsystem.GetSBoxShaderExportEnabled());
                     //     entity.SaveTexturePlates(savePath);
                     // }
                     //

Charm/Charm.csproj

@@ -87,6 +87,9 @@
       <None Update="ThirdParty\3dmigoto_shader_decomp.exe">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </None>
+      <None Update="ThirdParty\Alkahest\destiny_havok.dll">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </None>
       <None Update="ThirdParty\d3dcompiler_46.dll">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </None>
@@ -107,16 +110,15 @@
       </None>
     </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="..\Atlas\Shaders\Lighting.hlsl">
+      <Link>Shaders\Lighting.hlsl</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 
-    <ItemGroup>
-      <Content Include="..\Atlas\Shaders\Lighting.hlsl">
-        <Link>Shaders\Lighting.hlsl</Link>
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      </Content>
-    </ItemGroup>
-
-    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-      <Exec Command="xcopy &quot;$(SolutionDir)x64\$(Configuration)\Atlas.dll&quot; &quot;$(TargetDir)&quot; /y /i&#xA;xcopy &quot;$(SolutionDir)x64\$(Configuration)\Atlas.pdb&quot; &quot;$(TargetDir)&quot; /y /i" />
-    </Target>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="xcopy &quot;$(SolutionDir)x64\$(Configuration)\Atlas.dll&quot; &quot;$(TargetDir)&quot; /y /i&#xA;xcopy &quot;$(SolutionDir)x64\$(Configuration)\Atlas.pdb&quot; &quot;$(TargetDir)&quot; /y /i" />
+  </Target>
 
 </Project>

Charm/ConfigView.xaml

@@ -1,23 +1,24 @@
-<UserControl x:Class="Charm.ConfigView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:Charm"
-             mc:Ignorable="d"
-             d:DesignHeight="1080" d:DesignWidth="1920">
+<UserControl
+    x:Class="Charm.ConfigView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:Charm"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="1080"
+    d:DesignWidth="1920"
+    mc:Ignorable="d">
     <Grid>
         <TabControl x:Name="ConfigTabControl">
-            <TabItem Header="GENERAL" x:Name="ConfigTab">
-                <local:GeneralConfigView x:Name="ConfigControl"/>
+            <TabItem x:Name="ConfigTab" Header="GENERAL">
+                <local:GeneralConfigView x:Name="ConfigControl" />
             </TabItem>
-            <TabItem Header="SOURCE 2" x:Name="Source2Tab">
-                <local:Source2ConfigView x:Name="Source2Control"/>
+            <TabItem x:Name="SBoxTab" Header="S&amp;BOX">
+                <local:SBoxConfigView x:Name="SBoxControl" />
             </TabItem>
             <TabItem Header="UNREAL ENGINE" x:Name="UnrealTab">
                 <local:UnrealConfigView x:Name="UnrealControl"/>
             </TabItem>
-
         </TabControl>
     </Grid>
 </UserControl>

Charm/DevView.xaml.cs

@@ -11,13 +11,15 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using ConcurrentCollections;
+using Arithmic;
 using Tiger;
 using Tiger.Exporters;
 using Tiger.Schema;
 using Tiger.Schema.Audio;
 using Tiger.Schema.Entity;
 using Tiger.Schema.Investment;
 using Tiger.Schema.Shaders;
+using Tiger.Schema.Havok;
 using Tiger.Schema.Static;
 
 namespace Charm;
@@ -185,6 +187,37 @@ private void AddWindow(FileHash hash)
             }
             _mainWindow.SetNewestTabSelected();
         }
+        else if (fileMetadata.Type == 27 && fileMetadata.SubType == 0) // Havok
+        {
+            var shapeCollection = DestinyHavok.ReadShapeCollection(FileResourcer.Get().GetFile(hash).GetData());
+            if (shapeCollection is null)
+            {
+                Log.Error("Havok shape collection is null");
+                TagHashBox.Text = "NULL";
+                return;
+            }
+
+            Directory.CreateDirectory($"{ConfigSubsystem.Get().GetExportSavePath()}/HavokShapes");
+            int i = 0;
+            foreach (var shape in shapeCollection)
+            {
+                var vertices = shape.Vertices;
+                var indices = shape.Indices;
+
+                var sb = new StringBuilder();
+                foreach (var vertex in vertices)
+                {
+                    sb.AppendLine($"v {vertex.X} {vertex.Y} {vertex.Z}");
+                }
+                foreach (var index in indices.Chunk(3))
+                {
+                    sb.AppendLine($"f {index[0] + 1} {index[1] + 1} {index[2] + 1}");
+                }
+
+                Console.WriteLine($"Writing 'HavokShapes/shape_{hash}_{i}.obj'");
+                File.WriteAllText($"{ConfigSubsystem.Get().GetExportSavePath()}/HavokShapes/shape_{hash}_{i++}.obj", sb.ToString());
+            }
+        }
         else if ((fileMetadata.Type == 8 || fileMetadata.Type == 16) && fileMetadata.SubType == 0)
         {
             switch (reference.Hash32)
@@ -250,7 +283,7 @@ private void AddWindow(FileHash hash)
                     foreach (DynamicMeshPart part in parts)
                     {
                         if (part.Material == null) continue;
-                        scene.Materials.Add(new ExportMaterial(part.Material));
+                        scene.Materials.Add(new ExportMaterial(part.Material, MaterialType.Opaque));
                     }
                     Exporter.Get().Export();
 
@@ -262,8 +295,8 @@ private void AddWindow(FileHash hash)
                 case 0x8080714F:
                 case 0x80806C81:
                     Terrain terrain = FileResourcer.Get().GetFile<Terrain>(hash);
-                    ExporterScene terrainScene = Exporter.Get().CreateScene(hash, ExportType.Terrain);
-                    terrain.LoadIntoExporter(terrainScene, ConfigSubsystem.Get().GetExportSavePath(), false);
+                    ExporterScene terrainScene = Exporter.Get().CreateScene(hash, ExportType.Static);
+                    terrain.LoadIntoExporter(terrainScene, ConfigSubsystem.Get().GetExportSavePath());
                     Exporter.Get().Export();
                     break;
                 default:

Charm/EntityView.xaml.cs

@@ -137,10 +137,6 @@ public static void Export(List<Entity> entities, string name, ExportTypeFlag exp
                 entity.SaveMaterialsFromParts(scene, dynamicParts);
                 entity.SaveTexturePlates(savePath);
             }
-            if (ConfigSubsystem.Get().GetS2VMDLExportEnabled())
-            {
-                Source2Handler.SaveEntityVMDL($"{savePath}", entity);
-            }
         }
 
         if (exportType == ExportTypeFlag.Full)
@@ -167,7 +163,7 @@ public static void ExportInventoryItem(ApiItem item)
         EntitySkeleton overrideSkeleton = null;
         if (Strategy.CurrentStrategy >= TigerStrategy.DESTINY2_WITCHQUEEN_6307)
         {
-            Entity playerBase = FileResourcer.Get().GetFile<Entity>(new FileHash(Hash64Map.Get().GetHash32Checked("0000670F342E9595"))); // 64 bit more permanent 
+            Entity playerBase = FileResourcer.Get().GetFile<Entity>(new FileHash(Hash64Map.Get().GetHash32Checked("0000670F342E9595"))); // 64 bit more permanent
             overrideSkeleton = new EntitySkeleton(playerBase.Skeleton.Hash);
         }
         else if (Strategy.CurrentStrategy == TigerStrategy.DESTINY1_RISE_OF_IRON)

Charm/GeneralConfigView.xaml.cs

@@ -80,7 +80,6 @@ private void PopulateConfigPanel()
 
         GeneralConfigPanel.Children.Add(sp);
 
-
         // Save path
         ConfigSettingControl csp = new ConfigSettingControl();
         csp.SettingName = "Export save path";
@@ -89,14 +88,6 @@ private void PopulateConfigPanel()
         csp.ChangeButton.Click += ExportSavePath_OnClick;
         GeneralConfigPanel.Children.Add(csp);
 
-        // Enable Blender interop //force people to use the addon now >:)
-        //ConfigSettingControl cbe = new ConfigSettingControl();
-        //cbe.SettingName = "Generate Blender importing script";
-        //bool bval2 = _config.GetBlenderInteropEnabled();
-        //cbe.SettingValue = bval2.ToString();
-        //cbe.ChangeButton.Click += BlenderInteropEnabled_OnClick;
-        //GeneralConfigPanel.Children.Add(cbe);
-
         // Enable combined extraction folder for maps
         ConfigSettingControl cef = new ConfigSettingControl();
         cef.SettingName = "Use single folder extraction for maps";

Charm/MainMenuView.xaml

@@ -187,61 +187,18 @@
                     </Button>
                 </StackPanel>
 
-                <StackPanel Grid.Column="3" Margin="10,0,0,0">
-                    <TextBlock
-                        Padding="0,0,0,50"
-                        HorizontalAlignment="Center"
-                        FontSize="64"
-                        Text="Other" />
-                    <Button
-                        Height="75"
-                        Margin="20,0,20,40"
-                        Padding="20,20,20,20"
-                        HorizontalAlignment="Stretch"
-                        HorizontalContentAlignment="Stretch"
-                        Click="AllStringsViewButton_OnClick"
-                        Style="{StaticResource MaterialDesignPaperDarkButton}">
-                        <TextBlock
-                            Padding="0,10,0,10"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontFamily="{DynamicResource ResourceKey=Haas Grot Text 55 Roman}"
-                            FontSize="42"
-                            Text="STRINGS" />
-                    </Button>
-                    <Button
-                        Height="75"
-                        Margin="20,0,20,40"
-                        Padding="20,20,20,20"
-                        HorizontalAlignment="Stretch"
-                        HorizontalContentAlignment="Stretch"
-                        Click="AllTexturesViewButton_OnClick"
-                        Style="{StaticResource MaterialDesignPaperDarkButton}">
-                        <TextBlock
-                            Padding="0,10,0,10"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontFamily="{DynamicResource ResourceKey=Haas Grot Text 55 Roman}"
-                            FontSize="42"
-                            Text="TEXTURES" />
-                    </Button>
-                    <Button
-                        Height="75"
-                        Margin="20,0,20,40"
-                        Padding="20,20,20,20"
-                        HorizontalAlignment="Stretch"
-                        HorizontalContentAlignment="Stretch"
-                        Click="AllMaterialsViewButton_OnClick"
-                        Style="{StaticResource MaterialDesignPaperDarkButton}">
-                        <TextBlock
-                            Padding="0,10,0,10"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontFamily="{DynamicResource ResourceKey=Haas Grot Text 55 Roman}"
-                            FontSize="42"
-                            Text="MATERIALS" />
-                    </Button>
-                </StackPanel>
+        <StackPanel Grid.Column="3" Margin="10,0,0,0">
+            <TextBlock Text="Other" FontSize="64" HorizontalAlignment="Center" Padding="0,0,0,50"/>
+            <Button Height="75" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Click="AllStringsViewButton_OnClick" Margin="20,0,20,40" Padding="20, 20, 20, 20" Style="{StaticResource MaterialDesignPaperDarkButton}">
+                <TextBlock Text="STRINGS" VerticalAlignment="Center" FontSize="42" FontFamily="{DynamicResource ResourceKey=Neue Haas Grotesk Text Pro 55 Roman}"  HorizontalAlignment="Center" Padding="0,10,0,10"/>
+            </Button>
+            <Button Height="75" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Click="AllTexturesViewButton_OnClick" Margin="20,0,20,40" Padding="20, 20, 20, 20" Style="{StaticResource MaterialDesignPaperDarkButton}">
+                <TextBlock Text="TEXTURES" VerticalAlignment="Center" FontSize="42" FontFamily="{DynamicResource ResourceKey=Neue Haas Grotesk Text Pro 55 Roman}"  HorizontalAlignment="Center" Padding="0,10,0,10"/>
+            </Button>
+            <Button Height="75" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Click="AllMaterialsViewButton_OnClick" Margin="20,0,20,40" Padding="20, 20, 20, 20" Style="{StaticResource MaterialDesignPaperDarkButton}">
+                <TextBlock Text="MATERIALS" VerticalAlignment="Center" FontSize="42" FontFamily="{DynamicResource ResourceKey=Neue Haas Grotesk Text Pro 55 Roman}"  HorizontalAlignment="Center" Padding="0,10,0,10"/>
+            </Button>
+        </StackPanel>
             </StackPanel>
         </StackPanel>
     </Grid>

Charm/MapView.xaml

@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:Charm"
+             xmlns:atlasSharp="clr-namespace:AtlasSharp;assembly=AtlasSharp"
              mc:Ignorable="d"
              Loaded="OnControlLoaded"
              d:DesignHeight="300" d:DesignWidth="300">
@@ -15,5 +16,6 @@
             <RowDefinition Height="100*"/>
         </Grid.RowDefinitions>
         <local:ModelView x:Name="ModelView"/>
-    </Grid> 
+        <atlasSharp:AtlasView x:Name="AtlasView"/>
+    </Grid>
 </UserControl>