ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-01-03 14:23:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some formatting and naming changes, splitting files and some minor improvements.

Browse source
This commit is contained in:
Ottermandias 2023-02-23 14:48:46 +01:00
parent 1e471551d4
commit a2b62a8b6a
13 changed files with 928 additions and 997 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Penumbra/UI/Classes/ModEditWindow.FileEditor.cs
View file

@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Numerics;
using System.Reflection;
using Dalamud.Interface;
using Dalamud.Interface.ImGuiFileDialog;
using ImGuiNET;
@ -11,7 +11,6 @@ using OtterGui.Raii;
using Penumbra.GameData.Files;
using Penumbra.Mods;
using Penumbra.String.Classes;
using SixLabors.ImageSharp.PixelFormats;
namespace Penumbra.UI.Classes;
@ -176,9 +175,7 @@ public partial class ModEditWindow
}
private static T? DefaultParseFile( byte[] bytes )
{
return Activator.CreateInstance( typeof( T ), bytes ) as T;
}
=> Activator.CreateInstance( typeof( T ), BindingFlags.CreateInstance | BindingFlags.OptionalParamBinding, bytes ) as T;
private void UpdateCurrentFile( Mod.Editor.FileRegistry path )
{

1
Penumbra/UI/Classes/ModEditWindow.Materials.cs
View file

@ -11,6 +11,7 @@ using Dalamud.Interface.Internal.Notifications;
using ImGuiNET;
using Lumina.Data.Parsing;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Raii;
using Penumbra.GameData.Files;
using Penumbra.String.Classes;

9
Penumbra/UI/Classes/ModEditWindow.ShaderPackages.cs
View file

@ -10,6 +10,7 @@ using ImGuiNET;
using Lumina.Misc;
using OtterGui.Raii;
using OtterGui;
using OtterGui.Classes;
using Penumbra.GameData.Data;
using Penumbra.GameData.Files;
using Penumbra.Util;
@ -80,8 +81,8 @@ public partial class ModEditWindow
{
var extension = file.DirectXVersion switch
{
ShpkFile.DXVersion.DirectX9 => ".cso",
ShpkFile.DXVersion.DirectX11 => ".dxbc",
ShpkFile.DxVersion.DirectX9 => ".cso",
ShpkFile.DxVersion.DirectX11 => ".dxbc",
_ => throw new NotImplementedException(),
};
var defaultName = new string( objectName.Where( char.IsUpper ).ToArray() ).ToLower() + idx.ToString();
@ -148,7 +149,7 @@ public partial class ModEditWindow
ret |= DrawShaderPackageResourceArray( "Constant Buffers", "slot", true, shader.Constants, true );
ret |= DrawShaderPackageResourceArray( "Samplers", "slot", false, shader.Samplers, true );
ret |= DrawShaderPackageResourceArray( "Unordered Access Views", "slot", true, shader.UAVs, true );
ret |= DrawShaderPackageResourceArray( "Unordered Access Views", "slot", true, shader.Uavs, true );
if( shader.AdditionalHeader.Length > 0 )
{
@ -506,7 +507,7 @@ public partial class ModEditWindow
ret |= DrawShaderPackageResourceArray( "Constant Buffers", "type", true, file.Constants, disabled );
ret |= DrawShaderPackageResourceArray( "Samplers", "type", false, file.Samplers, disabled );
ret |= DrawShaderPackageResourceArray( "Unordered Access Views", "type", false, file.UAVs, disabled );
ret |= DrawShaderPackageResourceArray( "Unordered Access Views", "type", false, file.Uavs, disabled );
static bool DrawKeyArray( string arrayName, bool withId, ShpkFile.Key[] keys, bool _ )
{