krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

a bit formatting

Browse source
This commit is contained in:
greye 2012-09-21 09:36:18 +04:00
parent e69880f77e
commit bd94f257bf
2 changed files with 62 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

138
components/esm/loadland.cpp
View file

@ -8,63 +8,57 @@ namespace ESM
void Land::LandData::save(ESMWriter &esm) void Land::LandData::save(ESMWriter &esm)
{ {
// TODO: Make this actually work.
if (mDataTypes & Land::DATA_VNML) { if (mDataTypes & Land::DATA_VNML) {
esm.writeHNT("VNML", mNormals, sizeof(VNML)); esm.writeHNT("VNML", mNormals, sizeof(VNML));
} }
if (mDataTypes & Land::DATA_VHGT) { if (mDataTypes & Land::DATA_VHGT) {
VHGT offsets; VHGT offsets;
offsets.mHeightOffset = mHeights[0] / HEIGHT_SCALE; offsets.mHeightOffset = mHeights[0] / HEIGHT_SCALE;
offsets.mUnknown1 = mUnk1; offsets.mUnk1 = mUnk1;
offsets.mUnknown2 = mUnk2; offsets.mUnk2 = mUnk2;
float prevY = mHeights[0], prevX; float prevY = mHeights[0], prevX;
int number = 0; // avoid multiplication int number = 0; // avoid multiplication
for (int i = 0; i < LAND_SIZE; ++i) { for (int i = 0; i < LAND_SIZE; ++i) {
float diff = (mHeights[number] - prevY) / HEIGHT_SCALE; float diff = (mHeights[number] - prevY) / HEIGHT_SCALE;
offsets.mHeightData[number] =
(diff >= 0) ? (int8_t) (diff + 0.5) : (int8_t) (diff - 0.5);
prevX = prevY = mHeights[number];
++number;
for (int j = 1; j < LAND_SIZE; ++j) {
diff = (mHeights[number] - prevX) / HEIGHT_SCALE;
offsets.mHeightData[number] = offsets.mHeightData[number] =
(diff >= 0) ? (int8_t) (diff + 0.5) : (int8_t) (diff - 0.5); (diff >= 0) ? (int8_t) (diff + 0.5) : (int8_t) (diff - 0.5);
prevX = mHeights[number]; prevX = prevY = mHeights[number];
++number; ++number;
for (int j = 1; j < LAND_SIZE; ++j) {
diff = (mHeights[number] - prevX) / HEIGHT_SCALE;
offsets.mHeightData[number] =
(diff >= 0) ? (int8_t) (diff + 0.5) : (int8_t) (diff - 0.5);
prevX = mHeights[number];
++number;
}
} }
esm.writeHNT("VHGT", offsets, sizeof(VHGT));
} }
esm.writeHNT("VHGT", offsets, sizeof(VHGT));
}
//esm.writeHNT("WNAM", 0, 81);
/* esm.startSubRecord("WNAM");
for (int i = 0; i < 81; i++)
esm.writeT((char)0x80, 1);
esm.endRecord("WNAM");
*/
if (mDataTypes & Land::DATA_WNAM) { if (mDataTypes & Land::DATA_WNAM) {
esm.writeHNT("WNAM", mWnam, 81); esm.writeHNT("WNAM", mWnam, 81);
} }
if (mDataTypes & Land::DATA_VCLR) {
if (mDataTypes & Land::DATA_VCLR)
esm.writeHNT("VCLR", mColours, 3*LAND_NUM_VERTS); esm.writeHNT("VCLR", mColours, 3*LAND_NUM_VERTS);
if (mDataTypes & Land::DATA_VTEX) {
uint16_t vtex[256];
int readPos = 0; //bit ugly, but it works
for ( int y1 = 0; y1 < 4; y1++ )
for ( int x1 = 0; x1 < 4; x1++ )
for ( int y2 = 0; y2 < 4; y2++)
for ( int x2 = 0; x2 < 4; x2++ )
vtex[(y1*4+y2)*16+(x1*4+x2)] = mTextures[readPos++];
esm.writeHNT("VTEX", vtex, 512);
} }
if (mDataTypes & Land::DATA_VTEX) {
static uint16_t vtex[LAND_NUM_TEXTURES];
transposeTextureData(mTextures, vtex);
esm.writeHNT("VTEX", vtex, sizeof(vtex));
}
}
void Land::LandData::transposeTextureData(uint16_t *in, uint16_t *out)
{
int readPos = 0; //bit ugly, but it works
for ( int y1 = 0; y1 < 4; y1++ )
for ( int x1 = 0; x1 < 4; x1++ )
for ( int y2 = 0; y2 < 4; y2++)
for ( int x2 = 0; x2 < 4; x2++ )
out[(y1*4+y2)*16+(x1*4+x2)] = in[readPos++];
} }
Land::Land() Land::Land()
@ -175,56 +169,42 @@ void Land::loadData()
if (mEsm->isNextSub("VNML")) { if (mEsm->isNextSub("VNML")) {
mEsm->getHExact(mLandData->mNormals, sizeof(VNML)); mEsm->getHExact(mLandData->mNormals, sizeof(VNML));
}/* }
if (mEsm->isNextSub("VNML"))
{
mEsm->skipHSubSize(12675);
} */
if (mEsm->isNextSub("VHGT")) { if (mEsm->isNextSub("VHGT")) {
VHGT rawHeights; VHGT rawHeights;
mEsm->getHExact(&rawHeights, sizeof(VHGT)); mEsm->getHExact(&rawHeights, sizeof(VHGT));
float currentHeightOffset = rawHeights.mHeightOffset; float currentHeightOffset = rawHeights.mHeightOffset;
for (int y = 0; y < LAND_SIZE; y++) for (int y = 0; y < LAND_SIZE; y++)
{
currentHeightOffset += rawHeights.mHeightData[y * LAND_SIZE];
mLandData->mHeights[y * LAND_SIZE] = currentHeightOffset * HEIGHT_SCALE;
float tempOffset = currentHeightOffset;
for (int x = 1; x < LAND_SIZE; x++)
{ {
tempOffset += rawHeights.mHeightData[y * LAND_SIZE + x]; currentHeightOffset += rawHeights.mHeightData[y * LAND_SIZE];
mLandData->mHeights[x + y * LAND_SIZE] = tempOffset * HEIGHT_SCALE; mLandData->mHeights[y * LAND_SIZE] = currentHeightOffset * HEIGHT_SCALE;
float tempOffset = currentHeightOffset;
for (int x = 1; x < LAND_SIZE; x++)
{
tempOffset += rawHeights.mHeightData[y * LAND_SIZE + x];
mLandData->mHeights[x + y * LAND_SIZE] = tempOffset * HEIGHT_SCALE;
}
} }
} mLandData->mUnk1 = rawHeights.mUnk1;
mLandData->mUnk1 = rawHeights.mUnknown1; mLandData->mUnk2 = rawHeights.mUnk2;
mLandData->mUnk2 = rawHeights.mUnknown2;
} }
if (mEsm->isNextSub("WNAM")) if (mEsm->isNextSub("WNAM")) {
{
mEsm->getHExact(mLandData->mWnam, 81); mEsm->getHExact(mLandData->mWnam, 81);
} }
if (mEsm->isNextSub("VCLR")) if (mEsm->isNextSub("VCLR")) {
{
mLandData->mUsingColours = true; mLandData->mUsingColours = true;
mEsm->getHExact(&mLandData->mColours, 3*LAND_NUM_VERTS); mEsm->getHExact(&mLandData->mColours, 3*LAND_NUM_VERTS);
}else{ } else {
mLandData->mUsingColours = false; mLandData->mUsingColours = false;
} }
if (mEsm->isNextSub("VTEX")) if (mEsm->isNextSub("VTEX")) {
{ static uint16_t vtex[LAND_NUM_TEXTURES];
//TODO fix magic numbers mEsm->getHExact(&vtex, sizeof(vtex));
uint16_t vtex[256]; LandData::transposeTextureData(vtex, mLandData->mTextures);
mEsm->getHExact(&vtex, 512);
int readPos = 0; //bit ugly, but it works
for ( int y1 = 0; y1 < 4; y1++ )
for ( int x1 = 0; x1 < 4; x1++ )
for ( int y2 = 0; y2 < 4; y2++)
for ( int x2 = 0; x2 < 4; x2++ )
mLandData->mTextures[(y1*4+y2)*16+(x1*4+x2)] = vtex[readPos++];
} }
} }
else else

5
components/esm/loadland.hpp
View file

@ -61,8 +61,8 @@ struct Land : public Record
{ {
float mHeightOffset; float mHeightOffset;
int8_t mHeightData[LAND_NUM_VERTS]; int8_t mHeightData[LAND_NUM_VERTS];
short mUnknown1; short mUnk1;
char mUnknown2; char mUnk2;
}; };
#pragma pack(pop) #pragma pack(pop)
@ -84,6 +84,7 @@ struct Land : public Record
uint8_t mUnk2; uint8_t mUnk2;
void save(ESMWriter &esm); void save(ESMWriter &esm);
static void transposeTextureData(uint16_t *in, uint16_t *out);
}; };
LandData *mLandData; LandData *mLandData;