Skip to content

perf(scene): Create light list iterators on the stack at points of use #2646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mauller wants to merge 1 commit into
base: main
Choose a base branch
from
Open

perf(scene): Create light list iterators on the stack at points of use #2646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2127,12 +2127,9 @@ Int BaseHeightMapRenderObjClass::getStaticDiffuse(Int x, Int y)

RTS3DScene *pMyScene = (RTS3DScene *)Scene;
if (pMyScene) {
RefRenderObjListIterator *it = pMyScene->createLightsIterator();
Comment thread
Skyaero42 marked this conversation as resolved.
doTheLight(&vertex, lightRay, &normalAtTexel, it, 1.0f);
if (it) {
pMyScene->destroyLightsIterator(it);
it = nullptr;
}
RefRenderObjListClass *lightlist = pMyScene->getLightList();
RefRenderObjListIterator it(lightlist);
doTheLight(&vertex, lightRay, &normalAtTexel, &it, 1.0f);
} else {
doTheLight(&vertex, lightRay, &normalAtTexel, nullptr, 1.0f);
}
Expand Down
12 changes: 2 additions & 10 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,27 +601,19 @@ Bool W3DTerrainVisual::load( AsciiString filename )
pMapObj = pMapObj->getNext();
}


RefRenderObjListIterator *it = W3DDisplay::m_3DScene ? W3DDisplay::m_3DScene->createLightsIterator() : nullptr;
// apply the heightmap to the terrain render object

#ifdef DO_SEISMIC_SIMULATIONS
m_terrainRenderObject->initHeightData( m_clientHeightMap->getDrawWidth(),
m_clientHeightMap->getDrawHeight(),
m_clientHeightMap,
it);
nullptr);
#else
m_terrainRenderObject->initHeightData( m_logicHeightMap->getDrawWidth(),
m_logicHeightMap->getDrawHeight(),
m_logicHeightMap,
it);
nullptr);
#endif


if (it) {
W3DDisplay::m_3DScene->destroyLightsIterator(it);
it = nullptr;
}
// add our terrain render object to the scene
if (W3DDisplay::m_3DScene != nullptr)
W3DDisplay::m_3DScene->Add_Render_Object( m_terrainRenderObject );
Expand Down
10 changes: 3 additions & 7 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3602,11 +3602,7 @@ void W3DView::updateTerrain()
{
DEBUG_ASSERTCRASH(TheTerrainRenderObject != nullptr, ("TheTerrainRenderObject is null"));

RefRenderObjListIterator *it = W3DDisplay::m_3DScene->createLightsIterator();
TheTerrainRenderObject->updateCenter(m_3DCamera, it);
if (it)
{
W3DDisplay::m_3DScene->destroyLightsIterator(it);
it = nullptr;
}
RefRenderObjListClass* lightlist = W3DDisplay::m_3DScene->getLightList();
RefRenderObjListIterator it(lightlist);
TheTerrainRenderObject->updateCenter(m_3DCamera, &it);
}
3 changes: 1 addition & 2 deletions Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,11 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
/// Lighting methods
void addDynamicLight(W3DDynamicLight * obj);
void removeDynamicLight(W3DDynamicLight * obj);
RefRenderObjListIterator *createLightsIterator();
void destroyLightsIterator(RefRenderObjListIterator * it);
RefRenderObjListClass *getDynamicLights() {return &m_dynamicLightList;};
W3DDynamicLight *getADynamicLight();
void setGlobalLight(LightClass *pLight,Int lightIndex=0);
LightEnvironmentClass &getDefaultLightEnv() {return m_defaultLightEnv;}
RefRenderObjListClass* getLightList() { return &LightList; }

virtual void init() override {}
virtual void update() override {}
Expand Down
23 changes: 0 additions & 23 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,29 +1596,6 @@ void RTS3DScene::flushTranslucentObjects(RenderInfoClass & rinfo)
DX8Wrapper::Set_DX8_Render_State(D3DRS_AMBIENT,DX8Wrapper::Convert_Color(this->Get_Ambient_Light(),0.0f));
}

//=============================================================================
// RTS3DScene::createLightsIterator
//=============================================================================
/** Returns an iterator of the lights in the scene. */
//=============================================================================
RefRenderObjListIterator * RTS3DScene::createLightsIterator()
{
RefRenderObjListIterator * it = NEW RefRenderObjListIterator(&LightList); // poolify
return it;
}


//=============================================================================
// RTS3DScene::destroyLightsIterator
//=============================================================================
/** Destroys the iterator returned by createLightsIterator. */
//=============================================================================
void RTS3DScene::destroyLightsIterator(RefRenderObjListIterator * it)
{
delete it;
}


//=============================================================================
// RTS3DScene::addDynamicLight
//=============================================================================
Expand Down
3 changes: 1 addition & 2 deletions GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,11 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
/// Lighting methods
void addDynamicLight(W3DDynamicLight * obj);
void removeDynamicLight(W3DDynamicLight * obj);
RefRenderObjListIterator *createLightsIterator();
void destroyLightsIterator(RefRenderObjListIterator * it);
RefRenderObjListClass *getDynamicLights() {return &m_dynamicLightList;};
W3DDynamicLight *getADynamicLight();
void setGlobalLight(LightClass *pLight,Int lightIndex=0);
LightEnvironmentClass &getDefaultLightEnv() {return m_defaultLightEnv;}
RefRenderObjListClass* getLightList() { return &LightList; }

virtual void init() override {}
virtual void update() override {}
Expand Down
23 changes: 0 additions & 23 deletions GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1668,29 +1668,6 @@ void RTS3DScene::flushTranslucentObjects(RenderInfoClass & rinfo)
DX8Wrapper::Set_DX8_Render_State(D3DRS_AMBIENT,DX8Wrapper::Convert_Color(this->Get_Ambient_Light(),0.0f));
}

//=============================================================================
// RTS3DScene::createLightsIterator
//=============================================================================
/** Returns an iterator of the lights in the scene. */
//=============================================================================
RefRenderObjListIterator * RTS3DScene::createLightsIterator()
{
RefRenderObjListIterator * it = NEW RefRenderObjListIterator(&LightList); // poolify
return it;
}


//=============================================================================
// RTS3DScene::destroyLightsIterator
//=============================================================================
/** Destroys the iterator returned by createLightsIterator. */
//=============================================================================
void RTS3DScene::destroyLightsIterator(RefRenderObjListIterator * it)
{
delete it;
}


//=============================================================================
// RTS3DScene::addDynamicLight
//=============================================================================
Expand Down
Loading