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

parse viewports in normal order

Browse source
This commit is contained in:
Ian Curtis 2016-04-19 22:05:12 +00:00
parent df9fefd064
commit 58d187e59a
2 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -157,10 +157,8 @@ void CNew3D::RenderFrame(void)
glEnable (GL_CULL_FACE); glEnable (GL_CULL_FACE);
glFrontFace (GL_CW); glFrontFace (GL_CW);
for (int pri = 0; pri <= 3; pri++) { RenderViewport(0x800000); // build model structure
RenderViewport(0x800000, pri); // build model structure
}
m_vbo.Bind(true); m_vbo.Bind(true);
m_vbo.BufferSubData(MAX_ROM_POLYS*sizeof(Poly), m_polyBufferRam.size()*sizeof(Poly), m_polyBufferRam.data()); // upload all the dynamic data to GPU in one go m_vbo.BufferSubData(MAX_ROM_POLYS*sizeof(Poly), m_polyBufferRam.size()*sizeof(Poly), m_polyBufferRam.data()); // upload all the dynamic data to GPU in one go
@ -386,7 +384,6 @@ void CNew3D::DescendCullingNode(UINT32 addr)
DescendNodePtr(node1Ptr); DescendNodePtr(node1Ptr);
} }
// Proceed to second link
m_modelMat.PopMatrix(); m_modelMat.PopMatrix();
// Restore old texture offsets // Restore old texture offsets
@ -542,7 +539,7 @@ void CNew3D::InitMatrixStack(UINT32 matrixBaseAddr, Mat4& mat)
} }
// Draws viewports of the given priority // Draws viewports of the given priority
void CNew3D::RenderViewport(UINT32 addr, int pri) void CNew3D::RenderViewport(UINT32 addr)
{ {
GLfloat color[8][3] = // RGB1 translation GLfloat color[8][3] = // RGB1 translation
{ {
@ -570,22 +567,13 @@ void CNew3D::RenderViewport(UINT32 addr, int pri)
return; return;
} }
curPri = (vpnode[0x00] >> 3) & 3; // viewport priority
nextAddr = vpnode[0x01] & 0xFFFFFF; // next viewport
nodeAddr = vpnode[0x02]; // scene database node pointer
// Recursively process next viewport
if (vpnode[0x01] == 0) { // memory probably hasn't been set up yet, abort if (vpnode[0x01] == 0) { // memory probably hasn't been set up yet, abort
return; return;
} }
if (vpnode[0x01] != 0x01000000) {
RenderViewport(vpnode[0x01], pri);
}
// If the priority doesn't match, do not process curPri = (vpnode[0x00] >> 3) & 3; // viewport priority
if (curPri != pri) { nextAddr = vpnode[0x01] & 0xFFFFFF; // next viewport
return; nodeAddr = vpnode[0x02]; // scene database node pointer
}
// create node object // create node object
m_nodes.emplace_back(Node()); m_nodes.emplace_back(Node());
@ -594,7 +582,7 @@ void CNew3D::RenderViewport(UINT32 addr, int pri)
// get pointer to its viewport // get pointer to its viewport
vp = &m_nodes.back().viewport; vp = &m_nodes.back().viewport;
vp->priority = pri; vp->priority = curPri;
// Fetch viewport parameters (TO-DO: would rounding make a difference?) // Fetch viewport parameters (TO-DO: would rounding make a difference?)
vpX = (int)(((vpnode[0x1A] & 0xFFFF) / 16.0f) + 0.5f); // viewport X (12.4 fixed point) vpX = (int)(((vpnode[0x1A] & 0xFFFF) / 16.0f) + 0.5f); // viewport X (12.4 fixed point)
@ -734,6 +722,11 @@ void CNew3D::RenderViewport(UINT32 addr, int pri)
// Descend down the node link: Use recursive traversal // Descend down the node link: Use recursive traversal
DescendNodePtr(nodeAddr); DescendNodePtr(nodeAddr);
// render next viewport
if (vpnode[0x01] != 0x01000000) {
RenderViewport(vpnode[0x01]);
}
} }
void CNew3D::CopyVertexData(R3DPoly& r3dPoly, std::vector<Poly>& polyArray) void CNew3D::CopyVertexData(R3DPoly& r3dPoly, std::vector<Poly>& polyArray)

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

@ -164,7 +164,7 @@ private:
void DescendCullingNode(UINT32 addr); void DescendCullingNode(UINT32 addr);
void DescendPointerList(UINT32 addr); void DescendPointerList(UINT32 addr);
void DescendNodePtr(UINT32 nodeAddr); void DescendNodePtr(UINT32 nodeAddr);
void RenderViewport(UINT32 addr, int pri); void RenderViewport(UINT32 addr);
// building the scene // building the scene
void CacheModel(Model *m, const UINT32 *data); void CacheModel(Model *m, const UINT32 *data);