Skip to content

Commit 6eb9823

Browse files
remove more silly stuff
1 parent 360aece commit 6eb9823

File tree

9 files changed

+15
-246
lines changed

9 files changed

+15
-246
lines changed

include/ISceneManager.h

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@ namespace scene
3434
class IDummyTransformationSceneNode;
3535
class IMeshLoader;
3636
class IMeshSceneNode;
37-
class IMeshSceneNodeInstanced;
3837
class IMeshWriter;
3938
class ISceneNode;
4039
class ISceneNodeAnimator;
41-
class ISceneNodeAnimatorCollisionResponse;
4240

4341
//! The Scene Manager manages scene nodes, mesh recources, cameras and all the other stuff.
4442
/** All Scene nodes can be created only here. There is a always growing
@@ -193,15 +191,6 @@ namespace scene
193191
virtual IDummyTransformationSceneNode* addDummyTransformationSceneNode(
194192
IDummyTransformationSceneNode* parent=0, int32_t id=-1) = 0;
195193

196-
//! Gets the root scene node.
197-
/** This is the scene node which is parent
198-
of all scene nodes. The root scene node is a special scene node which
199-
only exists to manage all scene nodes. It will not be rendered and cannot
200-
be removed from the scene.
201-
\return Pointer to the root scene node.
202-
This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
203-
virtual ISceneNode* getRootSceneNode() = 0;
204-
205194
//! Get the current active camera.
206195
/** \return The active camera is returned. Note that this can
207196
be NULL, if there was no camera created yet.
@@ -213,17 +202,6 @@ namespace scene
213202
\param camera: The new camera which should be active. */
214203
virtual void setActiveCamera(ICameraSceneNode* camera) = 0;
215204

216-
//! Adds a scene node to the deletion queue.
217-
/** The scene node is immediatly
218-
deleted when it's secure. Which means when the scene node does not
219-
execute animators and things like that. This method is for example
220-
used for deleting scene nodes by their scene node animators. In
221-
most other cases, a ISceneNode::remove() call is enough, using this
222-
deletion queue is not necessary.
223-
See ISceneManager::createDeleteAnimator() for details.
224-
\param node: Node to detete. */
225-
virtual void addToDeletionQueue(IDummyTransformationSceneNode* node) = 0;
226-
227205
//! Posts an input event to the environment.
228206
/** Usually you do not have to
229207
use this method, it is used by the internal engine. */

