Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2024-11-29 09:05:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Really should cull against 5 frustum planes.

Browse source
This commit is contained in:
Ian Curtis 2019-11-15 20:00:25 +00:00
parent e1827cfd13
commit 06688de5fc
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1323,7 +1323,7 @@ void CNew3D::CalcTexOffset(int offX, int offY, int page, int x, int y, int& newX
newY += ((oldPage + page) & 1) * 1024; // max page 0-1 newY += ((oldPage + page) & 1) * 1024; // max page 0-1
} }
void CNew3D::CalcFrustumPlanes(Plane p[4], const float* matrix) void CNew3D::CalcFrustumPlanes(Plane p[5], const float* matrix)
{ {
// Left Plane // Left Plane
p[0].a = matrix[3] + matrix[0]; p[0].a = matrix[3] + matrix[0];
@ -1352,6 +1352,12 @@ void CNew3D::CalcFrustumPlanes(Plane p[4], const float* matrix)
p[3].c = matrix[11] - matrix[9]; p[3].c = matrix[11] - matrix[9];
p[3].d = matrix[15] - matrix[13]; p[3].d = matrix[15] - matrix[13];
p[3].Normalise(); p[3].Normalise();
// Front Plane
p[4].a = 0;
p[4].b = 0;
p[4].c = -1;
p[4].d =0;
} }
void CNew3D::CalcBox(float distance, BBox& box) void CNew3D::CalcBox(float distance, BBox& box)
@ -1427,7 +1433,7 @@ void CNew3D::TransformBox(const float *m, BBox& box)
} }
} }
Clip CNew3D::ClipBox(BBox& box, Plane planes[4]) Clip CNew3D::ClipBox(BBox& box, Plane planes[5])
{ {
int count = 0; int count = 0;
@ -1435,13 +1441,13 @@ Clip CNew3D::ClipBox(BBox& box, Plane planes[4])
int temp = 0; int temp = 0;
for (int j = 0; j < 4; j++) { for (int j = 0; j < 5; j++) {
if (planes[j].DistanceToPoint(box.points[i]) >= 0) { if (planes[j].DistanceToPoint(box.points[i]) >= 0) {
temp++; temp++;
} }
} }
if (temp == 4) count++; // point is inside all 4 frustum planes if (temp == 5) count++; // point is inside all 4 frustum planes
} }
if (count == 8) return Clip::INSIDE; if (count == 8) return Clip::INSIDE;
@ -1450,7 +1456,7 @@ Clip CNew3D::ClipBox(BBox& box, Plane planes[4])
//if we got here all points are outside of the view frustum //if we got here all points are outside of the view frustum
//check for all points being side same of any plane, means box outside of view //check for all points being side same of any plane, means box outside of view
for (int i = 0; i < 4; i++) { for (int i = 0; i < 5; i++) {
int temp = 0; int temp = 0;
@ -1480,7 +1486,7 @@ void CNew3D::CalcBoxExtents(const BBox& box)
} }
} }
void CNew3D::ClipPolygon(ClipPoly& clipPoly, Plane planes[4]) void CNew3D::ClipPolygon(ClipPoly& clipPoly, Plane planes[5])
{ {
//============ //============
ClipPoly temp; ClipPoly temp;
@ -1491,7 +1497,7 @@ void CNew3D::ClipPolygon(ClipPoly& clipPoly, Plane planes[4])
in = &clipPoly; in = &clipPoly;
out = &temp; out = &temp;
for (int i = 0; i < 4; i++) { for (int i = 0; i < 5; i++) {
//================= //=================
bool currentIn; bool currentIn;
@ -1502,6 +1508,7 @@ void CNew3D::ClipPolygon(ClipPoly& clipPoly, Plane planes[4])
currentDot = planes[i].DotProduct(in->list[0].pos); currentDot = planes[i].DotProduct(in->list[0].pos);
currentIn = (currentDot + planes[i].d) >= 0; currentIn = (currentDot + planes[i].d) >= 0;
out->count = 0;
for (int j = 0; j < in->count; j++) { for (int j = 0; j < in->count; j++) {
@ -1537,7 +1544,6 @@ void CNew3D::ClipPolygon(ClipPoly& clipPoly, Plane planes[4])
} }
std::swap(in, out); std::swap(in, out);
out->count = 0;
} }
} }

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

@ -277,7 +277,7 @@ private:
R3DScrollFog m_r3dScrollFog; R3DScrollFog m_r3dScrollFog;
R3DFrameBuffers m_r3dFrameBuffers; R3DFrameBuffers m_r3dFrameBuffers;
Plane m_planes[4]; Plane m_planes[5];
struct BBox struct BBox
{ {
@ -293,13 +293,13 @@ private:
NFPair m_nfPairs[4]; NFPair m_nfPairs[4];
int m_currentPriority; int m_currentPriority;
void CalcFrustumPlanes (Plane p[4], const float* matrix); void CalcFrustumPlanes (Plane p[5], const float* matrix);
void CalcBox (float distance, BBox& box); void CalcBox (float distance, BBox& box);
void TransformBox (const float *m, BBox& box); void TransformBox (const float *m, BBox& box);
void MultVec (const float matrix[16], const float in[4], float out[4]); void MultVec (const float matrix[16], const float in[4], float out[4]);
Clip ClipBox (BBox& box, Plane planes[4]); Clip ClipBox (BBox& box, Plane planes[5]);
void ClipModel (const Model *m); void ClipModel (const Model *m);
void ClipPolygon (ClipPoly& clipPoly, Plane planes[4]); void ClipPolygon (ClipPoly& clipPoly, Plane planes[5]);
void CalcBoxExtents (const BBox& box); void CalcBoxExtents (const BBox& box);
void CalcViewport (Viewport* vp, float near, float far); void CalcViewport (Viewport* vp, float near, float far);
}; };