Skip to content

Commit

Permalink
Renamed the byteswap functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@BSzili
BSzili committed Aug 2, 2023
1 parent f5d9c7c commit 0f6476f
Show file tree
Hide file tree
Showing 13 changed files with 163 additions and 163 deletions.
12 changes: 6 additions & 6 deletions TheForceEngine/TFE_Archive/gobArchive.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ bool GobArchive::validate(const char *archivePath, s32 minFileCount)
file.close();
return false;
}
header.MASTERX = TFE_Endian::swapLE32(header.MASTERX);
header.MASTERX = TFE_Endian::le32_to_cpu(header.MASTERX);
file.seek(header.MASTERX);
file.readBuffer(&MASTERN, sizeof(long));
MASTERN = TFE_Endian::swapLE32(MASTERN);
MASTERN = TFE_Endian::le32_to_cpu(MASTERN);
file.close();

return MASTERN >= minFileCount;
Expand All @@ -71,17 +71,17 @@ bool GobArchive::open(const char *archivePath)

// Read the directory.
m_file.readBuffer(&m_header, sizeof(GOB_Header_t));
m_header.MASTERX = TFE_Endian::swapLE32(m_header.MASTERX);
m_header.MASTERX = TFE_Endian::le32_to_cpu(m_header.MASTERX);
m_file.seek(m_header.MASTERX);

m_file.readBuffer(&m_fileList.MASTERN, sizeof(u32));
m_fileList.MASTERN = TFE_Endian::swapLE32(m_fileList.MASTERN);
m_fileList.MASTERN = TFE_Endian::le32_to_cpu(m_fileList.MASTERN);
m_fileList.entries = new GOB_Entry_t[m_fileList.MASTERN];
m_file.readBuffer(m_fileList.entries, sizeof(GOB_Entry_t), m_fileList.MASTERN);
for (s32 i = 0; i < m_fileList.MASTERN; i++)
{
m_fileList.entries[i].IX = TFE_Endian::swapLE32(m_fileList.entries[i].IX);
m_fileList.entries[i].LEN = TFE_Endian::swapLE32(m_fileList.entries[i].LEN);
m_fileList.entries[i].IX = TFE_Endian::le32_to_cpu(m_fileList.entries[i].IX);
m_fileList.entries[i].LEN = TFE_Endian::le32_to_cpu(m_fileList.entries[i].LEN);
}

strcpy(m_archivePath, archivePath);
Expand Down
12 changes: 6 additions & 6 deletions TheForceEngine/TFE_Archive/labArchive.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ bool LabArchive::open(const char *archivePath)

// Read the directory.
m_file.readBuffer(&m_header, sizeof(LAB_Header_t));
m_header.version = TFE_Endian::swapLE32(m_header.version);
m_header.fileCount = TFE_Endian::swapLE32(m_header.fileCount);
m_header.stringTableSize = TFE_Endian::swapLE32(m_header.stringTableSize);
m_header.version = TFE_Endian::le32_to_cpu(m_header.version);
m_header.fileCount = TFE_Endian::le32_to_cpu(m_header.fileCount);
m_header.stringTableSize = TFE_Endian::le32_to_cpu(m_header.stringTableSize);
m_stringTable = new char[m_header.stringTableSize + 1];
m_entries = new LAB_Entry_t[m_header.fileCount];

// Read the file entries.
m_file.readBuffer(m_entries, sizeof(LAB_Entry_t), m_header.fileCount);
for (u32 i = 0; i < m_header.fileCount; i++)
{
m_entries[i].nameOffset = TFE_Endian::swapLE32(m_entries[i].nameOffset);
m_entries[i].dataOffset = TFE_Endian::swapLE32(m_entries[i].dataOffset);
m_entries[i].len = TFE_Endian::swapLE32(m_entries[i].len);
m_entries[i].nameOffset = TFE_Endian::le32_to_cpu(m_entries[i].nameOffset);
m_entries[i].dataOffset = TFE_Endian::le32_to_cpu(m_entries[i].dataOffset);
m_entries[i].len = TFE_Endian::le32_to_cpu(m_entries[i].len);
}

