INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-24 13:47:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

ZoneCodeGenerator: Change ContentLoader to use vars for fastfile pointer transfer and change ZoneInputStream API to be able to specify load location to better reflect the way the games do it.

Browse Source
This commit is contained in:
Jan
2019-11-14 14:48:40 +01:00
parent 3839b22f71
commit b7ab2a1aa6
9 changed files with 170 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/ZoneLoading/Zone/Stream/Impl/XBlockInputStream.cpp
View File

@ -4,6 +4,7 @@
#include "Loading/Exception/InvalidOffsetBlockOffsetException.h"
#include <cassert>
#include "Loading/Exception/OutOfBlockBoundsException.h"
XBlockInputStream::XBlockInputStream(std::vector<XBlock*>& blocks, ILoadingStream* stream, const int blockBitCount, const block_t insertBlock) : m_blocks(blocks)
{
@ -93,7 +94,7 @@ void* XBlockInputStream::Alloc(const int align)
return &block->m_buffer[m_block_offsets[block->m_index]];
}
void XBlockInputStream::LoadData(const size_t size)
void XBlockInputStream::LoadData(void* dst, const size_t size)
{
assert(!m_block_stack.empty());
@ -102,17 +103,25 @@ void XBlockInputStream::LoadData(const size_t size)
XBlock* block = m_block_stack.top();
if(m_block_offsets[block->m_index] + size >= block->m_buffer_size)
if(block->m_buffer > dst || block->m_buffer + block->m_buffer_size < dst)
{
throw OutOfBlockBoundsException(block);
}
if(reinterpret_cast<uint8_t*>(dst) + size >= block->m_buffer + block->m_buffer_size)
{
throw BlockOverflowException(block);
}
m_stream->Load(&block->m_buffer[m_block_offsets[block->m_index]], size);
// Theoretically ptr should always be at the current block offset.
assert(dst == &block->m_buffer[m_block_offsets[block->m_index]]);
m_stream->Load(dst, size);
m_block_offsets[block->m_index] += size;
}
void XBlockInputStream::LoadNullTerminated()
void XBlockInputStream::LoadNullTerminated(void* dst)
{
assert(!m_block_stack.empty());
@ -121,8 +130,16 @@ void XBlockInputStream::LoadNullTerminated()
XBlock* block = m_block_stack.top();
if (block->m_buffer > dst || block->m_buffer + block->m_buffer_size < dst)
{
throw OutOfBlockBoundsException(block);
}
// Theoretically ptr should always be at the current block offset.
assert(dst == &block->m_buffer[m_block_offsets[block->m_index]]);
uint8_t byte;
size_t offset = m_block_offsets[block->m_index];
size_t offset = reinterpret_cast<uint8_t*>(dst) - block->m_buffer;
do
{
m_stream->Load(&byte, 1);

5
src/ZoneLoading/Zone/Stream/Impl/XBlockInputStream.h
View File

@ -30,11 +30,12 @@ public:
void* Alloc(int align) override;
void LoadData(size_t size) override;
void LoadNullTerminated() override;
void LoadData(void* dst, size_t size) override;
void LoadNullTerminated(void* dst) override;
void** InsertPointer() override;
void* ConvertOffsetToPointer(const void* offset) override;
void* ConvertOffsetToAlias(const void* offset) override;
};