From 0813cfa375c6646b213366ffd66e0c49d13f3729 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Thu, 18 Jul 2024 15:31:15 -0400
Subject: [PATCH 1/7] Add shrink ray tool.

---
 .../ModPack/Wizard/ExportWizardWindow.xaml    |  4 ++-
 .../ModPack/Wizard/ExportWizardWindow.xaml.cs | 35 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/FFXIV_TexTools/Views/ModPack/Wizard/ExportWizardWindow.xaml b/FFXIV_TexTools/Views/ModPack/Wizard/ExportWizardWindow.xaml
index 61a7270f..7334ca8b 100644
--- a/FFXIV_TexTools/Views/ModPack/Wizard/ExportWizardWindow.xaml
+++ b/FFXIV_TexTools/Views/ModPack/Wizard/ExportWizardWindow.xaml
@@ -66,7 +66,9 @@
                                 <TextBox x:Name="ModPackName" mah:TextBoxHelper.Watermark="{Binding Source={x:Static resx:UIStrings.Mod_Pack_Name}}" Grid.Column="1" Grid.Row="0" Margin="5" TabIndex="0"/>
                                 <xctk:MaskedTextBox x:Name="ModPackVersion" input:InputMethod.IsInputMethodEnabled="False" Mask="0.9.9" Text="1 . 0 . 0" Grid.Column="1" Grid.Row="1" Margin="5" MinHeight="26"  TabIndex="2"  PreviewMouseUp="ModPackVersion_PreviewMouseUp" InsertKeyMode="Overwrite" VerticalContentAlignment="Bottom" Padding="0,0,0,2" />
 
-                            </Grid>
+                                <Button Grid.Row="2" Grid.Column="1" Margin="5" Content="Shrink Modpack" Click="ShrinkModpack_Click"/>
+
+                                </Grid>
                             <Grid Grid.Column="1">
                                 <Grid>
                                     <Grid.RowDefinitions>
diff --git a/FFXIV_TexTools/Views/ModPack/Wizard/ExportWizardWindow.xaml.cs b/FFXIV_TexTools/Views/ModPack/Wizard/ExportWizardWindow.xaml.cs
index bc4fe92d..923780de 100644
--- a/FFXIV_TexTools/Views/ModPack/Wizard/ExportWizardWindow.xaml.cs
+++ b/FFXIV_TexTools/Views/ModPack/Wizard/ExportWizardWindow.xaml.cs
@@ -538,5 +538,40 @@ private void SetTitle()
                 Title = "Create Modpack - Page " + CurrentIndex;
             }
         }
+
+        private async void ShrinkModpack_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+
+            var imgSize = Settings.Default.MaxImageSize > 0 ? Settings.Default.MaxImageSize.ToString() : "No Limit";
+            if(!this.ShowConfirmation("Shrink Confirmation", "This will:\n"
+                + "\n- Shrink all Textures to your current Max Image Size: " + imgSize
+                + "\n- Resave/Repack all MDLs in the modpack."
+                + "\n- Generate missing Mipmaps, and remove unnecessary Mipmaps."
+                + "\n- Resize invalid-sized textures."
+                + "\n- Repack all Textures in the modpack (for TTMPs)."
+                + "\n- Remove unused files from the modpack."
+                + "\n\n This will NOT update Endwalker files (other than MDLs) for Dawntrail."))
+            {
+                return;
+            }
+
+            var settings = new ShrinkRay.ShrinkRaySettings();
+            settings.MaxTextureSize = Settings.Default.MaxImageSize;
+
+            try
+            {
+                await LockUi();
+                var res = await ShrinkRay.ShrinkModpack(Data, settings);
+                Data = res;
+            }
+            catch(Exception ex)
+            {
+                this.ShowError("Shrink Ray Failure", "Unable to shrink modpack:\n\n" + ex.Message);
+            }
+            finally
+            {
+                await UnlockUi();
+            }
+        }
     }
 }

From bebc2ab33b16284f791ed38f9dc8b4cca35f5f55 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Thu, 18 Jul 2024 15:31:31 -0400
Subject: [PATCH 2/7] ref

---
 lib/xivModdingFramework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index 0542bf0b..07970c10 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit 0542bf0b0d19eca8d0d94448756611c8915c7e4b
+Subproject commit 07970c10ba0614f288eb3bbc253af45547b1a0ce

From e85cc432b5d0b3422884d5ef41d95915e3cda81a Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Thu, 18 Jul 2024 17:38:47 -0400
Subject: [PATCH 3/7] Don't crash upgrade on missing folder.