// Read string table.
Expand Down
4 changes: 2 additions & 2 deletions TheForceEngine/TFE_Archive/lfdArchive.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ bool LfdArchive::open(const char *archivePath)
// Read the directory.
LFD_Entry_t root, entry;
m_file.readBuffer(&root, sizeof(LFD_Entry_t));
root.LENGTH = TFE_Endian::swapLE32(root.LENGTH);
root.LENGTH = TFE_Endian::le32_to_cpu(root.LENGTH);
m_fileList.MASTERN = root.LENGTH / sizeof(LFD_Entry_t);
m_fileList.entries = new LFD_EntryFinal_t[m_fileList.MASTERN];

s32 IX = sizeof(LFD_Entry_t) + root.LENGTH;
for (s32 i = 0; i < m_fileList.MASTERN; i++)
{
m_file.readBuffer(&entry, sizeof(LFD_Entry_t));
entry.LENGTH = TFE_Endian::swapLE32(entry.LENGTH);
entry.LENGTH = TFE_Endian::le32_to_cpu(entry.LENGTH);

char name[9] = { 0 };
char ext[5] = { 0 };
Expand Down
76 changes: 38 additions & 38 deletions TheForceEngine/TFE_Asset/spriteAsset_Jedi.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,19 @@ namespace TFE_Sprite_Jedi

// Determine ahead of time how much we need to allocate.
WaxFrame* base_frame = (WaxFrame*)data;
base_frame->offsetX = TFE_Endian::swapLE32(base_frame->offsetX);
base_frame->offsetY = TFE_Endian::swapLE32(base_frame->offsetY);
base_frame->flip = TFE_Endian::swapLE32(base_frame->flip);
base_frame->cellOffset = TFE_Endian::swapLE32(base_frame->cellOffset);
base_frame->widthWS = TFE_Endian::swapLE32(base_frame->widthWS);
base_frame->heightWS = TFE_Endian::swapLE32(base_frame->heightWS);
base_frame->offsetX = TFE_Endian::le32_to_cpu(base_frame->offsetX);
base_frame->offsetY = TFE_Endian::le32_to_cpu(base_frame->offsetY);
base_frame->flip = TFE_Endian::le32_to_cpu(base_frame->flip);
base_frame->cellOffset = TFE_Endian::le32_to_cpu(base_frame->cellOffset);
base_frame->widthWS = TFE_Endian::le32_to_cpu(base_frame->widthWS);
base_frame->heightWS = TFE_Endian::le32_to_cpu(base_frame->heightWS);

WaxCell* base_cell = WAX_CellPtr(data, base_frame);
base_cell->sizeX = TFE_Endian::swapLE32(base_cell->sizeX);
base_cell->sizeY = TFE_Endian::swapLE32(base_cell->sizeY);
base_cell->compressed = TFE_Endian::swapLE32(base_cell->compressed);
base_cell->dataSize = TFE_Endian::swapLE32(base_cell->dataSize);
base_cell->columnOffset = TFE_Endian::swapLE32(base_cell->columnOffset);
base_cell->sizeX = TFE_Endian::le32_to_cpu(base_cell->sizeX);
base_cell->sizeY = TFE_Endian::le32_to_cpu(base_cell->sizeY);
base_cell->compressed = TFE_Endian::le32_to_cpu(base_cell->compressed);
base_cell->dataSize = TFE_Endian::le32_to_cpu(base_cell->dataSize);
base_cell->columnOffset = TFE_Endian::le32_to_cpu(base_cell->columnOffset);
const u32 columnSize = base_cell->sizeX * sizeof(u32);

// This is a "load in place" format in the original code.
Expand Down Expand Up @@ -106,7 +106,7 @@ namespace TFE_Sprite_Jedi
u32* columns = (u32*)((u8*)asset + cell->columnOffset);
for (s32 c = 0; c < cell->sizeX; c++)
{
columns[c] = TFE_Endian::swapLE32(columns[c]);
columns[c] = TFE_Endian::le32_to_cpu(columns[c]);
}
}
else
Expand Down Expand Up @@ -230,16 +230,16 @@ namespace TFE_Sprite_Jedi

