Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Object list now using standard stl container classes instead of deprecated LL clones.

Browse Source
This commit is contained in:
Shyotl
2011-03-24 05:09:34 -05:00
parent 0150bac422
commit 39af56c6f7
3 changed files with 106 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llglsandbox.cpp
View File

@@ -1056,11 +1056,11 @@ void LLViewerObjectList::renderObjectBeacons()
S32 last_line_width = -1;
// gGL.begin(LLRender::LINES); // Always happens in (line_width != last_line_width)
BOOL flush = FALSE;
for (S32 i = 0; i < mDebugBeacons.count(); i++)
BOOL flush = FALSE;
for (std::vector<LLDebugBeacon>::iterator iter = mDebugBeacons.begin(); iter != mDebugBeacons.end(); ++iter)
{
const LLDebugBeacon &debug_beacon = mDebugBeacons[i];
const LLDebugBeacon &debug_beacon = *iter;
LLColor4 color = debug_beacon.mColor;
color.mV[3] *= 0.25f;
S32 line_width = debug_beacon.mLineWidth;
@@ -1098,10 +1098,10 @@ void LLViewerObjectList::renderObjectBeacons()
S32 last_line_width = -1;
// gGL.begin(LLRender::LINES); // Always happens in (line_width != last_line_width)
BOOL flush = FALSE;
for (S32 i = 0; i < mDebugBeacons.count(); i++)
BOOL flush = FALSE;
for (std::vector<LLDebugBeacon>::iterator iter = mDebugBeacons.begin(); iter != mDebugBeacons.end(); ++iter)
{
const LLDebugBeacon &debug_beacon = mDebugBeacons[i];
const LLDebugBeacon &debug_beacon = *iter;
S32 line_width = debug_beacon.mLineWidth;
if (line_width != last_line_width)
@@ -1133,9 +1133,9 @@ void LLViewerObjectList::renderObjectBeacons()
gGL.flush();
glLineWidth(1.f);
for (S32 i = 0; i < mDebugBeacons.count(); i++)
for (std::vector<LLDebugBeacon>::iterator iter = mDebugBeacons.begin(); iter != mDebugBeacons.end(); ++iter)
{
LLDebugBeacon &debug_beacon = mDebugBeacons[i];
LLDebugBeacon &debug_beacon = *iter;
if (debug_beacon.mString == "")
{
continue;

152
indra/newview/llviewerobjectlist.cpp
View File

@@ -95,7 +95,7 @@ extern LLPipeline gPipeline;
// Statics for object lookup tables.
U32 LLViewerObjectList::sSimulatorMachineIndex = 1; // Not zero deliberately, to speed up index check.
LLMap<U64, U32> LLViewerObjectList::sIPAndPortToIndex;
std::map<U64, U32> LLViewerObjectList::sIPAndPortToIndex;
std::map<U64, LLUUID> LLViewerObjectList::sIndexAndLocalIDToUUID;
LLViewerObjectList::LLViewerObjectList()
@@ -594,10 +594,9 @@ void LLViewerObjectList::processCachedObjectUpdate(LLMessageSystem *mesgsys,
void LLViewerObjectList::dirtyAllObjectInventory()
{
S32 count = mObjects.count();
for(S32 i = 0; i < count; ++i)
for (vobj_list_t::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter)
{
mObjects[i]->dirtyInventory();
(*iter)->dirtyInventory();
}
}
@@ -610,14 +609,14 @@ void LLViewerObjectList::updateApparentAngles(LLAgent &agent)
S32 num_updates, max_value;
if (NUM_BINS - 1 == mCurBin)
{
num_updates = mObjects.count() - mCurLazyUpdateIndex;
max_value = mObjects.count();
num_updates = (S32) mObjects.size() - mCurLazyUpdateIndex;
max_value = (S32) mObjects.size();
gImageList.setUpdateStats(TRUE);
}
else
{
num_updates = (mObjects.count() / NUM_BINS) + 1;
max_value = llmin(mObjects.count(), mCurLazyUpdateIndex + num_updates);
num_updates = ((S32) mObjects.size() / NUM_BINS) + 1;
max_value = llmin((S32) mObjects.size(), mCurLazyUpdateIndex + num_updates);
}
@@ -666,7 +665,7 @@ void LLViewerObjectList::updateApparentAngles(LLAgent &agent)
}
mCurLazyUpdateIndex = max_value;
if (mCurLazyUpdateIndex == mObjects.count())
if (mCurLazyUpdateIndex == mObjects.size())
{
mCurLazyUpdateIndex = 0;
}
@@ -827,7 +826,7 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
}
*/
mNumObjectsStat.addValue(mObjects.count());
mNumObjectsStat.addValue((S32) mObjects.size());
mNumActiveObjectsStat.addValue(num_active_objects);
mNumSizeCulledStat.addValue(mNumSizeCulled);
mNumVisCulledStat.addValue(mNumVisCulled);
@@ -835,9 +834,9 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
void LLViewerObjectList::clearDebugText()
{
for (S32 i = 0; i < mObjects.count(); i++)
for (vobj_list_t::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter)
{
mObjects[i]->setDebugText("");
(*iter)->setDebugText("");
}
}
@@ -845,14 +844,13 @@ void LLViewerObjectList::clearDebugText()
void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp)
{
LLMemType mt(LLMemType::MTYPE_OBJECT);
if (mDeadObjects.find(objectp->mID) != mDeadObjects.end())
if (mDeadObjects.count(objectp->mID))
{
llinfos << "Object " << objectp->mID << " already on dead list, ignoring cleanup!" << llendl;
return;
}
else
{
mDeadObjects.insert(std::pair<LLUUID, LLPointer<LLViewerObject> >(objectp->mID, objectp));
}
mDeadObjects.insert(std::pair<LLUUID, LLPointer<LLViewerObject> >(objectp->mID, objectp));
// Cleanup any references we have to this object
// Remove from object map so noone can look it up.
@@ -878,7 +876,7 @@ void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp)
if (objectp->isOnMap())
{
mMapObjects.removeObj(objectp);
removeFromMap(objectp);
}
// Don't clean up mObject references, these will be cleaned up more efficiently later!
@@ -935,10 +933,10 @@ void LLViewerObjectList::killObjects(LLViewerRegion *regionp)
{
LLViewerObject *objectp;
S32 i;
for (i = 0; i < mObjects.count(); i++)
for (vobj_list_t::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter)
{
objectp = mObjects[i];
objectp = *iter;
if (objectp->mRegionp == regionp)
{
@@ -955,9 +953,9 @@ void LLViewerObjectList::killAllObjects()
// Used only on global destruction.
LLViewerObject *objectp;
for (S32 i = 0; i < mObjects.count(); i++)
for (vobj_list_t::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter)
{
objectp = mObjects[i];
objectp = *iter;
killObject(objectp);
llassert(objectp->isDead());
@@ -967,7 +965,7 @@ void LLViewerObjectList::killAllObjects()
if(!mObjects.empty())
{
llwarns << "LLViewerObjectList::killAllObjects still has entries in mObjects: " << mObjects.count() << llendl;
llwarns << "LLViewerObjectList::killAllObjects still has entries in mObjects: " << mObjects.size() << llendl;
mObjects.clear();
}
@@ -992,16 +990,15 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer)
return;
}
S32 i = 0;
S32 num_removed = 0;
LLViewerObject *objectp;
while (i < mObjects.count())
for (vobj_list_t::iterator iter = mObjects.begin(); iter != mObjects.end(); )
{
// Scan for all of the dead objects and remove any "global" references to them.
objectp = mObjects[i];
objectp = *iter;
if (objectp->isDead())
{
mObjects.remove(i);
iter = mObjects.erase(iter);
num_removed++;
if (num_removed == mNumDeadObjects)
@@ -1012,8 +1009,7 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer)
}
else
{
// iterate, this isn't a dead object.
i++;
++iter;
}
}
@@ -1063,10 +1059,9 @@ void LLViewerObjectList::shiftObjects(const LLVector3 &offset)
}
LLViewerObject *objectp;
S32 i;
for (i = 0; i < mObjects.count(); i++)
for (vobj_list_t::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter)
{
objectp = getObject(i);
objectp = *iter;
// There could be dead objects on the object list, so don't update stuff if the object is dead.
if (objectp && !objectp->isDead())
{
@@ -1098,10 +1093,14 @@ void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap)
F32 max_radius = gSavedSettings.getF32("MiniMapPrimMaxRadius");
for (S32 i = 0; i < mMapObjects.count(); i++)
for (vobj_list_t::iterator iter = mMapObjects.begin(); iter != mMapObjects.end(); ++iter)
{
LLViewerObject* objectp = mMapObjects[i];
if (objectp->isDead() || !objectp->getRegion() || objectp->isOrphaned() || objectp->isAttachment())
LLViewerObject* objectp = *iter;
llassert_always(objectp);
llassert_always(!objectp->isDead());
if (!objectp->getRegion() || objectp->isOrphaned() || objectp->isAttachment())
{
continue;
}
@@ -1177,10 +1176,9 @@ void LLViewerObjectList::generatePickList(LLCamera &camera)
LLViewerObject *objectp;
S32 i;
// Reset all of the GL names to zero.
for (i = 0; i < mObjects.count(); i++)
for (vobj_list_t::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter)
{
objectp = mObjects[i];
objectp->mGLName = 0;
(*iter)->mGLName = 0;
}
mSelectPickList.clear();
@@ -1240,6 +1238,7 @@ void LLViewerObjectList::generatePickList(LLCamera &camera)
LLVOAvatar* avatarp = gAgent.getAvatarObject();
if (avatarp)
{
LLVOAvatar* avatarp = gAgent.getAvatarObject();
for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin();
iter != avatarp->mAttachmentPoints.end(); )
{
@@ -1343,17 +1342,19 @@ void LLViewerObjectList::addDebugBeacon(const LLVector3 &pos_agent,
const LLColor4 &text_color,
S32 line_width)
{
LLDebugBeacon *beaconp = mDebugBeacons.reserve_block(1);
beaconp->mPositionAgent = pos_agent;
beaconp->mString = string;
beaconp->mColor = color;
beaconp->mTextColor = text_color;
beaconp->mLineWidth = line_width;
LLDebugBeacon beacon;
beacon.mPositionAgent = pos_agent;
beacon.mString = string;
beacon.mColor = color;
beacon.mTextColor = text_color;
beacon.mLineWidth = line_width;
mDebugBeacons.push_back(beacon);
}
void LLViewerObjectList::resetObjectBeacons()
{
mDebugBeacons.reset();
mDebugBeacons.clear();
}
LLViewerObject *LLViewerObjectList::createObjectViewer(const LLPCode pcode, LLViewerRegion *regionp)
@@ -1377,7 +1378,7 @@ LLViewerObject *LLViewerObjectList::createObjectViewer(const LLPCode pcode, LLVi
mUUIDAvatarMap[fullid] = pAvatar;
}
mObjects.put(objectp);
mObjects.push_back(objectp);
updateActive(objectp);
@@ -1421,7 +1422,7 @@ LLViewerObject *LLViewerObjectList::createObject(const LLPCode pcode, LLViewerRe
gMessageSystem->getSenderIP(),
gMessageSystem->getSenderPort());
mObjects.put(objectp);
mObjects.push_back(objectp);
updateActive(objectp);
@@ -1433,7 +1434,7 @@ LLViewerObject *LLViewerObjectList::replaceObject(const LLUUID &id, const LLPCod
LLViewerObject *old_instance = findObject(id);
if (old_instance)
{
cleanupReferences(old_instance);
//cleanupReferences(old_instance);
old_instance->markDead();
return createObject(pcode, regionp, id, old_instance->getLocalID(), LLHost());
@@ -1444,11 +1445,11 @@ LLViewerObject *LLViewerObjectList::replaceObject(const LLUUID &id, const LLPCod
S32 LLViewerObjectList::findReferences(LLDrawable *drawablep) const
{
LLViewerObject *objectp;
S32 i;
S32 num_refs = 0;
for (i = 0; i < mObjects.count(); i++)
for (vobj_list_t::const_iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter)
{
objectp = mObjects[i];
objectp = *iter;
if (objectp->mDrawable.notNull())
{
num_refs += objectp->mDrawable->findReferences(drawablep);
@@ -1493,15 +1494,15 @@ void LLViewerObjectList::orphanize(LLViewerObject *childp, U32 parent_id, U32 ip
// Unknown parent, add to orpaned child list
U64 parent_info = getIndex(parent_id, ip, port);
if (-1 == mOrphanParents.find(parent_info))
if (std::find(mOrphanParents.begin(), mOrphanParents.end(), parent_info) == mOrphanParents.end())
{
mOrphanParents.put(parent_info);
mOrphanParents.push_back(parent_info);
}
LLViewerObjectList::OrphanInfo oi(parent_info, childp->mID);
if (-1 == mOrphanChildren.find(oi))
if (std::find(mOrphanChildren.begin(), mOrphanChildren.end(), oi) == mOrphanChildren.end())
{
mOrphanChildren.put(oi);
mOrphanChildren.push_back(oi);
mNumOrphans++;
}
}
@@ -1524,28 +1525,29 @@ void LLViewerObjectList::findOrphans(LLViewerObject* objectp, U32 ip, U32 port)
// See if we are a parent of an orphan.
// Note: This code is fairly inefficient but it should happen very rarely.
// It can be sped up if this is somehow a performance issue...
if (0 == mOrphanParents.count())
if (mOrphanParents.empty())
{
// no known orphan parents
return;
}
if (-1 == mOrphanParents.find(getIndex(objectp->mLocalID, ip, port)))
if (std::find(mOrphanParents.begin(), mOrphanParents.end(), getIndex(objectp->mLocalID, ip, port)) == mOrphanParents.end())
{
// did not find objectp in OrphanParent list
return;
}
S32 i;
U64 parent_info = getIndex(objectp->mLocalID, ip, port);
BOOL orphans_found = FALSE;
// Iterate through the orphan list, and set parents of matching children.
for (i = 0; i < mOrphanChildren.count(); i++)
{
if (mOrphanChildren[i].mParentInfo != parent_info)
for (std::vector<OrphanInfo>::iterator iter = mOrphanChildren.begin(); iter != mOrphanChildren.end(); )
{
if (iter->mParentInfo != parent_info)
{
++iter;
continue;
}
LLViewerObject *childp = findObject(mOrphanChildren[i].mChildInfo);
LLViewerObject *childp = findObject(iter->mChildInfo);
if (childp)
{
if (childp == objectp)
@@ -1579,29 +1581,35 @@ void LLViewerObjectList::findOrphans(LLViewerObject* objectp, U32 ip, U32 port)
objectp->addChild(childp);
orphans_found = TRUE;
++iter;
}
else
{
llinfos << "Missing orphan child, removing from list" << llendl;
mOrphanChildren.remove(i);
i--;
iter = mOrphanChildren.erase(iter);
}
}
// Remove orphan parent and children from lists now that they've been found
mOrphanParents.remove(mOrphanParents.find(parent_info));
i = 0;
while (i < mOrphanChildren.count())
{
if (mOrphanChildren[i].mParentInfo == parent_info)
std::vector<U64>::iterator iter = std::find(mOrphanParents.begin(), mOrphanParents.end(), parent_info);
if (iter != mOrphanParents.end())
{
mOrphanChildren.remove(i);
mOrphanParents.erase(iter);
}
}
for (std::vector<OrphanInfo>::iterator iter = mOrphanChildren.begin(); iter != mOrphanChildren.end(); )
{
if (iter->mParentInfo == parent_info)
{
iter = mOrphanChildren.erase(iter);
mNumOrphans--;
}
else
{
i++;
++iter;
}
}

31
indra/newview/llviewerobjectlist.h
View File

@@ -38,7 +38,6 @@
// common includes
#include "llstat.h"
#include "lldarrayptr.h"
#include "llstring.h"
// project includes
@@ -49,7 +48,7 @@ class LLNetMap;
class LLDebugBeacon;
const U32 CLOSE_BIN_SIZE = 10;
const U32 NUM_BINS = 16;
const U32 NUM_BINS = 128;
// GL name = position in object list + GL_NAME_INDEX_OFFSET so that
// we can have special numbers like zero.
@@ -119,9 +118,7 @@ public:
LLViewerObject *getSelectedObject(const U32 object_id);
inline S32 getNumObjects() { return mObjects.count(); }
LLDynamicArrayPtr<LLPointer<LLViewerObject> > getObjectMap(){ return mMapObjects; }
inline S32 getNumObjects() { return (S32) mObjects.size(); }
void addToMap(LLViewerObject *objectp);
void removeFromMap(LLViewerObject *objectp);
@@ -135,7 +132,7 @@ public:
S32 findReferences(LLDrawable *drawablep) const; // Find references to drawable in all objects, and return value.
S32 getOrphanParentCount() const { return mOrphanParents.count(); }
S32 getOrphanParentCount() const { return (S32) mOrphanParents.size(); }
S32 getOrphanCount() const { return mNumOrphans; }
void orphanize(LLViewerObject *childp, U32 parent_id, U32 ip, U32 port);
void findOrphans(LLViewerObject* objectp, U32 ip, U32 port);
@@ -194,14 +191,16 @@ public:
S32 mNumUnknownKills;
S32 mNumDeadObjects;
protected:
LLDynamicArray<U64> mOrphanParents; // LocalID/ip,port of orphaned objects
LLDynamicArray<OrphanInfo> mOrphanChildren; // UUID's of orphaned objects
std::vector<U64> mOrphanParents; // LocalID/ip,port of orphaned objects
std::vector<OrphanInfo> mOrphanChildren; // UUID's of orphaned objects
S32 mNumOrphans;
LLDynamicArrayPtr<LLPointer<LLViewerObject>, 256> mObjects;
typedef std::vector<LLPointer<LLViewerObject> > vobj_list_t;
vobj_list_t mObjects;
std::set<LLPointer<LLViewerObject> > mActiveObjects;
LLDynamicArrayPtr<LLPointer<LLViewerObject> > mMapObjects;
vobj_list_t mMapObjects;
typedef std::map<LLUUID, LLPointer<LLViewerObject> > vo_map;
vo_map mDeadObjects; // Need to keep multiple entries per UUID
@@ -209,12 +208,12 @@ protected:
std::map<LLUUID, LLPointer<LLViewerObject> > mUUIDObjectMap;
std::map<LLUUID, LLPointer<LLVOAvatar> > mUUIDAvatarMap;
LLDynamicArray<LLDebugBeacon> mDebugBeacons;
std::vector<LLDebugBeacon> mDebugBeacons;
S32 mCurLazyUpdateIndex;
static U32 sSimulatorMachineIndex;
static LLMap<U64, U32> sIPAndPortToIndex;
static std::map<U64, U32> sIPAndPortToIndex;
static std::map<U64, LLUUID> sIndexAndLocalIDToUUID;
@@ -282,12 +281,16 @@ inline LLViewerObject *LLViewerObjectList::getObject(const S32 index)
inline void LLViewerObjectList::addToMap(LLViewerObject *objectp)
{
mMapObjects.put(objectp);
mMapObjects.push_back(objectp);
}
inline void LLViewerObjectList::removeFromMap(LLViewerObject *objectp)
{
mMapObjects.removeObj(objectp);
std::vector<LLPointer<LLViewerObject> >::iterator iter = std::find(mMapObjects.begin(), mMapObjects.end(), objectp);
if (iter != mMapObjects.end())
{
mMapObjects.erase(iter);
}
}