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

Imc Fixes.

Browse source
This commit is contained in:
Ottermandias 2022-03-28 15:54:18 +02:00
parent ac70f8db89
commit 7915d516e2
4 changed files with 112 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Penumbra/Meta/Files/ImcFile.cs
View file

@ -6,6 +6,7 @@ using Newtonsoft.Json;
using Penumbra.GameData.ByteString;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Util;
using Penumbra.Interop;
using Penumbra.Interop.Structs;
namespace Penumbra.Meta.Files;
@ -68,7 +69,7 @@ public unsafe class ImcFile : MetaBaseFile
public readonly Utf8GamePath Path;
public readonly int NumParts;
public bool ChangesSinceLoad = true;
public bool ChangesSinceLoad = false;
public ReadOnlySpan< ImcEntry > Span
=> new(( ImcEntry* )( Data + PreambleSize ), ( Length - PreambleSize ) / sizeof( ImcEntry ));
@ -79,17 +80,6 @@ public unsafe class ImcFile : MetaBaseFile
private static ushort PartMask( byte* data )
=> *( ushort* )( data + 2 );
private static ImcEntry* DefaultPartPtr( byte* data, int partIdx )
{
var flag = 1 << partIdx;
if( ( PartMask( data ) & flag ) == 0 )
{
return null;
}
return ( ImcEntry* )( data + PreambleSize ) + partIdx;
}
private static ImcEntry* VariantPtr( byte* data, int partIdx, int variantIdx )
{
var flag = 1 << partIdx;
@ -140,6 +130,7 @@ public unsafe class ImcFile : MetaBaseFile
var newLength = ( ( ( ActualLength - 1 ) >> 7 ) + 1 ) << 7;
PluginLog.Verbose( "Resized IMC {Path} from {Length} to {NewLength}.", Path, Length, newLength );
ResizeResources( newLength );
ChangesSinceLoad = true;
}
var defaultPtr = ( ImcEntry* )( Data + PreambleSize );
@ -173,8 +164,7 @@ public unsafe class ImcFile : MetaBaseFile
return false;
}
*variantPtr = entry;
ChangesSinceLoad = true;
*variantPtr = entry;
return true;
}
@ -187,8 +177,6 @@ public unsafe class ImcFile : MetaBaseFile
Functions.MemCpyUnchecked( Data, ptr, file.Data.Length );
Functions.MemSet( Data + file.Data.Length, 0, Length - file.Data.Length );
}
ChangesSinceLoad = true;
}
public ImcFile( Utf8GamePath path )
@ -226,7 +214,7 @@ public unsafe class ImcFile : MetaBaseFile
}
}
public void Replace( ResourceHandle* resource )
public void Replace( ResourceHandle* resource, bool firstTime )
{
var (data, length) = resource->GetData();
if( data == IntPtr.Zero )
@ -234,18 +222,10 @@ public unsafe class ImcFile : MetaBaseFile
return;
}
var requiredLength = ActualLength;
resource->SetData( ( IntPtr )Data, Length );
if( length >= requiredLength )
if( firstTime )
{
Functions.MemCpyUnchecked( ( void* )data, Data, requiredLength );
Functions.MemSet( ( byte* )data + requiredLength, 0, length - requiredLength );
return;
Penumbra.MetaFileManager.AddImcFile( resource, data, length );
}
MemoryHelper.GameFree( ref data, ( ulong )length );
var file = ( byte* )MemoryHelper.GameAllocateDefault( ( ulong )requiredLength );
Functions.MemCpyUnchecked( file, Data, requiredLength );
resource->SetData( ( IntPtr )file, requiredLength );
}
}

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

@ -24,7 +24,7 @@ public unsafe class MetaBaseFile : IDisposable
protected void AllocateData( int length )
{
Length = length;
Data = ( byte* )MemoryHelper.GameAllocateDefault( ( ulong )length );
Data = ( byte* )Penumbra.MetaFileManager.AllocateFileMemory( length );
if( length > 0 )
{
GC.AddMemoryPressure( length );
@ -53,7 +53,7 @@ public unsafe class MetaBaseFile : IDisposable
return;
}
var data = ( byte* )MemoryHelper.GameAllocateDefault( ( ulong )newLength );
var data = ( byte* )Penumbra.MetaFileManager.AllocateFileMemory( ( ulong )newLength );
if( newLength > Length )
{
Functions.MemCpyUnchecked( data, Data, Length );