const u8* data = s_buffer.data();
Wax* srcWax = (Wax*)data;
srcWax->version = TFE_Endian::swapLE32(srcWax->version);
srcWax->animCount = TFE_Endian::swapLE32(srcWax->animCount);
srcWax->frameCount = TFE_Endian::swapLE32(srcWax->frameCount);
srcWax->cellCount = TFE_Endian::swapLE32(srcWax->cellCount);
srcWax->xScale = TFE_Endian::swapLE32(srcWax->xScale);
srcWax->yScale = TFE_Endian::swapLE32(srcWax->yScale);
srcWax->xtraLight = TFE_Endian::swapLE32(srcWax->xtraLight);
srcWax->version = TFE_Endian::le32_to_cpu(srcWax->version);
srcWax->animCount = TFE_Endian::le32_to_cpu(srcWax->animCount);
srcWax->frameCount = TFE_Endian::le32_to_cpu(srcWax->frameCount);
srcWax->cellCount = TFE_Endian::le32_to_cpu(srcWax->cellCount);
srcWax->xScale = TFE_Endian::le32_to_cpu(srcWax->xScale);
srcWax->yScale = TFE_Endian::le32_to_cpu(srcWax->yScale);
srcWax->xtraLight = TFE_Endian::le32_to_cpu(srcWax->xtraLight);
for (s32 animIdx = 0; animIdx < WAX_MAX_ANIM; animIdx++)
{
srcWax->animOffsets[animIdx] = TFE_Endian::swapLE32(srcWax->animOffsets[animIdx]);
srcWax->animOffsets[animIdx] = TFE_Endian::le32_to_cpu(srcWax->animOffsets[animIdx]);
}

// every animation is filled out until the end, so no animations = no wax.
Expand All @@ -262,13 +262,13 @@ namespace TFE_Sprite_Jedi
if (animOffset[animIdx] && std::find(swappedAnims.begin(), swappedAnims.end(), animOffset[animIdx]) == swappedAnims.end())
{
swappedAnims.push_back(animOffset[animIdx]);
anim->worldWidth = TFE_Endian::swapLE32(anim->worldWidth);
anim->worldHeight = TFE_Endian::swapLE32(anim->worldHeight);
anim->frameRate = TFE_Endian::swapLE32(anim->frameRate);
anim->frameCount = TFE_Endian::swapLE32(anim->frameCount);
anim->worldWidth = TFE_Endian::le32_to_cpu(anim->worldWidth);
anim->worldHeight = TFE_Endian::le32_to_cpu(anim->worldHeight);
anim->frameRate = TFE_Endian::le32_to_cpu(anim->frameRate);
anim->frameCount = TFE_Endian::le32_to_cpu(anim->frameCount);
for (s32 v = 0; v < WAX_MAX_VIEWS; v++)
{
anim->viewOffsets[v] = TFE_Endian::swapLE32(anim->viewOffsets[v]);
anim->viewOffsets[v] = TFE_Endian::le32_to_cpu(anim->viewOffsets[v]);
}
}
const s32* viewOffsets = anim->viewOffsets;
Expand All @@ -280,7 +280,7 @@ namespace TFE_Sprite_Jedi
swappedViews.push_back(viewOffsets[v]);
for (s32 f = 0; f < WAX_MAX_FRAMES; f++)
{
view->frameOffsets[f] = TFE_Endian::swapLE32(view->frameOffsets[f]);
view->frameOffsets[f] = TFE_Endian::le32_to_cpu(view->frameOffsets[f]);
}
}
const s32* frameOffset = view->frameOffsets;
Expand All @@ -290,28 +290,28 @@ namespace TFE_Sprite_Jedi
if (frameOffset[f] && std::find(swappedFrames.begin(), swappedFrames.end(), frameOffset[f]) == swappedFrames.end())
{
swappedFrames.push_back(frameOffset[f]);
frame->offsetX = TFE_Endian::swapLE32(frame->offsetX);
frame->offsetY = TFE_Endian::swapLE32(frame->offsetY);
frame->flip = TFE_Endian::swapLE32(frame->flip);
frame->cellOffset = TFE_Endian::swapLE32(frame->cellOffset);
frame->widthWS = TFE_Endian::swapLE32(frame->widthWS);
frame->heightWS = TFE_Endian::swapLE32(frame->heightWS);
frame->offsetX = TFE_Endian::le32_to_cpu(frame->offsetX);
frame->offsetY = TFE_Endian::le32_to_cpu(frame->offsetY);
frame->flip = TFE_Endian::le32_to_cpu(frame->flip);
frame->cellOffset = TFE_Endian::le32_to_cpu(frame->cellOffset);
frame->widthWS = TFE_Endian::le32_to_cpu(frame->widthWS);
frame->heightWS = TFE_Endian::le32_to_cpu(frame->heightWS);
}
WaxCell* cell = frame->cellOffset ? (WaxCell*)(data + frame->cellOffset) : nullptr;
if (frame->cellOffset && std::find(swappedCells.begin(), swappedCells.end(), frame->cellOffset) == swappedCells.end())
{
swappedCells.push_back(frame->cellOffset);
cell->sizeX = TFE_Endian::swapLE32(cell->sizeX);
cell->sizeY = TFE_Endian::swapLE32(cell->sizeY);
cell->compressed = TFE_Endian::swapLE32(cell->compressed);
cell->dataSize = TFE_Endian::swapLE32(cell->dataSize);
cell->columnOffset = TFE_Endian::swapLE32(cell->columnOffset);
cell->sizeX = TFE_Endian::le32_to_cpu(cell->sizeX);
cell->sizeY = TFE_Endian::le32_to_cpu(cell->sizeY);
cell->compressed = TFE_Endian::le32_to_cpu(cell->compressed);
cell->dataSize = TFE_Endian::le32_to_cpu(cell->dataSize);
cell->columnOffset = TFE_Endian::le32_to_cpu(cell->columnOffset);
if (cell->compressed == 1)
{
u32* columns = (u32*)(data + frame->cellOffset + sizeof(WaxCell));
for (s32 c = 0; c < cell->sizeX; c++)
{
columns[c] = TFE_Endian::swapLE32(columns[c]);
columns[c] = TFE_Endian::le32_to_cpu(columns[c]);
}
}
}
Expand Down
20 changes: 10 additions & 10 deletions TheForceEngine/TFE_DarkForces/GameUI/delt.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ namespace TFE_DarkForces
file.close();

