ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-02-21 15:27:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes.

Browse source
This commit is contained in:
Ottermandias 2022-03-16 17:12:31 +01:00
parent 8d2e84eecf
commit 581b91b337
13 changed files with 123 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra/Meta/Files/CmpFile.cs
View file

@ -39,7 +39,7 @@ public sealed unsafe class CmpFile : MetaBaseFile
public static float GetDefault( SubRace subRace, RspAttribute attribute )
{
var data = ( byte* )Penumbra.CharacterUtility.DefaultResources[ CharacterUtility.HumanCmpIdx ].Address;
var data = ( byte* )Penumbra.CharacterUtility.DefaultResource( CharacterUtility.HumanCmpIdx ).Address;
return *( float* )( data + RacialScalingStart + ToRspIndex( subRace ) * RspEntry.ByteSize + ( int )attribute * 4 );
}

52
Penumbra/Meta/Files/EstFile.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Runtime.InteropServices;
using System.Windows.Forms;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Util;
using Penumbra.Meta.Manipulations;
@ -15,7 +16,7 @@ public sealed unsafe class EstFile : MetaBaseFile
{
private const ushort EntryDescSize = 4;
private const ushort EntrySize = 2;
private const int IncreaseSize = 100;
private const int IncreaseSize = 512;
public int Count
=> *( int* )Data;
@ -52,58 +53,57 @@ public sealed unsafe class EstFile : MetaBaseFile
{
var data = Data;
var length = Length;
AllocateData( length + IncreaseSize * ( EntryDescSize + EntrySize ) );
AllocateData( length + IncreaseSize );
Functions.MemCpyUnchecked( Data, data, length );
Functions.MemSet( Data + length, 0, IncreaseSize * ( EntryDescSize + EntrySize ) );
Functions.MemSet( Data + length, 0, IncreaseSize );
GC.RemoveMemoryPressure( length );
Marshal.FreeHGlobal( ( IntPtr )data );
}
var control = ( uint* )( Data + 4 );
var entries = ( ushort* )( Data + 4 * ( Count + 1 ) );
var control = ( Info* )( Data + 4 );
var entries = ( ushort* )( control + Count );
for( var i = Count; i > idx; --i )
for( var i = Count - 1; i >= idx; --i )
{
*( entries + i + 2 ) = entries[ i - 1 ];
entries[ i + 3 ] = entries[ i ];
}
entries[ idx + 2 ] = skeletonId;
for( var i = idx - 1; i >= 0; --i )
{
*( entries + i + 2 ) = entries[ i ];
entries[ i + 2 ] = entries[ i ];
}
for( var i = Count; i > idx; --i )
for( var i = Count - 1; i >= idx; --i )
{
*( control + i ) = control[ i - 1 ];
control[ i + 1 ] = control[ i ];
}
control[ idx ] = new Info( genderRace, setId );
*( int* )Data = Count + 1;
*( ushort* )control = setId;
*( ( ushort* )control + 1 ) = ( ushort )genderRace;
control[ idx ] = skeletonId;
}
private void RemoveEntry( int idx )
{
var entries = ( ushort* )( Data + 4 * Count );
var control = ( uint* )( Data + 4 );
*( int* )Data = Count - 1;
var count = Count;
var control = ( Info* )( Data + 4 );
var entries = ( ushort* )( control + Count );
for( var i = idx; i < count; ++i )
for( var i = idx; i < Count; ++i )
{
control[ i ] = control[ i + 1 ];
}
for( var i = 0; i < count; ++i )
for( var i = 0; i < Count; ++i )
{
entries[ i ] = entries[ i + 1 ];
entries[ i - 2 ] = entries[ i + 1 ];
}
entries[ count ] = 0;
entries[ count + 1 ] = 0;
entries[ count + 2 ] = 0;
entries[ Count - 3 ] = 0;
entries[ Count - 2 ] = 0;
entries[ Count - 1 ] = 0;
*( int* )Data = Count - 1;
}
[StructLayout( LayoutKind.Sequential, Size = 4 )]
@ -179,7 +179,7 @@ public sealed unsafe class EstFile : MetaBaseFile
: base( ( int )estType )
{
var length = DefaultData.Length;
AllocateData( length + IncreaseSize * ( EntryDescSize + EntrySize ) );
AllocateData( length + IncreaseSize );
Reset();
}
@ -188,7 +188,7 @@ public sealed unsafe class EstFile : MetaBaseFile
public static ushort GetDefault( EstManipulation.EstType estType, GenderRace genderRace, ushort setId )
{
var data = ( byte* )Penumbra.CharacterUtility.DefaultResources[ ( int )estType ].Address;
var data = ( byte* )Penumbra.CharacterUtility.DefaultResource( ( int )estType ).Address;
var count = *( int* )data;
var span = new ReadOnlySpan< Info >( data + 4, count );
var (idx, found) = FindEntry( span, genderRace, setId );

10
Penumbra/Meta/Files/MetaBaseFile.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Runtime.InteropServices;
using Dalamud.Memory;
namespace Penumbra.Meta.Files;
@ -14,17 +13,18 @@ public unsafe class MetaBaseFile : IDisposable
=> Index = idx;
protected (IntPtr Data, int Length) DefaultData
=> Penumbra.CharacterUtility.DefaultResources[ Index ];
=> Penumbra.CharacterUtility.DefaultResource( Index );
// Reset to default values.
public virtual void Reset()
{}
{ }
// Obtain memory.
protected void AllocateData( int length )
{
Length = length;
Data = ( byte* )MemoryHelper.GameAllocateDefault( ( ulong )length ); ;
Data = ( byte* )MemoryHelper.GameAllocateDefault( ( ulong )length );
;
GC.AddMemoryPressure( length );
}
@ -32,7 +32,7 @@ public unsafe class MetaBaseFile : IDisposable
protected void ReleaseUnmanagedResources()
{
var ptr = ( IntPtr )Data;
MemoryHelper.GameFree( ref ptr, (ulong) Length );
MemoryHelper.GameFree( ref ptr, ( ulong )Length );
GC.RemoveMemoryPressure( Length );
Length = 0;
Data = null;