rosethorn/frostbite
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

texture chunks

Browse source
This commit is contained in:
Ian Brown 2021-03-23 00:05:58 +00:00
parent 1516e0201c
commit 4ce3f37714
5 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CuttownTest/gameData.cpp
View file

@ -44,7 +44,7 @@ void GameData::read(QString rootDir, QString worldName)
gobName = worldName.toUpper() + ".GOB";
QString gobFile = lmpDir + "/" + gobName;
worldGob = new GobFile(gobFile.toStdString(), gameType);
world = WorldReader().readWorld(worldGob, worldName.toLower().toStdString().c_str());
world = WorldReader(gameType).readWorld(worldGob, worldName.toLower().toStdString().c_str());
}
}

2
snowlib/World.cpp
View file

@ -1,6 +1,6 @@
#include "World.h"
World::World()
World::World() : textureChunkOffsets(100*100, 0)
{
topoStartCol = 0;
topoStartRow = 0;

4
snowlib/World.h
View file

@ -60,4 +60,8 @@ public:
// All of the topo patches. This collection owns the patches.
std::vector<TopoPatch*> topoPatches;
// The texture chunk offsets. 2D array with a 100 x 100 dimension.
std::vector<int> textureChunkOffsets;
void setTextureChunkOffset(int x, int y, int addr) { textureChunkOffsets.at(y * 100 + x) = addr; }
};

27
snowlib/WorldReader.cpp
View file

@ -50,6 +50,33 @@ void WorldReader::decodeWorldFile(World* world, const unsigned char* data, int d
int offset68 = DataUtil::getLEInt(data, 0x68);
int worldTexOffsetsOffset = DataUtil::getLEInt(data, 0x6C);
readTextureChunkOffsets(world, data, dataLength, worldTexOffsetsOffset, texMinx, texMiny, texMaxx+1, texMaxy);
}
void WorldReader::readTextureChunkOffsets(World* world, const unsigned char* data, int dataLength, int worldTexOffsetsOffset, int texMinx, int texMiny, int texMaxx, int texMaxy)
{
for (int y = texMiny; y <= texMaxy; ++y)
{
for (int x = texMinx; x <= texMaxx; ++x)
{
int cellOffset = ((y - texMiny) * 100 + x - texMinx) * 8;
// This test is needed to deal with town.world in BGDA which addresses textures outside of the maximum x range.
if (dataLength >= cellOffset + 4)
{
int addr;
if (GameType::CHAMPIONS_RTA == gameType || GameType::JL_HEROES == gameType)
{
// TODO: Figure out what this should really be
addr = 0x800;
}
else
{
addr = DataUtil::getLEInt(data, cellOffset);
}
world->setTextureChunkOffset(x, y, addr);
}
}
}
}
void WorldReader::decodeTopography(World* world, const unsigned char* data, int dataLength)

7
snowlib/WorldReader.h
View file

@ -1,5 +1,7 @@
#pragma once
#include "GameType.h"
class World;
class LmpRepository;
class TopoPatch;
@ -7,10 +9,15 @@ class TopoPatch;
class WorldReader
{
public:
WorldReader(GameType gameType) : gameType(gameType) {}
World* readWorld(LmpRepository* lmpRepository, const char* name);
private:
GameType gameType;
void decodeWorldFile(World* world, const unsigned char* data, int dataLength);
void decodeTopography(World* world, const unsigned char* data, int dataLength);
TopoPatch* readTopoPatch(const unsigned char* data, int offset);
void readTextureChunkOffsets(World* world, const unsigned char* data, int dataLength, int worldTexOffsetsOffset, int texMinx, int texMiny, int texMaxx, int texMaxy);
};