Skip to content

Revert "[ZH] Use hash maps for Object and Drawable lookups in GameClient, GameLogic like Generals does (#676)" #735

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
xezon merged 1 commit into from
Apr 21, 2025
Merged

Revert "[ZH] Use hash maps for Object and Drawable lookups in GameClient, GameLogic like Generals does (#676)" #735

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
26 changes: 17 additions & 9 deletions GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,10 @@ class SnowManager;

/// Function pointers for use by GameClient callback functions.
typedef void (*GameClientFuncPtr)( Drawable *draw, void *userData );
typedef std::hash_map<DrawableID, Drawable *, rts::hash<DrawableID>, rts::equal_to<DrawableID> > DrawablePtrHash;
typedef DrawablePtrHash::iterator DrawablePtrHashIt;
//typedef std::hash_map<DrawableID, Drawable *, rts::hash<DrawableID>, rts::equal_to<DrawableID> > DrawablePtrHash;
//typedef DrawablePtrHash::iterator DrawablePtrHashIt;

typedef std::vector<Drawable*> DrawablePtrVector;

//-----------------------------------------------------------------------------
/** The Client message dispatcher, this is the last "translator" on the message
Expand Down Expand Up @@ -163,7 +165,8 @@ class GameClient : public SubsystemInterface,
UnsignedInt m_frame; ///< Simulation frame number from server

Drawable *m_drawableList; ///< All of the drawables in the world
DrawablePtrHash m_drawableHash; ///< Used for DrawableID lookups
// DrawablePtrHash m_drawableHash; ///< Used for DrawableID lookups
DrawablePtrVector m_drawableVector;

DrawableID m_nextDrawableID; ///< For allocating drawable id's
DrawableID allocDrawableID( void ); ///< Returns a new unique drawable id
Expand Down Expand Up @@ -238,13 +241,18 @@ inline Drawable* GameClient::findDrawableByID( const DrawableID id )
if( id == INVALID_DRAWABLE_ID )
return NULL;

DrawablePtrHashIt it = m_drawableHash.find(id);
if (it == m_drawableHash.end()) {
// no such drawable
return NULL;
}
// DrawablePtrHashIt it = m_drawableHash.find(id);
// if (it == m_drawableHash.end()) {
// // no such drawable
// return NULL;
// }
//
// return (*it).second;

if( (size_t)id < m_drawableVector.size() )
return m_drawableVector[(size_t)id];

return (*it).second;
return NULL;
}


Expand Down
20 changes: 13 additions & 7 deletions GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,10 @@ enum

/// Function pointers for use by GameLogic callback functions.
typedef void (*GameLogicFuncPtr)( Object *obj, void *userData );
typedef std::hash_map<ObjectID, Object *, rts::hash<ObjectID>, rts::equal_to<ObjectID> > ObjectPtrHash;
typedef ObjectPtrHash::const_iterator ObjectPtrIter;
//typedef std::hash_map<ObjectID, Object *, rts::hash<ObjectID>, rts::equal_to<ObjectID> > ObjectPtrHash;
//typedef ObjectPtrHash::const_iterator ObjectPtrIter;

typedef std::vector<Object*> ObjectPtrVector;

// ------------------------------------------------------------------------------------------------
/**
Expand Down Expand Up @@ -319,7 +320,8 @@ class GameLogic : public SubsystemInterface, public Snapshot
WindowLayout *m_background;

Object* m_objList; ///< All of the objects in the world.
ObjectPtrHash m_objHash; ///< Used for ObjectID lookups
// ObjectPtrHash m_objHash; ///< Used for ObjectID lookups
ObjectPtrVector m_objVector;

// this is a vector, but is maintained as a priority queue.
// never modify it directly; please use the proper access methods.
Expand Down Expand Up @@ -410,11 +412,15 @@ inline Object* GameLogic::findObjectByID( ObjectID id )
if( id == INVALID_ID )
return NULL;

ObjectPtrHash::iterator it = m_objHash.find(id);
if (it == m_objHash.end())
return NULL;
// ObjectPtrHash::iterator it = m_objHash.find(id);
// if (it == m_objHash.end())
// return NULL;
//
// return (*it).second;
if( (size_t)id < m_objVector.size() )
return m_objVector[(size_t)id];

return (*it).second;
return NULL;
}


Expand Down
21 changes: 13 additions & 8 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,12 +450,11 @@ void GameClient::init( void )
void GameClient::reset( void )
{
Drawable *draw, *nextDraw;
m_drawableHash.clear();
#if USING_STLPORT
m_drawableHash.resize(DRAWABLE_HASH_SIZE);
#else
m_drawableHash.reserve(DRAWABLE_HASH_SIZE);
#endif
// m_drawableHash.clear();
// m_drawableHash.resize(DRAWABLE_HASH_SIZE);

m_drawableVector.clear();
m_drawableVector.resize(DRAWABLE_HASH_SIZE, NULL);

// need to reset the in game UI to clear drawables before they are destroyed
TheInGameUI->reset();
Expand Down Expand Up @@ -863,7 +862,12 @@ void GameClient::addDrawableToLookupTable(Drawable *draw )
return;

// add to lookup
m_drawableHash[ draw->getID() ] = draw;
// m_drawableHash[ draw->getID() ] = draw;
DrawableID newID = draw->getID();
while( newID >= m_drawableVector.size() ) // Fail case is hella rare, so faster to double up on size() call
m_drawableVector.resize(m_drawableVector.size() * 2, NULL);

m_drawableVector[ newID ] = draw;

} // end addDrawableToLookupTable

Expand All @@ -878,7 +882,8 @@ void GameClient::removeDrawableFromLookupTable( Drawable *draw )
return;

// remove from table
m_drawableHash.erase( draw->getID() );
// m_drawableHash.erase( draw->getID() );
m_drawableVector[ draw->getID() ] = NULL;

} // end removeDrawableFromLookupTable

Expand Down
21 changes: 13 additions & 8 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,12 +441,11 @@ void GameLogic::reset( void )
destroyAllObjectsImmediate();

// set the hash to be rather large. We need to optimize this value later.
m_objHash.clear();
#if USING_STLPORT
m_objHash.resize(OBJ_HASH_SIZE);
#else
m_objHash.reserve(OBJ_HASH_SIZE);
#endif
// m_objHash.clear();
// m_objHash.resize(OBJ_HASH_SIZE);
m_objVector.clear();
m_objVector.resize(OBJ_HASH_SIZE, NULL);

m_gamePaused = FALSE;
m_inputEnabledMemory = TRUE;
m_mouseVisibleMemory = TRUE;
Expand Down Expand Up @@ -3868,7 +3867,12 @@ void GameLogic::addObjectToLookupTable( Object *obj )
return;

// add to lookup
m_objHash[ obj->getID() ] = obj;
// m_objHash[ obj->getID() ] = obj;
ObjectID newID = obj->getID();
while( newID >= m_objVector.size() ) // Fail case is hella rare, so faster to double up on size() call
m_objVector.resize(m_objVector.size() * 2, NULL);

m_objVector[ newID ] = obj;

} // end addObjectToLookupTable

Expand All @@ -3883,7 +3887,8 @@ void GameLogic::removeObjectFromLookupTable( Object *obj )
return;

// remove from lookup table
m_objHash.erase( obj->getID() );
// m_objHash.erase( obj->getID() );
m_objVector[ obj->getID() ] = NULL;

} // end removeObjectFromLookupTable

Expand Down