abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Forcing update of EntityPredicate.h

Browse Source 
This was SVN commit r2092.
This commit is contained in:
MarkT 2005-03-30 18:25:07 +00:00
parent 31fb8c37c4
commit 414960a654
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/simulation/EntityManager.h
View File

@ -22,6 +22,7 @@
#include "Singleton.h"
#include "Entity.h"
#include "EntityHandles.h"
#include "EntityPredicate.h"
#include "EntityMessage.h"
#define MAX_HANDLES 4096
@ -38,28 +39,39 @@ friend class CHandle;
static bool m_extant;
void destroy( u16 handle );
public:
typedef bool (*EntityPredicate)( CEntity* target );
typedef bool (*EntityPredicateUD)( CEntity* target, void* userdata );
CEntityManager();
~CEntityManager();
HEntity create( CBaseEntity* base, CVector3D position, float orientation );
HEntity create( CStrW templatename, CVector3D position, float orientation );
HEntity* getByHandle( u16 index );
void updateAll( size_t timestep );
void interpolateAll( float relativeoffset );
void InitializeAll();
void TickAll();
void renderAll();
std::vector<HEntity>* matches( EntityPredicate predicate );
std::vector<HEntity>* matches( EntityPredicateUD predicate, void* userdata );
std::vector<HEntity>* matches( EntityPredicate predicate1, EntityPredicate predicate2 );
std::vector<HEntity>* matches( EntityPredicateUD predicate1, EntityPredicateUD predicate2, void* userdata );
// Predicate functions
typedef bool (*EntityPredicate)( CEntity* target, void* userdata );
template<EntityPredicate left, EntityPredicate right> static bool EntityPredicateLogicalOr( CEntity* target, void* userdata )
{ return( left( target, userdata ) || right( target, userdata ) ); }
template<EntityPredicate left, EntityPredicate right> static bool EntityPredicateLogicalAnd( CEntity* target, void* userdata )
{ return( left( target, userdata ) && right( target, userdata ) ); }
template<EntityPredicate operand> static bool EntityPredicateLogicalNot( CEntity* target, void* userdata )
{ return( !operand( target, userdata ) ); }
std::vector<HEntity>* matches( EntityPredicate predicate, void* userdata = NULL );
std::vector<HEntity>* getExtant();
static inline bool extant() // True if the singleton is actively maintaining handles. When false, system is shutting down, handles are quietly dumped.
{
return( m_extant );
}
};
#endif

0
source/simulation/EntityPredicate.h Normal file
View File

8
source/simulation/EntitySupport.h
View File

@ -32,13 +32,13 @@ public:
m_Hack = Hack;
m_Pierce = Pierce;
m_Typeless = Typeless;
AddProperty<float>( L"crush", &m_Crush );
AddProperty<float>( L"hack", &m_Hack );
AddProperty<float>( L"pierce", &m_Pierce );
AddProperty<float>( L"typeless", &m_Typeless );
}
static void ScriptingInit()
{
AddClassProperty<float>( L"crush", &CDamageType::m_Crush );
AddClassProperty<float>( L"hack", &CDamageType::m_Hack );
AddClassProperty<float>( L"pierce", &CDamageType::m_Pierce );
AddClassProperty<float>( L"typeless", &CDamageType::m_Typeless );
CJSObject<CDamageType>::ScriptingInit( "DamageType", Construct, 3 );
}
static JSBool Construct( JSContext* cx, JSObject* obj, unsigned int argc, jsval* argv, jsval* rval )