zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-05-16 23:11:42 +00:00
Code Activity

Remove un-needed constants and switch to parsing name by null character.

Browse Source
This commit is contained in:
njohnson
2026-05-11 14:54:10 -04:00
committed by Jan Laupetin
parent d1b74c7230
commit 4208bab758
8 changed files with 19 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/Game/IW3/LightDef/LightDefLoaderIW3.cpp
+3 -10
View File
@@ -13,8 +13,6 @@ using namespace IW3;
namespace namespace
{ {
constexpr auto MAX_IMAGE_NAME_SIZE = 0x800;
class LoaderLightDef final : public AssetCreator<AssetLightDef> class LoaderLightDef final : public AssetCreator<AssetLightDef>
{ {
public: public:
@@ -31,23 +29,18 @@ namespace
if (!file.IsOpen()) if (!file.IsOpen())
return AssetCreationResult::NoAction(); return AssetCreationResult::NoAction();
const auto imageNameSize = file.m_length - sizeof(char) - sizeof(char);
if (imageNameSize < 0 || imageNameSize > MAX_IMAGE_NAME_SIZE)
return AssetCreationResult::Failure();
auto* lightDef = m_memory.Alloc<GfxLightDef>(); auto* lightDef = m_memory.Alloc<GfxLightDef>();
lightDef->name = m_memory.Dup(assetName.c_str()); lightDef->name = m_memory.Dup(assetName.c_str());
context.GetZoneAssetCreationState<LightDefAssetCreationState>().SetLightDefLookupStart(lightDef, context); context.GetZoneAssetCreationState<LightDefAssetCreationState>().SetLightDefLookupStart(lightDef, context);
AssetRegistration<AssetLightDef> registration(assetName, lightDef); AssetRegistration<AssetLightDef> registration(assetName, lightDef);
std::string imageName(static_cast<size_t>(imageNameSize), '\0'); std::string imageName;
int8_t samplerState; int8_t samplerState;
int8_t lmapLookupStart; int8_t lmapLookupStart;
file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t)); file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t));
file.m_stream->read(&imageName[0], static_cast<size_t>(imageNameSize)); std::getline(*file.m_stream, imageName, '\0');
auto* imageDependency = context.LoadDependency<AssetImage>(imageName); auto* imageDependency = context.LoadDependency<AssetImage>(imageName);
if (!imageDependency) if (!imageDependency)
src/ObjLoading/Game/IW4/LightDef/LightDefAssetCreationStateIW4.cpp
+5
View File
@@ -4,6 +4,11 @@
using namespace IW4; using namespace IW4;
namespace
{
constexpr auto MAX_LMAP_USAGE = 512;
};
LightDefAssetCreationState::LightDefAssetCreationState() LightDefAssetCreationState::LightDefAssetCreationState()
: m_lmap_pixels_used_for_falloff(0) : m_lmap_pixels_used_for_falloff(0)
{ {
src/ObjLoading/Game/IW4/LightDef/LightDefAssetCreationStateIW4.h
-2
View File
@@ -6,8 +6,6 @@
namespace IW4 namespace IW4
{ {
constexpr auto MAX_LMAP_USAGE = 512;
class LightDefAssetCreationState : public IZoneAssetCreationState class LightDefAssetCreationState : public IZoneAssetCreationState
{ {
public: public:
src/ObjLoading/Game/IW4/LightDef/LightDefLoaderIW4.cpp
+2 -10
View File
@@ -13,8 +13,6 @@ using namespace IW4;
namespace namespace
{ {
constexpr auto MAX_IMAGE_NAME_SIZE = 0x800;
class LoaderLightDef final : public AssetCreator<AssetLightDef> class LoaderLightDef final : public AssetCreator<AssetLightDef>
{ {
public: public:
@@ -31,10 +29,6 @@ namespace
if (!file.IsOpen()) if (!file.IsOpen())
return AssetCreationResult::NoAction(); return AssetCreationResult::NoAction();
const auto imageNameSize = file.m_length - sizeof(char) - sizeof(char);
if (imageNameSize < 0 || imageNameSize > MAX_IMAGE_NAME_SIZE)
return AssetCreationResult::Failure();
auto* lightDef = m_memory.Alloc<GfxLightDef>(); auto* lightDef = m_memory.Alloc<GfxLightDef>();
lightDef->name = m_memory.Dup(assetName.c_str()); lightDef->name = m_memory.Dup(assetName.c_str());
@@ -42,13 +36,11 @@ namespace
AssetRegistration<AssetLightDef> registration(assetName, lightDef); AssetRegistration<AssetLightDef> registration(assetName, lightDef);
std::string imageName(static_cast<size_t>(imageNameSize), '\0'); std::string imageName;
int8_t samplerState; int8_t samplerState;
int8_t lmapLookupStart; int8_t lmapLookupStart;
file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t)); file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t));
file.m_stream->read(&imageName[0], static_cast<size_t>(imageNameSize)); std::getline(*file.m_stream, imageName, '\0');
file.m_stream->read(reinterpret_cast<char*>(&lmapLookupStart), sizeof(int8_t));
auto* imageDependency = context.LoadDependency<AssetImage>(imageName); auto* imageDependency = context.LoadDependency<AssetImage>(imageName);
if (!imageDependency) if (!imageDependency)
src/ObjLoading/Game/IW5/LightDef/LightDefAssetCreationStateIW5.cpp
+5
View File
@@ -4,6 +4,11 @@
using namespace IW5; using namespace IW5;
namespace
{
constexpr auto MAX_LMAP_USAGE = 512;
};
LightDefAssetCreationState::LightDefAssetCreationState() LightDefAssetCreationState::LightDefAssetCreationState()
: m_lmap_pixels_used_for_falloff(0) : m_lmap_pixels_used_for_falloff(0)
{ {
src/ObjLoading/Game/IW5/LightDef/LightDefAssetCreationStateIW5.h
-2
View File
@@ -6,8 +6,6 @@
namespace IW5 namespace IW5
{ {
constexpr auto MAX_LMAP_USAGE = 512;
class LightDefAssetCreationState : public IZoneAssetCreationState class LightDefAssetCreationState : public IZoneAssetCreationState
{ {
public: public:
src/ObjLoading/Game/T5/LightDef/LightDefLoaderT5.cpp
+2 -10
View File
@@ -12,8 +12,6 @@ using namespace T5;
namespace namespace
{ {
constexpr auto MAX_IMAGE_NAME_SIZE = 0x800;
class LoaderLightDef final : public AssetCreator<AssetLightDef> class LoaderLightDef final : public AssetCreator<AssetLightDef>
{ {
public: public:
@@ -30,22 +28,16 @@ namespace
if (!file.IsOpen()) if (!file.IsOpen())
return AssetCreationResult::NoAction(); return AssetCreationResult::NoAction();
const auto imageNameSize = file.m_length - sizeof(char) - sizeof(char);
if (imageNameSize < 0 || imageNameSize > MAX_IMAGE_NAME_SIZE)
return AssetCreationResult::Failure();
auto* lightDef = m_memory.Alloc<GfxLightDef>(); auto* lightDef = m_memory.Alloc<GfxLightDef>();
lightDef->name = m_memory.Dup(assetName.c_str()); lightDef->name = m_memory.Dup(assetName.c_str());
AssetRegistration<AssetLightDef> registration(assetName, lightDef); AssetRegistration<AssetLightDef> registration(assetName, lightDef);
std::string imageName(static_cast<size_t>(imageNameSize), '\0'); std::string attenuationName;
int8_t samplerState; int8_t samplerState;
int8_t lmapLookupStart; int8_t lmapLookupStart;
file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t)); file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t));
file.m_stream->read(&imageName[0], static_cast<size_t>(imageNameSize)); std::getline(*file.m_stream, attenuationName, '\0');
file.m_stream->read(reinterpret_cast<char*>(&lmapLookupStart), sizeof(int8_t));
auto* imageDependency = context.LoadDependency<AssetImage>(imageName); auto* imageDependency = context.LoadDependency<AssetImage>(imageName);
if (!imageDependency) if (!imageDependency)
src/ObjLoading/Game/T6/LightDef/LightDefLoaderT6.cpp
+2 -10
View File
@@ -12,8 +12,6 @@ using namespace T6;
namespace namespace
{ {
constexpr auto MAX_IMAGE_NAME_SIZE = 0x800;
class LoaderLightDef final : public AssetCreator<AssetLightDef> class LoaderLightDef final : public AssetCreator<AssetLightDef>
{ {
public: public:
@@ -30,22 +28,16 @@ namespace
if (!file.IsOpen()) if (!file.IsOpen())
return AssetCreationResult::NoAction(); return AssetCreationResult::NoAction();
const auto imageNameSize = file.m_length - sizeof(char) - sizeof(char);
if (imageNameSize < 0 || imageNameSize > MAX_IMAGE_NAME_SIZE)
return AssetCreationResult::Failure();
auto* lightDef = m_memory.Alloc<GfxLightDef>(); auto* lightDef = m_memory.Alloc<GfxLightDef>();
lightDef->name = m_memory.Dup(assetName.c_str()); lightDef->name = m_memory.Dup(assetName.c_str());
AssetRegistration<AssetLightDef> registration(assetName, lightDef); AssetRegistration<AssetLightDef> registration(assetName, lightDef);
std::string imageName(static_cast<size_t>(imageNameSize), '\0'); std::string attenuationName;
int8_t samplerState; int8_t samplerState;
int8_t lmapLookupStart; int8_t lmapLookupStart;
file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t)); file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t));
file.m_stream->read(&imageName[0], static_cast<size_t>(imageNameSize)); std::getline(*file.m_stream, attenuationName, '\0');
file.m_stream->read(reinterpret_cast<char*>(&lmapLookupStart), sizeof(int8_t));
auto* imageDependency = context.LoadDependency<AssetImage>(imageName); auto* imageDependency = context.LoadDependency<AssetImage>(imageName);
if (!imageDependency) if (!imageDependency)