---
 FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs b/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs
index a518d293..6664b692 100644
--- a/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs
+++ b/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs
@@ -59,7 +59,7 @@ public async Task<EUpgradeResult> ProcessMod(string baseDir, string targetDir, s
             } catch (Exception ex)
             {
                 LogUpgradeError(targetDir, mod, ex);
-                if (Directory.Exists(target))
+                if (Directory.Exists(target) && Directory.Exists(source))
                 {
                     if (source != target)
                     {

From 330420d76ad24751b6910efd8b73af165feafa22 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Thu, 18 Jul 2024 17:53:09 -0400
Subject: [PATCH 4/7] Cleaning out unused renderer objects/code in prep for
 some custom shader stuff.

---
 FFXIV_TexTools/Custom/CustomEffectsManager.cs |  36 ++++--
 .../ViewModels/BaseViewPortViewModel.cs       | 110 ++++--------------
 .../ViewModels/Viewport3DViewModel.cs         |   8 +-
 3 files changed, 49 insertions(+), 105 deletions(-)

diff --git a/FFXIV_TexTools/Custom/CustomEffectsManager.cs b/FFXIV_TexTools/Custom/CustomEffectsManager.cs
index 0821153f..baf33584 100644
--- a/FFXIV_TexTools/Custom/CustomEffectsManager.cs
+++ b/FFXIV_TexTools/Custom/CustomEffectsManager.cs
@@ -19,11 +19,26 @@
 using System;
 using System.IO;
 using SharpDX.Direct3D;
+using SharpDX.Direct3D11;
+using SharpDX.DXGI;
 
 namespace FFXIV_TexTools.Custom
 {
     public class CustomEffectsManager : DefaultEffectsManager
     {
+        private static readonly InputElement[] CustomVSInput = new InputElement[10]
+        {
+                new InputElement("POSITION", 0, Format.R32G32B32A32_Float, InputElement.AppendAligned, 0),
+                new InputElement("NORMAL", 0,   Format.R32G32B32_Float, InputElement.AppendAligned, 0),
+                new InputElement("TANGENT", 0,  Format.R32G32B32_Float, InputElement.AppendAligned, 0),
+                new InputElement("BINORMAL", 0, Format.R32G32B32_Float, InputElement.AppendAligned, 0),
+                new InputElement("TEXCOORD", 0, Format.R32G32_Float, InputElement.AppendAligned, 1),
+                new InputElement("COLOR", 0,    Format.R32G32B32A32_Float, InputElement.AppendAligned, 2),
+                new InputElement("TEXCOORD", 1, Format.R32G32B32A32_Float, InputElement.AppendAligned, 3, InputClassification.PerInstanceData, 1),
+                new InputElement("TEXCOORD", 2, Format.R32G32B32A32_Float, InputElement.AppendAligned, 3, InputClassification.PerInstanceData, 1),
+                new InputElement("TEXCOORD", 3, Format.R32G32B32A32_Float, InputElement.AppendAligned, 3, InputClassification.PerInstanceData, 1),
+                new InputElement("TEXCOORD", 4, Format.R32G32B32A32_Float, InputElement.AppendAligned, 3, InputClassification.PerInstanceData, 1)
+        };
         public static class CustomShaderNames
         {
             public static readonly string CustomShader = "CustomShader";
@@ -36,7 +51,7 @@ public CustomEffectsManager()
         {
             var customMesh = new TechniqueDescription(CustomShaderNames.CustomShader)
             {
-                InputLayoutDescription = new InputLayoutDescription(DefaultVSShaderByteCodes.VSMeshDefault, DefaultInputLayout.VSInput),
+                InputLayoutDescription = new InputLayoutDescription(DefaultVSShaderByteCodes.VSMeshDefault, CustomVSInput),
                 PassDescriptions = new[]
                 {
                     new ShaderPassDescription(DefaultPassNames.Default)
@@ -371,21 +386,18 @@ public CustomEffectsManager()
         public static class CustomPSShaderDescription
         {
             public static ShaderDescription PSCustomMesh = new ShaderDescription(nameof(PSCustomMesh), ShaderStage.Pixel,
-                new ShaderReflector(), ShaderHelper.LoadShaderCode($"{AppDomain.CurrentDomain.BaseDirectory}\\Resources\\Shaders\\psCustomMeshBlinnPhong.cso"));
+                new ShaderReflector(), LoadShaderCode($"{AppDomain.CurrentDomain.BaseDirectory}\\Resources\\Shaders\\psCustomMeshBlinnPhong.cso"));
         }
 
-        public static class ShaderHelper
+        public static byte[] LoadShaderCode(string path)
         {
-            public static byte[] LoadShaderCode(string path)
+            if (File.Exists(path))
             {
-                if (File.Exists(path))
-                {
-                    return File.ReadAllBytes(path);
-                }
-                else
-                {
-                    throw new ArgumentException($"Shader File not found: {path}");
-                }
+                return File.ReadAllBytes(path);
+            }
+            else
+            {
+                throw new ArgumentException($"Shader File not found: {path}");
             }
         }
     }
diff --git a/FFXIV_TexTools/ViewModels/BaseViewPortViewModel.cs b/FFXIV_TexTools/ViewModels/BaseViewPortViewModel.cs
index 285e3457..e1fb4fbb 100644
--- a/FFXIV_TexTools/ViewModels/BaseViewPortViewModel.cs
+++ b/FFXIV_TexTools/ViewModels/BaseViewPortViewModel.cs
@@ -14,137 +14,75 @@
 // 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 FFXIV_TexTools.Custom;
 using FFXIV_TexTools.Helpers;
 using HelixToolkit.Wpf.SharpDX;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 
 namespace FFXIV_TexTools.ViewModels
 {
     public class BaseViewPortViewModel: ObservableObject, IDisposable
     {
-        private const string Orthographic = "Orthographic Camera";
+        private Camera _Camera;
 
-        private const string Perspective = "Perspective Camera";
+        private IRenderTechnique _RenderTechnique;
 
-        private string _cameraModel;
+        private string _SubTitle;
 
-        private Camera _camera;
-
-        private IRenderTechnique _renderTechnique;
-
-        private string _subTitle;
-
-        private string _title;
+        private string _Title;
 
         public string Title
         {
-            get => _title;
-            set => SetValue(ref _title, value, "Title");
+            get => _Title;
+            set => SetValue(ref _Title, value, "Title");
         }
 
         public string SubTitle
         {
-            get => _subTitle;
-            set => SetValue(ref _subTitle, value, "SubTitle");
+            get => _SubTitle;
+            set => SetValue(ref _SubTitle, value, "SubTitle");
         }
 
         public IRenderTechnique RenderTechnique
         {
-            get => _renderTechnique;
-            set => SetValue(ref _renderTechnique, value, "RenderTechnique");
+            get => _RenderTechnique;
+            set => SetValue(ref _RenderTechnique, value, "RenderTechnique");
         }
 
-        private List<string> CameraModelCollection { get; set; }
 
-        public string CameraModel
-        {
-            get => _cameraModel;
-            set
-            {
-                if (SetValue(ref _cameraModel, value, "CameraModel"))
-                {
-                    OnCameraModelChanged();
-                }
-            }
-        }
 
         public Camera Camera
         {
-            get => _camera;
+            get => _Camera;
 
             set
             {
-                SetValue(ref _camera, value, "Camera");
-                CameraModel = value is PerspectiveCamera
-                                       ? Perspective
-                                       : value is OrthographicCamera ? Orthographic : null;
+                SetValue(ref _Camera, value, "Camera");
             }
         }
 
-        private IEffectsManager effectsManager;
+        private IEffectsManager _EffectsManager;
 
         public IEffectsManager EffectsManager
         {
-            get => effectsManager;
-            set => SetValue(ref effectsManager, value);
-        }
-
-        private string _renderTechniqueName = DefaultRenderTechniqueNames.Mesh;
-        public string RenderTechniqueName
-        {
-            get => _renderTechniqueName;
-            set
-            {
-                _renderTechniqueName = value;
-                RenderTechnique = EffectsManager[value];
-            }
-
+            get => _EffectsManager;
+            set => SetValue(ref _EffectsManager, value);
         }
 
-        private readonly OrthographicCamera _defaultOrthographicCamera = new OrthographicCamera { Position = new System.Windows.Media.Media3D.Point3D(0, 0, 5), LookDirection = new System.Windows.Media.Media3D.Vector3D(-0, -0, -5), UpDirection = new System.Windows.Media.Media3D.Vector3D(0, 1, 0), NearPlaneDistance = 1, FarPlaneDistance = 100 };
-
-        private readonly PerspectiveCamera _defaultPerspectiveCamera = new PerspectiveCamera { Position = new System.Windows.Media.Media3D.Point3D(0, 0, 5), LookDirection = new System.Windows.Media.Media3D.Vector3D(-0, -0, -5), UpDirection = new System.Windows.Media.Media3D.Vector3D(0, 1, 0), NearPlaneDistance = 0.5, FarPlaneDistance = 150 };
-
-        public event EventHandler CameraModelChanged;
-
         public BaseViewPortViewModel()
         {
-            // camera models
-            CameraModelCollection = new List<string>()
+            try
             {
-                Orthographic,
-                Perspective,
-            };
-
-            // on camera changed callback
-            CameraModelChanged += (s, e) =>
+                // The effect manager automatically attaches itself to the renderer via AddTechnique() somehow.
+                EffectsManager = new CustomEffectsManager();
+            }
+            catch (Exception ex)
             {
-                if (_cameraModel == Orthographic)
-                {
-                    if (!(Camera is OrthographicCamera))
-                        Camera = _defaultOrthographicCamera;
-                }
-                else if (_cameraModel == Perspective)
-                {
-                    if (!(Camera is PerspectiveCamera))
-                        Camera = _defaultPerspectiveCamera;
-                }
-                else
-                {
-                    throw new HelixToolkitException("Camera Model Error.".L());
-                }
-            };
-
-            // default camera model
-            CameraModel = Perspective;
-        }
-
-        public void OnCameraModelChanged()
-        {
-            var eh = CameraModelChanged;
-            eh?.Invoke(this, new EventArgs());
+                Trace.WriteLine(ex);
+            }
         }
 
         #region IDisposable Support
diff --git a/FFXIV_TexTools/ViewModels/Viewport3DViewModel.cs b/FFXIV_TexTools/ViewModels/Viewport3DViewModel.cs
index b4b3e4b3..c7a1722b 100644
--- a/FFXIV_TexTools/ViewModels/Viewport3DViewModel.cs
+++ b/FFXIV_TexTools/ViewModels/Viewport3DViewModel.cs
@@ -70,17 +70,11 @@ public class Viewport3DViewModel : BaseViewPortViewModel, INotifyPropertyChanged
 
         public ObservableElement3DCollection Models { get; } = new ObservableElement3DCollection();
 
-        public Viewport3DViewModel()
+        public Viewport3DViewModel() : base()
         {
             Title = "";
             SubTitle = "";
 
-            // Eat exception to not immediately crash in VirtualBox
-            try
-            {
-                EffectsManager = new CustomEffectsManager();
-            } catch { }
-
             Camera = new PerspectiveCamera();
             Camera.CameraInternal.PropertyChanged += CameraInternal_PropertyChanged;
 

From 01afdfbbbd1f8e92e5e2f8f49bbef6fe9c081b14 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Thu, 18 Jul 2024 18:52:14 -0400
Subject: [PATCH 5/7] Colorset square is now Colorset sphere, and fix tiling
 mode.

---
 .../ViewModels/BaseViewPortViewModel.cs       |  1 +
 .../ViewModels/ColorsetEditorViewModel.cs     | 68 +++++++++----------
 .../ViewModels/Viewport3DViewModel.cs         |  2 +-
 .../FileControls/ColorsetFileControl.xaml     |  8 +--
 4 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/FFXIV_TexTools/ViewModels/BaseViewPortViewModel.cs b/FFXIV_TexTools/ViewModels/BaseViewPortViewModel.cs
index e1fb4fbb..a04b6903 100644
--- a/FFXIV_TexTools/ViewModels/BaseViewPortViewModel.cs
+++ b/FFXIV_TexTools/ViewModels/BaseViewPortViewModel.cs
@@ -83,6 +83,7 @@ public BaseViewPortViewModel()
             {
                 Trace.WriteLine(ex);
             }
+            Camera = new PerspectiveCamera();
         }
 
         #region IDisposable Support
diff --git a/FFXIV_TexTools/ViewModels/ColorsetEditorViewModel.cs b/FFXIV_TexTools/ViewModels/ColorsetEditorViewModel.cs
index 920afd16..8bb22832 100644
--- a/FFXIV_TexTools/ViewModels/ColorsetEditorViewModel.cs
+++ b/FFXIV_TexTools/ViewModels/ColorsetEditorViewModel.cs
@@ -24,10 +24,12 @@
 using xivModdingFramework.Textures.FileTypes;
 using Vector3D = System.Windows.Media.Media3D.Vector3D;
 using WinColor = System.Windows.Media.Color;
+using Point3D = System.Windows.Media.Media3D.Point3D;
+using SharpDX.Direct3D11;
 
 namespace FFXIV_TexTools.ViewModels
 {
-    public class ColorsetEditorViewModel : INotifyPropertyChanged, IDisposable
+    public class ColorsetEditorViewModel : BaseViewPortViewModel, INotifyPropertyChanged, IDisposable
     {
         private static XivTex TileTextureNormal;
         private static XivTex TileTextureOrb;
@@ -36,9 +38,6 @@ public class ColorsetEditorViewModel : INotifyPropertyChanged, IDisposable
         private Viewport3DX _viewport;
 
         public ObservableElement3DCollection Models { get; } = new ObservableElement3DCollection();
-        public Camera Camera { get; set; }
-        bool _NeedLights = true;
-        public EffectsManager EffectsManager { get; }
 
         private XivMtrl _mtrl;
         private int RowId;
@@ -78,16 +77,11 @@ private bool LegacyShader
             }
         }
 
-        public ColorsetEditorViewModel(Viewport3DX viewport)
+        public ColorsetEditorViewModel(Viewport3DX viewport) : base()
         {
-
-            // Eat exception to not immediately crash in VirtualBox
-            try
-            {
-                EffectsManager = new DefaultEffectsManager();
-            } catch { }
-            Camera = new PerspectiveCamera();
             _viewport = viewport;
+            Camera.UpDirection = new System.Windows.Media.Media3D.Vector3D(0, 1, 0);
+            Camera.LookAt(new Point3D(0, 0, 0), new Vector3D(-4, 0, 0), 0);
         }
 
 
@@ -97,16 +91,6 @@ public async Task SetMaterial(XivMtrl mtrl, StainingTemplateFile dyeFile) {
             _viewport.BackgroundColor = System.Windows.Media.Colors.Gray;
             _viewport.Background = Brushes.Gray;
 
-            if (_NeedLights) {
-
-
-                _NeedLights = false;
-            }
-
-            _viewport.Camera.UpDirection = new System.Windows.Media.Media3D.Vector3D(0, 1, 0);
-            _viewport.Camera.LookDirection = new System.Windows.Media.Media3D.Vector3D(0, 0, -1);
-            _viewport.Camera.Position = new System.Windows.Media.Media3D.Point3D(0, 0, 3);
-
 
 
             if (TileTextureNormal == null)
@@ -348,6 +332,10 @@ await TextureHelpers.ModifyPixels((offset) =>
                     lmMaterial.DiffuseAlphaMap = MakeTextureModel(diffuseMask);
                     lmMaterial.SpecularColorMap = MakeTextureModel(specularMask);
 
+                    var sampler = HelixToolkit.SharpDX.Core.Shaders.DefaultSamplers.LinearSamplerWrapAni1;
+                    sampler.AddressU = TextureAddressMode.Wrap;
+                    sampler.AddressV = TextureAddressMode.Wrap;
+                    lmMaterial.DiffuseMapSampler = sampler;
                 }
 
                 MeshGeometryModel3D mgm3 = new MeshGeometryModel3D()
@@ -517,21 +505,33 @@ private void AddQuad(MeshBuilder plane, PlaneAxis axis, float offset)
             plane.Normals[uvOffset + 2] = new SharpDX.Vector3(0, 0, 1);
             plane.Normals[uvOffset + 3] = new SharpDX.Vector3(0, 0, 1);
         }
+
+        private bool _UseSphere = true;
         private MeshGeometry3D MakeCube()
         {
-            var plane = new MeshBuilder();
-            plane.CreateTextureCoordinates = true;
-
-            //AddQuad(plane, PlaneAxis.X, 0.5f);
-            //AddQuad(plane, PlaneAxis.X, -0.5f);
-            //AddQuad(plane, PlaneAxis.Y, 0.5f);
-            //AddQuad(plane, PlaneAxis.Y, -0.5f);
-            AddQuad(plane, PlaneAxis.Z, 100.0f);
-            //AddQuad(plane, PlaneAxis.Z, -0.5f);
 
-            plane.ComputeTangents(MeshFaces.Default);
-
-            return plane.ToMeshGeometry3D();
+            if (_UseSphere)
+            {
+                var builder = new MeshBuilder();
+                builder.AddSphere(SharpDX.Vector3.Zero);
+                builder.ComputeTangents(MeshFaces.Default);
+                var mg = builder.ToMesh();
+                return mg;
+            }
+            else
+            {
+                var builder = new MeshBuilder();
+                builder.AddCube();
+                /*AddQuad(builder, PlaneAxis.X, 0.5f);
+                AddQuad(builder, PlaneAxis.X, -0.5f);
+                AddQuad(builder, PlaneAxis.Y, 0.5f);
+                AddQuad(builder, PlaneAxis.Y, -0.5f);
+                AddQuad(builder, PlaneAxis.Z, 0.5f);
+                AddQuad(builder, PlaneAxis.Z, -0.5f);*/
+
+                builder.ComputeTangents(MeshFaces.Default);
+                return builder.ToMeshGeometry3D();
+            }
         }
 
 
diff --git a/FFXIV_TexTools/ViewModels/Viewport3DViewModel.cs b/FFXIV_TexTools/ViewModels/Viewport3DViewModel.cs
index c7a1722b..3a75c512 100644
--- a/FFXIV_TexTools/ViewModels/Viewport3DViewModel.cs
+++ b/FFXIV_TexTools/ViewModels/Viewport3DViewModel.cs
@@ -75,7 +75,6 @@ public Viewport3DViewModel() : base()
             Title = "";
             SubTitle = "";
 
-            Camera = new PerspectiveCamera();
             Camera.CameraInternal.PropertyChanged += CameraInternal_PropertyChanged;
 
             BackgroundColor = Properties.Settings.Default.BG_Color;
@@ -374,6 +373,7 @@ await Application.Current.Dispatcher.InvokeAsync(() =>
                                 DiffuseMapSampler = sampler
                             };
 
+
                             lock (_Materials)
                             {
                                 _Materials.Add(material);
diff --git a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml
index aed50ea9..75193894 100644
--- a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml
+++ b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml
@@ -341,7 +341,7 @@
                         Grid.ColumnSpan="2"
                         EffectsManager="{Binding EffectsManager}"
                         Camera="{Binding Camera}"
-                        ZoomExtentsWhenLoaded="True"
+                        ZoomExtentsWhenLoaded="False"
                         ZoomDistanceLimitNear="0.0001">
                 <hx:Viewport3DX.InputBindings>
                     <KeyBinding Command="hx:ViewportCommands.ZoomExtents" Gesture="Control+E" />
@@ -350,11 +350,11 @@
                     <MouseBinding Command="hx:ViewportCommands.Zoom" Gesture="MiddleClick" />
                     <MouseBinding Command="hx:ViewportCommands.Pan" Gesture="LeftClick" />
                 </hx:Viewport3DX.InputBindings>
-                
+
                 <hx:DirectionalLight3D
-                     Direction="0,0,-1" 
+                     Direction="-1,-1,1" 
                     Color="#AAAAAAAA" IsRendering="True" />
-                
+
                 <hx:GroupModel3D ItemsSource="{Binding Models}"/>
             </hx:Viewport3DX>
             <Canvas Grid.Row="2" Name="AlternateViewportCanvas" Visibility="Hidden" IsHitTestVisible="False"/>

From 882806d71856173a0e31ab3a7786300005731642 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Thu, 18 Jul 2024 19:00:34 -0400
Subject: [PATCH 6/7] ver

---
 FFXIV_TexTools/FFXIV_TexTools.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj
index 905311d9..51aeffde 100644
--- a/FFXIV_TexTools/FFXIV_TexTools.csproj
+++ b/FFXIV_TexTools/FFXIV_TexTools.csproj
@@ -23,9 +23,9 @@
     <Product>FFXIV_TexTools</Product>
     <Copyright>Copyright ©  2024</Copyright>
     
-    <ApplicationVersion>3.0.7.4</ApplicationVersion>
-    <AssemblyVersion>3.0.7.4</AssemblyVersion>
-    <FileVersion>3.0.7.4</FileVersion>
+    <ApplicationVersion>3.0.7.5</ApplicationVersion>
+    <AssemblyVersion>3.0.7.5</AssemblyVersion>
+    <FileVersion>3.0.7.5</FileVersion>
     
     <LangVersion>9.0</LangVersion>
     <UseWPF>true</UseWPF>

From 34b3578756333951a7593863dce304ca07e07c30 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Thu, 18 Jul 2024 19:00:52 -0400
Subject: [PATCH 7/7] Update Framework Reference to Update v3.0.7.5

---
 lib/xivModdingFramework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index 07970c10..6e7239e6 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit 07970c10ba0614f288eb3bbc253af45547b1a0ce
+Subproject commit 6e7239e6712b11d82808e251d788c9c6462ea5d3