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

Disable light modifier on fog, seems not to work .. values don't make sense. Maybe the model3 doesn't use these.

Browse source
This commit is contained in:
Ian Curtis 2016-05-13 19:26:10 +00:00
parent c8f8cd1655
commit c4b5b185c6
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -341,6 +341,8 @@ void CNew3D::DescendCullingNode(UINT32 addr)
node2Ptr = node[0x08 - m_offset]; node2Ptr = node[0x08 - m_offset];
matrixOffset = node[0x03 - m_offset] & 0xFFF; matrixOffset = node[0x03 - m_offset] & 0xFFF;
short extent = node[9 - m_offset] >> 16;
// seems to indicate second link is invalid (fixes circular references) // seems to indicate second link is invalid (fixes circular references)
if ((node[0x00] & 0x07) != 0x06) { if ((node[0x00] & 0x07) != 0x06) {
DescendNodePtr(node2Ptr); DescendNodePtr(node2Ptr);
@ -561,7 +563,7 @@ void CNew3D::RenderViewport(UINT32 addr)
{ 1.0, 0.0, 0.0 }, // red { 1.0, 0.0, 0.0 }, // red
{ 1.0, 0.0, 1.0 }, // purple { 1.0, 0.0, 1.0 }, // purple
{ 1.0, 1.0, 0.0 }, // yellow { 1.0, 1.0, 0.0 }, // yellow
{ 1.0, 1.0, 1.0 } // white { 1.0, 1.0, 1.0 } // white
}; };
// Translate address and obtain pointer // Translate address and obtain pointer
@ -593,7 +595,7 @@ void CNew3D::RenderViewport(UINT32 addr)
int vpY = (int)(((vpnode[0x1A] >> 16) / 16.0f) + 0.5f); // viewport Y (12.4) int vpY = (int)(((vpnode[0x1A] >> 16) / 16.0f) + 0.5f); // viewport Y (12.4)
int vpWidth = (int)(((vpnode[0x14] & 0xFFFF) / 4.0f) + 0.5f); // width (14.2) int vpWidth = (int)(((vpnode[0x14] & 0xFFFF) / 4.0f) + 0.5f); // width (14.2)
int vpHeight = (int)(((vpnode[0x14] >> 16) / 4.0f) + 0.5f); // height (14.2) int vpHeight = (int)(((vpnode[0x14] >> 16) / 4.0f) + 0.5f); // height (14.2)
uint32_t matrixBase = vpnode[0x16] & 0xFFFFFF; // matrix base address uint32_t matrixBase = vpnode[0x16] & 0xFFFFFF; // matrix base address
if (vpX) { if (vpX) {
vpX += 2; vpX += 2;
@ -656,7 +658,7 @@ void CNew3D::RenderViewport(UINT32 addr)
vp->lightingParams[5] = 0.0; // reserved vp->lightingParams[5] = 0.0; // reserved
// Spotlight // Spotlight
int spotColorIdx = (vpnode[0x20] >> 11) & 7; // spotlight color index int spotColorIdx = (vpnode[0x20] >> 11) & 7; // spotlight color index
vp->spotEllipse[0] = (float)((vpnode[0x1E] >> 3) & 0x1FFF); // spotlight X position (fractional component?) vp->spotEllipse[0] = (float)((vpnode[0x1E] >> 3) & 0x1FFF); // spotlight X position (fractional component?)
vp->spotEllipse[1] = (float)((vpnode[0x1D] >> 3) & 0x1FFF); // spotlight Y vp->spotEllipse[1] = (float)((vpnode[0x1D] >> 3) & 0x1FFF); // spotlight Y
vp->spotEllipse[2] = (float)((vpnode[0x1E] >> 16) & 0xFFFF); // spotlight X size (16-bit? May have fractional component below bit 16) vp->spotEllipse[2] = (float)((vpnode[0x1E] >> 16) & 0xFFFF); // spotlight X size (16-bit? May have fractional component below bit 16)
@ -877,12 +879,15 @@ void CNew3D::CacheModel(Model *m, const UINT32 *data)
currentMesh->polyAlpha = ph.PolyAlpha(); currentMesh->polyAlpha = ph.PolyAlpha();
currentMesh->lighting = ph.LightEnabled() && !ph.FixedShading(); currentMesh->lighting = ph.LightEnabled() && !ph.FixedShading();
/*
if (!ph.Luminous()) { if (!ph.Luminous()) {
currentMesh->fogIntensity = 1.0f; currentMesh->fogIntensity = 1.0f;
} }
else { else {
currentMesh->fogIntensity = ph.LightModifier(); currentMesh->fogIntensity = ph.LightModifier();
} }*/
currentMesh->fogIntensity = 1.0;
if (ph.TexEnabled()) { if (ph.TexEnabled()) {
currentMesh->format = ph.TexFormat(); currentMesh->format = ph.TexFormat();