sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace Listenable system by signals

Browse Source 
Former-commit-id: 16fb0b3e703ca4b41ceb97fab938cebb05f677d4
This commit is contained in:
Lynix
2015-06-07 15:16:11 +02:00
parent 3e8d2e1e47
commit fe25249136
24 changed files with 182 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/Nazara/Utility/Node.hpp
View File

@@ -8,7 +8,7 @@
#define NAZARA_NODE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/Listenable.hpp>
#include <Nazara/Core/Signal.hpp>
#include <Nazara/Math/Matrix4.hpp>
#include <Nazara/Math/Quaternion.hpp>
#include <Nazara/Math/Vector3.hpp>
@@ -16,7 +16,7 @@
#include <unordered_map>
#include <vector>
class NAZARA_API NzNode : public NzListenable<NzNode>
class NAZARA_API NzNode
{
public:
NzNode();
@@ -90,16 +90,10 @@ class NAZARA_API NzNode : public NzListenable<NzNode>
NzNode& operator=(const NzNode& node);
class NAZARA_API Listener
{
public:
Listener() = default;
virtual ~Listener();
virtual bool OnNodeInvalidated(const NzNode* node, void* userdata);
virtual bool OnNodeParented(const NzNode* node, const NzNode* parent, void* userdata);
virtual void OnNodeReleased(const NzNode* node, void* userdata);
};
// Signals
NazaraSignal(OnNodeInvalidation, const NzNode*); //< Args: me
NazaraSignal(OnNodeNewParent, const NzNode*, const NzNode*); //< Args: me
NazaraSignal(OnNodeRelease, const NzNode*); //< Args: me
protected:
void AddChild(NzNode* node) const;
@@ -126,7 +120,6 @@ class NAZARA_API NzNode : public NzListenable<NzNode>
bool m_inheritRotation;
bool m_inheritScale;
mutable bool m_transformMatrixUpdated;
};
#endif // NAZARA_NODE_HPP