sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed scene visible updatables 

Former-commit-id: 9633d7049bbe9d5f6b304ab8e9702fae93540018
This commit is contained in:
Lynix 2013-03-20 17:07:07 +01:00
parent 29d66892b7
commit 5ac36d99ef
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/3D/Scene.hpp
View File

@ -28,6 +28,8 @@ class NAZARA_API NzScene
NzScene(); NzScene();
~NzScene(); ~NzScene();
void AddToVisibilityList(NzUpdatable* object);
void Cull(); void Cull();
void Draw(); void Draw();
@ -35,12 +37,12 @@ class NAZARA_API NzScene
float GetUpdateTime() const; float GetUpdateTime() const;
unsigned int GetUpdatePerSecond() const; unsigned int GetUpdatePerSecond() const;
void RegisterForUpdate(NzUpdatable* node); void RegisterForUpdate(NzUpdatable* object);
void SetAmbientColor(const NzColor& color); void SetAmbientColor(const NzColor& color);
void SetUpdatePerSecond(unsigned int updatePerSecond); void SetUpdatePerSecond(unsigned int updatePerSecond);
void UnregisterForUpdate(NzUpdatable* node); void UnregisterForUpdate(NzUpdatable* object);
void Update(); void Update();
void UpdateVisible(); void UpdateVisible();

29
src/Nazara/3D/Scene.cpp
View File

@ -45,7 +45,8 @@ struct NzSceneImpl
{ {
} }
std::set<NzUpdatable*> updateList; std::vector<NzUpdatable*> updateList;
std::vector<NzUpdatable*> visibleUpdateList;
std::vector<NzRenderer::InstancingData> instancingData; std::vector<NzRenderer::InstancingData> instancingData;
NzClock updateClock; NzClock updateClock;
NzColor ambientColor = NzColor(25,25,25); NzColor ambientColor = NzColor(25,25,25);
@ -53,7 +54,7 @@ struct NzSceneImpl
NzSceneRoot root; NzSceneRoot root;
const NzCamera* activeCamera; const NzCamera* activeCamera;
NzVertexBuffer* skinningBuffer; NzVertexBuffer* skinningBuffer;
bool update = true; bool update;
float frameTime; float frameTime;
float updateTime; float updateTime;
unsigned int updatePerSecond = 60; unsigned int updatePerSecond = 60;
@ -80,9 +81,15 @@ NzScene::~NzScene()
delete m_impl; delete m_impl;
} }
void NzScene::AddToVisibilityList(NzUpdatable* object)
{
m_impl->visibleUpdateList.push_back(object);
}
void NzScene::Cull() void NzScene::Cull()
{ {
m_impl->renderQueue.Clear(); m_impl->renderQueue.Clear();
m_impl->visibleUpdateList.clear();
// Frustum culling // Frustum culling
RecursiveFrustumCull(m_impl->renderQueue, m_impl->activeCamera->GetFrustum(), &m_impl->root); RecursiveFrustumCull(m_impl->renderQueue, m_impl->activeCamera->GetFrustum(), &m_impl->root);
@ -333,7 +340,7 @@ void NzScene::RegisterForUpdate(NzUpdatable* object)
} }
#endif #endif
m_impl->updateList.insert(object); m_impl->updateList.push_back(object);
} }
void NzScene::SetAmbientColor(const NzColor& color) void NzScene::SetAmbientColor(const NzColor& color)
@ -356,34 +363,32 @@ void NzScene::UnregisterForUpdate(NzUpdatable* object)
} }
#endif #endif
m_impl->updateList.erase(object); auto it = std::find(m_impl->updateList.begin(), m_impl->updateList.end(), object);
if (it != m_impl->updateList.end())
m_impl->updateList.erase(it);
} }
void NzScene::Update() void NzScene::Update()
{ {
if (m_impl->updatePerSecond == 0 || m_impl->updateClock.GetMilliseconds() > 1000/m_impl->updatePerSecond) m_impl->update = (m_impl->updatePerSecond == 0 || m_impl->updateClock.GetMilliseconds() > 1000/m_impl->updatePerSecond);
if (m_impl->update)
{ {
m_impl->updateTime = m_impl->updateClock.GetSeconds(); m_impl->updateTime = m_impl->updateClock.GetSeconds();
m_impl->updateClock.Restart(); m_impl->updateClock.Restart();
for (NzUpdatable* updatable : m_impl->updateList) for (NzUpdatable* updatable : m_impl->updateList)
{
///TODO: Multihreading ///TODO: Multihreading
updatable->Update(); updatable->Update();
} }
}
} }
void NzScene::UpdateVisible() void NzScene::UpdateVisible()
{/* {
if (m_impl->update) if (m_impl->update)
{ {
for (NzSceneNode* node : m_impl->visibleNodes) for (NzUpdatable* node : m_impl->visibleUpdateList)
{
if (node->ShouldUpdateWhenVisible())
node->Update(); node->Update();
} }
}*/
} }
NzScene::operator const NzSceneNode&() const NzScene::operator const NzSceneNode&() const