Cayleb-Ordo/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Simplify component interface: remove explicit context parameter, use GetSimContext() instead.

Browse Source 
This was SVN commit r8867.
This commit is contained in:
Ykkrosh 2011-01-16 14:08:38 +00:00
parent f39f279132
commit c3b734775b
32 changed files with 196 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/simulation2/components/CCmpAIManager.cpp
View File

@ -408,12 +408,12 @@ public:
return "<a:component type='system'/><empty/>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode))
virtual void Init(const CParamNode& UNUSED(paramNode))
{
LoadEntityTemplates();
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -427,9 +427,9 @@ public:
m_Worker.Serialize(serialize.GetStream(), serialize.IsDebug());
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize)
{
Init(context, paramNode);
Init(paramNode);
m_Worker.Deserialize(deserialize.GetStream());
}

12
source/simulation2/components/CCmpCommandQueue.cpp
View File

@ -40,11 +40,11 @@ public:
return "<a:component type='system'/><empty/>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode))
virtual void Init(const CParamNode& UNUSED(paramNode))
{
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -58,19 +58,17 @@ public:
}
}
virtual void Deserialize(const CSimContext& context, const CParamNode& UNUSED(paramNode), IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& UNUSED(paramNode), IDeserializer& deserialize)
{
JSContext* cx = context.GetScriptInterface().GetContext();
u32 numCmds;
deserialize.NumberU32_Unbounded("num commands", numCmds);
for (size_t i = 0; i < numCmds; ++i)
{
i32 player;
jsval data;
CScriptValRooted data;
deserialize.NumberI32_Unbounded("player", player);
deserialize.ScriptVal("data", data);
SimulationCommand c = { player, CScriptValRooted(cx, data) };
SimulationCommand c = { player, data };
m_LocalQueue.push_back(c);
}
}

10
source/simulation2/components/CCmpDecay.cpp
View File

