Ykkrosh
35e91718c5
Atlas: Added ActorViewer. Moved GL canvas into separate class for shared
use. Disabled message-handling callback while blocked on the game, and
stopped creating dialog boxes inside the game thread in order to avoid
deadlocks (hopefully). Support multiple Views (for independent sets of
camera/update/render code). Recalculate territory boundaries when
necessary. Changed default list of animations to match those currently
used by actors.
# Tidied up more code.
Moved some more #includes out of .h files, to minimise unnecessary
compilation.
MathUtil: Deleted unused/unuseful macros (M_PI (use PI instead), M_PI_2
(use PI/2), MAX3, ABS (use abs)).
ObjectManager: Removed some ScEd-specific things.
Unit: Moved creation out of UnitManager, so units can be created without
adding to the manager. Changed CStr8 to the more conventional CStr.
app_hooks: Removed warning for setting multiple times.
win: Restored SEH catcher.
GameSetup, GameView: Removed RenderNoCull, because it doesn't seem to do
what it says it does ("force renderer to load everything") since we're
loading-on-demand most stuff and it doesn't seem especially useful since
we'd prefer to minimise loading times (but feel free to correct me if
I'm wrong). (And because it crashes when things need to be initialised
in a different order, so it's easier to remove than to understand and
fix it.)
PatchRData, Renderer: Work sensibly when there's no game (hence no LOS
manager, water, etc).
LOSManager: Use entity position instead of actor position when possible.
TerritoryManager: Allow delayed recalculations (so Atlas can issue lots
of move+recalculate commands per frame).
Cinematic: Non-pointer wxTimer, so it doesn't leak and doesn't have to
be deleted manually.
This was SVN commit r4261.
44 lines
1.0 KiB
C++
44 lines
1.0 KiB
C++
// Supporting data types for CEntity and related
|
|
|
|
#ifndef ENTITY_SUPPORT_INCLUDED
|
|
#define ENTITY_SUPPORT_INCLUDED
|
|
|
|
#include "EntityHandles.h"
|
|
|
|
class CEntityManager;
|
|
|
|
struct SEntityAction
|
|
{
|
|
float m_MaxRange;
|
|
float m_MinRange;
|
|
size_t m_Speed;
|
|
CStr8 m_Animation;
|
|
SEntityAction() { m_MaxRange = m_MinRange = 0.0f; m_Speed = 1000; m_Animation = "walk"; }
|
|
SEntityAction(float minRange, float maxRange, size_t speed, CStr8& animation)
|
|
: m_MinRange(minRange), m_MaxRange(maxRange), m_Speed(speed), m_Animation(animation) {}
|
|
};
|
|
|
|
class CClassSet
|
|
{
|
|
CClassSet* m_Parent;
|
|
typedef std::vector<CStrW> Set;
|
|
Set m_Members;
|
|
Set m_AddedMembers; // Members that this set adds to on top of those in its parent
|
|
Set m_RemovedMembers; // Members that this set removes even if its parent has them
|
|
|
|
public:
|
|
CClassSet() : m_Parent(NULL) {}
|
|
|
|
bool IsMember( const CStrW& Test );
|
|
|
|
void Rebuild();
|
|
|
|
inline void SetParent( CClassSet* Parent )
|
|
{ m_Parent = Parent; Rebuild(); }
|
|
|
|
CStrW getMemberList();
|
|
void setFromMemberList(const CStrW& list);
|
|
};
|
|
|
|
#endif
|