mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-02-01 04:45:34 +00:00
Remove an unused hook
This commit is contained in:
parent
03b6334ceb
commit
728365b48d
8 changed files with 1 additions and 45 deletions
|
@ -19,7 +19,7 @@ source_group(game FILES ${GAME} ${GAME_HEADER})
|
||||||
add_openmw_dir (mwrender
|
add_openmw_dir (mwrender
|
||||||
renderingmanager debugging sky camera animation npcanimation creatureanimation activatoranimation
|
renderingmanager debugging sky camera animation npcanimation creatureanimation activatoranimation
|
||||||
actors objects renderinginterface localmap occlusionquery water shadows
|
actors objects renderinginterface localmap occlusionquery water shadows
|
||||||
characterpreview externalrendering globalmap videoplayer ripplesimulation refraction
|
characterpreview globalmap videoplayer ripplesimulation refraction
|
||||||
terrainstorage renderconst
|
terrainstorage renderconst
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,6 @@ namespace ESM
|
||||||
|
|
||||||
namespace MWRender
|
namespace MWRender
|
||||||
{
|
{
|
||||||
class ExternalRendering;
|
|
||||||
class Animation;
|
class Animation;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -366,8 +365,6 @@ namespace MWBase
|
||||||
|
|
||||||
virtual void enableActorCollision(const MWWorld::Ptr& actor, bool enable) = 0;
|
virtual void enableActorCollision(const MWWorld::Ptr& actor, bool enable) = 0;
|
||||||
|
|
||||||
virtual void setupExternalRendering (MWRender::ExternalRendering& rendering) = 0;
|
|
||||||
|
|
||||||
virtual int canRest() = 0;
|
virtual int canRest() = 0;
|
||||||
///< check if the player is allowed to rest \n
|
///< check if the player is allowed to rest \n
|
||||||
/// 0 - yes \n
|
/// 0 - yes \n
|
||||||
|
|
|
@ -6,8 +6,6 @@
|
||||||
|
|
||||||
#include <components/esm/loadnpc.hpp>
|
#include <components/esm/loadnpc.hpp>
|
||||||
|
|
||||||
#include "externalrendering.hpp"
|
|
||||||
|
|
||||||
#include "../mwworld/ptr.hpp"
|
#include "../mwworld/ptr.hpp"
|
||||||
|
|
||||||
namespace OEngine
|
namespace OEngine
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
#ifndef GAME_RENDERING_EXTERNALRENDERING_H
|
|
||||||
#define GAME_RENDERING_EXTERNALRENDERING_H
|
|
||||||
|
|
||||||
namespace Ogre
|
|
||||||
{
|
|
||||||
class SceneManager;
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace MWRender
|
|
||||||
{
|
|
||||||
/// \brief Base class for out of world rendering
|
|
||||||
class ExternalRendering
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
virtual void setup (Ogre::SceneManager *sceneManager) = 0;
|
|
||||||
|
|
||||||
virtual ~ExternalRendering() {}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -39,7 +39,6 @@
|
||||||
#include "localmap.hpp"
|
#include "localmap.hpp"
|
||||||
#include "water.hpp"
|
#include "water.hpp"
|
||||||
#include "npcanimation.hpp"
|
#include "npcanimation.hpp"
|
||||||
#include "externalrendering.hpp"
|
|
||||||
#include "globalmap.hpp"
|
#include "globalmap.hpp"
|
||||||
#include "videoplayer.hpp"
|
#include "videoplayer.hpp"
|
||||||
#include "terrainstorage.hpp"
|
#include "terrainstorage.hpp"
|
||||||
|
@ -932,11 +931,6 @@ bool RenderingManager::isPositionExplored (float nX, float nY, int x, int y, boo
|
||||||
return mLocalMap->isPositionExplored(nX, nY, x, y, interior);
|
return mLocalMap->isPositionExplored(nX, nY, x, y, interior);
|
||||||
}
|
}
|
||||||
|
|
||||||
void RenderingManager::setupExternalRendering (MWRender::ExternalRendering& rendering)
|
|
||||||
{
|
|
||||||
rendering.setup (mRendering.getScene());
|
|
||||||
}
|
|
||||||
|
|
||||||
Animation* RenderingManager::getAnimation(const MWWorld::Ptr &ptr)
|
Animation* RenderingManager::getAnimation(const MWWorld::Ptr &ptr)
|
||||||
{
|
{
|
||||||
Animation *anim = mActors->getAnimation(ptr);
|
Animation *anim = mActors->getAnimation(ptr);
|
||||||
|
|
|
@ -48,7 +48,6 @@ namespace MWRender
|
||||||
class Shadows;
|
class Shadows;
|
||||||
class LocalMap;
|
class LocalMap;
|
||||||
class Water;
|
class Water;
|
||||||
class ExternalRendering;
|
|
||||||
class GlobalMap;
|
class GlobalMap;
|
||||||
class VideoPlayer;
|
class VideoPlayer;
|
||||||
class Animation;
|
class Animation;
|
||||||
|
@ -204,8 +203,6 @@ public:
|
||||||
bool isPositionExplored (float nX, float nY, int x, int y, bool interior);
|
bool isPositionExplored (float nX, float nY, int x, int y, bool interior);
|
||||||
///< see MWRender::LocalMap::isPositionExplored
|
///< see MWRender::LocalMap::isPositionExplored
|
||||||
|
|
||||||
void setupExternalRendering (MWRender::ExternalRendering& rendering);
|
|
||||||
|
|
||||||
Animation* getAnimation(const MWWorld::Ptr &ptr);
|
Animation* getAnimation(const MWWorld::Ptr &ptr);
|
||||||
|
|
||||||
void playVideo(const std::string& name, bool allowSkipping);
|
void playVideo(const std::string& name, bool allowSkipping);
|
||||||
|
|
|
@ -1705,11 +1705,6 @@ namespace MWWorld
|
||||||
mPhysics->addActor(mPlayer->getPlayer());
|
mPhysics->addActor(mPlayer->getPlayer());
|
||||||
}
|
}
|
||||||
|
|
||||||
void World::setupExternalRendering (MWRender::ExternalRendering& rendering)
|
|
||||||
{
|
|
||||||
mRendering->setupExternalRendering (rendering);
|
|
||||||
}
|
|
||||||
|
|
||||||
int World::canRest ()
|
int World::canRest ()
|
||||||
{
|
{
|
||||||
Ptr::CellStore *currentCell = mWorldScene->getCurrentCell();
|
Ptr::CellStore *currentCell = mWorldScene->getCurrentCell();
|
||||||
|
|
|
@ -456,8 +456,6 @@ namespace MWWorld
|
||||||
|
|
||||||
virtual void enableActorCollision(const MWWorld::Ptr& actor, bool enable);
|
virtual void enableActorCollision(const MWWorld::Ptr& actor, bool enable);
|
||||||
|
|
||||||
virtual void setupExternalRendering (MWRender::ExternalRendering& rendering);
|
|
||||||
|
|
||||||
virtual int canRest();
|
virtual int canRest();
|
||||||
///< check if the player is allowed to rest \n
|
///< check if the player is allowed to rest \n
|
||||||
/// 0 - yes \n
|
/// 0 - yes \n
|
||||||
|
|
Loading…
Reference in a new issue