mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-14 15:40:18 +00:00
Code Issues Projects Releases Wiki Activity

cleanup and use C++ version of FLT_MAX

Browse Source
This commit is contained in:
Bret Curtis 2020-04-23 10:10:50 +02:00
parent ed20d869b4
commit 407fbe320e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/terrain/quadtreeworld.cpp
View File

@ -2,6 +2,7 @@
#include <osgUtil/CullVisitor> #include <osgUtil/CullVisitor>
#include <limits>
#include <sstream> #include <sstream>
#include <components/misc/constants.hpp> #include <components/misc/constants.hpp>
@ -311,11 +312,11 @@ void updateWaterCullingView(HeightCullCallback* callback, ViewData* vd, osgUtil:
{ {
if (!(cv->getTraversalMask() & callback->getCullMask())) if (!(cv->getTraversalMask() & callback->getCullMask()))
return; return;
float lowZ = FLT_MAX; float lowZ = std::numeric_limits<float>::max();
float highZ = callback->getHighZ(); float highZ = callback->getHighZ();
if (cv->getEyePoint().z() <= highZ || outofworld) if (cv->getEyePoint().z() <= highZ || outofworld)
{ {
callback->setLowZ(-FLT_MAX); callback->setLowZ(-std::numeric_limits<float>::max());
return; return;
} }
cv->pushCurrentMask(); cv->pushCurrentMask();

4
components/terrain/world.hpp
View File

@ -7,9 +7,9 @@
#include <osg/NodeCallback> #include <osg/NodeCallback>
#include <atomic> #include <atomic>
#include <limits>
#include <memory> #include <memory>
#include <set> #include <set>
#include <atomic>
#include "defs.hpp" #include "defs.hpp"
#include "cellborder.hpp" #include "cellborder.hpp"
@ -43,7 +43,7 @@ namespace Terrain
class HeightCullCallback : public osg::NodeCallback class HeightCullCallback : public osg::NodeCallback
{ {
public: public:
HeightCullCallback() : mLowZ(-FLT_MAX), mHighZ(FLT_MAX), mMask(~0) {} HeightCullCallback() : mLowZ(-std::numeric_limits<float>::max()), mHighZ(std::numeric_limits<float>::max()), mMask(~0) {}
void setLowZ(float z) void setLowZ(float z)
{ {