Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2025-04-10 19:15:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix model normals, add code for fixed shading, as of yet flag to turn it on is unknown

Browse source
This commit is contained in:
Ian Curtis 2016-04-26 09:06:48 +00:00
parent b730fc466c
commit 3e8439c09c
3 changed files with 5 additions and 11 deletions

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

@ -896,9 +896,9 @@ void CNew3D::CacheModel(Model *m, const UINT32 *data)
p.v[j].pos[1] = (GLfloat)(((INT32)iy) >> 8) * m_vertexFactor; p.v[j].pos[1] = (GLfloat)(((INT32)iy) >> 8) * m_vertexFactor;
p.v[j].pos[2] = (GLfloat)(((INT32)iz) >> 8) * m_vertexFactor; p.v[j].pos[2] = (GLfloat)(((INT32)iz) >> 8) * m_vertexFactor;
p.v[j].normal[0] = p.faceNormal[0] + (GLfloat)(INT8)(ix & 0xFF); // vertex normals are offset from polygon normal - we can normalise them in the shader p.v[j].normal[0] = (INT8)(ix & 0xFF) / 128.f;
p.v[j].normal[1] = p.faceNormal[1] + (GLfloat)(INT8)(iy & 0xFF); p.v[j].normal[1] = (INT8)(iy & 0xFF) / 128.f;
p.v[j].normal[2] = p.faceNormal[2] + (GLfloat)(INT8)(iz & 0xFF); p.v[j].normal[2] = (INT8)(iz & 0xFF) / 128.f;
if ((ph.header[1] & 2) == 0) { if ((ph.header[1] & 2) == 0) {
UINT32 colorIdx = ((ph.header[4] >> 8) & 0x7FF); UINT32 colorIdx = ((ph.header[4] >> 8) & 0x7FF);
@ -906,8 +906,8 @@ void CNew3D::CacheModel(Model *m, const UINT32 *data)
p.v[j].color[1] = (m_polyRAM[0x400 + colorIdx] >> 8) & 0xFF; p.v[j].color[1] = (m_polyRAM[0x400 + colorIdx] >> 8) & 0xFF;
p.v[j].color[0] = (m_polyRAM[0x400 + colorIdx] >> 16) & 0xFF; p.v[j].color[0] = (m_polyRAM[0x400 + colorIdx] >> 16) & 0xFF;
} }
else if (ph.FixedShading()) { else if (0 /* fixed shading bit as of yet unknown */) {
UINT8 shade = ph.ShadeValue(); UINT8 shade = (UINT8)((ix & 0xFF) + 128);
p.v[j].color[0] = shade; p.v[j].color[0] = shade;
p.v[j].color[1] = shade; p.v[j].color[1] = shade;
p.v[j].color[2] = shade; p.v[j].color[2] = shade;

5
Src/Graphics/New3D/PolyHeader.cpp
View file

@ -255,11 +255,6 @@ bool PolyHeader::FixedShading()
return (header[6] & 0x2000000) > 0; return (header[6] & 0x2000000) > 0;
} }
UINT8 PolyHeader::ShadeValue()
{
return (UINT8)(((header[6] >> 26) & 0x1F) * (255.f / 0x1F));
}
bool PolyHeader::PolyAlpha() bool PolyHeader::PolyAlpha()
{ {
return (header[6] & 0x00800000) == 0; return (header[6] & 0x00800000) == 0;

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

@ -118,7 +118,6 @@ public:
bool AlphaTest(); bool AlphaTest();
UINT8 Transparency(); // 0-255 UINT8 Transparency(); // 0-255
bool FixedShading(); bool FixedShading();
UINT8 ShadeValue();
bool PolyAlpha(); bool PolyAlpha();
bool TextureAlpha(); bool TextureAlpha();
bool StencilPoly(); bool StencilPoly();