mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 20:53:52 +00:00
Code Issues Releases Wiki Activity

Merge branch 'refactor/shadowtechnique' into 'master'

Browse source 
Cleanup code in mwshadowtechnique.cpp

See merge request OpenMW/openmw!1756
This commit is contained in:
psi29a 2022-04-11 11:15:27 +00:00
commit 5820e5701a
1 changed files with 99 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

227
components/sceneutil/mwshadowtechnique.cpp
View file

@ -26,6 +26,8 @@
#include <osg/ClipControl> #include <osg/ClipControl>
#include <sstream> #include <sstream>
#include <deque>
#include <vector>
#include "shadowsbin.hpp" #include "shadowsbin.hpp"
@ -1945,8 +1947,9 @@ bool MWShadowTechnique::computeShadowCameraSettings(Frustum& frustum, LightData&
struct ConvexHull struct ConvexHull
{ {
typedef std::vector<osg::Vec3d> Vertices; typedef std::vector<osg::Vec3d> Vertices;
typedef std::pair< osg::Vec3d, osg::Vec3d > Edge; typedef std::pair<osg::Vec3d, osg::Vec3d> Edge;
typedef std::list< Edge > Edges; typedef std::vector<Edge> Edges;
typedef std::vector<osg::Vec3d> VertexSet;
Edges _edges; Edges _edges;
@ -1954,20 +1957,20 @@ struct ConvexHull
void setToFrustum(MWShadowTechnique::Frustum& frustum) void setToFrustum(MWShadowTechnique::Frustum& frustum)
{ {
_edges.push_back( Edge(frustum.corners[0],frustum.corners[1]) ); _edges.emplace_back(frustum.corners[0], frustum.corners[1]);
_edges.push_back( Edge(frustum.corners[1],frustum.corners[2]) ); _edges.emplace_back(frustum.corners[1], frustum.corners[2]);
_edges.push_back( Edge(frustum.corners[2],frustum.corners[3]) ); _edges.emplace_back(frustum.corners[2], frustum.corners[3]);
_edges.push_back( Edge(frustum.corners[3],frustum.corners[0]) ); _edges.emplace_back(frustum.corners[3], frustum.corners[0]);
_edges.push_back( Edge(frustum.corners[4],frustum.corners[5]) ); _edges.emplace_back(frustum.corners[4], frustum.corners[5]);
_edges.push_back( Edge(frustum.corners[5],frustum.corners[6]) ); _edges.emplace_back(frustum.corners[5], frustum.corners[6]);
_edges.push_back( Edge(frustum.corners[6],frustum.corners[7]) ); _edges.emplace_back(frustum.corners[6], frustum.corners[7]);
_edges.push_back( Edge(frustum.corners[7],frustum.corners[4]) ); _edges.emplace_back(frustum.corners[7], frustum.corners[4]);
_edges.push_back( Edge(frustum.corners[0],frustum.corners[4]) ); _edges.emplace_back(frustum.corners[0], frustum.corners[4]);
_edges.push_back( Edge(frustum.corners[1],frustum.corners[5]) ); _edges.emplace_back(frustum.corners[1], frustum.corners[5]);
_edges.push_back( Edge(frustum.corners[2],frustum.corners[6]) ); _edges.emplace_back(frustum.corners[2], frustum.corners[6]);
_edges.push_back( Edge(frustum.corners[3],frustum.corners[7]) ); _edges.emplace_back(frustum.corners[3], frustum.corners[7]);
} }
struct ConvexHull2D struct ConvexHull2D
@ -1981,22 +1984,22 @@ struct ConvexHull
} }
// Calculates the 2D convex hull and returns it as a vector containing the points in CCW order with the first and last point being the same. // Calculates the 2D convex hull and returns it as a vector containing the points in CCW order with the first and last point being the same.
static std::vector<Point> convexHull(std::set<Point> &P) static Vertices convexHull(const VertexSet &P)
{ {
size_t n = P.size(), k = 0; size_t n = P.size(), k = 0;
if (n <= 3) if (n <= 3)
return std::vector<Point>(P.cbegin(), P.cend()); return Vertices(P.cbegin(), P.cend());
std::vector<Point> H(2 * n); Vertices H(2 * n);
// Points are already sorted in a std::set // Points are already sorted in a std::set
// Build lower hull // Build lower hull
for (auto pItr = P.cbegin(); pItr != P.cend(); ++pItr) for(const auto& vert : P)
{ {
while (k >= 2 && cross(H[k - 2], H[k - 1], *pItr) <= 0) while (k >= 2 && cross(H[k - 2], H[k - 1], vert) <= 0)
k--; k--;
H[k++] = *pItr; H[k++] = vert;
} }
// Build upper hull // Build upper hull
@ -2053,38 +2056,39 @@ struct ConvexHull
void extendTowardsNegativeZ() void extendTowardsNegativeZ()
{ {
typedef std::set<osg::Vec3d> VertexSet;
// Collect the set of vertices // Collect the set of vertices
VertexSet vertices; VertexSet vertices;
for (const Edge& edge : _edges) for (const Edge& edge : _edges)
{ {
vertices.insert(edge.first); vertices.emplace_back(edge.first);
vertices.insert(edge.second); vertices.emplace_back(edge.second);
} }
// Sort and make unique.
std::sort(vertices.begin(), vertices.end());
vertices.erase(std::unique(vertices.begin(), vertices.end()), vertices.end());
if (vertices.size() == 0) if (vertices.size() == 0)
return; return;
// Get the vertices contributing to the 2D convex hull // Get the vertices contributing to the 2D convex hull
Vertices extremeVertices = ConvexHull2D::convexHull(vertices); Vertices extremeVertices = ConvexHull2D::convexHull(vertices);
VertexSet extremeVerticesSet(extremeVertices.cbegin(), extremeVertices.cend());
// Add their extrusions to the final edge collection // Add their extrusions to the final edge collection
// We extrude as far as -1.5 as the coordinate space shouldn't ever put any shadow casters further than -1.0 // We extrude as far as -1.5 as the coordinate space shouldn't ever put any shadow casters further than -1.0
Edges finalEdges; Edges finalEdges;
// Add edges towards -Z // Add edges towards -Z
for (auto vertex : extremeVertices) for (const auto& vertex : extremeVertices)
finalEdges.push_back(Edge(vertex, osg::Vec3d(vertex.x(), vertex.y(), -1.5))); finalEdges.emplace_back(vertex, osg::Vec3d(vertex.x(), vertex.y(), -1.5));
// Add edge loop to 'seal' the hull // Add edge loop to 'seal' the hull
for (auto itr = extremeVertices.cbegin(); itr != extremeVertices.cend() - 1; ++itr) for (auto itr = extremeVertices.cbegin(); itr != extremeVertices.cend() - 1; ++itr)
finalEdges.push_back(Edge(osg::Vec3d(itr->x(), itr->y(), -1.5), osg::Vec3d((itr + 1)->x(), (itr + 1)->y(), -1.5))); finalEdges.emplace_back(osg::Vec3d(itr->x(), itr->y(), -1.5), osg::Vec3d((itr + 1)->x(), (itr + 1)->y(), -1.5));
// The convex hull algorithm we are using sometimes places a point at both ends of the vector, so we don't always need to add the last edge separately. // The convex hull algorithm we are using sometimes places a point at both ends of the vector, so we don't always need to add the last edge separately.
if (extremeVertices.front() != extremeVertices.back()) if (extremeVertices.front() != extremeVertices.back())
finalEdges.push_back(Edge(osg::Vec3d(extremeVertices.front().x(), extremeVertices.front().y(), -1.5), osg::Vec3d(extremeVertices.back().x(), extremeVertices.back().y(), -1.5))); finalEdges.emplace_back(osg::Vec3d(extremeVertices.front().x(), extremeVertices.front().y(), -1.5), osg::Vec3d(extremeVertices.back().x(), extremeVertices.back().y(), -1.5));
// Remove internal edges connected to extreme vertices // Remove internal edges connected to extreme vertices
for (auto vertex : extremeVertices) for (const auto& vertex : extremeVertices)
{ {
Vertices connectedVertices; Vertices connectedVertices;
for (const Edge& edge : _edges) for (const Edge& edge : _edges)
@ -2094,37 +2098,35 @@ struct ConvexHull
else if (edge.second == vertex) else if (edge.second == vertex)
connectedVertices.push_back(edge.first); connectedVertices.push_back(edge.first);
} }
connectedVertices.push_back(osg::Vec3d(vertex.x(), vertex.y(), -1.5)); connectedVertices.emplace_back(vertex.x(), vertex.y(), -1.5);
Vertices unwantedEdgeEnds = findInternalEdges(vertex, connectedVertices); Vertices unwantedEdgeEnds = findInternalEdges(vertex, connectedVertices);
for (auto edgeEnd : unwantedEdgeEnds) for (const auto& edgeEnd : unwantedEdgeEnds)
{ {
for (auto itr = _edges.begin(); itr != _edges.end();) const auto edgeA = Edge(vertex, edgeEnd);
{ const auto edgeB = Edge(edgeEnd, vertex);
if (*itr == Edge(vertex, edgeEnd)) _edges.erase(std::remove_if(_edges.begin(), _edges.end(), [&](const auto& elem)
{ {
itr = _edges.erase(itr); return elem == edgeA || elem == edgeB;
break; }), _edges.end());
}
else if (*itr == Edge(edgeEnd, vertex))
{
itr = _edges.erase(itr);
break;
}
else
++itr;
}
} }
} }
// Gather connected vertices // Gather connected vertices
VertexSet unprocessedConnectedVertices(extremeVertices.begin(), extremeVertices.end()); VertexSet unprocessedConnectedVertices = std::move(extremeVertices);
VertexSet connectedVertices; VertexSet connectedVertices;
while (unprocessedConnectedVertices.size() > 0) const auto containsVertex = [&](const auto& vert)
{ {
osg::Vec3d vertex = *unprocessedConnectedVertices.begin(); return std::find(connectedVertices.begin(), connectedVertices.end(), vert) != connectedVertices.end();
unprocessedConnectedVertices.erase(unprocessedConnectedVertices.begin()); };
connectedVertices.insert(vertex);
while (!unprocessedConnectedVertices.empty())
{
osg::Vec3d vertex = unprocessedConnectedVertices.back();
unprocessedConnectedVertices.pop_back();
connectedVertices.emplace_back(vertex);
for (const Edge& edge : _edges) for (const Edge& edge : _edges)
{ {
osg::Vec3d otherEnd; osg::Vec3d otherEnd;
@ -2135,16 +2137,16 @@ struct ConvexHull
else else
continue; continue;
if (connectedVertices.count(otherEnd)) if (containsVertex(otherEnd))
continue; continue;
unprocessedConnectedVertices.insert(otherEnd); unprocessedConnectedVertices.emplace_back(otherEnd);
} }
} }
for (const Edge& edge : _edges) for (const Edge& edge : _edges)
{ {
if (connectedVertices.count(edge.first) || connectedVertices.count(edge.second)) if (containsVertex(edge.first) || containsVertex(edge.second))
finalEdges.push_back(edge); finalEdges.push_back(edge);
} }
@ -2153,12 +2155,10 @@ struct ConvexHull
void transform(const osg::Matrixd& m) void transform(const osg::Matrixd& m)
{ {
for(Edges::iterator itr = _edges.begin(); for (auto& edge : _edges)
itr != _edges.end();
++itr)
{ {
itr->first = itr->first * m; edge.first = edge.first * m;
itr->second = itr->second * m; edge.second = edge.second * m;
} }
} }
@ -2167,18 +2167,14 @@ struct ConvexHull
Vertices intersections; Vertices intersections;
// OSG_NOTICE<<"clip("<<plane<<") edges.size()="<<_edges.size()<<std::endl; // OSG_NOTICE<<"clip("<<plane<<") edges.size()="<<_edges.size()<<std::endl;
for(Edges::iterator itr = _edges.begin(); for(auto itr = _edges.begin(); itr != _edges.end();)
itr != _edges.end();
)
{ {
double d0 = plane.distance(itr->first); double d0 = plane.distance(itr->first);
double d1 = plane.distance(itr->second); double d1 = plane.distance(itr->second);
if (d0<0.0 && d1<0.0) if (d0<0.0 && d1<0.0)
{ {
// OSG_NOTICE<<" Edge completely outside, removing"<<std::endl; // OSG_NOTICE<<" Edge completely outside, removing"<<std::endl;
Edges::iterator to_delete_itr = itr; itr = _edges.erase(itr);
++itr;
_edges.erase(to_delete_itr);
} }
else if (d0>=0.0 && d1>=0.0) else if (d0>=0.0 && d1>=0.0)
{ {
@ -2215,15 +2211,15 @@ struct ConvexHull
if (intersections.size() == 2) if (intersections.size() == 2)
{ {
_edges.push_back( Edge(intersections[0], intersections[1]) ); _edges.emplace_back(intersections[0], intersections[1]);
return; return;
} }
if (intersections.size() == 3) if (intersections.size() == 3)
{ {
_edges.push_back( Edge(intersections[0], intersections[1]) ); _edges.emplace_back(intersections[0], intersections[1]);
_edges.push_back( Edge(intersections[1], intersections[2]) ); _edges.emplace_back(intersections[1], intersections[2]);
_edges.push_back( Edge(intersections[2], intersections[0]) ); _edges.emplace_back(intersections[2], intersections[0]);
return; return;
} }
@ -2241,11 +2237,9 @@ struct ConvexHull
up.normalize(); up.normalize();
osg::Vec3d center; osg::Vec3d center;
for(Vertices::iterator itr = intersections.begin(); for(auto& vertex : intersections)
itr != intersections.end();
++itr)
{ {
center += *itr; center += vertex;
center.x() = osg::maximum(center.x(), -dbl_max); center.x() = osg::maximum(center.x(), -dbl_max);
center.y() = osg::maximum(center.y(), -dbl_max); center.y() = osg::maximum(center.y(), -dbl_max);
@ -2260,11 +2254,9 @@ struct ConvexHull
typedef std::map<double, std::list<std::pair<osg::Vec3d, double>>> VertexMap; typedef std::map<double, std::list<std::pair<osg::Vec3d, double>>> VertexMap;
VertexMap vertexMap; VertexMap vertexMap;
for(Vertices::iterator itr = intersections.begin(); for (const auto& vertex : intersections)
itr != intersections.end();
++itr)
{ {
osg::Vec3d dv = (*itr-center); osg::Vec3d dv = vertex - center;
double h = dv * side; double h = dv * side;
double v = dv * up; double v = dv * up;
double angle = atan2(h,v); double angle = atan2(h,v);
@ -2285,20 +2277,18 @@ struct ConvexHull
auto listItr = vertexMap[angle].begin(); auto listItr = vertexMap[angle].begin();
while (listItr != vertexMap[angle].end() && listItr->second < sortValue) while (listItr != vertexMap[angle].end() && listItr->second < sortValue)
++listItr; ++listItr;
vertexMap[angle].insert(listItr, std::make_pair(*itr, sortValue)); vertexMap[angle].emplace(listItr, std::make_pair(vertex, sortValue));
} }
else else
vertexMap[angle].push_back(std::make_pair(*itr, sortValue)); vertexMap[angle].emplace_back(vertex, sortValue);
} }
osg::Vec3d previous_v = vertexMap.rbegin()->second.back().first; osg::Vec3d previous_v = vertexMap.rbegin()->second.back().first;
for(VertexMap::iterator itr = vertexMap.begin(); for (auto itr = vertexMap.begin(); itr != vertexMap.end(); ++itr)
itr != vertexMap.end();
++itr)
{ {
for (auto vertex : itr->second) for (const auto& vertex : itr->second)
{ {
_edges.push_back(Edge(previous_v, vertex.first)); _edges.emplace_back(previous_v, vertex.first);
previous_v = vertex.first; previous_v = vertex.first;
} }
} }
@ -2309,24 +2299,19 @@ struct ConvexHull
void clip(const osg::Polytope& polytope) void clip(const osg::Polytope& polytope)
{ {
const osg::Polytope::PlaneList& planes = polytope.getPlaneList(); const osg::Polytope::PlaneList& planes = polytope.getPlaneList();
for(osg::Polytope::PlaneList::const_iterator itr = planes.begin(); for(const auto& plane : planes)
itr != planes.end();
++itr)
{ {
clip(*itr); clip(plane);
} }
} }
double min(unsigned int index) const double min(unsigned int index) const
{ {
double m = dbl_max; double m = dbl_max;
for(Edges::const_iterator itr = _edges.begin(); for(const auto& edge : _edges)
itr != _edges.end();
++itr)
{ {
const Edge& edge = *itr; if (edge.first[index] < m) m = edge.first[index];
if (edge.first[index]<m) m = edge.first[index]; if (edge.second[index] < m) m = edge.second[index];
if (edge.second[index]<m) m = edge.second[index];
} }
return m; return m;
} }
@ -2334,13 +2319,10 @@ struct ConvexHull
double max(unsigned int index) const double max(unsigned int index) const
{ {
double m = -dbl_max; double m = -dbl_max;
for(Edges::const_iterator itr = _edges.begin(); for (const auto& edge : _edges)
itr != _edges.end();
++itr)
{ {
const Edge& edge = *itr; if (edge.first[index] > m) m = edge.first[index];
if (edge.first[index]>m) m = edge.first[index]; if (edge.second[index] > m) m = edge.second[index];
if (edge.second[index]>m) m = edge.second[index];
} }
return m; return m;
} }
@ -2350,19 +2332,15 @@ struct ConvexHull
double m = dbl_max; double m = dbl_max;
osg::Vec3d delta; osg::Vec3d delta;
double ratio; double ratio;
for(Edges::const_iterator itr = _edges.begin(); for (const auto& edge : _edges)
itr != _edges.end();
++itr)
{ {
const Edge& edge = *itr; delta = edge.first - eye;
ratio = delta[index] / delta[1];
if (ratio < m) m = ratio;
delta = edge.first-eye; delta = edge.second - eye;
ratio = delta[index]/delta[1]; ratio = delta[index] / delta[1];
if (ratio<m) m = ratio; if (ratio < m) m = ratio;
delta = edge.second-eye;
ratio = delta[index]/delta[1];
if (ratio<m) m = ratio;
} }
return m; return m;
} }
@ -2372,32 +2350,25 @@ struct ConvexHull
double m = -dbl_max; double m = -dbl_max;
osg::Vec3d delta; osg::Vec3d delta;
double ratio; double ratio;
for(Edges::const_iterator itr = _edges.begin(); for (const auto& edge : _edges)
itr != _edges.end();
++itr)
{ {
const Edge& edge = *itr; delta = edge.first - eye;
ratio = delta[index] / delta[1];
if (ratio > m) m = ratio;
delta = edge.first-eye; delta = edge.second - eye;
ratio = delta[index]/delta[1]; ratio = delta[index] / delta[1];
if (ratio>m) m = ratio; if (ratio > m) m = ratio;
delta = edge.second-eye;
ratio = delta[index]/delta[1];
if (ratio>m) m = ratio;
} }
return m; return m;
} }
void output(std::ostream& out) void output(std::ostream& out)
{ {
out<<"ConvexHull"<<std::endl; out << "ConvexHull" << std::endl;
for(Edges::const_iterator itr = _edges.begin(); for (const auto& edge : _edges)
itr != _edges.end();
++itr)
{ {
const Edge& edge = *itr; out << " edge (" << edge.first << ") (" << edge.second << ")" << std::endl;
out<<" edge ("<<edge.first<<") ("<<edge.second<<")"<<std::endl;
} }
} }
}; };