Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix an oversight in cc67d54aeb

Browse Source 
Reviewed by: Itms,
Tested by: Angen,
Differential: https://code.wildfiregames.com/D1372

This was SVN commit r21498.
This commit is contained in:
Stan 2018-03-10 22:42:01 +00:00
parent fede6cccf1
commit c9fe940401
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
source/renderer/SilhouetteRenderer.cpp
View File

@ -100,7 +100,8 @@ void SilhouetteRenderer::AddCaster(CModel* model)
* that lets us pack and sort the edge/point list efficiently.
*/
static const u16 MAX_COORD = std::numeric_limits<u8>::max();
static const u16 g_MaxCoord = 1 << 14;
static const u16 g_HalfMaxCoord = g_MaxCoord / 2;
struct Occluder
{
@ -170,19 +171,21 @@ static void ComputeScreenBounds(Occluder& occluder, const CBoundingBoxAligned& b
u16 x1 = std::numeric_limits<u16>::min();
u16 y1 = std::numeric_limits<u16>::min();
float z0 = std::numeric_limits<float>::max();
u16 halfMaxCoord = MAX_COORD / 2;
for (size_t ix = 0; ix <= 1; ix++)
for (size_t ix = 0; ix <= 1; ++ix)
{
for (size_t iy = 0; iy <= 1; iy++)
for (size_t iy = 0; iy <= 1; ++iy)
{
for (size_t iz = 0; iz <= 1; iz++)
for (size_t iz = 0; iz <= 1; ++iz)
{
CVector4D vec(bounds[ix].X, bounds[iy].Y, bounds[iz].Z, 1.0f);
CVector4D svec = proj.Transform(vec);
x0 = std::min(x0, static_cast<u16>(halfMaxCoord + (halfMaxCoord * svec.X / svec.W)));
y0 = std::min(y0, static_cast<u16>(halfMaxCoord + (halfMaxCoord * svec.Y / svec.W)));
x1 = std::max(x1, static_cast<u16>(halfMaxCoord + (halfMaxCoord * svec.X / svec.W)));
y1 = std::max(y1, static_cast<u16>(halfMaxCoord + (halfMaxCoord * svec.Y / svec.W)));
CVector4D svec = proj.Transform(CVector4D(bounds[ix].X, bounds[iy].Y, bounds[iz].Z, 1.0f));
x0 = std::min(x0, static_cast<u16>(g_HalfMaxCoord + static_cast<u16>(g_HalfMaxCoord * svec.X / svec.W)));
y0 = std::min(y0, static_cast<u16>(g_HalfMaxCoord + static_cast<u16>(g_HalfMaxCoord * svec.Y / svec.W)));
x1 = std::max(x1, static_cast<u16>(g_HalfMaxCoord + static_cast<u16>(g_HalfMaxCoord * svec.X / svec.W)));
y1 = std::max(y1, static_cast<u16>(g_HalfMaxCoord + static_cast<u16>(g_HalfMaxCoord * svec.Y / svec.W)));
std::clog << x0 << std::endl;
std::clog << y0 << std::endl;
std::clog << y1 << std::endl;
std::clog << x1 << std::endl;
z0 = std::min(z0, svec.Z / svec.W);
}
}
@ -190,24 +193,21 @@ static void ComputeScreenBounds(Occluder& occluder, const CBoundingBoxAligned& b
// TODO: there must be a quicker way to do this than to test every vertex,
// given the symmetry of the bounding box
occluder.x0 = clamp(x0, std::numeric_limits<u16>::min(), static_cast<u16>(MAX_COORD - 1));
occluder.y0 = clamp(y0, std::numeric_limits<u16>::min(), static_cast<u16>(MAX_COORD - 1));
occluder.x1 = clamp(x1, std::numeric_limits<u16>::min(), static_cast<u16>(MAX_COORD - 1));
occluder.y1 = clamp(y1, std::numeric_limits<u16>::min(), static_cast<u16>(MAX_COORD - 1));
occluder.x0 = clamp(x0, std::numeric_limits<u16>::min(), static_cast<u16>(g_MaxCoord - 1));
occluder.y0 = clamp(y0, std::numeric_limits<u16>::min(), static_cast<u16>(g_MaxCoord - 1));
occluder.x1 = clamp(x1, std::numeric_limits<u16>::min(), static_cast<u16>(g_MaxCoord - 1));
occluder.y1 = clamp(y1, std::numeric_limits<u16>::min(), static_cast<u16>(g_MaxCoord - 1));
occluder.z = z0;
}
static void ComputeScreenPos(Caster& caster, const CVector3D& pos, CMatrix3D& proj)
{
CVector4D svec = proj.Transform(CVector4D(pos.X, pos.Y, pos.Z, 1.0f));
u16 halfMaxCoord = MAX_COORD / 2;
u16 x = static_cast<u16>(halfMaxCoord + (halfMaxCoord * svec.X / svec.W));
u16 y = static_cast<u16>(halfMaxCoord + (halfMaxCoord * svec.Y / svec.W));
float z = svec.Z / svec.W;
caster.x = clamp(x, std::numeric_limits<u16>::min(), static_cast<u16>(MAX_COORD - 1));
caster.y = clamp(y, std::numeric_limits<u16>::min(), static_cast<u16>(MAX_COORD - 1));
caster.z = z;
u16 x = g_HalfMaxCoord + static_cast<int>(g_HalfMaxCoord * svec.X / svec.W);
u16 y = g_HalfMaxCoord + static_cast<int>(g_HalfMaxCoord * svec.Y / svec.W);
caster.x = clamp(x, std::numeric_limits<u16>::min(), static_cast<u16>(g_MaxCoord - 1));
caster.y = clamp(y, std::numeric_limits<u16>::min(), static_cast<u16>(g_MaxCoord - 1));
caster.z = svec.Z / svec.W;
}
void SilhouetteRenderer::ComputeSubmissions(const CCamera& camera)
@ -318,7 +318,7 @@ void SilhouetteRenderer::ComputeSubmissions(const CCamera& camera)
d.rendered = false;
ComputeScreenPos(d, pos, proj);
u16 id = static_cast<u16>(occluders.size());
u16 id = static_cast<u16>(casters.size());
casters.push_back(d);
entries.push_back(EntryCreate(POINT, id, d.x));
@ -468,7 +468,7 @@ void SilhouetteRenderer::RenderDebugOverlays(const CCamera& camera)
m.Translate(0.0f, (float)g_yres, -1000.0f);
CMatrix3D proj;
proj.SetOrtho(0.f, MAX_COORD, 0.f, MAX_COORD, -1.f, 1000.f);
proj.SetOrtho(0.f, g_MaxCoord, 0.f, g_MaxCoord, -1.f, 1000.f);
m = proj * m;
shader->Uniform(str_transform, proj);