Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2025-02-16 17:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

skip invalid culling nodes

Browse source
This commit is contained in:
Ian Curtis 2019-07-28 12:14:13 +00:00
parent 17f4103123
commit 714f6a123a
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -489,6 +489,8 @@ bool CNew3D::DrawModel(UINT32 modelAddr)
// Descends into a 10-word culling node // Descends into a 10-word culling node
void CNew3D::DescendCullingNode(UINT32 addr) void CNew3D::DescendCullingNode(UINT32 addr)
{ {
enum class NodeType { undefined = -1, viewport = 0, rootNode = 1, cullingNode = 2 };
const UINT32 *node, *lodTable; const UINT32 *node, *lodTable;
UINT32 matrixOffset, child1Ptr, sibling2Ptr; UINT32 matrixOffset, child1Ptr, sibling2Ptr;
BBox bbox; BBox bbox;
@ -497,6 +499,7 @@ void CNew3D::DescendCullingNode(UINT32 addr)
UINT16 uBlendRadius; UINT16 uBlendRadius;
float fBlendRadius; float fBlendRadius;
UINT8 lodTablePointer; UINT8 lodTablePointer;
NodeType nodeType;
if (m_nodeAttribs.StackLimit()) { if (m_nodeAttribs.StackLimit()) {
return; return;
@ -509,11 +512,17 @@ void CNew3D::DescendCullingNode(UINT32 addr)
} }
// Extract known fields // Extract known fields
nodeType = (NodeType)(node[0x00] & 3);
child1Ptr = node[0x07 - m_offset] & 0x7FFFFFF; // mask colour table bits child1Ptr = node[0x07 - m_offset] & 0x7FFFFFF; // mask colour table bits
sibling2Ptr = node[0x08 - m_offset] & 0x1FFFFFF; // mask colour table bits sibling2Ptr = node[0x08 - m_offset] & 0x1FFFFFF; // mask colour table bits
matrixOffset = node[0x03 - m_offset] & 0xFFF; matrixOffset = node[0x03 - m_offset] & 0xFFF;
lodTablePointer = (node[0x03 - m_offset] >> 12) & 0x7F; lodTablePointer = (node[0x03 - m_offset] >> 12) & 0x7F;
// check our node type
if (nodeType == NodeType::viewport) {
return; // viewport nodes aren't rendered
}
// parse siblings // parse siblings
if ((node[0x00] & 0x07) != 0x06) { // colour table seems to indicate no siblings if ((node[0x00] & 0x07) != 0x06) { // colour table seems to indicate no siblings
if (!(sibling2Ptr & 0x1000000) && sibling2Ptr) { if (!(sibling2Ptr & 0x1000000) && sibling2Ptr) {