mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Code Issues Projects Releases Wiki Activity

Ogre 1.9 compatibility changes

Browse Source
This commit is contained in:
scrawl 2013-08-29 17:14:25 +02:00
parent c8e31725dc
commit f12d5b728a
4 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/openmw/mwrender/videoplayer.cpp
View File

@ -1037,7 +1037,6 @@ public:
VideoPlayer::VideoPlayer(Ogre::SceneManager* sceneMgr, Ogre::RenderWindow* window)
: mState(NULL)
, mSceneMgr(sceneMgr)
, mVideoMaterial(NULL)
, mRectangle(NULL)
, mNode(NULL)
, mAllowSkipping(false)

5
extern/sdl4ogre/cursormanager.hpp vendored
View File

@ -4,10 +4,7 @@
#include <SDL_types.h>
#include <string>
namespace Ogre
{
class TexturePtr;
}
#include <OgreTexture.h>
namespace SFO
{

14
libs/openengine/bullet/BulletShapeLoader.cpp
View File

@ -104,6 +104,20 @@ BulletShapeManager::~BulletShapeManager()
sThis = 0;
}
#if (OGRE_VERSION >= ((1 << 16) | (9 << 8) | 0))
BulletShapePtr BulletShapeManager::getByName(const Ogre::String& name, const Ogre::String& groupName)
{
return getResourceByName(name, groupName).staticCast<BulletShape>();
}
BulletShapePtr BulletShapeManager::create (const Ogre::String& name, const Ogre::String& group,
bool isManual, Ogre::ManualResourceLoader* loader,
const Ogre::NameValuePairList* createParams)
{
return createResource(name,group,isManual,loader,createParams).staticCast<BulletShape>();
}
#endif
BulletShapePtr BulletShapeManager::load(const Ogre::String &name, const Ogre::String &group)
{
BulletShapePtr textf = getByName(name);

21
libs/openengine/bullet/BulletShapeLoader.h
View File

@ -48,6 +48,8 @@ public:
/**
*
*/
#if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
class BulletShapePtr : public Ogre::SharedPtr<BulletShape>
{
public:
@ -91,9 +93,9 @@ public:
return *this;
}
};
#else
typedef Ogre::SharedPtr<BulletShape> BulletShapePtr;
#endif
/**
*Hold any BulletShape that was created by the ManualBulletShapeLoader.
@ -137,6 +139,19 @@ public:
BulletShapeManager();
virtual ~BulletShapeManager();
#if (OGRE_VERSION >= ((1 << 16) | (9 << 8) | 0))
/// Get a resource by name
/// @see ResourceManager::getByName
BulletShapePtr getByName(const Ogre::String& name, const Ogre::String& groupName = Ogre::ResourceGroupManager::AUTODETECT_RESOURCE_GROUP_NAME);
/// Create a new shape
/// @see ResourceManager::createResource
BulletShapePtr create (const Ogre::String& name, const Ogre::String& group,
bool isManual = false, Ogre::ManualResourceLoader* loader = 0,
const Ogre::NameValuePairList* createParams = 0);
#endif
virtual BulletShapePtr load(const Ogre::String &name, const Ogre::String &group);
static BulletShapeManager &getSingleton();