Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

BBOX: Transform the planes by the matrix so we don't need to transform the box

Browse source
This commit is contained in:
Henrik Rydgard 2013-11-14 11:01:31 +01:00
parent 871d8b28ab
commit 8a69543ec4
2 changed files with 61 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
GPU/GLES/TransformPipeline.cpp
View file

@ -695,7 +695,7 @@ rotateVBO:
prim = indexGen.Prim();
}
DEBUG_LOG(G3D, "Flush prim %i! %i verts in one go", prim, vertexCount);
VERBOSE_LOG(G3D, "Flush prim %i! %i verts in one go", prim, vertexCount);
SetupDecFmtForDraw(program, dec_->GetDecVtxFmt(), vbo ? 0 : decoded);
if (useElements) {
@ -718,7 +718,7 @@ rotateVBO:
// Undo the strip optimization, not supported by the SW code yet.
if (prim == GE_PRIM_TRIANGLE_STRIP)
prim = GE_PRIM_TRIANGLES;
DEBUG_LOG(G3D, "Flush prim %i SW! %i verts in one go", prim, indexGen.VertexCount());
VERBOSE_LOG(G3D, "Flush prim %i SW! %i verts in one go", prim, indexGen.VertexCount());
SoftwareTransformAndDraw(
prim, decoded, program, indexGen.VertexCount(),
@ -745,13 +745,31 @@ struct Plane {
};
void PlanesFromMatrix(float mtx[16], Plane planes[6]) {
// TODO: Which order is the most optimal?
planes[0].Set(mtx[3]-mtx[0], mtx[7]-mtx[4], mtx[11]-mtx[8], mtx[15]-mtx[12]);// Right clipping plane.
planes[1].Set(mtx[3]+mtx[0], mtx[7]+mtx[4], mtx[11]+mtx[8], mtx[15]+mtx[12]);// Left clipping plane.
planes[2].Set(mtx[3]+mtx[1], mtx[7]+mtx[5], mtx[11]+mtx[9], mtx[15]+mtx[13]);// Bottom clipping plane.
planes[3].Set(mtx[3]-mtx[1], mtx[7]-mtx[5], mtx[11]-mtx[9], mtx[15]-mtx[13]);// Top clipping plane.
planes[4].Set(mtx[3]+mtx[2], mtx[7]+mtx[6], mtx[11]+mtx[10], mtx[15]+mtx[14]); // Near clipping plane.
planes[5].Set(mtx[3]-mtx[2], mtx[7]-mtx[6], mtx[11]-mtx[10], mtx[15]-mtx[14]);// Far clipping plane.
planes[0].Set(mtx[3]-mtx[0], mtx[7]-mtx[4], mtx[11]-mtx[8], mtx[15]-mtx[12]); // Right
planes[1].Set(mtx[3]+mtx[0], mtx[7]+mtx[4], mtx[11]+mtx[8], mtx[15]+mtx[12]); // Left
planes[2].Set(mtx[3]+mtx[1], mtx[7]+mtx[5], mtx[11]+mtx[9], mtx[15]+mtx[13]); // Bottom
planes[3].Set(mtx[3]-mtx[1], mtx[7]-mtx[5], mtx[11]-mtx[9], mtx[15]-mtx[13]); // Top
planes[4].Set(mtx[3]+mtx[2], mtx[7]+mtx[6], mtx[11]+mtx[10], mtx[15]+mtx[14]); // Near
planes[5].Set(mtx[3]-mtx[2], mtx[7]-mtx[6], mtx[11]-mtx[10], mtx[15]-mtx[14]); // Far
}
static void ConvertMatrix4x3To4x4(const float *m4x3, float *m4x4) {
m4x4[0] = m4x3[0];
m4x4[1] = m4x3[1];
m4x4[2] = m4x3[2];
m4x4[3] = 0.0f;
m4x4[4] = m4x3[3];
m4x4[5] = m4x3[4];
m4x4[6] = m4x3[5];
m4x4[7] = 0.0f;
m4x4[8] = m4x3[6];
m4x4[9] = m4x3[7];
m4x4[10] = m4x3[8];
m4x4[11] = 0.0f;
m4x4[12] = m4x3[9];
m4x4[13] = m4x3[10];
m4x4[14] = m4x3[11];
m4x4[15] = 1.0f;
}
// This code is HIGHLY unoptimized!
@ -759,6 +777,8 @@ void PlanesFromMatrix(float mtx[16], Plane planes[6]) {
// It does the simplest and safest test possible: If all points of a bbox is outside a single of
// our clipping planes, we reject the box.
bool TransformDrawEngine::TestBoundingBox(void* control_points, int vertexCount, u32 vertType) {
// TODO: Skip NormalizeVertices if vertType = only float
// Simplify away bones and morph before proceeding
// Special case for float positions only.
// This clip test is not very accurate but does succeed in removing some bboxes at least.
@ -770,7 +790,16 @@ bool TransformDrawEngine::TestBoundingBox(void* control_points, int vertexCount,
Plane planes[6];
PlanesFromMatrix(gstate.projMatrix, planes);
// TODO: Multiply the matrices together first, so that we can skip the matrix multiplications later
float world[16];
float view[16];
ConvertMatrix4x3To4x4(gstate.worldMatrix, world);
ConvertMatrix4x3To4x4(gstate.viewMatrix, view);
float worldview[16];
Matrix4ByMatrix4(worldview, world, view);
float worldviewproj[16];
Matrix4ByMatrix4(worldviewproj, worldview, gstate.projMatrix);
PlanesFromMatrix(worldviewproj, planes);
for (int plane = 0; plane < 6; plane++) {
int inside = 0;
@ -780,24 +809,12 @@ bool TransformDrawEngine::TestBoundingBox(void* control_points, int vertexCount,
for (int i = 0; i < 8; i++) {
const SimpleVertex &vert = corners[box * 8 + i];
// To world space...
float worldPos[3];
Vec3ByMatrix43(worldPos, (float *)&vert.pos.x, gstate.worldMatrix);
// To view space...
float viewPos[3];
Vec3ByMatrix43(viewPos, worldPos, gstate.viewMatrix);
// Here we can test against the frustum planes!
float value = planes[plane].Test(viewPos);
float value = planes[plane].Test((float *)&vert.pos.x);
if (value < 0)
out++;
else
inside++;
// float frustumPos[4];
// Vec3ByMatrix44(frustumPos, viewPos, gstate.projMatrix);
}
}
@ -807,10 +824,7 @@ bool TransformDrawEngine::TestBoundingBox(void* control_points, int vertexCount,
}
// Any out. For testing that the planes are in the right locations.
//if (out != 0) {
// All out
// return false;
//}
if (out != 0) return false;
}
return true;

24
GPU/Math3D.h
View file

@ -612,12 +612,20 @@ inline void Vec3ByMatrix43(float vecOut[3], const float v[3], const float m[12])
inline void Vec3ByMatrix44(float vecOut[4], const float v[3], const float m[16])
{
vecOut[0] = v[0] * m[0] + v[1] * m[4] + v[2] * m[8] + m[9];
vecOut[1] = v[0] * m[1] + v[1] * m[5] + v[2] * m[9] + m[10];
vecOut[2] = v[0] * m[2] + v[1] * m[6] + v[2] * m[10] + m[11];
vecOut[3] = v[0] * m[3] + v[1] * m[7] + v[2] * m[11] + m[15];
vecOut[0] = v[0] * m[0] + v[1] * m[4] + v[2] * m[8] + m[12];
vecOut[1] = v[0] * m[1] + v[1] * m[5] + v[2] * m[9] + m[13];
vecOut[2] = v[0] * m[2] + v[1] * m[6] + v[2] * m[10] + m[14];
}
inline void Vec4ByMatrix44(float vecOut[4], const float v[4], const float m[16])
{
vecOut[0] = v[0] * m[0] + v[1] * m[4] + v[2] * m[8] + v[3] * m[12];
vecOut[1] = v[0] * m[1] + v[1] * m[5] + v[2] * m[9] + v[3] * m[13];
vecOut[2] = v[0] * m[2] + v[1] * m[6] + v[2] * m[10] + v[3] * m[14];
vecOut[3] = v[0] * m[3] + v[1] * m[7] + v[2] * m[11] + v[3] * m[15];
}
inline void Norm3ByMatrix43(float vecOut[3], const float v[3], const float m[12])
{
vecOut[0] = v[0] * m[0] + v[1] * m[3] + v[2] * m[6];
@ -625,6 +633,14 @@ inline void Norm3ByMatrix43(float vecOut[3], const float v[3], const float m[12]
vecOut[2] = v[0] * m[2] + v[1] * m[5] + v[2] * m[8];
}
inline void Matrix4ByMatrix4(float out[16], const float a[16], const float b[16]) {
Vec4ByMatrix44(out, a, b);
Vec4ByMatrix44(out + 4, a + 4, b);
Vec4ByMatrix44(out + 8, a + 8, b);
Vec4ByMatrix44(out + 12, a + 12, b);
}
inline float Vec3Dot(const float v1[3], const float v2[3])
{
return v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2];