Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2025-03-06 14:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

The model3 shares vertices between polygons. But it also seems to do this for polygons with different textures. This means the texture coordinate for potentially different sizes textures is shared. Currently this was broken leading to some corrupted looking textures. The fix is to simply cache the old texture coordinates, and recalculate the normalised coordinates in the new texture coordinate space.

Browse source
This commit is contained in:
Ian Curtis 2016-12-06 14:39:46 +00:00
parent 10a5d2c0e1
commit da8b63b44b
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Src/Graphics/New3D/New3D.cpp
View file

@ -1,5 +1,4 @@
#include "New3D.h"
#include "PolyHeader.h"
#include "Texture.h"
#include "Vec.h"
#include <cmath>
@ -985,6 +984,7 @@ void CNew3D::SetMeshValues(SortingMesh *currentMesh, PolyHeader &ph)
void CNew3D::CacheModel(Model *m, const UINT32 *data)
{
Vertex prev[4];
UINT16 prevTexCoords[4][2];
PolyHeader ph;
int numPolys = 0;
UINT64 lastHash = -1;
@ -1002,7 +1002,7 @@ void CNew3D::CacheModel(Model *m, const UINT32 *data)
do {
R3DPoly p; // current polygon
GLfloat uvScale;
float uvScale;
int i, j;
if (ph.header[6] == 0) {
@ -1034,8 +1034,6 @@ void CNew3D::CacheModel(Model *m, const UINT32 *data)
currentMesh = &sMap[hash];
}
lastHash = hash;
// Obtain basic polygon parameters
p.number = ph.NumVerts();
uvScale = ph.UVScale();
@ -1050,10 +1048,20 @@ void CNew3D::CacheModel(Model *m, const UINT32 *data)
if (ph.SharedVertex(i))
{
p.v[j] = prev[i];
++j;
//check if we need to recalc tex coords - will only happen if tex tiles are different + sharing vertices
if (hash != lastHash) {
if (currentMesh->textured) {
Texture::GetCoordinates(currentMesh->width, currentMesh->height, prevTexCoords[i][0], prevTexCoords[i][1], uvScale, p.v[j].texcoords[0], p.v[j].texcoords[1]);
}
}
j++;
}
}
lastHash = hash;
// copy face attributes
if ((ph.header[1] & 2) == 0) {
@ -1132,6 +1140,10 @@ void CNew3D::CacheModel(Model *m, const UINT32 *data)
p.v[j].texcoords[0] = texU;
p.v[j].texcoords[1] = texV;
//cache un-normalised tex coordinates
prevTexCoords[j][0] = (UINT16)(it >> 16);
prevTexCoords[j][1] = (UINT16)(it & 0xFFFF);
vData += 4;
}

1
Src/Graphics/New3D/New3D.h
View file

@ -40,6 +40,7 @@
#include "Plane.h"
#include "Vec.h"
#include "R3DScrollFog.h"
#include "PolyHeader.h"
namespace New3D {