mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 09:39:43 +00:00
Code Issues Releases Wiki Activity

Replace detournavigator includes by forward declarations

Browse source
This commit is contained in:
elsid 2021-11-06 00:48:39 +01:00
parent 9f808fbe3a
commit 6b30d375fa
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
7 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/engine.cpp
View file

@ -37,8 +37,6 @@
#include <components/version/version.hpp>
#include <components/detournavigator/navigator.hpp>
#include <components/misc/frameratelimiter.hpp>
#include <components/sceneutil/screencapture.hpp>

3
apps/openmw/mwrender/actorspaths.cpp
View file

@ -9,6 +9,9 @@
#include "../mwbase/world.hpp"
#include "../mwbase/environment.hpp"
#include <algorithm>
namespace MWRender
{
ActorsPaths::ActorsPaths(const osg::ref_ptr<osg::Group>& root, bool enabled)

8
apps/openmw/mwrender/actorspaths.hpp
View file

@ -3,18 +3,22 @@
#include <apps/openmw/mwworld/ptr.hpp>
#include <components/detournavigator/navigator.hpp>
#include <osg/ref_ptr>
#include <unordered_map>
#include <deque>
#include <map>
namespace osg
{
class Group;
}
namespace DetourNavigator
{
struct Settings;
}
namespace MWRender
{
class ActorsPaths

3
apps/openmw/mwrender/navmesh.cpp
View file

@ -10,11 +10,14 @@
#include "../mwbase/world.hpp"
#include "../mwbase/environment.hpp"
#include <limits>
namespace MWRender
{
NavMesh::NavMesh(const osg::ref_ptr<osg::Group>& root, bool enabled)
: mRootNode(root)
, mEnabled(enabled)
, mId(std::numeric_limits<std::size_t>::max())
, mGeneration(0)
, mRevision(0)
{

13
apps/openmw/mwrender/navmesh.hpp
View file

@ -1,16 +1,23 @@
#ifndef OPENMW_MWRENDER_NAVMESH_H
#define OPENMW_MWRENDER_NAVMESH_H
#include <components/detournavigator/navigator.hpp>
#include <osg/ref_ptr>
#include <cstddef>
class dtNavMesh;
namespace osg
{
class Group;
class Geometry;
}
namespace DetourNavigator
{
struct Settings;
}
namespace MWRender
{
class NavMesh
@ -38,7 +45,7 @@ namespace MWRender
private:
osg::ref_ptr<osg::Group> mRootNode;
bool mEnabled;
std::size_t mId = std::numeric_limits<std::size_t>::max();
std::size_t mId;
std::size_t mGeneration;
std::size_t mRevision;
osg::ref_ptr<osg::Group> mGroup;

2
apps/openmw/mwrender/recastmesh.cpp
View file

@ -3,6 +3,8 @@
#include <components/sceneutil/recastmesh.hpp>
#include <components/resource/resourcesystem.hpp>
#include <components/resource/scenemanager.hpp>
#include <components/detournavigator/settings.hpp>
#include <components/detournavigator/recastmesh.hpp>
#include <osg/PositionAttitudeTransform>

7
apps/openmw/mwrender/recastmesh.hpp
View file

@ -1,7 +1,7 @@
#ifndef OPENMW_MWRENDER_RECASTMESH_H
#define OPENMW_MWRENDER_RECASTMESH_H
#include <components/detournavigator/navigator.hpp>
#include <components/detournavigator/recastmeshtiles.hpp>
#include <osg/ref_ptr>
@ -13,6 +13,11 @@ namespace osg
class Geometry;
}
namespace DetourNavigator
{
struct Settings;
}
namespace MWRender
{
class RecastMesh