include/splines.h

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,22 @@ namespace core
1818
{
1919

2020
// TODO @Przemog
21-
// TODO: Rename to Follow Curve Animator
22-
// TODO: Refactor into an interpolator so we can use it for rotations too
21+
// TODO: Refactor the base into an interpolator so we can use it for rotations too (in `core`)
22+
// control points
23+
// looping, finishing or pingponging (repeat, clamp or mirror)
24+
// do what `getPos_fromParameter` does but call it `getValue`
25+
// do what `getUnnormDirection_fromParameter` does but call it `getDerivativeAndTangent`
26+
// TODO: Refactor the other functionality Follow Curve Animator (in `scene`)
27+
// need `getSplineLength` as `getCurveLength`
28+
// info about segments
29+
// info about arclength being precise (for many splines its not because arclength integrals are not fun)
30+
// for the Follow Spine Animators (derived from interpolator)
31+
// implement `_fromParameter` as simple passthroughs
32+
// remember that `getPos` and `getUnnormDirection` need to be implemented in arclength (so the object can follow at constant speed)
33+
// TODO: Implement a FollowCircle or FollowEllipsoid derived from Follow Curve Animator
34+
//
2335
// TODO: Refactor the `BlockChange` stuff into an ext::baw::Animators
36+
// all the methods with `BlockChange` in the name
2437
class ISpline// : public AllocationOverrideDefault
2538
{
2639
public:

source/Nabla/CSceneManager.cpp

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ CSceneManager::CSceneManager(IrrlichtDevice* device, video::IVideoDriver* driver
4444
//! destructor
4545
CSceneManager::~CSceneManager()
4646
{
47-
clearDeletionList();
48-
4947
if (CursorControl)
5048
CursorControl->drop();
5149

@@ -166,16 +164,6 @@ IDummyTransformationSceneNode* CSceneManager::addDummyTransformationSceneNode(
166164
return node;
167165
}
168166

169-
//! Returns the root scene node. This is the scene node wich is parent
170-
//! of all scene nodes. The root scene node is a special scene node which
171-
//! only exists to manage all scene nodes. It is not rendered and cannot
172-
//! be removed from the scene.
173-
//! \return Returns a pointer to the root scene node.
174-
ISceneNode* CSceneManager::getRootSceneNode()
175-
{
176-
return this;
177-
}
178-
179167

180168
//! Returns the current active camera.
181169
//! \return The active camera is returned. Note that this can be NULL, if there
@@ -233,32 +221,6 @@ void CSceneManager::OnAnimate(uint32_t timeMs)
233221
}
234222
}
235223

236-
//! Adds a scene node to the deletion queue.
237-
void CSceneManager::addToDeletionQueue(IDummyTransformationSceneNode* node)
238-
{
239-
if (!node)
240-
return;
241-
242-
node->grab();
243-
DeletionList.push_back(node);
244-
}
245-
246-
247-
//! clears the deletion list
248-
void CSceneManager::clearDeletionList()
249-
{
250-
if (DeletionList.empty())
251-
return;
252-
253-
for (uint32_t i=0; i<DeletionList.size(); ++i)
254-
{
255-
DeletionList[i]->remove();
256-
DeletionList[i]->drop();
257-
}
258-
259-
DeletionList.clear();
260-
}
261-
262224
//! Posts an input event to the environment. Usually you do not have to
263225
//! use this method, it is used by the internal engine.
264226
bool CSceneManager::receiveIfEventReceiverDidNotAbsorb(const SEvent& event)

source/Nabla/CSceneManager.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,6 @@ namespace scene
8888
virtual IDummyTransformationSceneNode* addDummyTransformationSceneNode(
8989
IDummyTransformationSceneNode* parent=0, int32_t id=-1);
9090

91-
//! Returns the root scene node. This is the scene node wich is parent
92-
//! of all scene nodes. The root scene node is a special scene node which
93-
//! only exists to manage all scene nodes. It is not rendered and cannot
94-
//! be removed from the scene.
95-
//! \return Pointer to the root scene node.
96-
virtual ISceneNode* getRootSceneNode();
97-
9891
//! Returns the current active camera.
9992
//! \return The active camera is returned. Note that this can be NULL, if there
10093
//! was no camera created yet.
@@ -104,10 +97,6 @@ namespace scene
10497
//! \param camera: The new camera which should be active.
10598
virtual void setActiveCamera(ICameraSceneNode* camera);
10699

107-
108-
//! Adds a scene node to the deletion queue.
109-
virtual void addToDeletionQueue(IDummyTransformationSceneNode* node);
110-
111100
//! Posts an input event to the environment. Usually you do not have to
112101
//! use this method, it is used by the internal engine.
113102
virtual bool receiveIfEventReceiverDidNotAbsorb(const SEvent& event);

source/Nabla/CSceneNodeAnimatorFlyCircle.cpp

Lines changed: 0 additions & 75 deletions
This file was deleted.

source/Nabla/CSceneNodeAnimatorFlyCircle.h

Lines changed: 0 additions & 59 deletions
This file was deleted.

source/Nabla/ISceneNodeAnimatorFinishing.h

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/nbl/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ ${NBL_ROOT_PATH}/source/Nabla/CSceneManager.cpp
229229
${NBL_ROOT_PATH}/source/Nabla/CSceneNodeAnimatorCameraFPS.cpp
230230
${NBL_ROOT_PATH}/source/Nabla/CSceneNodeAnimatorCameraMaya.cpp
231231
${NBL_ROOT_PATH}/source/Nabla/CSceneNodeAnimatorCameraModifiedMaya.cpp
232-
${NBL_ROOT_PATH}/source/Nabla/CSceneNodeAnimatorFlyCircle.cpp
233232
)
234233
set(NABLA_SRCS_COMMON
235234
${NBL_CORE_SOURCES}

src/nbl/pch.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
#include "CWriteFile.h"
109109
#include "CZipReader.h"
110110
#include "FW_Mutex.h" // refactor
111-
#include "ISceneNodeAnimatorFinishing.h"
112111
#include "os.h"
113112
*/
114113

0 commit comments

Comments
 (0)