MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge revision 4724 from branch to ogl-es: 

- Fix SDL device compilation. VideoDriver is now always dropped after Scenemanager and FileSystem after those two to prevent memory-leaks in some situations.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4830 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2014-05-08 13:46:18 +00:00
parent fbc4fa7da1
commit c73006c7a4
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Irrlicht/CIrrDeviceSDL.cpp
View File

@ -754,7 +754,7 @@ void CIrrDeviceSDL::maximizeWindow()
} }
//! Get the position of this window on screen //! Get the position of this window on screen
core::position2di getWindowPosition() core::position2di CIrrDeviceSDL::getWindowPosition()
{ {
return core::position2di(-1, -1); return core::position2di(-1, -1);
} }

27
source/Irrlicht/CIrrDeviceStub.cpp
View File

@ -60,14 +60,17 @@ CIrrDeviceStub::~CIrrDeviceStub()
if (GUIEnvironment) if (GUIEnvironment)
GUIEnvironment->drop(); GUIEnvironment->drop();
if (SceneManager)
SceneManager->drop();
if (VideoDriver) if (VideoDriver)
VideoDriver->drop(); VideoDriver->drop();
if (ContextManager) if (ContextManager)
ContextManager->drop(); ContextManager->drop();
if (SceneManager) if ( FileSystem )
SceneManager->drop(); FileSystem->drop();
if (InputReceivingSceneManager) if (InputReceivingSceneManager)
InputReceivingSceneManager->drop(); InputReceivingSceneManager->drop();
@ -366,25 +369,25 @@ bool CIrrDeviceStub::activateAccelerometer(float updateInterval)
{ {
return false; return false;
} }
//! No-op in this implementation //! No-op in this implementation
bool CIrrDeviceStub::deactivateAccelerometer() bool CIrrDeviceStub::deactivateAccelerometer()
{ {
return false; return false;
} }
//! No-op in this implementation //! No-op in this implementation
bool CIrrDeviceStub::isAccelerometerActive() bool CIrrDeviceStub::isAccelerometerActive()
{ {
return false; return false;
} }
//! No-op in this implementation //! No-op in this implementation
bool CIrrDeviceStub::isAccelerometerAvailable() bool CIrrDeviceStub::isAccelerometerAvailable()
{ {
return false; return false;
} }
//! No-op in this implementation //! No-op in this implementation
bool CIrrDeviceStub::activateGyroscope(float updateInterval) bool CIrrDeviceStub::activateGyroscope(float updateInterval)
{ {
@ -396,37 +399,37 @@ bool CIrrDeviceStub::deactivateGyroscope()
{ {
return false; return false;
} }
//! No-op in this implementation //! No-op in this implementation
bool CIrrDeviceStub::isGyroscopeActive() bool CIrrDeviceStub::isGyroscopeActive()
{ {
return false; return false;
} }
//! No-op in this implementation //! No-op in this implementation
bool CIrrDeviceStub::isGyroscopeAvailable() bool CIrrDeviceStub::isGyroscopeAvailable()
{ {
return false; return false;
} }
//! No-op in this implementation //! No-op in this implementation
bool CIrrDeviceStub::activateDeviceMotion(float updateInterval) bool CIrrDeviceStub::activateDeviceMotion(float updateInterval)
{ {
return false; return false;
} }
//! No-op in this implementation //! No-op in this implementation
bool CIrrDeviceStub::deactivateDeviceMotion() bool CIrrDeviceStub::deactivateDeviceMotion()
{ {
return false; return false;
} }
//! No-op in this implementation //! No-op in this implementation
bool CIrrDeviceStub::isDeviceMotionActive() bool CIrrDeviceStub::isDeviceMotionActive()
{ {
return false; return false;
} }
//! No-op in this implementation //! No-op in this implementation
bool CIrrDeviceStub::isDeviceMotionAvailable() bool CIrrDeviceStub::isDeviceMotionAvailable()
{ {