INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-25 14:17:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: make memory from zone a reference instead of ptr

Browse Source
This commit is contained in:
Jan
2025-05-02 11:42:17 +01:00
parent 9e940a6f53
commit 8b85cadb77
29 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ZoneLoading/Game/IW3/XAssets/gfximage/gfximage_actions.cpp
View File

@ -19,6 +19,6 @@ void Actions_GfxImage::LoadImageData(GfxImageLoadDef* loadDef, GfxImage* image)
{
const size_t loadDefSize = offsetof(IW3::GfxImageLoadDef, data) + loadDef->resourceSize;
image->texture.loadDef = static_cast<GfxImageLoadDef*>(m_zone.GetMemory()->AllocRaw(loadDefSize));
image->texture.loadDef = static_cast<GfxImageLoadDef*>(m_zone.Memory().AllocRaw(loadDefSize));
memcpy(image->texture.loadDef, loadDef, loadDefSize);
}

2
src/ZoneLoading/Game/IW3/XAssets/loadedsound/loadedsound_actions.cpp
View File

@ -14,7 +14,7 @@ void Actions_LoadedSound::SetSoundData(MssSound* sound) const
if (sound->info.data_len > 0)
{
const auto* tempData = sound->data;
sound->data = m_zone.GetMemory()->Alloc<char>(sound->info.data_len);
sound->data = m_zone.Memory().Alloc<char>(sound->info.data_len);
memcpy(sound->data, tempData, sound->info.data_len);
}
else

2
src/ZoneLoading/Game/IW4/XAssets/gfximage/gfximage_actions.cpp
View File

@ -19,6 +19,6 @@ void Actions_GfxImage::LoadImageData(GfxImageLoadDef* loadDef, GfxImage* image)
{
const size_t loadDefSize = offsetof(IW4::GfxImageLoadDef, data) + loadDef->resourceSize;
image->texture.loadDef = static_cast<GfxImageLoadDef*>(m_zone.GetMemory()->AllocRaw(loadDefSize));
image->texture.loadDef = static_cast<GfxImageLoadDef*>(m_zone.Memory().AllocRaw(loadDefSize));
memcpy(image->texture.loadDef, loadDef, loadDefSize);
}

2
src/ZoneLoading/Game/IW4/XAssets/loadedsound/loadedsound_actions.cpp
View File

@ -14,7 +14,7 @@ void Actions_LoadedSound::SetSoundData(MssSound* sound) const
if (sound->info.data_len > 0)
{
const auto* tempData = sound->data;
sound->data = m_zone.GetMemory()->Alloc<char>(sound->info.data_len);
sound->data = m_zone.Memory().Alloc<char>(sound->info.data_len);
memcpy(sound->data, tempData, sound->info.data_len);
}
else

2
src/ZoneLoading/Game/IW4/XAssets/xmodel/xmodel_actions.cpp
View File