@ -79,7 +79,7 @@ public:
"</optional>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& paramNode)
virtual void Init(const CParamNode& paramNode)
{
m_Active = !paramNode.GetChild("Inactive").IsOk();
m_DelayTime = paramNode.GetChild("DelayTime").ToFixed().ToFloat();
@ -97,7 +97,7 @@ public:
}
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -106,12 +106,12 @@ public:
// This component isn't network-synchronised, so don't serialize anything
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& UNUSED(deserialize))
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& UNUSED(deserialize))
{
Init(context, paramNode);
Init(paramNode);
}
virtual void HandleMessage(const CSimContext& UNUSED(context), const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{

8
source/simulation2/components/CCmpFootprint.cpp
View File

@ -73,7 +73,7 @@ public:
"</element>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& paramNode)
virtual void Init(const CParamNode& paramNode)
{
if (paramNode.GetChild("Square").IsOk())
{
@ -96,7 +96,7 @@ public:
m_Height = paramNode.GetChild("Height").ToFixed();
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -105,9 +105,9 @@ public:
// No dynamic state to serialize
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& UNUSED(deserialize))
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& UNUSED(deserialize))
{
Init(context, paramNode);
Init(paramNode);
}
virtual void GetShape(EShape& shape, entity_pos_t& size0, entity_pos_t& size1, entity_pos_t& height)

14
source/simulation2/components/CCmpMinimap.cpp
View File

@ -79,7 +79,7 @@ public:
"</optional>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& paramNode)
virtual void Init(const CParamNode& paramNode)
{
m_Active = true;
@ -101,7 +101,7 @@ public:
}
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -129,14 +129,14 @@ public:
SerializeCommon(serialize);
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize)
{
Init(context, paramNode);
Init(paramNode);
SerializeCommon(deserialize);
}
virtual void HandleMessage(const CSimContext& context, const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{
@ -169,10 +169,10 @@ public:
break;
// Find the new player's colour
CmpPtr<ICmpPlayerManager> cmpPlayerManager(context, SYSTEM_ENTITY);
CmpPtr<ICmpPlayerManager> cmpPlayerManager(GetSimContext(), SYSTEM_ENTITY);
if (cmpPlayerManager.null())
break;
CmpPtr<ICmpPlayer> cmpPlayer(context, cmpPlayerManager->GetPlayerByID(msgData.to));
CmpPtr<ICmpPlayer> cmpPlayer(GetSimContext(), cmpPlayerManager->GetPlayerByID(msgData.to));
if (cmpPlayer.null())
break;
CColor colour = cmpPlayer->GetColour();

20
source/simulation2/components/CCmpMotionBall.cpp
View File

@ -43,13 +43,13 @@ public:
return "<a:component type='test'/><ref name='anything'/>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode))
virtual void Init(const CParamNode& UNUSED(paramNode))
{
m_SpeedX = 0;
m_SpeedZ = 0;
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -59,32 +59,32 @@ public:
serialize.NumberFloat_Unbounded("speed z", m_SpeedZ);
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize)
{
Init(context, paramNode);
Init(paramNode);
deserialize.NumberFloat_Unbounded("speed x", m_SpeedX);
deserialize.NumberFloat_Unbounded("speed z", m_SpeedZ);
}
virtual void HandleMessage(const CSimContext& context, const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{
case MT_Update:
{
fixed dt = static_cast<const CMessageUpdate&> (msg).turnLength;
Move(context, dt);
Move(dt);
break;
}
}
}
void Move(const CSimContext& context, fixed dt);
void Move(fixed dt);
};
void CCmpMotionBall::Move(const CSimContext& context, fixed dt)
void CCmpMotionBall::Move(fixed dt)
{
CmpPtr<ICmpPosition> cmpPosition(context, GetEntityId());
CmpPtr<ICmpPosition> cmpPosition(GetSimContext(), GetEntityId());
if (cmpPosition.null())
return;
@ -95,7 +95,7 @@ void CCmpMotionBall::Move(const CSimContext& context, fixed dt)
float z = pos.Z.ToFloat();
CVector3D normal;
context.GetTerrain().CalcNormal(x / CELL_SIZE, z / CELL_SIZE, normal);
GetSimContext().GetTerrain().CalcNormal(x / CELL_SIZE, z / CELL_SIZE, normal);
// Flatten the vector, to get the downhill force
float g = 10.f;
CVector3D force(g * normal.X, 0.f, g * normal.Z);

14
source/simulation2/components/CCmpObstruction.cpp
View File

@ -83,7 +83,7 @@ public:
"</optional>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& paramNode)
virtual void Init(const CParamNode& paramNode)
{
if (paramNode.GetChild("Unit").IsOk())
{
@ -107,7 +107,7 @@ public:
m_ControlGroup = GetEntityId();
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -124,14 +124,14 @@ public:
SerializeCommon(serialize);
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize)
{
Init(context, paramNode);
Init(paramNode);
SerializeCommon(deserialize);
}
virtual void HandleMessage(const CSimContext& context, const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{
@ -145,7 +145,7 @@ public:
if (!data.inWorld && !m_Tag.valid())
break; // nothing needs to change
CmpPtr<ICmpObstructionManager> cmpObstructionManager(context, SYSTEM_ENTITY);
CmpPtr<ICmpObstructionManager> cmpObstructionManager(GetSimContext(), SYSTEM_ENTITY);
if (cmpObstructionManager.null())
break;
@ -172,7 +172,7 @@ public:
{
if (m_Tag.valid())
{
CmpPtr<ICmpObstructionManager> cmpObstructionManager(context, SYSTEM_ENTITY);
CmpPtr<ICmpObstructionManager> cmpObstructionManager(GetSimContext(), SYSTEM_ENTITY);
if (cmpObstructionManager.null())
break;

22
source/simulation2/components/CCmpObstructionManager.cpp
View File

@ -134,7 +134,7 @@ public:
return "<a:component type='system'/><empty/>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode))
virtual void Init(const CParamNode& UNUSED(paramNode))
{
m_DebugOverlayEnabled = false;
m_DebugOverlayDirty = true;
@ -153,7 +153,7 @@ public:
ResetSubdivisions(entity_pos_t::FromInt(1), entity_pos_t::FromInt(1));
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -184,21 +184,21 @@ public:
SerializeCommon(serialize);
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize)
{
Init(context, paramNode);
Init(paramNode);
SerializeCommon(deserialize);
}
virtual void HandleMessage(const CSimContext& context, const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{
case MT_RenderSubmit:
{
const CMessageRenderSubmit& msgData = static_cast<const CMessageRenderSubmit&> (msg);
RenderSubmit(context, msgData.collector);
RenderSubmit(msgData.collector);
break;
}
}
@ -408,7 +408,7 @@ public:
m_DebugOverlayLines.clear();
}
void RenderSubmit(const CSimContext& context, SceneCollector& collector);
void RenderSubmit(SceneCollector& collector);
private:
// To support lazy updates of grid rasterisations of obstruction data,
@ -773,7 +773,7 @@ bool CCmpObstructionManager::FindMostImportantObstruction(const IObstructionTest
return false;
}
void CCmpObstructionManager::RenderSubmit(const CSimContext& context, SceneCollector& collector)
void CCmpObstructionManager::RenderSubmit(SceneCollector& collector)
{
if (!m_DebugOverlayEnabled)
return;
@ -789,7 +789,7 @@ void CCmpObstructionManager::RenderSubmit(const CSimContext& context, SceneColle
m_DebugOverlayLines.push_back(SOverlayLine());
m_DebugOverlayLines.back().m_Color = boundsColour;
SimRender::ConstructSquareOnGround(context,
SimRender::ConstructSquareOnGround(GetSimContext(),
(m_WorldX0+m_WorldX1).ToFloat()/2.f, (m_WorldZ0+m_WorldZ1).ToFloat()/2.f,
(m_WorldX1-m_WorldX0).ToFloat(), (m_WorldZ1-m_WorldZ0).ToFloat(),
0, m_DebugOverlayLines.back(), true);
@ -798,7 +798,7 @@ void CCmpObstructionManager::RenderSubmit(const CSimContext& context, SceneColle
{
m_DebugOverlayLines.push_back(SOverlayLine());
m_DebugOverlayLines.back().m_Color = (it->second.moving ? movingColour : defaultColour);
SimRender::ConstructSquareOnGround(context, it->second.x.ToFloat(), it->second.z.ToFloat(), it->second.r.ToFloat()*2, it->second.r.ToFloat()*2, 0, m_DebugOverlayLines.back(), true);
SimRender::ConstructSquareOnGround(GetSimContext(), it->second.x.ToFloat(), it->second.z.ToFloat(), it->second.r.ToFloat()*2, it->second.r.ToFloat()*2, 0, m_DebugOverlayLines.back(), true);
}
for (std::map<u32, StaticShape>::iterator it = m_StaticShapes.begin(); it != m_StaticShapes.end(); ++it)
@ -806,7 +806,7 @@ void CCmpObstructionManager::RenderSubmit(const CSimContext& context, SceneColle
m_DebugOverlayLines.push_back(SOverlayLine());
m_DebugOverlayLines.back().m_Color = defaultColour;
float a = atan2(it->second.v.X.ToFloat(), it->second.v.Y.ToFloat());
SimRender::ConstructSquareOnGround(context, it->second.x.ToFloat(), it->second.z.ToFloat(), it->second.hw.ToFloat()*2, it->second.hh.ToFloat()*2, a, m_DebugOverlayLines.back(), true);
SimRender::ConstructSquareOnGround(GetSimContext(), it->second.x.ToFloat(), it->second.z.ToFloat(), it->second.hw.ToFloat()*2, it->second.hh.ToFloat()*2, a, m_DebugOverlayLines.back(), true);
}
m_DebugOverlayDirty = false;

10
source/simulation2/components/CCmpOverlayRenderer.cpp
View File

@ -53,11 +53,11 @@ public:
return "<a:component type='system'/><empty/>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode))
virtual void Init(const CParamNode& UNUSED(paramNode))
{
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -68,12 +68,12 @@ public:
// after deserialization?
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& UNUSED(deserialize))
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& UNUSED(deserialize))
{
Init(context, paramNode);
Init(paramNode);
}
virtual void HandleMessage(const CSimContext& UNUSED(context), const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{

8
source/simulation2/components/CCmpOwnership.cpp
View File

@ -45,12 +45,12 @@ public:
"<empty/>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode))
virtual void Init(const CParamNode& UNUSED(paramNode))
{
m_Owner = INVALID_PLAYER;
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -59,12 +59,12 @@ public:
serialize.NumberI32_Unbounded("owner", m_Owner);
}
virtual void Deserialize(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode), IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& UNUSED(paramNode), IDeserializer& deserialize)
{
deserialize.NumberI32_Unbounded("owner", m_Owner);
}
virtual void HandleMessage(const CSimContext& UNUSED(context), const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{

14
source/simulation2/components/CCmpPathfinder.cpp
View File

@ -40,7 +40,7 @@ const int DEFAULT_MOVE_COST = 256;
REGISTER_COMPONENT_TYPE(Pathfinder)
void CCmpPathfinder::Init(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode))
void CCmpPathfinder::Init(const CParamNode& UNUSED(paramNode))
{
m_MapSize = 0;
m_Grid = NULL;
@ -125,7 +125,7 @@ void CCmpPathfinder::Init(const CSimContext& UNUSED(context), const CParamNode&
}
}
void CCmpPathfinder::Deinit(const CSimContext& UNUSED(context))
void CCmpPathfinder::Deinit()
{
SetDebugOverlay(false); // cleans up memory
ResetDebugPath();
@ -174,23 +174,23 @@ void CCmpPathfinder::Serialize(ISerializer& serialize)
serialize.NumberU32_Unbounded("next ticket", m_NextAsyncTicket);
}
void CCmpPathfinder::Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize)
void CCmpPathfinder::Deserialize(const CParamNode& paramNode, IDeserializer& deserialize)
{
Init(context, paramNode);
Init(paramNode);
SerializeVector<SerializeLongRequest>()(deserialize, "long requests", m_AsyncLongPathRequests);
SerializeVector<SerializeShortRequest>()(deserialize, "short requests", m_AsyncShortPathRequests);
deserialize.NumberU32_Unbounded("next ticket", m_NextAsyncTicket);
}
void CCmpPathfinder::HandleMessage(const CSimContext& context, const CMessage& msg, bool UNUSED(global))
void CCmpPathfinder::HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{
case MT_RenderSubmit:
{
const CMessageRenderSubmit& msgData = static_cast<const CMessageRenderSubmit&> (msg);
RenderSubmit(context, msgData.collector);
RenderSubmit(msgData.collector);
break;
}
case MT_TerrainChanged:
@ -202,7 +202,7 @@ void CCmpPathfinder::HandleMessage(const CSimContext& context, const CMessage& m
}
}
void CCmpPathfinder::RenderSubmit(const CSimContext& UNUSED(context), SceneCollector& collector)
void CCmpPathfinder::RenderSubmit(SceneCollector& collector)
{
for (size_t i = 0; i < m_DebugOverlayShortPathLines.size(); ++i)
collector.Submit(&m_DebugOverlayShortPathLines[i]);

10
source/simulation2/components/CCmpPathfinder_Common.h
View File

@ -194,15 +194,15 @@ public:
return "<a:component type='system'/><empty/>";
}
virtual void Init(const CSimContext& context, const CParamNode& paramNode);
virtual void Init(const CParamNode& paramNode);
virtual void Deinit(const CSimContext& context);
virtual void Deinit();
virtual void Serialize(ISerializer& serialize);
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize);
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize);
virtual void HandleMessage(const CSimContext& context, const CMessage& msg, bool global);
virtual void HandleMessage(const CMessage& msg, bool global);
virtual u8 GetPassabilityClass(const std::string& name);
@ -257,7 +257,7 @@ public:
*/
void UpdateGrid();
void RenderSubmit(const CSimContext& context, SceneCollector& collector);
void RenderSubmit(SceneCollector& collector);
};
#endif // INCLUDED_CCMPPATHFINDER_COMMON

10
source/simulation2/components/CCmpPosition.cpp
View File

@ -96,7 +96,7 @@ public:
"</element>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& paramNode)
virtual void Init(const CParamNode& paramNode)
{
std::wstring anchor = paramNode.GetChild("Anchor").ToString();
if (anchor == L"pitch")
@ -117,7 +117,7 @@ public:
m_InterpolatedRotY = 0;
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -152,9 +152,9 @@ public:
}
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize)
{
Init(context, paramNode);
Init(paramNode);
deserialize.Bool("in world", m_InWorld);
if (m_InWorld)
@ -363,7 +363,7 @@ public:
return mXZ;
}
virtual void HandleMessage(const CSimContext& UNUSED(context), const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{

30
source/simulation2/components/CCmpProjectileManager.cpp
View File

@ -54,11 +54,11 @@ public:
return "<a:component type='system'/><empty/>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode))
virtual void Init(const CParamNode& UNUSED(paramNode))
{
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -69,25 +69,25 @@ public:
// (That means projectiles will vanish if you save/load - is that okay?)
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& UNUSED(deserialize))
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& UNUSED(deserialize))
{
Init(context, paramNode);
Init(paramNode);
}
virtual void HandleMessage(const CSimContext& context, const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{
case MT_Interpolate:
{
const CMessageInterpolate& msgData = static_cast<const CMessageInterpolate&> (msg);
Interpolate(context, msgData.frameTime, msgData.offset);
Interpolate(msgData.frameTime, msgData.offset);
break;
}
case MT_RenderSubmit:
{
const CMessageRenderSubmit& msgData = static_cast<const CMessageRenderSubmit&> (msg);
RenderSubmit(context, msgData.collector, msgData.frustum, msgData.culling);
RenderSubmit(msgData.collector, msgData.frustum, msgData.culling);
break;
}
}
@ -119,11 +119,11 @@ private:
void LaunchProjectile(entity_id_t source, CFixedVector3D targetPoint, entity_id_t targetEnt, fixed speed, fixed gravity);
void AdvanceProjectile(const CSimContext& context, Projectile& projectile, float dt, float frameOffset);
void AdvanceProjectile(Projectile& projectile, float dt, float frameOffset);
void Interpolate(const CSimContext& context, float frameTime, float frameOffset);
void Interpolate(float frameTime, float frameOffset);
void RenderSubmit(const CSimContext& context, SceneCollector& collector, const CFrustum& frustum, bool culling);
void RenderSubmit(SceneCollector& collector, const CFrustum& frustum, bool culling);
};
REGISTER_COMPONENT_TYPE(ProjectileManager)
@ -199,7 +199,7 @@ void CCmpProjectileManager::LaunchProjectile(entity_id_t source, CFixedVector3D
m_Projectiles.push_back(projectile);
}
void CCmpProjectileManager::AdvanceProjectile(const CSimContext& context, Projectile& projectile, float dt, float frameOffset)
void CCmpProjectileManager::AdvanceProjectile(Projectile& projectile, float dt, float frameOffset)
{
// Do nothing if we've already reached the target
if (projectile.timeLeft <= 0)
@ -212,7 +212,7 @@ void CCmpProjectileManager::AdvanceProjectile(const CSimContext& context, Projec
// Track the target entity (if there is one, and it's still alive)
if (projectile.targetEnt != INVALID_ENTITY)
{
CmpPtr<ICmpPosition> targetPos(context, projectile.targetEnt);
CmpPtr<ICmpPosition> targetPos(GetSimContext(), projectile.targetEnt);
if (!targetPos.null())
{
CMatrix3D t = targetPos->GetInterpolatedTransform(frameOffset, false);
@ -271,11 +271,11 @@ void CCmpProjectileManager::AdvanceProjectile(const CSimContext& context, Projec
projectile.unit->GetModel().SetTransform(transform);
}
void CCmpProjectileManager::Interpolate(const CSimContext& context, float frameTime, float frameOffset)
void CCmpProjectileManager::Interpolate(float frameTime, float frameOffset)
{
for (size_t i = 0; i < m_Projectiles.size(); ++i)
{
AdvanceProjectile(context, m_Projectiles[i], frameTime, frameOffset);
AdvanceProjectile(m_Projectiles[i], frameTime, frameOffset);
}
// Remove the ones that have reached their target
@ -304,7 +304,7 @@ void CCmpProjectileManager::Interpolate(const CSimContext& context, float frameT
}
}
void CCmpProjectileManager::RenderSubmit(const CSimContext& UNUSED(context), SceneCollector& collector, const CFrustum& frustum, bool culling)
void CCmpProjectileManager::RenderSubmit(SceneCollector& collector, const CFrustum& frustum, bool culling)
{
CmpPtr<ICmpRangeManager> cmpRangeManager(GetSimContext(), SYSTEM_ENTITY);
int player = GetSimContext().GetCurrentDisplayedPlayer();

10
source/simulation2/components/CCmpRangeManager.cpp
View File

@ -209,7 +209,7 @@ public:
return "<a:component type='system'/><empty/>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode))
virtual void Init(const CParamNode& UNUSED(paramNode))
{
m_QueryNext = 1;
@ -227,7 +227,7 @@ public:
m_TerrainVerticesPerSide = 0;
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -256,9 +256,9 @@ public:
SerializeCommon(serialize);
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize)
{
Init(context, paramNode);
Init(paramNode);
SerializeCommon(deserialize);
@ -266,7 +266,7 @@ public:
ResetDerivedData();
}
virtual void HandleMessage(const CSimContext& UNUSED(context), const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{

22
source/simulation2/components/CCmpSelectable.cpp
View File

@ -60,11 +60,11 @@ public:
"<empty/>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode))
virtual void Init(const CParamNode& UNUSED(paramNode))
{
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -74,11 +74,11 @@ public:
// reconstructed by the GUI soon enough, I think)
}
virtual void Deserialize(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode), IDeserializer& UNUSED(deserialize))
virtual void Deserialize(const CParamNode& UNUSED(paramNode), IDeserializer& UNUSED(deserialize))
{
}
virtual void HandleMessage(const CSimContext& context, const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{
@ -87,7 +87,7 @@ public:
if (m_Overlay.m_Color.a > 0)
{
float offset = static_cast<const CMessageInterpolate&> (msg).offset;
ConstructShape(context, offset);
ConstructShape(offset);
}
break;
}
@ -119,9 +119,9 @@ public:
// TODO: it'd be nice to fade smoothly (but quickly) from transparent to solid
}
void ConstructShape(const CSimContext& context, float frameOffset)
void ConstructShape(float frameOffset)
{
CmpPtr<ICmpPosition> cmpPosition(context, GetEntityId());
CmpPtr<ICmpPosition> cmpPosition(GetSimContext(), GetEntityId());
if (cmpPosition.null())
return;
@ -131,11 +131,11 @@ public:
float x, z, rotY;
cmpPosition->GetInterpolatedPosition2D(frameOffset, x, z, rotY);
CmpPtr<ICmpFootprint> cmpFootprint(context, GetEntityId());
CmpPtr<ICmpFootprint> cmpFootprint(GetSimContext(), GetEntityId());
if (cmpFootprint.null())
{
// Default (this probably shouldn't happen) - just render an arbitrary-sized circle
SimRender::ConstructCircleOnGround(context, x, z, 2.f, m_Overlay, cmpPosition->IsFloating());
SimRender::ConstructCircleOnGround(GetSimContext(), x, z, 2.f, m_Overlay, cmpPosition->IsFloating());
}
else
{
@ -144,9 +144,9 @@ public:
cmpFootprint->GetShape(shape, size0, size1, height);
if (shape == ICmpFootprint::SQUARE)
SimRender::ConstructSquareOnGround(context, x, z, size0.ToFloat(), size1.ToFloat(), rotY, m_Overlay, cmpPosition->IsFloating());
SimRender::ConstructSquareOnGround(GetSimContext(), x, z, size0.ToFloat(), size1.ToFloat(), rotY, m_Overlay, cmpPosition->IsFloating());
else
SimRender::ConstructCircleOnGround(context, x, z, size0.ToFloat(), m_Overlay, cmpPosition->IsFloating());
SimRender::ConstructCircleOnGround(GetSimContext(), x, z, size0.ToFloat(), m_Overlay, cmpPosition->IsFloating());
}
}

10
source/simulation2/components/CCmpSoundManager.cpp
View File

@ -42,11 +42,11 @@ public:
return "<a:component type='system'/><empty/>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode))
virtual void Init(const CParamNode& UNUSED(paramNode))
{
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
for (std::map<std::wstring, CSoundGroup*>::iterator it = m_SoundGroups.begin(); it != m_SoundGroups.end(); ++it)
delete it->second;
@ -59,12 +59,12 @@ public:
// (If we add music support in here then we might want to save the music state, though)
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& UNUSED(deserialize))
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& UNUSED(deserialize))
{
Init(context, paramNode);
Init(paramNode);
}
virtual void HandleMessage(const CSimContext& UNUSED(context), const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{

12
source/simulation2/components/CCmpTemplateManager.cpp
View File

@ -46,16 +46,16 @@ public:
return "<a:component type='system'/><empty/>";
}
virtual void Init(const CSimContext& context, const CParamNode& UNUSED(paramNode))
virtual void Init(const CParamNode& UNUSED(paramNode))
{
m_DisableValidation = false;
m_Validator.LoadGrammar(context.GetComponentManager().GenerateSchema());
m_Validator.LoadGrammar(GetSimContext().GetComponentManager().GenerateSchema());
// TODO: handle errors loading the grammar here?
// TODO: support hotloading changes to the grammar
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -84,9 +84,9 @@ public:
// template data before other components (like the tech components) have been deserialized
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize)
{
Init(context, paramNode);
Init(paramNode);
u32 numEntities;
deserialize.NumberU32_Unbounded("num entities", numEntities);
@ -100,7 +100,7 @@ public:
}
}
virtual void HandleMessage(const CSimContext& UNUSED(context), const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{

10
source/simulation2/components/CCmpTerrain.cpp
View File

@ -42,12 +42,12 @@ public:
return "<a:component type='system'/><empty/>";
}
virtual void Init(const CSimContext& context, const CParamNode& UNUSED(paramNode))
virtual void Init(const CParamNode& UNUSED(paramNode))
{
m_Terrain = &context.GetTerrain();
m_Terrain = &GetSimContext().GetTerrain();
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -55,9 +55,9 @@ public:
{
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& UNUSED(deserialize))
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& UNUSED(deserialize))
{
Init(context, paramNode);
Init(paramNode);
}
virtual CFixedVector3D CalcNormal(entity_pos_t x, entity_pos_t z)

24
source/simulation2/components/CCmpTest.cpp
View File

@ -41,7 +41,7 @@ public:
return "<a:component type='test'/><ref name='anything'/>";
}
virtual void Init(const CSimContext&, const CParamNode& paramNode)
virtual void Init(const CParamNode& paramNode)
{
if (paramNode.GetChild("x").IsOk())
m_x = paramNode.GetChild("x").ToInt();
@ -49,7 +49,7 @@ public:
m_x = 11000;
}
virtual void Deinit(const CSimContext&)
virtual void Deinit()
{
}
@ -58,7 +58,7 @@ public:
serialize.NumberI32_Unbounded("x", m_x);
}
virtual void Deserialize(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode), IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& UNUSED(paramNode), IDeserializer& deserialize)
{
deserialize.NumberI32_Unbounded("x", m_x);
}
@ -68,7 +68,7 @@ public:
return m_x;
}
virtual void HandleMessage(const CSimContext&, const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{
@ -105,12 +105,12 @@ public:
return "<a:component type='test'/><empty/>";
}
virtual void Init(const CSimContext&, const CParamNode&)
virtual void Init(const CParamNode&)
{
m_x = 12000;
}
virtual void Deinit(const CSimContext&)
virtual void Deinit()
{
}
@ -119,7 +119,7 @@ public:
serialize.NumberI32_Unbounded("x", m_x);
}
virtual void Deserialize(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode), IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& UNUSED(paramNode), IDeserializer& deserialize)
{
deserialize.NumberI32_Unbounded("x", m_x);
}
@ -129,7 +129,7 @@ public:
return m_x;
}
virtual void HandleMessage(const CSimContext&, const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{
@ -166,12 +166,12 @@ public:
return "<a:component type='test'/><empty/>";
}
virtual void Init(const CSimContext&, const CParamNode&)
virtual void Init(const CParamNode&)
{
m_x = 21000;
}
virtual void Deinit(const CSimContext&)
virtual void Deinit()
{
}
@ -180,7 +180,7 @@ public:
serialize.NumberI32_Unbounded("x", m_x);
}
virtual void Deserialize(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode), IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& UNUSED(paramNode), IDeserializer& deserialize)
{
deserialize.NumberI32_Unbounded("x", m_x);
}
@ -190,7 +190,7 @@ public:
return m_x;
}
virtual void HandleMessage(const CSimContext&, const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{

14
source/simulation2/components/CCmpUnitMotion.cpp
View File

@ -270,7 +270,7 @@ public:
* TODO: the running/charging thing needs to be designed and implemented
*/
virtual void Init(const CSimContext& context, const CParamNode& paramNode)
virtual void Init(const CParamNode& paramNode)
{
m_FormationController = paramNode.GetChild("FormationController").ToBool();
@ -286,14 +286,14 @@ public:
m_RunSpeed = m_WalkSpeed;
}
CmpPtr<ICmpPathfinder> cmpPathfinder(context, SYSTEM_ENTITY);
CmpPtr<ICmpPathfinder> cmpPathfinder(GetSimContext(), SYSTEM_ENTITY);
if (!cmpPathfinder.null())
{
m_PassClass = cmpPathfinder->GetPassabilityClass(paramNode.GetChild("PassabilityClass").ToASCIIString());
m_CostClass = cmpPathfinder->GetCostClass(paramNode.GetChild("CostClass").ToASCIIString());
}
CmpPtr<ICmpObstruction> cmpObstruction(context, GetEntityId());
CmpPtr<ICmpObstruction> cmpObstruction(GetSimContext(), GetEntityId());
if (!cmpObstruction.null())
m_Radius = cmpObstruction->GetUnitRadius();
@ -309,7 +309,7 @@ public:
m_DebugOverlayEnabled = false;
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -344,14 +344,14 @@ public:
SerializeCommon(serialize);
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize)
{
Init(context, paramNode);
Init(paramNode);
SerializeCommon(deserialize);
}
virtual void HandleMessage(const CSimContext& UNUSED(context), const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{

8
source/simulation2/components/CCmpVision.cpp
View File

@ -49,14 +49,14 @@ public:
"</element>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& paramNode)
virtual void Init(const CParamNode& paramNode)
{
m_Range = paramNode.GetChild("Range").ToFixed();
m_RetainInFog = paramNode.GetChild("RetainInFog").ToBool();
m_AlwaysVisible = paramNode.GetChild("AlwaysVisible").ToBool();
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -65,9 +65,9 @@ public:
// No dynamic state to serialize
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& UNUSED(deserialize))
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& UNUSED(deserialize))
{
Init(context, paramNode);
Init(paramNode);
}
virtual entity_pos_t GetRange()

16
source/simulation2/components/CCmpVisualActor.cpp
View File

@ -94,11 +94,11 @@ public:
"</optional>";
}
virtual void Init(const CSimContext& context, const CParamNode& paramNode)
virtual void Init(const CParamNode& paramNode)
{
m_Unit = NULL;
if (!context.HasUnitManager())
if (!GetSimContext().HasUnitManager())
return; // do nothing if graphics are disabled
// TODO: we should do some fancy animation of under-construction buildings rising from the ground,
@ -111,7 +111,7 @@ public:
m_R = m_G = m_B = fixed::FromInt(1);
std::set<CStr> selections;
m_Unit = context.GetUnitManager().CreateUnit(m_ActorName, selections);
m_Unit = GetSimContext().GetUnitManager().CreateUnit(m_ActorName, selections);
if (!m_Unit)
{
// The error will have already been logged
@ -123,11 +123,11 @@ public:
SelectAnimation("idle", false, 0.f, L"");
}
virtual void Deinit(const CSimContext& context)
virtual void Deinit()
{
if (m_Unit)
{
context.GetUnitManager().DeleteUnit(m_Unit);
GetSimContext().GetUnitManager().DeleteUnit(m_Unit);
m_Unit = NULL;
}
}
@ -155,16 +155,16 @@ public:
serialize.NumberFixed_Unbounded("b", m_B);
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize)
{
Init(context, paramNode);
Init(paramNode);
deserialize.NumberFixed_Unbounded("r", m_R);
deserialize.NumberFixed_Unbounded("g", m_G);
deserialize.NumberFixed_Unbounded("b", m_B);
}
virtual void HandleMessage(const CSimContext& UNUSED(context), const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
// Quick exit for running in non-graphical mode
if (m_Unit == NULL)

10
source/simulation2/components/CCmpWaterManager.cpp
View File

@ -42,12 +42,12 @@ public:
return "<a:component type='system'/><empty/>";
}
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode))
virtual void Init(const CParamNode& UNUSED(paramNode))
{
SetWaterLevel(entity_pos_t::FromInt(5));
}
virtual void Deinit(const CSimContext& UNUSED(context))
virtual void Deinit()
{
}
@ -56,14 +56,14 @@ public:
serialize.NumberFixed_Unbounded("height", m_WaterHeight);
}
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize)
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize)
{
Init(context, paramNode);
Init(paramNode);
deserialize.NumberFixed_Unbounded("height", m_WaterHeight);
}
virtual void HandleMessage(const CSimContext& UNUSED(context), const CMessage& msg, bool UNUSED(global))
virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
{
switch (msg.GetType())
{

8
source/simulation2/scripting/ScriptComponent.cpp
View File

@ -30,19 +30,19 @@ CComponentTypeScript::CComponentTypeScript(ScriptInterface& scriptInterface, jsv
m_HasCustomDeserialize = m_ScriptInterface.HasProperty(m_Instance.get(), "Deserialize");
}
void CComponentTypeScript::Init(const CSimContext& UNUSED(context), const CParamNode& paramNode, entity_id_t ent)
void CComponentTypeScript::Init(const CParamNode& paramNode, entity_id_t ent)
{
m_ScriptInterface.SetProperty(m_Instance.get(), "entity", (int)ent, true, false);
m_ScriptInterface.SetProperty(m_Instance.get(), "template", paramNode, true, false);
m_ScriptInterface.CallFunctionVoid(m_Instance.get(), "Init");
}
void CComponentTypeScript::Deinit(const CSimContext& UNUSED(context))
void CComponentTypeScript::Deinit()
{
m_ScriptInterface.CallFunctionVoid(m_Instance.get(), "Deinit");
}
void CComponentTypeScript::HandleMessage(const CSimContext& UNUSED(context), const CMessage& msg, bool global)
void CComponentTypeScript::HandleMessage(const CMessage& msg, bool global)
{
const char* name = global ? msg.GetScriptGlobalHandlerName() : msg.GetScriptHandlerName();
@ -69,7 +69,7 @@ void CComponentTypeScript::Serialize(ISerializer& serialize)
}
}
void CComponentTypeScript::Deserialize(const CSimContext& UNUSED(context), const CParamNode& paramNode, IDeserializer& deserialize, entity_id_t ent)
void CComponentTypeScript::Deserialize(const CParamNode& paramNode, IDeserializer& deserialize, entity_id_t ent)
{
// Support a custom "Deserialize" function, to which we pass the deserialized data
// instead of automatically adding the deserialized properties onto the object

8
source/simulation2/scripting/ScriptComponent.h
View File

@ -38,12 +38,12 @@ public:
jsval GetInstance() const { return m_Instance.get(); }
void Init(const CSimContext& context, const CParamNode& paramNode, entity_id_t ent);
void Deinit(const CSimContext& context);
void HandleMessage(const CSimContext& context, const CMessage& msg, bool global);
void Init(const CParamNode& paramNode, entity_id_t ent);
void Deinit();
void HandleMessage(const CMessage& msg, bool global);
void Serialize(ISerializer& serialize);
void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize, entity_id_t ent);
void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize, entity_id_t ent);
// Use Boost.PP to define:
// template<typename R> R Call(const char* funcname);

22
source/simulation2/system/Component.h
View File

@ -60,25 +60,25 @@
{ \
return "<a:component type='script-wrapper'/><empty/>"; \
} \
virtual void Init(const CSimContext& context, const CParamNode& paramNode) \
virtual void Init(const CParamNode& paramNode) \
{ \
m_Script.Init(context, paramNode, GetEntityId()); \
m_Script.Init(paramNode, GetEntityId()); \
} \
virtual void Deinit(const CSimContext& context) \
virtual void Deinit() \
{ \
m_Script.Deinit(context); \
m_Script.Deinit(); \
} \
virtual void HandleMessage(const CSimContext& context, const CMessage& msg, bool global) \
virtual void HandleMessage(const CMessage& msg, bool global) \
{ \
m_Script.HandleMessage(context, msg, global); \
m_Script.HandleMessage(msg, global); \
} \
virtual void Serialize(ISerializer& serialize) \
{ \
m_Script.Serialize(serialize); \
} \
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize) \
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize) \
{ \
m_Script.Deserialize(context, paramNode, deserialize, GetEntityId()); \
m_Script.Deserialize(paramNode, deserialize, GetEntityId()); \
} \
virtual jsval GetJSInstance() const \
{ \
@ -89,16 +89,16 @@
public:
#define DEFAULT_MOCK_COMPONENT() \
virtual void Init(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode)) \
virtual void Init(const CParamNode& UNUSED(paramNode)) \
{ \
} \
virtual void Deinit(const CSimContext& UNUSED(context)) \
virtual void Deinit() \
{ \
} \
virtual void Serialize(ISerializer& UNUSED(serialize)) \
{ \
} \
virtual void Deserialize(const CSimContext& UNUSED(context), const CParamNode& UNUSED(paramNode), IDeserializer& UNUSED(deserialize)) \
virtual void Deserialize(const CParamNode& UNUSED(paramNode), IDeserializer& UNUSED(deserialize)) \
{ \
} \

12
source/simulation2/system/ComponentManager.cpp
View File

@ -448,7 +448,7 @@ void CComponentManager::ResetState()
std::map<entity_id_t, IComponent*>::iterator eit = iit->second.begin();
for (; eit != iit->second.end(); ++eit)
{
eit->second->Deinit(m_SimContext);
eit->second->Deinit();
m_ComponentTypesById[iit->first].dealloc(eit->second);
}
}
@ -567,7 +567,7 @@ bool CComponentManager::AddComponent(entity_id_t ent, ComponentTypeId cid, const
if (!component)
return false;
component->Init(m_SimContext, paramNode);
component->Init(paramNode);
return true;
}
@ -704,7 +704,7 @@ void CComponentManager::FlushDestroyedComponents()
std::map<entity_id_t, IComponent*>::iterator eit = iit->second.find(ent);
if (eit != iit->second.end())
{
eit->second->Deinit(m_SimContext);
eit->second->Deinit();
m_ComponentTypesById[iit->first].dealloc(eit->second);
iit->second.erase(ent);
}
@ -769,7 +769,7 @@ void CComponentManager::PostMessage(entity_id_t ent, const CMessage& msg) const
// Send the message to all of them
std::map<entity_id_t, IComponent*>::const_iterator eit = emap->second.find(ent);
if (eit != emap->second.end())
eit->second->HandleMessage(m_SimContext, msg, false);
eit->second->HandleMessage(msg, false);
}
}
@ -794,7 +794,7 @@ void CComponentManager::BroadcastMessage(const CMessage& msg) const
// Send the message to all of them
std::map<entity_id_t, IComponent*>::const_iterator eit = emap->second.begin();
for (; eit != emap->second.end(); ++eit)
eit->second->HandleMessage(m_SimContext, msg, false);
eit->second->HandleMessage(msg, false);
}
}
@ -831,7 +831,7 @@ void CComponentManager::SendGlobalMessage(entity_id_t ent, const CMessage& msg)
// Send the message to all of them
std::map<entity_id_t, IComponent*>::const_iterator eit = emap->second.begin();
for (; eit != emap->second.end(); ++eit)
eit->second->HandleMessage(m_SimContext, msg, true);
eit->second->HandleMessage(msg, true);
}
}
}