s16 frameCount = *((s16*)buffer);
frameCount = TFE_Endian::swapLE16(frameCount);
frameCount = TFE_Endian::le16_to_cpu(frameCount);

const u8* frames = buffer + 2;

Expand All @@ -105,7 +105,7 @@ namespace TFE_DarkForces
for (s32 i = 0; i < frameCount; i++)
{
u32 size = *((u32*)frames);
size = TFE_Endian::swapLE32(size);
size = TFE_Endian::le32_to_cpu(size);
frames += 4;

loadDeltIntoFrame(&outFramePtr[i], frames, size);
Expand Down Expand Up @@ -230,10 +230,10 @@ namespace TFE_DarkForces
void loadDeltIntoFrame(DeltFrame* frame, const u8* buffer, u32 size)
{
DeltHeader header = *((DeltHeader*)buffer);
header.offsetX = TFE_Endian::swapLE16(header.offsetX);
header.offsetY = TFE_Endian::swapLE16(header.offsetY);
header.sizeX = TFE_Endian::swapLE16(header.sizeX);
header.sizeY = TFE_Endian::swapLE16(header.sizeY);
header.offsetX = TFE_Endian::le16_to_cpu(header.offsetX);
header.offsetY = TFE_Endian::le16_to_cpu(header.offsetY);
header.sizeX = TFE_Endian::le16_to_cpu(header.sizeX);
header.sizeY = TFE_Endian::le16_to_cpu(header.sizeY);
header.sizeX++;
header.sizeY++;

Expand Down Expand Up @@ -263,10 +263,10 @@ namespace TFE_DarkForces

data += sizeof(DeltLine);

const s32 startX = TFE_Endian::swapLE16(line->xStart);
const s32 startY = TFE_Endian::swapLE16(line->yStart);
const bool rle = (TFE_Endian::swapLE16(line->sizeAndType) & 1) ? true : false;
s32 pixelCount = (TFE_Endian::swapLE16(line->sizeAndType) >> 1) & 0x3FFF;
const s32 startX = TFE_Endian::le16_to_cpu(line->xStart);
const s32 startY = TFE_Endian::le16_to_cpu(line->yStart);
const bool rle = (TFE_Endian::le16_to_cpu(line->sizeAndType) & 1) ? true : false;
s32 pixelCount = (TFE_Endian::le16_to_cpu(line->sizeAndType) >> 1) & 0x3FFF;

u8* image = frame->texture.image + startX + startY * header.sizeX;
while (pixelCount > 0)
Expand Down
Loading

0 comments on commit 0f6476f

Please sign in to comment.