zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-04-07 12:18:40 +00:00
Code Activity

chore: use namespace for FileUtils

Browse Source
This commit is contained in:
Jan Laupetin
2026-03-05 20:27:47 +01:00
parent 304ebd56a7
commit d469af2328
15 changed files with 103 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ObjCommon/ObjContainer/IPak/IPakTypes.h
View File

@@ -6,12 +6,12 @@
namespace ipak_consts
{
static constexpr uint32_t IPAK_MAGIC = FileUtils::MakeMagic32('K', 'A', 'P', 'I');
static constexpr uint32_t IPAK_MAGIC = utils::MakeMagic32('K', 'A', 'P', 'I');
static constexpr uint32_t IPAK_VERSION = 0x50000;
static constexpr uint32_t IPAK_INDEX_SECTION = 1;
static constexpr uint32_t IPAK_DATA_SECTION = 2;
static constexpr uint32_t IPAK_BRANDING_SECTION = FileUtils::MakeMagic32('M', 'E', 'T', 'A');
static constexpr uint32_t IPAK_BRANDING_SECTION = utils::MakeMagic32('M', 'E', 'T', 'A');
static constexpr size_t IPAK_CHUNK_SIZE = 0x8000;
static constexpr size_t IPAK_CHUNK_COUNT_PER_READ = 0x8;

4
src/ObjCommon/Shader/D3D11ShaderAnalyser.cpp
View File

@@ -41,8 +41,8 @@ namespace d3d11
namespace
{
constexpr auto TAG_RDEF = FileUtils::MakeMagic32('R', 'D', 'E', 'F');
constexpr auto TAG_SHDR = FileUtils::MakeMagic32('S', 'H', 'D', 'R');
constexpr auto TAG_RDEF = utils::MakeMagic32('R', 'D', 'E', 'F');
constexpr auto TAG_SHDR = utils::MakeMagic32('S', 'H', 'D', 'R');
constexpr auto CHUNK_TABLE_OFFSET = 28u;

2
src/ObjCommon/Shader/D3D9ShaderAnalyser.cpp
View File

@@ -222,7 +222,7 @@ namespace d3d9
const char* constantTableComment;
size_t constantTableCommentSize;
if (!FindComment(shaderByteCode, shaderByteCodeSize, FileUtils::MakeMagic32('C', 'T', 'A', 'B'), constantTableComment, constantTableCommentSize))
if (!FindComment(shaderByteCode, shaderByteCodeSize, utils::MakeMagic32('C', 'T', 'A', 'B'), constantTableComment, constantTableCommentSize))
return false;
if (constantTableCommentSize < sizeof(ConstantTable))

2
src/ObjCommon/Sound/FlacDecoder.cpp
View File

@@ -12,7 +12,7 @@
namespace
{
constexpr auto FLAC_MAGIC = FileUtils::MakeMagic32('f', 'L', 'a', 'C');
constexpr auto FLAC_MAGIC = utils::MakeMagic32('f', 'L', 'a', 'C');
enum class MetaDataBlockType : unsigned
{

9
src/ObjCommon/Sound/WavTypes.h
View File

@@ -1,12 +1,13 @@
#pragma once
#include "Utils/FileUtils.h"
#include <cstdint>
constexpr uint32_t WAV_WAVE_ID = FileUtils::MakeMagic32('W', 'A', 'V', 'E');
constexpr uint32_t WAV_CHUNK_ID_RIFF = FileUtils::MakeMagic32('R', 'I', 'F', 'F');
constexpr uint32_t WAV_CHUNK_ID_FMT = FileUtils::MakeMagic32('f', 'm', 't', ' ');
constexpr uint32_t WAV_CHUNK_ID_DATA = FileUtils::MakeMagic32('d', 'a', 't', 'a');
constexpr uint32_t WAV_WAVE_ID = utils::MakeMagic32('W', 'A', 'V', 'E');
constexpr uint32_t WAV_CHUNK_ID_RIFF = utils::MakeMagic32('R', 'I', 'F', 'F');
constexpr uint32_t WAV_CHUNK_ID_FMT = utils::MakeMagic32('f', 'm', 't', ' ');
constexpr uint32_t WAV_CHUNK_ID_DATA = utils::MakeMagic32('d', 'a', 't', 'a');
struct WavChunkHeader
{

6
src/ObjCommon/XModel/Gltf/GltfConstants.h
View File

@@ -7,12 +7,12 @@
namespace gltf
{
constexpr uint32_t GLTF_MAGIC = FileUtils::MakeMagic32('g', 'l', 'T', 'F');
constexpr uint32_t GLTF_MAGIC = utils::MakeMagic32('g', 'l', 'T', 'F');
constexpr uint32_t GLTF_VERSION = 2u;
constexpr auto GLTF_VERSION_STRING = "2.0";
constexpr uint32_t CHUNK_MAGIC_JSON = FileUtils::MakeMagic32('J', 'S', 'O', 'N');
constexpr uint32_t CHUNK_MAGIC_BIN = FileUtils::MakeMagic32('B', 'I', 'N', '\x00');
constexpr uint32_t CHUNK_MAGIC_JSON = utils::MakeMagic32('J', 'S', 'O', 'N');
constexpr uint32_t CHUNK_MAGIC_BIN = utils::MakeMagic32('B', 'I', 'N', '\x00');
constexpr auto GLTF_LENGTH_OFFSET = 8u;
constexpr auto GLTF_JSON_CHUNK_LENGTH_OFFSET = 12u;