4
source/simulation2/system/ComponentManagerSerialization.cpp
View File

@ -277,9 +277,9 @@ bool CComponentManager::DeserializeState(std::istream& stream)
// Deserialize, with the appropriate template for this component
if (entTemplate)
component->Deserialize(m_SimContext, entTemplate->GetChild(ctname.c_str()), deserializer);
component->Deserialize(entTemplate->GetChild(ctname.c_str()), deserializer);
else
component->Deserialize(m_SimContext, noParam, deserializer);
component->Deserialize(noParam, deserializer);
// If this was the template manager, remember it so we can use it when
// deserializing any further non-system entities

4
source/simulation2/system/ComponentTest.h
View File

@ -91,7 +91,7 @@ public:
void HandleMessage(IComponent* cmp, const CMessage& msg, bool global)
{
cmp->HandleMessage(m_Context, msg, global);
cmp->HandleMessage(msg, global);
}
/**
@ -124,7 +124,7 @@ public:
CStdDeserializer stdde2(test2.GetScriptInterface(), stdstr1);
IComponent* cmp2 = test2.m_ComponentManager.ConstructComponent(ent, m_Cid);
cmp2->Deserialize(test2.m_Context, m_Param.GetChild("test"), stdde2);
cmp2->Deserialize(m_Param.GetChild("test"), stdde2);
TS_ASSERT(stdstr1.peek() == EOF); // Deserialize must read whole stream

2
source/simulation2/system/IComponent.cpp
View File

@ -29,7 +29,7 @@ std::string IComponent::GetSchema()
return "<empty/>";
}
void IComponent::HandleMessage(const CSimContext& UNUSED(context), const CMessage& UNUSED(msg), bool UNUSED(global))
void IComponent::HandleMessage(const CMessage& UNUSED(msg), bool UNUSED(global))
{
}

8
source/simulation2/system/IComponent.h
View File

@ -37,10 +37,10 @@ public:
static std::string GetSchema();
virtual void Init(const CSimContext& context, const CParamNode& paramNode) = 0;
virtual void Deinit(const CSimContext& context) = 0;
virtual void Init(const CParamNode& paramNode) = 0;
virtual void Deinit() = 0;
virtual void HandleMessage(const CSimContext& context, const CMessage& msg, bool global);
virtual void HandleMessage(const CMessage& msg, bool global);
entity_id_t GetEntityId() const { return m_EntityId; }
void SetEntityId(entity_id_t ent) { m_EntityId = ent; }
@ -50,7 +50,7 @@ public:
static u8 GetSerializationVersion() { return 0; }
virtual void Serialize(ISerializer& serialize) = 0;
virtual void Deserialize(const CSimContext& context, const CParamNode& paramNode, IDeserializer& deserialize) = 0;
virtual void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize) = 0;
virtual JSClass* GetJSClass() const;
virtual jsval GetJSInstance() const;