mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-24 14:23:54 +00:00
Code Issues Releases Wiki Activity

Skip adjusting near and far planes for instances that won't affect it

Browse source
This commit is contained in:
AnyOldName3 2023-04-30 01:58:43 +01:00
parent f0fcb5e5df
commit ab625804ab
1 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
apps/openmw/mwrender/groundcover.cpp
View file

@ -46,8 +46,9 @@ namespace MWRender
{ {
public: public:
InstancedComputeNearFarCullCallback( InstancedComputeNearFarCullCallback(
const std::vector<Groundcover::GroundcoverEntry>& instances, const osg::Vec3& chunkPosition) const std::vector<Groundcover::GroundcoverEntry>& instances, const osg::Vec3& chunkPosition, const osg::BoundingBox& instanceBounds)
: mInstanceMatrices() : mInstanceMatrices()
, mInstanceBounds(instanceBounds)
{ {
mInstanceMatrices.reserve(instances.size()); mInstanceMatrices.reserve(instances.size());
for (const auto& instance : instances) for (const auto& instance : instances)
@ -101,11 +102,25 @@ namespace MWRender
if (dNear < computedZNear) if (dNear < computedZNear)
{ {
dNear = std::numeric_limits<value_type>::max(); dNear = computedZNear;
for (const auto& instanceMatrix : mInstanceMatrices) for (const auto& instanceMatrix : mInstanceMatrices)
{ {
osg::Matrix fullMatrix = instanceMatrix * matrix;
osg::Vec3 instanceLookVector(-fullMatrix(0, 2), -fullMatrix(1, 2), -fullMatrix(2, 2));
unsigned int instanceBbCornerFar
= (instanceLookVector.x() >= 0 ? 1 : 0) | (instanceLookVector.y() >= 0 ? 2 : 0) | (instanceLookVector.z() >= 0 ? 4 : 0);
unsigned int instanceBbCornerNear = (~instanceBbCornerFar) & 7;
value_type instanceDNear = distance(mInstanceBounds.corner(instanceBbCornerNear), fullMatrix);
value_type instanceDFar = distance(mInstanceBounds.corner(instanceBbCornerFar), fullMatrix);
if (instanceDNear > instanceDFar)
std::swap(instanceDNear, instanceDFar);
if (instanceDFar < 0 || instanceDNear > dNear)
continue;
value_type newNear = cullVisitor.computeNearestPointInFrustum( value_type newNear = cullVisitor.computeNearestPointInFrustum(
instanceMatrix * matrix, planes, *drawable); fullMatrix, planes, *drawable);
dNear = std::min(dNear, newNear); dNear = std::min(dNear, newNear);
} }
if (dNear < computedZNear) if (dNear < computedZNear)
@ -114,9 +129,23 @@ namespace MWRender
if (cnfMode == osg::CullSettings::COMPUTE_NEAR_FAR_USING_PRIMITIVES && dFar > computedZFar) if (cnfMode == osg::CullSettings::COMPUTE_NEAR_FAR_USING_PRIMITIVES && dFar > computedZFar)
{ {
dFar = -std::numeric_limits<value_type>::max(); dFar = computedZFar;
for (const auto& instanceMatrix : mInstanceMatrices) for (const auto& instanceMatrix : mInstanceMatrices)
{ {
osg::Matrix fullMatrix = instanceMatrix * matrix;
osg::Vec3 instanceLookVector(-fullMatrix(0, 2), -fullMatrix(1, 2), -fullMatrix(2, 2));
unsigned int instanceBbCornerFar
= (instanceLookVector.x() >= 0 ? 1 : 0) | (instanceLookVector.y() >= 0 ? 2 : 0) | (instanceLookVector.z() >= 0 ? 4 : 0);
unsigned int instanceBbCornerNear = (~instanceBbCornerFar) & 7;
value_type instanceDNear = distance(mInstanceBounds.corner(instanceBbCornerNear), fullMatrix);
value_type instanceDFar = distance(mInstanceBounds.corner(instanceBbCornerFar), fullMatrix);
if (instanceDNear > instanceDFar)
std::swap(instanceDNear, instanceDFar);
if (instanceDFar < 0 || instanceDFar < dFar)
continue;
value_type newFar = cullVisitor.computeFurthestPointInFrustum( value_type newFar = cullVisitor.computeFurthestPointInFrustum(
instanceMatrix * matrix, planes, *drawable); instanceMatrix * matrix, planes, *drawable);
dFar = std::max(dFar, newFar); dFar = std::max(dFar, newFar);
@ -132,6 +161,7 @@ namespace MWRender
private: private:
std::vector<osg::Matrix> mInstanceMatrices; std::vector<osg::Matrix> mInstanceMatrices;
osg::BoundingBox mInstanceBounds;
}; };
class InstancingVisitor : public osg::NodeVisitor class InstancingVisitor : public osg::NodeVisitor
@ -153,7 +183,8 @@ namespace MWRender
osg::ref_ptr<osg::Vec4Array> transforms = new osg::Vec4Array(mInstances.size()); osg::ref_ptr<osg::Vec4Array> transforms = new osg::Vec4Array(mInstances.size());
osg::BoundingBox box; osg::BoundingBox box;
float radius = geom.getBoundingBox().radius(); osg::BoundingBox originalBox = geom.getBoundingBox();
float radius = originalBox.radius();
for (unsigned int i = 0; i < transforms->getNumElements(); i++) for (unsigned int i = 0; i < transforms->getNumElements(); i++)
{ {
osg::Vec3f pos(mInstances[i].mPos.asVec3()); osg::Vec3f pos(mInstances[i].mPos.asVec3());
@ -181,7 +212,7 @@ namespace MWRender
geom.setVertexAttribArray(6, transforms.get(), osg::Array::BIND_PER_VERTEX); geom.setVertexAttribArray(6, transforms.get(), osg::Array::BIND_PER_VERTEX);
geom.setVertexAttribArray(7, rotations.get(), osg::Array::BIND_PER_VERTEX); geom.setVertexAttribArray(7, rotations.get(), osg::Array::BIND_PER_VERTEX);
geom.addCullCallback(new InstancedComputeNearFarCullCallback(mInstances, mChunkPosition)); geom.addCullCallback(new InstancedComputeNearFarCullCallback(mInstances, mChunkPosition, originalBox));
} }
private: private: