livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Proper fix of detecting avatars at unknown height after CoarseLocationUpdate update 

* Reverted proposed change of LLWorld::getAvatars() as part of STORM-1793, because it breaks stuff
meow-7.2.2
Ansariel 2012-02-03 15:05:00 +01:00
parent c2ec10bbc4
commit 69508cb27b
4 changed files with 85 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
indra/newview/llnetmap.cpp
View File

@ -386,7 +386,7 @@ void LLNetMap::draw()
// Draw avatars
for (U32 i = 0; i < avatar_ids.size(); i++)
{
//pos_map = globalPosToView(positions[i]); // <FS:Ansariel> Do this later after advanced height check
pos_map = globalPosToView(positions[i]);
LLUUID uuid = avatar_ids[i];
// bool show_as_friend = (LLAvatarTracker::instance().getBuddyInfo(uuid) != NULL);
@ -397,11 +397,26 @@ void LLNetMap::draw()
LLColor4 color = show_as_friend ? map_avatar_friend_color : map_avatar_color;
// <FS:Ansariel> Also check for legacy unknown height reported as height = 0m
// <FS:Ansariel> Check for unknown Z-offset => AVATAR_UNKNOWN_Z_OFFSET
//unknown_relative_z = positions[i].mdV[VZ] == COARSEUPDATE_MAX_Z &&
// camera_position.mV[VZ] >= COARSEUPDATE_MAX_Z;
unknown_relative_z = (positions[i].mdV[VZ] == COARSEUPDATE_MAX_Z &&
camera_position.mV[VZ] >= COARSEUPDATE_MAX_Z) || (positions[i].mdV[VZ] == 0.f);
unknown_relative_z = false;
if (positions[i].mdV[VZ] == AVATAR_UNKNOWN_Z_OFFSET)
{
if (camera_position.mV[VZ] >= COARSEUPDATE_MAX_Z)
{
// No exact data and cam >=1020 => we don't know if
// other avatar is above or below us => unknown
unknown_relative_z = true;
}
else
{
// No exact data but cam is below 1020 => other avatar
// is definitely above us => bump Z-offset to F32_MAX
// so we get the up chevron
pos_map.mV[VZ] = F32_MAX;
}
}
// </FS:Ansariel>
// Colorize muted avatars and Lindens
@ -411,19 +426,6 @@ void LLNetMap::draw()
if (muteListInstance->isMuted(uuid)) color = map_avatar_muted_color;
else if (gCacheName->getFullName(uuid, fullName) && muteListInstance->isLinden(fullName)) color = map_avatar_linden_color;
// Try to workaround 1020m bug by using
// the viewer object for the avatar.
if (unknown_relative_z)
{
LLViewerObject* viewerObject = gObjectList.findObject(uuid);
if (viewerObject)
{
positions[i].mdV[VZ] = viewerObject->getPositionGlobal().mdV[VZ];
unknown_relative_z = false;
}
}
pos_map = globalPosToView(positions[i]);
// Mark Avatars with special colors - Ansariel
if (LLNetMap::sAvatarMarksMap.find(uuid) != LLNetMap::sAvatarMarksMap.end())
{
@ -783,24 +785,26 @@ BOOL LLNetMap::handleToolTipAgent(const LLUUID& avatar_id)
LLVector3d delta = otherPosition - myPosition;
F32 distance = (F32)delta.magVec();
// If avatar is >1020, the value for Z is returned as 0 (legacy) or 1020 (new)
bool isHigher1020mBug = (otherPosition[VZ] == COARSEUPDATE_MAX_Z || otherPosition[VZ] == 0.0);
// If avatar is >=1020, the value for Z might be returned as AVATAR_UNKNOWN_Z_OFFSET
bool isHigher1020mBug = (otherPosition[VZ] == AVATAR_UNKNOWN_Z_OFFSET);
// Ansariel: Try to get distance from the nearby people panel
// aka radar. This usually contains better data,
// especially when above 1020m.
LLPanel* panel_people = LLSideTray::getInstance()->getPanel("panel_people");
if (panel_people != NULL)
// aka radar when above 1020m.
if (isHigher1020mBug)
{
LLAvatarListItem* avatar_list_item = ((LLPanelPeople*)panel_people)->getNearbyList()->getAvatarListItem(avatar_id);
if (avatar_list_item != NULL)
LLPanel* panel_people = LLSideTray::getInstance()->getPanel("panel_people");
if (panel_people != NULL)
{
F32 radar_distance = avatar_list_item->getRange();
if (isHigher1020mBug && radar_distance > -1.f)
LLAvatarListItem* avatar_list_item = ((LLPanelPeople*)panel_people)->getNearbyList()->getAvatarListItem(avatar_id);
if (avatar_list_item != NULL)
{
distance = radar_distance;
isHigher1020mBug = false;
F32 radar_distance = avatar_list_item->getRange();
if (radar_distance > -1.f)
{
distance = radar_distance;
isHigher1020mBug = false;
}
}
}
}

2
indra/newview/llpanelpeople.cpp
View File

@ -984,7 +984,7 @@ void LLPanelPeople::updateNearbyList()
av->setAvatarName(avName); // maintain compatibility with underlying list, deprecated
U32 lastZOffsetTime = av->getLastZOffsetTime();
F32 avZOffset = av->getZOffset();
if (avPos[VZ] < 0.1 || avPos[VZ] == 1020.f) // if our official z position is 0.0 (legacy) or 1020 (new), we need a correction.
if (avPos[VZ] == AVATAR_UNKNOWN_Z_OFFSET) // if our official z position is AVATAR_UNKNOWN_Z_OFFSET, we need a correction.
{
// set correction if we have it
if (avZOffset > 0.1)

68
indra/newview/llworld.cpp
View File

@ -1213,24 +1213,35 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi
{
positions->clear();
}
// get the list of avatars from the character list first, so distances are correct
// when agent is above 1020m and other avatars are nearby
for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
iter != LLCharacter::sInstances.end(); ++iter)
{
LLVOAvatar* pVOAvatar = (LLVOAvatar*) *iter;
LLVector3d pos_global = pVOAvatar->getPositionGlobal();
LLUUID uuid = pVOAvatar->getID();
if( !pVOAvatar->isDead() &&
!pVOAvatar->isSelf() &&
!uuid.isNull() &&
dist_vec_squared(pos_global, relative_to) <= radius_squared &&
positions != NULL &&
avatar_ids != NULL)
{
positions->push_back(pos_global);
avatar_ids->push_back(uuid);
}
// get the list of avatars from the character list first, so distances are correct
// when agent is above 1020m and other avatars are nearby
for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
iter != LLCharacter::sInstances.end(); ++iter)
{
// <FS:Ansariel> Watch out for a potential merge of STORM-1793!
// avatar_ids and positions MUST be checked
// INDEPENDENTLY!!! Things rely on being able to
// pass either one as NULL!!!
LLVOAvatar* pVOAvatar = (LLVOAvatar*) *iter;
if(!pVOAvatar->isDead() && !pVOAvatar->isSelf())
{
LLUUID uuid = pVOAvatar->getID();
if(!uuid.isNull())
{
LLVector3d pos_global = pVOAvatar->getPositionGlobal();
if(dist_vec_squared(pos_global, relative_to) <= radius_squared)
{
if(positions != NULL)
{
positions->push_back(pos_global);
}
if(avatar_ids !=NULL)
{
avatar_ids->push_back(uuid);
}
}
}
}
}
// region avatars added for situations where radius is greater than RenderFarClip
for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
@ -1241,7 +1252,11 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi
S32 count = regionp->mMapAvatars.count();
for (S32 i = 0; i < count; i++)
{
LLVector3d pos_global = unpackLocalToGlobalPosition(regionp->mMapAvatars.get(i), origin_global);
// <FS:Ansariel>
//LLVector3d pos_global = unpackLocalToGlobalPosition(regionp->mMapAvatars.get(i), origin_global);
U32 compact_local = regionp->mMapAvatars.get(i);
LLVector3d pos_global = unpackLocalToGlobalPosition(compact_local, origin_global);
// </FS:Ansariel>
if(dist_vec_squared(pos_global, relative_to) <= radius_squared)
{
LLUUID uuid = regionp->mMapAvatarIDs.get(i);
@ -1250,9 +1265,22 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi
{
if(positions != NULL)
{
// <FS:Ansariel> Explictly return AVATAR_UNKNOWN_Z_OFFSET
// if height of avatar is unknown so we
// can take measures. If we wouldn't do
// this, we won't be able to distinguish
// if height is unknown or not if 1020
// is returned for Z-offset.
U32 coarse_location_z_offset = (compact_local & 0xFFU);
if (coarse_location_z_offset == 255 || coarse_location_z_offset == 0)
{
pos_global.mdV[VZ] = AVATAR_UNKNOWN_Z_OFFSET;
}
// </FS:Ansariel>
positions->push_back(pos_global);
avatar_ids->push_back(uuid);
}
avatar_ids->push_back(uuid);
}
}
}

2
indra/newview/llworld.h
View File

@ -55,6 +55,8 @@ class LLCloudPuff;
class LLCloudGroup;
class LLVOAvatar;
const F32 AVATAR_UNKNOWN_Z_OFFSET = -1.f; // <FS:Ansariel> Const value for avatars at unknown height
// LLWorld maintains a stack of unused viewer_regions and an array of pointers to viewer regions
// as simulators are connected to, viewer_regions are popped off the stack and connected as required
// as simulators are removed, they are pushed back onto the stack