@ -13,7 +13,7 @@ void Actions_XModel::SetModelSurfs(XModelLodInfo* lodInfo, XModelSurfs* modelSur
{
if (modelSurfs)
{
lodInfo->modelSurfs = m_zone.GetMemory()->Alloc<XModelSurfs>();
lodInfo->modelSurfs = m_zone.Memory().Alloc<XModelSurfs>();
memcpy(lodInfo->modelSurfs, modelSurfs, sizeof(XModelSurfs));
}
}

2
src/ZoneLoading/Game/IW5/XAssets/clipmap_t/clipmap_t_actions.cpp
View File

@ -12,6 +12,6 @@ Actions_clipMap_t::Actions_clipMap_t(Zone& zone)
void Actions_clipMap_t::ReallocClipInfo(const ClipInfo* clipInfo, clipMap_t* clipMap) const
{
clipMap->pInfo = m_zone.GetMemory()->Alloc<ClipInfo>();
clipMap->pInfo = m_zone.Memory().Alloc<ClipInfo>();
memcpy(clipMap->pInfo, clipInfo, sizeof(ClipInfo));
}

2
src/ZoneLoading/Game/IW5/XAssets/gfximage/gfximage_actions.cpp
View File

@ -19,6 +19,6 @@ void Actions_GfxImage::LoadImageData(GfxImageLoadDef* loadDef, GfxImage* image)
{
const size_t loadDefSize = offsetof(IW5::GfxImageLoadDef, data) + loadDef->resourceSize;
image->texture.loadDef = static_cast<GfxImageLoadDef*>(m_zone.GetMemory()->AllocRaw(loadDefSize));
image->texture.loadDef = static_cast<GfxImageLoadDef*>(m_zone.Memory().AllocRaw(loadDefSize));
memcpy(image->texture.loadDef, loadDef, loadDefSize);
}

2
src/ZoneLoading/Game/IW5/XAssets/loadedsound/loadedsound_actions.cpp
View File

@ -14,7 +14,7 @@ void Actions_LoadedSound::SetSoundData(MssSound* sound) const
if (sound->info.data_len > 0)
{
char* tempData = sound->data;
sound->data = m_zone.GetMemory()->Alloc<char>(sound->info.data_len);
sound->data = m_zone.Memory().Alloc<char>(sound->info.data_len);
memcpy(sound->data, tempData, sound->info.data_len);
}
else

2
src/ZoneLoading/Game/IW5/XAssets/xmodel/xmodel_actions.cpp
View File

@ -13,7 +13,7 @@ void Actions_XModel::SetModelSurfs(XModelLodInfo* lodInfo, XModelSurfs* modelSur
{
if (modelSurfs)
{
lodInfo->modelSurfs = m_zone.GetMemory()->Alloc<XModelSurfs>();
lodInfo->modelSurfs = m_zone.Memory().Alloc<XModelSurfs>();
memcpy(lodInfo->modelSurfs, modelSurfs, sizeof(XModelSurfs));
}
}

2
src/ZoneLoading/Game/T5/XAssets/gfximage/gfximage_actions.cpp
View File

@ -19,6 +19,6 @@ void Actions_GfxImage::LoadImageData(GfxImageLoadDef* loadDef, GfxImage* image)
{
const size_t loadDefSize = offsetof(GfxImageLoadDef, data) + loadDef->resourceSize;
image->texture.loadDef = static_cast<GfxImageLoadDef*>(m_zone.GetMemory()->AllocRaw(loadDefSize));
image->texture.loadDef = static_cast<GfxImageLoadDef*>(m_zone.Memory().AllocRaw(loadDefSize));
memcpy(image->texture.loadDef, loadDef, loadDefSize);
}

2
src/ZoneLoading/Game/T6/XAssets/gfximage/gfximage_actions.cpp
View File

@ -19,6 +19,6 @@ void Actions_GfxImage::LoadImageData(GfxImageLoadDef* loadDef, GfxImage* image)
{
const size_t loadDefSize = offsetof(T6::GfxImageLoadDef, data) + loadDef->resourceSize;
image->texture.loadDef = static_cast<GfxImageLoadDef*>(m_zone.GetMemory()->AllocRaw(loadDefSize));
image->texture.loadDef = static_cast<GfxImageLoadDef*>(m_zone.Memory().AllocRaw(loadDefSize));
memcpy(image->texture.loadDef, loadDef, loadDefSize);
}

4
src/ZoneLoading/Loading/ContentLoaderBase.cpp
View File

@ -5,7 +5,7 @@
ContentLoaderBase::ContentLoaderBase(Zone& zone)
: varXString(nullptr),
m_zone(zone),
m_memory(*zone.GetMemory()),
m_memory(zone.Memory()),
m_stream(nullptr)
{
}
@ -13,7 +13,7 @@ ContentLoaderBase::ContentLoaderBase(Zone& zone)
ContentLoaderBase::ContentLoaderBase(Zone& zone, IZoneInputStream* stream)
: varXString(nullptr),
m_zone(zone),
m_memory(*zone.GetMemory()),
m_memory(zone.Memory()),
m_stream(stream)
{
}

2
src/ZoneLoading/Loading/ZoneLoader.cpp
View File

@ -36,7 +36,7 @@ void ZoneLoader::AddXBlock(std::unique_ptr<XBlock> block)
return b1->m_index < b2->m_index;
});
m_zone->GetMemory()->AddBlock(std::move(block));
m_zone->Memory().AddBlock(std::move(block));
}
void ZoneLoader::AddLoadingStep(std::unique_ptr<ILoadingStep> step)