Skip to content

Commit

Permalink
Changed iterator loops to range-based for loops.
Browse files Browse the repository at this point in the history
  • Loading branch information
@afritz1
afritz1 committed Apr 11, 2018
1 parent b911e8f commit 781039e
Show file tree
Hide file tree
Showing 12 changed files with 103 additions and 190 deletions.
33 changes: 13 additions & 20 deletions fileformats/CellLoader_Daggerfall.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -703,11 +703,9 @@ Sector *CellLoader_Daggerfall::LoadBlock_Ext(IDriver3D *pDriver, uint32_t uLengt
{
bool bValidNode = true;
//is this point inside a mesh?
std::vector<uint32_t>::iterator iObj = pSector->m_Objects.begin();
std::vector<uint32_t>::iterator eObj = pSector->m_Objects.end();
for (; iObj != eObj; ++iObj)
for (const uint32_t objID : pSector->m_Objects)
{
Object *pObj = ObjectManager::GetObjectFromID( *iObj );
Object *pObj = ObjectManager::GetObjectFromID(objID);
Vector3 vMin, vMax;
pObj->GetWorldBounds(vMin, vMax);
//is this node inside an object? If so, it is invalid...
Expand Down Expand Up @@ -1474,12 +1472,10 @@ Sector *CellLoader_Daggerfall::LoadBlock(IDriver3D *pDriver, uint32_t uLength, i
}

//now resolve action records.
std::vector<uint32_t>::iterator iObj = pSector->m_Objects.begin();
std::vector<uint32_t>::iterator eObj = pSector->m_Objects.end();
int idx=0;
for (; iObj != eObj; ++iObj)
int idx = 0;
for (const uint32_t objID : pSector->m_Objects)
{
Object *pObj = ObjectManager::GetObjectFromID( *iObj );
Object *pObj = ObjectManager::GetObjectFromID(objID);
assert(pObj);

//resolve parent/child relationship.
Expand All @@ -1488,18 +1484,17 @@ Sector *CellLoader_Daggerfall::LoadBlock(IDriver3D *pDriver, uint32_t uLength, i
MeshAction *pGameDataParent = (MeshAction *)pObj->GetGameData();

int idxTarget = 0;
std::vector<uint32_t>::iterator iObjTarget = pSector->m_Objects.begin();
for (; iObjTarget != eObj; ++iObjTarget)
for (const uint32_t objTargetID : pSector->m_Objects)
{
if ( objRecordID[idxTarget] == objTarget[idx] )
{
Object *pObjTarget = ObjectManager::GetObjectFromID( *iObjTarget );
Object *pObjTarget = ObjectManager::GetObjectFromID(objTargetID);
MeshAction *pGameDataTarget = (MeshAction *)pObjTarget->GetGameData();

if ( pGameDataTarget )
{
pGameDataTarget->nParentID = *iObj;
pGameDataParent->nTargetID = *iObjTarget;
pGameDataTarget->nParentID = objID;
pGameDataParent->nTargetID = objTargetID;
}

break;
Expand All @@ -1511,10 +1506,9 @@ Sector *CellLoader_Daggerfall::LoadBlock(IDriver3D *pDriver, uint32_t uLength, i
}

//Initialize the objects.
iObj = pSector->m_Objects.begin();
for (; iObj != eObj; ++iObj)
for (const uint32_t objID : pSector->m_Objects)
{
Object *pObj = ObjectManager::GetObjectFromID( *iObj );
Object *pObj = ObjectManager::GetObjectFromID(objID);
assert(pObj);

//Finish the object initialization. Setup logics and such.
Expand Down Expand Up @@ -1578,10 +1572,9 @@ Sector *CellLoader_Daggerfall::LoadBlock(IDriver3D *pDriver, uint32_t uLength, i

//assign lights to objects.
const std::vector<LightObject *>& lightList = pSector->GetLightList();
iObj = pSector->m_Objects.begin();
for (; iObj != eObj; ++iObj)
for (const uint32_t objID : pSector->m_Objects)
{
Object *pObj = ObjectManager::GetObjectFromID( *iObj );
Object *pObj = ObjectManager::GetObjectFromID(objID);
assert(pObj);

Vector3 vCen;
Expand Down
18 changes: 3 additions & 15 deletions movieplayback/LFD_Film.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -579,12 +579,8 @@ bool LFD_Film::Update()
{
m_Commands[m_nTime].bActivated = true;

std::vector<Command *>::iterator iter = m_Commands[m_nTime].commands.begin();
std::vector<Command *>::iterator end = m_Commands[m_nTime].commands.end();

for (; iter!=end; ++iter)
for (Command *pCmd : m_Commands[m_nTime].commands)
{
Command *pCmd = *iter;
if ( pCmd->cmd == CMD_SWITCH )
{
Graphic *pGraphic = (Graphic *)pCmd->pData;
Expand Down Expand Up @@ -704,12 +700,8 @@ bool LFD_Film::Update()
{
if ( !bFilmFinished )
{
std::vector<Graphic *>::iterator iter = m_Graphics.begin();
std::vector<Graphic *>::iterator end = m_Graphics.end();
for (; iter!=end; ++iter)
for (Graphic *pGraphic : m_Graphics)
{
Graphic *pGraphic = *iter;

if ( pGraphic->nAnimate > 0)
{
pGraphic->nFrame++;
Expand Down Expand Up @@ -968,12 +960,8 @@ void LFD_Film::Render(float fDeltaTime)
}

//render all the graphics that are visible...
std::vector<Graphic *>::iterator iter = m_Graphics.begin();
std::vector<Graphic *>::iterator end = m_Graphics.end();
for (; iter!=end; ++iter)
for (Graphic *pGraphic : m_Graphics)
{
Graphic *pGraphic = *iter;

if ( pGraphic->bVisible )
{
AddGraphicToQueue(pGraphic, pGraphic->nLayer+100);
Expand Down
11 changes: 2 additions & 9 deletions os/Input.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,8 @@ void Input::SetKeyDown(int32_t key)
key = s_OS_KeyMapping[key];

//now fire off any callbacks...
std::vector<KeyDownCB_t *>::iterator iter = m_KeyDownCB.begin();
std::vector<KeyDownCB_t *>::iterator end = m_KeyDownCB.end();
for (; iter != end; ++iter)
for (KeyDownCB_t *pKeyDownCB : m_KeyDownCB)
{
KeyDownCB_t *pKeyDownCB = *iter;

bool bFireCB = true;
if ( (pKeyDownCB->nFlags&KDCb_FLAGS_NOREPEAT) && (m_aKeyState[key] != 0) )
bFireCB = false;
Expand Down Expand Up @@ -95,11 +91,8 @@ void Input::SetCharacterDown(char c)
if ( c >= 32 && c < 127 )
{
//fire off any "character" callbacks.
std::vector<KeyDownCB_t *>::iterator iter = m_CharDownCB.begin();
std::vector<KeyDownCB_t *>::iterator end = m_CharDownCB.end();
for (; iter != end; ++iter)
for (KeyDownCB_t *pCharDownCB : m_CharDownCB)
{
KeyDownCB_t *pCharDownCB = *iter;
if ( pCharDownCB )
{
pCharDownCB->pCB(c);
Expand Down
6 changes: 1 addition & 5 deletions render/RenderQue.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,8 @@ void RenderQue::Render()
m_pDriver->EnableCulling(true);
m_pDriver->SetWorldMatrix(nullptr, 0, 0);
//go through the list.
std::vector<MaterialEntry *>::iterator iEntry = m_apRenderBuckets[RBUCKET_OPAQUE].begin();
std::vector<MaterialEntry *>::iterator eEntry = m_apRenderBuckets[RBUCKET_OPAQUE].end();
for (; iEntry != eEntry; ++iEntry)
for (const MaterialEntry *pEntry : m_apRenderBuckets[RBUCKET_OPAQUE])
{
const MaterialEntry *pEntry = *iEntry;

//Set the world matrix.
m_pDriver->SetWorldMatrix(pEntry->mWorld, pEntry->worldX, pEntry->worldY);
//Set the texture.
Expand Down
79 changes: 38 additions & 41 deletions ui/Console.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,13 @@ void Console::Print(const std::string& text)
void Console::PrintCommandHelp(const std::string& cmd)
{
bool bCmdFound = false;
std::list<ConsoleItem>::const_iterator iter;
for (iter = m_ItemList.begin(); iter != m_ItemList.end(); ++iter)
for (const ConsoleItem &item : m_ItemList)
{
if ( (*iter).name == cmd )
if ( item.name == cmd )
{
Print("^8---------------------------------------------------");
Print("^8" + (*iter).name + ": ");
Print("^2" + (*iter).help);
Print("^8" + item.name + ": ");
Print("^2" + item.help);
Print("^8---------------------------------------------------");
bCmdFound = true;
break;
Expand Down Expand Up @@ -473,15 +472,14 @@ void Console::PrintCommands(const char *pszText/*=nullptr*/)
l--;
}

std::list<ConsoleItem>::const_iterator iter;
for (iter = m_ItemList.begin(); iter != m_ItemList.end(); ++iter)
for (const ConsoleItem &item : m_ItemList)
{
if ( pszText != nullptr && l > 0 )
{
if ( strnicmp(pszText, (*iter).name.c_str(), l) != 0 )
if ( strnicmp(pszText, item.name.c_str(), l) != 0 )
continue;
}
sprintf(szCmdText, "^7%s", (*iter).name.c_str());
sprintf(szCmdText, "^7%s", item.name.c_str());
Print(szCmdText);
}
}
Expand All @@ -491,7 +489,6 @@ bool Console::ParseCommandLine()
std::ostringstream out;
std::string::size_type index = 0;
std::vector<std::string> arguments;
std::list<ConsoleItem>::const_iterator iter;

//add to text buffer - command echo.
if ( m_bEchoCommands )
Expand Down Expand Up @@ -534,23 +531,23 @@ bool Console::ParseCommandLine()
}

//execute (must look for a command or variable).
for (iter = m_ItemList.begin(); iter != m_ItemList.end(); ++iter)
for (const ConsoleItem &item : m_ItemList)
{
if ( iter->name == arguments[0] )
if ( item.name == arguments[0] )
{
switch (iter->type)
switch (item.type)
{
case CTYPE_UCHAR:
if ( arguments.size() > 2) return false;
else if ( arguments.size() == 1)
{
out.str(""); //clear stringstream
out << (*iter).name << " = " << *((unsigned char *)(*iter).varPtr);
out << item.name << " = " << *((unsigned char *)item.varPtr);
Print(out.str());
}
else
{
*((unsigned char *)(*iter).varPtr) = (unsigned char)atoi(arguments[1].c_str());
*((unsigned char *)item.varPtr) = (unsigned char)atoi(arguments[1].c_str());
}
return true;
break;
Expand All @@ -559,12 +556,12 @@ bool Console::ParseCommandLine()
else if ( arguments.size() == 1)
{
out.str(""); //clear stringstream
out << (*iter).name << " = " << *((char *)(*iter).varPtr);
out << item.name << " = " << *((char *)item.varPtr);
Print(out.str());
}
else
{
*((char *)(*iter).varPtr) = (char)atoi(arguments[1].c_str());
*((char *)item.varPtr) = (char)atoi(arguments[1].c_str());
}
return true;
break;
Expand All @@ -573,12 +570,12 @@ bool Console::ParseCommandLine()
else if ( arguments.size() == 1)
{
out.str(""); //clear stringstream
out << (*iter).name << " = " << *((uint32_t *)(*iter).varPtr);
out << item.name << " = " << *((uint32_t *)item.varPtr);
Print(out.str());
}
else
{
*((uint32_t *)(*iter).varPtr) = (uint32_t)atoi(arguments[1].c_str());
*((uint32_t *)item.varPtr) = (uint32_t)atoi(arguments[1].c_str());
}
return true;
break;
Expand All @@ -587,12 +584,12 @@ bool Console::ParseCommandLine()
else if ( arguments.size() == 1)
{
out.str(""); //clear stringstream
out << (*iter).name << " = " << *((int32_t *)(*iter).varPtr);
out << item.name << " = " << *((int32_t *)item.varPtr);
Print(out.str());
}
else
{
*((int32_t *)(*iter).varPtr) = (int32_t)atoi(arguments[1].c_str());
*((int32_t *)item.varPtr) = (int32_t)atoi(arguments[1].c_str());
}
return true;
break;
Expand All @@ -601,12 +598,12 @@ bool Console::ParseCommandLine()
else if ( arguments.size() == 1)
{
out.str(""); //clear stringstream
out << (*iter).name << " = " << *((float *)(*iter).varPtr);
out << item.name << " = " << *((float *)item.varPtr);
Print(out.str());
}
else
{
*((float *)(*iter).varPtr) = (float)atof(arguments[1].c_str());
*((float *)item.varPtr) = (float)atof(arguments[1].c_str());
}
return true;
break;
Expand All @@ -615,12 +612,12 @@ bool Console::ParseCommandLine()
else if ( arguments.size() == 1)
{
out.str(""); //clear stringstream
out << (*iter).name << " = " << ( *((bool *)(*iter).varPtr) ? "1" : "0" );
out << item.name << " = " << ( *((bool *)item.varPtr) ? "1" : "0" );
Print(out.str());
}
else
{
*((bool *)(*iter).varPtr) = atoi(arguments[1].c_str()) ? true : false;
*((bool *)item.varPtr) = atoi(arguments[1].c_str()) ? true : false;
}
return true;
break;
Expand All @@ -629,12 +626,12 @@ bool Console::ParseCommandLine()
else if ( arguments.size() == 1)
{
out.str(""); //clear stringstream
out << (*iter).name << " = " << *((std::string *)(*iter).varPtr);
out << item.name << " = " << *((std::string *)item.varPtr);
Print(out.str());
}
else
{
*((std::string *)(*iter).varPtr) = arguments[1];
*((std::string *)item.varPtr) = arguments[1];
}
return true;
break;
Expand All @@ -643,12 +640,12 @@ bool Console::ParseCommandLine()
else if ( arguments.size() == 1)
{
out.str(""); //clear stringstream
out << (*iter).name << " = " << std::string((char *)(*iter).varPtr);
out << item.name << " = " << std::string((char *)item.varPtr);
Print(out.str());
}
else
{
strcpy((char *)(*iter).varPtr, arguments[1].c_str());
strcpy((char *)item.varPtr, arguments[1].c_str());
}
return true;
break;
Expand All @@ -657,15 +654,15 @@ bool Console::ParseCommandLine()
else if ( arguments.size() != 4 )
{
out.str(""); //clear stringstream
out << (*iter).name << " = " << ((Vector3 *)(*iter).varPtr)->x << " " << ((Vector3 *)(*iter).varPtr)->y << " " <<
((Vector3 *)(*iter).varPtr)->z;
out << item.name << " = " << ((Vector3 *)item.varPtr)->x << " " << ((Vector3 *)item.varPtr)->y << " " <<
((Vector3 *)item.varPtr)->z;
Print(out.str());
}
else
{
((Vector3 *)(*iter).varPtr)->x = (float)atof(arguments[1].c_str());
((Vector3 *)(*iter).varPtr)->y = (float)atof(arguments[2].c_str());
((Vector3 *)(*iter).varPtr)->z = (float)atof(arguments[3].c_str());
((Vector3 *)item.varPtr)->x = (float)atof(arguments[1].c_str());
((Vector3 *)item.varPtr)->y = (float)atof(arguments[2].c_str());
((Vector3 *)item.varPtr)->z = (float)atof(arguments[3].c_str());
}
return true;
break;
Expand All @@ -674,21 +671,21 @@ bool Console::ParseCommandLine()
else if ( arguments.size() != 5 )
{
out.str(""); //clear stringstream
out << (*iter).name << " = " << ((Vector4 *)(*iter).varPtr)->x << " " << ((Vector4 *)(*iter).varPtr)->y << " " <<
((Vector4 *)(*iter).varPtr)->z << " " << ((Vector4 *)(*iter).varPtr)->w;
out << item.name << " = " << ((Vector4 *)item.varPtr)->x << " " << ((Vector4 *)item.varPtr)->y << " " <<
((Vector4 *)item.varPtr)->z << " " << ((Vector4 *)item.varPtr)->w;
Print(out.str());
}
else
{
((Vector4 *)(*iter).varPtr)->x = (float)atof(arguments[1].c_str());
((Vector4 *)(*iter).varPtr)->y = (float)atof(arguments[2].c_str());
((Vector4 *)(*iter).varPtr)->z = (float)atof(arguments[3].c_str());
((Vector4 *)(*iter).varPtr)->w = (float)atof(arguments[4].c_str());
((Vector4 *)item.varPtr)->x = (float)atof(arguments[1].c_str());
((Vector4 *)item.varPtr)->y = (float)atof(arguments[2].c_str());
((Vector4 *)item.varPtr)->z = (float)atof(arguments[3].c_str());
((Vector4 *)item.varPtr)->w = (float)atof(arguments[4].c_str());
}
return true;
break;
case CTYPE_FUNCTION:
(*iter).func(arguments, (*iter).userData);
item.func(arguments, item.userData);
return true;
break;
default:
Expand Down
Loading

0 comments on commit 781039e

Please sign in to comment.