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

remove pointless loop

Browse source
This commit is contained in:
Ian Curtis 2016-05-07 15:45:02 +00:00
parent ded3168060
commit 242cddac2d
1 changed files with 21 additions and 24 deletions

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

@ -903,35 +903,32 @@ void CNew3D::CacheModel(Model *m, const UINT32 *data)
// copy face attributes // copy face attributes
for (i = 0; i < p.number; i++) { if ((ph.header[1] & 2) == 0) {
UINT32 colorIdx = (ph.header[4] >> 8) & 0x7FF;
if ((ph.header[1] & 2) == 0) { p.faceColour[2] = (m_polyRAM[0x400 + colorIdx] & 0xFF) / 255.f;
UINT32 colorIdx = (ph.header[4] >> 8) & 0x7FF; p.faceColour[1] = ((m_polyRAM[0x400 + colorIdx] >> 8) & 0xFF) / 255.f;
p.faceColour[2] = (m_polyRAM[0x400 + colorIdx] & 0xFF) / 255.f; p.faceColour[0] = ((m_polyRAM[0x400 + colorIdx] >> 16) & 0xFF) / 255.f;
p.faceColour[1] = ((m_polyRAM[0x400 + colorIdx] >> 8) & 0xFF) / 255.f; }
p.faceColour[0] = ((m_polyRAM[0x400 + colorIdx] >> 16) & 0xFF) / 255.f; else {
if (ph.ColorDisabled()) { // no colours were set
p.faceColour[0] = 1.0f;
p.faceColour[1] = 1.0f;
p.faceColour[2] = 1.0f;
} }
else { else {
if (ph.ColorDisabled()) { // no colours were set p.faceColour[0] = ((ph.header[4] >> 24)) / 255.f;
p.faceColour[0] = 1.0f; p.faceColour[1] = ((ph.header[4] >> 16) & 0xFF) / 255.f;
p.faceColour[1] = 1.0f; p.faceColour[2] = ((ph.header[4] >> 8) & 0xFF) / 255.f;
p.faceColour[2] = 1.0f;
}
else {
p.faceColour[0] = ((ph.header[4] >> 24)) / 255.f;
p.faceColour[1] = ((ph.header[4] >> 16) & 0xFF) / 255.f;
p.faceColour[2] = ((ph.header[4] >> 8) & 0xFF) / 255.f;
}
}
if ((ph.header[6] & 0x00800000)) { // if set, polygon is opaque
p.faceColour[3] = 1.0f;
}
else {
p.faceColour[3] = ph.Transparency() / 255.f;
} }
} }
if ((ph.header[6] & 0x00800000)) { // if set, polygon is opaque
p.faceColour[3] = 1.0f;
}
else {
p.faceColour[3] = ph.Transparency() / 255.f;
}
// if we have flat shading, we can't re-use normals from shared vertices // if we have flat shading, we can't re-use normals from shared vertices
for (i = 0; i < p.number && !ph.SmoothShading(); i++) { for (i = 0; i < p.number && !ph.SmoothShading(); i++) {
p.v[i].normal[0] = p.faceNormal[0]; p.v[i].normal[0] = p.faceNormal[0];