From 3b2511661e98eb5c0dbaf30ab72783b53341e03f Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 27 Jan 2012 08:33:26 -0500 Subject: STORM-1793 1) Treat all mini-map altitudes above 1020 m as the same height 2) Improve z-level accuracy With help from Aleric Inglewood --- indra/newview/llworld.cpp | 52 ++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 35 deletions(-) (limited to 'indra/newview/llworld.cpp') diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 676287c0ad..86780d0604 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -1161,24 +1161,13 @@ void send_agent_resume() static LLVector3d unpackLocalToGlobalPosition(U32 compact_local, const LLVector3d& region_origin) { - LLVector3d pos_global; - LLVector3 pos_local; - U8 bits; + LLVector3d pos_local; - bits = compact_local & 0xFF; - pos_local.mV[VZ] = F32(bits) * 4.f; - compact_local >>= 8; + pos_local.mdV[VZ] = (compact_local & 0xFFU) * 4; + pos_local.mdV[VY] = (compact_local >> 8) & 0xFFU; + pos_local.mdV[VX] = (compact_local >> 16) & 0xFFU; - bits = compact_local & 0xFF; - pos_local.mV[VY] = (F32)bits; - compact_local >>= 8; - - bits = compact_local & 0xFF; - pos_local.mV[VX] = (F32)bits; - - pos_global.setVec( pos_local ); - pos_global += region_origin; - return pos_global; + return region_origin + pos_local; } void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector* positions, const LLVector3d& relative_to, F32 radius) const @@ -1199,24 +1188,17 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector* positi iter != LLCharacter::sInstances.end(); ++iter) { LLVOAvatar* pVOAvatar = (LLVOAvatar*) *iter; - if(!pVOAvatar->isDead() && !pVOAvatar->isSelf()) + 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) { - 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); - } - } - } + positions->push_back(pos_global); + avatar_ids->push_back(uuid); } } // region avatars added for situations where radius is greater than RenderFarClip @@ -1233,13 +1215,13 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector* positi { LLUUID uuid = regionp->mMapAvatarIDs.get(i); // if this avatar doesn't already exist in the list, add it - if(uuid.notNull() && avatar_ids!=NULL && std::find(avatar_ids->begin(), avatar_ids->end(), uuid) == avatar_ids->end()) + if(uuid.notNull() && avatar_ids != NULL && std::find(avatar_ids->begin(), avatar_ids->end(), uuid) == avatar_ids->end()) { if(positions != NULL) { positions->push_back(pos_global); + avatar_ids->push_back(uuid); } - avatar_ids->push_back(uuid); } } } -- cgit v1.2.3 From f106ef838397f62261e7ec4e94f96848f37acf19 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 3 Feb 2012 09:02:01 -0500 Subject: STORM-1793 Fix bad assumption in getAvatars --- indra/newview/llworld.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'indra/newview/llworld.cpp') diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 86780d0604..bbe440e14f 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -1193,12 +1193,17 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector* positi 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); + 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 -- cgit v1.2.3 From acb1df8b856f49b970a5756bbed24cafad127df8 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 3 Feb 2012 11:48:00 -0500 Subject: STORM-1793 Fix another logic error in getAvatars --- indra/newview/llworld.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llworld.cpp') diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index bbe440e14f..5b2e78477c 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -1222,11 +1222,11 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector* positi // if this avatar doesn't already exist in the list, add it if(uuid.notNull() && avatar_ids != NULL && std::find(avatar_ids->begin(), avatar_ids->end(), uuid) == avatar_ids->end()) { - if(positions != NULL) + if (positions != NULL) { positions->push_back(pos_global); - avatar_ids->push_back(uuid); } + avatar_ids->push_back(uuid); } } } -- cgit v1.2.3 From 21f3634d29fda4ea39537102bfdcc29c37e718ba Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Mon, 6 Feb 2012 18:00:18 -0500 Subject: STORM-1793 Fix dumb syntax error --- indra/newview/llworld.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'indra/newview/llworld.cpp') diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 5b2e78477c..fbd8b3ada3 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -1190,19 +1190,18 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector* positi LLVOAvatar* pVOAvatar = (LLVOAvatar*) *iter; LLVector3d pos_global = pVOAvatar->getPositionGlobal(); LLUUID uuid = pVOAvatar->getID(); - if( !pVOAvatar->isDead() && - !pVOAvatar->isSelf() && - !uuid.isNull() && + if( !pVOAvatar->isDead() + && !pVOAvatar->isSelf() + && !uuid.isNull() && dist_vec_squared(pos_global, relative_to) <= radius_squared) + { + if(positions != NULL) { - if(positions != NULL) - { - positions->push_back(pos_global); - } - if(avatar_ids !=NULL) - { - avatar_ids->push_back(uuid); - } + positions->push_back(pos_global); + } + if(avatar_ids !=NULL) + { + avatar_ids->push_back(uuid); } } } -- cgit v1.2.3