Skip to content

Commit f650459

Browse files
remove some legacy cruft and empty file
1 parent e74a368 commit f650459

File tree

3 files changed

+5
-96
lines changed

3 files changed

+5
-96
lines changed

source/Nabla/CSceneManager.cpp

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55

66
#include "BuildConfigOptions.h"
77
#include "CSceneManager.h"
8-
#include "IFileSystem.h"
9-
#include "IReadFile.h"
10-
#include "IWriteFile.h"
11-
#include "IrrlichtDevice.h"
128

139
#include "nbl_os.h"
1410

@@ -23,44 +19,6 @@ namespace nbl
2319
namespace scene
2420
{
2521

26-
//! constructor
27-
CSceneManager::CSceneManager(IrrlichtDevice* device, video::IVideoDriver* driver, nbl::ITimer* timer, io::IFileSystem* fs,
28-
gui::ICursorControl* cursorControl)
29-
: ISceneNode(0, 0), Driver(driver), Timer(timer), Device(device),
30-
CursorControl(cursorControl), ActiveCamera(0)
31-
{
32-
#ifdef _NBL_DEBUG
33-
ISceneManager::setDebugName("CSceneManager ISceneManager");
34-
#endif
35-
36-
if (Driver)
37-
Driver->grab();
38-
if (CursorControl)
39-
CursorControl->grab();
40-
}
41-
42-
43-
//! destructor
44-
CSceneManager::~CSceneManager()
45-
{
46-
if (CursorControl)
47-
CursorControl->drop();
48-
49-
if (ActiveCamera)
50-
ActiveCamera->drop();
51-
ActiveCamera = 0;
52-
53-
// remove all nodes and animators before dropping the driver
54-
// as render targets may be destroyed twice
55-
56-
removeAll();
57-
removeAnimators();
58-
59-
if (Driver)
60-
Driver->drop();
61-
}
62-
63-
6422
//! Adds a camera scene node to the tree and sets it as active camera.
6523
//! \param position: Position of the space relative to its parent where the camera will be placed.
6624
//! \param lookat: Position where the camera will look at. Also known as target.
@@ -172,12 +130,6 @@ void CSceneManager::setActiveCamera(ICameraSceneNode* camera)
172130
ActiveCamera = camera;
173131
}
174132

175-
176-
//! renders the node.
177-
void CSceneManager::render()
178-
{
179-
}
180-
181133
//!
182134
void CSceneManager::OnAnimate(uint32_t timeMs)
183135
{
@@ -209,22 +161,6 @@ bool CSceneManager::receiveIfEventReceiverDidNotAbsorb(const SEvent& event)
209161
return ret;
210162
}
211163

212-
213-
//! Removes all children of this scene node
214-
void CSceneManager::removeAll()
215-
{
216-
ISceneNode::removeAll();
217-
setActiveCamera(0);
218-
}
219-
220-
221-
//! Clears the whole scene. All scene nodes are removed.
222-
void CSceneManager::clear()
223-
{
224-
removeAll();
225-
}
226-
227-
228164
} // end namespace scene
229165
} // end namespace nbl
230166

source/Nabla/CSceneManager.h

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,18 @@
88

99
#include "ISceneManager.h"
1010
#include "ISceneNode.h"
11-
#include "ICursorControl.h"
12-
13-
#include <map>
14-
#include <string>
1511

1612
namespace nbl
1713
{
18-
class ITimer;
19-
namespace io
20-
{
21-
class IFileSystem;
22-
}
2314
namespace scene
2415
{
2516

26-
/*!
27-
The Scene Manager manages scene nodes, mesh recources, cameras and all the other stuff.
28-
*/
29-
class CSceneManager : public ISceneManager, public ISceneNode
30-
{
31-
protected:
32-
//! destructor
33-
virtual ~CSceneManager();
34-
17+
/*!
18+
The Scene Manager manages scene nodes, mesh recources, cameras and all the other stuff.
19+
*/
20+
class CSceneManager : public ISceneManager, public ISceneNode
21+
{
3522
public:
36-
//! constructor
37-
CSceneManager( IrrlichtDevice* device, video::IVideoDriver* driver,
38-
nbl::ITimer* timer, io::IFileSystem* fs, gui::ICursorControl* cursorControl);
39-
40-
//! returns the video driver
41-
inline video::IVideoDriver* getVideoDriver() override { return Driver; }
42-
4323
//!
4424
virtual void OnAnimate(uint32_t timeMs);
4525

@@ -88,10 +68,6 @@ namespace scene
8868
//! \param camera: The new camera which should be active.
8969
virtual void setActiveCamera(ICameraSceneNode* camera);
9070

91-
//! Posts an input event to the environment. Usually you do not have to
92-
//! use this method, it is used by the internal engine.
93-
virtual bool receiveIfEventReceiverDidNotAbsorb(const SEvent& event);
94-
9571
//! Clears the whole scene. All scene nodes are removed.
9672
virtual void clear();
9773

@@ -112,9 +88,6 @@ namespace scene
11288
//! parent device
11389
IrrlichtDevice* Device;
11490

115-
//! cursor control
116-
gui::ICursorControl* CursorControl;
117-
11891
//! current active camera
11992
ICameraSceneNode* ActiveCamera;
12093
};

src/nbl/system/CSystemWin32.cpp

Whitespace-only changes.

0 commit comments

Comments
 (0)