mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-10-09 08:21:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

# OS X build fixes.

Browse Source 
spidermonkey-tip script fix.
GCC 4.2 compatibility.
Remove redundant code in extern_libs.lua

This was SVN commit r7371.
This commit is contained in:
Ykkrosh
2010-03-20 16:26:25 +00:00
parent 901056e5b3
commit 23a702c335
9 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/Simulation2.cpp
+12 -3
View File
@@ -146,13 +146,15 @@ void CSimulation2Impl::Update(float frameTime)
CFixed_23_8 turnLengthFixed = CFixed_23_8::FromInt(TURN_LENGTH) / 1000;
m_DeltaTime -= turnLength;
m_ComponentManager.BroadcastMessage(CMessageTurnStart());
CMessageTurnStart msgTurnStart;
m_ComponentManager.BroadcastMessage(msgTurnStart);
CmpPtr<ICmpCommandQueue> cmpCommandQueue(m_SimContext, SYSTEM_ENTITY);
if (!cmpCommandQueue.null())
cmpCommandQueue->ProcessCommands();
m_ComponentManager.BroadcastMessage(CMessageUpdate(turnLengthFixed));
CMessageUpdate msgUpdate(turnLengthFixed);
m_ComponentManager.BroadcastMessage(msgUpdate);
// Clean up any entities destroyed during the simulation update
m_ComponentManager.FlushDestroyedComponents();
@@ -164,7 +166,8 @@ void CSimulation2Impl::Interpolate(float frameTime)
// TODO: Use CTurnManager
double turnLength = TURN_LENGTH / 1000.0;
float offset = clamp(m_DeltaTime / turnLength + 1.0, 0.0, 1.0);
m_ComponentManager.BroadcastMessage(CMessageInterpolate(frameTime, offset));
CMessageInterpolate msg(frameTime, offset);
m_ComponentManager.BroadcastMessage(msg);
}
////////////////////////////////////////////////////////////////
@@ -252,6 +255,12 @@ void CSimulation2::Interpolate(float frameTime)
m->Interpolate(frameTime);
}
void CSimulation2::RenderSubmit(SceneCollector& collector, const CFrustum& frustum, bool culling)
{
CMessageRenderSubmit msg(collector, frustum, culling);
m->m_ComponentManager.BroadcastMessage(msg);
}
bool CSimulation2::LoadScripts(const VfsPath& path)
{
return m->LoadScripts(path);