Skip to content

[GEN][ZH] Remove unnecessary NULL pointer tests in RTS3DScene::RTS3DScene() #1105

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

Merged
merged 1 commit into from
Jun 22, 2025
Merged

[GEN][ZH] Remove unnecessary NULL pointer tests in RTS3DScene::RTS3DScene() #1105

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
22 changes: 15 additions & 7 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 @@ -136,7 +136,7 @@ RTS3DScene::RTS3DScene()
//Allocate memory to hold queue of visible renderobjects that need to be drawn last
//because they are forced translucent.
m_translucentObjectsCount = 0;
if (TheGlobalData && TheGlobalData->m_maxVisibleTranslucentObjects)
if (TheGlobalData->m_maxVisibleTranslucentObjects > 0)
m_translucentObjectsBuffer = NEW RenderObjClass* [TheGlobalData->m_maxVisibleTranslucentObjects];
else
m_translucentObjectsBuffer = NULL;
Expand All @@ -146,18 +146,26 @@ RTS3DScene::RTS3DScene()
m_numNonOccluderOrOccludee=0;
m_occludedObjectsCount=0;

m_potentialOccluders=NULL;
m_potentialOccludees=NULL;
m_nonOccludersOrOccludees=NULL;
if (TheGlobalData->m_maxVisibleOccluderObjects > 0)
m_potentialOccluders = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccluderObjects];
else
m_potentialOccluders = NULL;

if (TheGlobalData->m_maxVisibleOccludeeObjects > 0)
m_potentialOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccludeeObjects];
else
m_potentialOccludees = NULL;

if (TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects > 0)
m_nonOccludersOrOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects];
else
m_nonOccludersOrOccludees = NULL;

//Modify the shader to make occlusion transparent
ShaderClass shader = PlayerColorShader;
shader.Set_Src_Blend_Func(ShaderClass::SRCBLEND_SRC_ALPHA);
shader.Set_Dst_Blend_Func(ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA);

m_potentialOccluders = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccluderObjects];
m_potentialOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccludeeObjects];
m_nonOccludersOrOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects];
#ifdef USE_NON_STENCIL_OCCLUSION
for (i=0; i<MAX_PLAYER_COUNT; i++)
{ m_occludedMaterialPass[i]=NEW_REF(MaterialPassClass,());
Expand Down
23 changes: 15 additions & 8 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 @@ -152,7 +152,7 @@ RTS3DScene::RTS3DScene()
//Allocate memory to hold queue of visible renderobjects that need to be drawn last
//because they are forced translucent.
m_translucentObjectsCount = 0;
if (TheGlobalData && TheGlobalData->m_maxVisibleTranslucentObjects)
if (TheGlobalData->m_maxVisibleTranslucentObjects > 0)
m_translucentObjectsBuffer = NEW RenderObjClass* [TheGlobalData->m_maxVisibleTranslucentObjects];
else
m_translucentObjectsBuffer = NULL;
Expand All @@ -162,19 +162,26 @@ RTS3DScene::RTS3DScene()
m_numNonOccluderOrOccludee=0;
m_occludedObjectsCount=0;

m_potentialOccluders=NULL;
m_potentialOccludees=NULL;
m_nonOccludersOrOccludees=NULL;
if (TheGlobalData->m_maxVisibleOccluderObjects > 0)
m_potentialOccluders = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccluderObjects];
else
m_potentialOccluders = NULL;

if (TheGlobalData->m_maxVisibleOccludeeObjects > 0)
m_potentialOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccludeeObjects];
else
m_potentialOccludees = NULL;

if (TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects > 0)
m_nonOccludersOrOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects];
else
m_nonOccludersOrOccludees = NULL;

//Modify the shader to make occlusion transparent
ShaderClass shader = PlayerColorShader;
shader.Set_Src_Blend_Func(ShaderClass::SRCBLEND_SRC_ALPHA);
shader.Set_Dst_Blend_Func(ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA);

m_potentialOccluders = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccluderObjects];
m_potentialOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccludeeObjects];
m_nonOccludersOrOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects];

#ifdef USE_NON_STENCIL_OCCLUSION
for (i=0; i<MAX_PLAYER_COUNT; i++)
{ m_occludedMaterialPass[i]=NEW_REF(MaterialPassClass,());
Expand Down
Loading