-#ifdef USE_ENTITYTABLE_DEFINE
-#ifndef __ENTITYTABLENAME
-#define __ENTITYTABLENAME g_EntityTable
-#endif
-#define Entity_Alloc __ENTITYTABLENAME.m_pfnEntity_Alloc
-#define Entity_Free __ENTITYTABLENAME.m_pfnEntity_Free
-#define Entity_Clone __ENTITYTABLENAME.m_pfnEntity_Clone
-#define SetKeyValue __ENTITYTABLENAME.m_pfnSetKeyValue
-#define DeleteKey __ENTITYTABLENAME.m_pfnDeleteKey
-#define ValueForKey __ENTITYTABLENAME.m_pfnValueForKey
-#define FloatForKey __ENTITYTABLENAME.m_pfnFloatForKey
-#define IntForKey __ENTITYTABLENAME.m_pfnIntForKey
-#define GetVectorForKey __ENTITYTABLENAME.m_pfnGetVectorForKey
-#define Entity_AddToList __ENTITYTABLENAME.m_pfnEntity_AddToList
-#define Entity_RemoveFromList __ENTITYTABLENAME.m_pfnEntity_RemoveFromList
-#define Entity_LinkBrush __ENTITYTABLENAME.m_pfnEntity_LinkBrush
-#define Entity_UnlinkBrush __ENTITYTABLENAME.m_pfnEntity_UnlinkBrush
-#define DrawLight __ENTITYTABLENAME.m_pfnDrawLight
-#define Entity_MemorySize __ENTITYTABLENAME.m_pfnEntity_MemorySize
-#define Entity_AllocateEpair __ENTITYTABLENAME.m_pfnAllocateEpair
-#define Entity_GetKeyValList __ENTITYTABLENAME.m_pfnGetEntityKeyValList
-#define Entity_SetKeyValList __ENTITYTABLENAME.m_pfnSetEntityKeyValList
-#endif
+class Entity
+{
+public:
+STRING_CONSTANT( Name, "Entity" );
+
+class Observer
+{
+public:
+virtual void insert( const char* key, EntityKeyValue& value ) = 0;
+virtual void erase( const char* key, EntityKeyValue& value ) = 0;
+virtual void clear() { };
+};
+
+class Visitor
+{
+public:
+virtual void visit( const char* key, const char* value ) = 0;
+};
+
+virtual const EntityClass& getEntityClass() const = 0;
+virtual void forEachKeyValue( Visitor& visitor ) const = 0;
+virtual void setKeyValue( const char* key, const char* value ) = 0;
+virtual const char* getKeyValue( const char* key ) const = 0;
+virtual bool isContainer() const = 0;
+virtual void attach( Observer& observer ) = 0;
+virtual void detach( Observer& observer ) = 0;
+};
+
+class EntityCopyingVisitor : public Entity::Visitor
+{
+Entity& m_entity;
+public:
+EntityCopyingVisitor( Entity& entity )
+ : m_entity( entity ){
+}
+
+void visit( const char* key, const char* value ){
+ if ( !string_equal( key, "classname" ) ) {
+ m_entity.setKeyValue( key, value );
+ }
+}
+};
+
+inline Entity* Node_getEntity( scene::Node& node ){
+ return NodeTypeCast<Entity>::cast( node );
+}
+
+
+template<typename value_type>
+class Stack;
+template<typename Contained>
+class Reference;
+
+namespace scene
+{
+class Node;
+}
+
+typedef Reference<scene::Node> NodeReference;
+
+namespace scene
+{
+typedef Stack<NodeReference> Path;
+}
+
+class Counter;
+
+class EntityCreator
+{
+public:
+INTEGER_CONSTANT( Version, 2 );
+STRING_CONSTANT( Name, "entity" );
+
+virtual scene::Node& createEntity( EntityClass* eclass ) = 0;
+
+typedef void ( *KeyValueChangedFunc )();
+virtual void setKeyValueChangedFunc( KeyValueChangedFunc func ) = 0;
+
+virtual void setCounter( Counter* counter ) = 0;
+
+virtual void connectEntities( const scene::Path& e1, const scene::Path& e2, int index ) = 0;
+
+virtual void setLightRadii( bool lightRadii ) = 0;
+virtual bool getLightRadii() = 0;
+virtual void setShowNames( bool showNames ) = 0;
+virtual bool getShowNames() = 0;
+virtual void setShowAngles( bool showAngles ) = 0;
+virtual bool getShowAngles() = 0;
+
+virtual void printStatistics() const = 0;
+};
+
+#include "modulesystem.h"
+
+template<typename Type>
+class GlobalModule;
+typedef GlobalModule<EntityCreator> GlobalEntityModule;
+
+template<typename Type>
+class GlobalModuleRef;
+typedef GlobalModuleRef<EntityCreator> GlobalEntityModuleRef;
+
+inline EntityCreator& GlobalEntityCreator(){
+ return GlobalEntityModule::getTable();
+}