From b8d46a1c011351352ff2edf16912c3ee7e9cb883 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 22 Sep 2009 13:50:20 -0700 Subject: Display selected avatars larger than normal, zoom in at a reasonable speed. Included missing artwork --- linden/indra/newview/llnetmap.cpp | 30 ++++++++++++--------- .../skins/default/textures/map_avatar_32.tga | Bin 0 -> 2894 bytes .../skins/default/textures/map_avatar_above_32.tga | Bin 0 -> 2909 bytes .../skins/default/textures/map_avatar_below_32.tga | Bin 0 -> 3037 bytes .../skins/default/textures/map_avatar_you_32.tga | Bin 0 -> 3395 bytes 5 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 linden/indra/newview/skins/default/textures/map_avatar_32.tga create mode 100644 linden/indra/newview/skins/default/textures/map_avatar_above_32.tga create mode 100644 linden/indra/newview/skins/default/textures/map_avatar_below_32.tga create mode 100644 linden/indra/newview/skins/default/textures/map_avatar_you_32.tga (limited to 'linden') diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp index b8bf0cb..cac35b9 100644 --- a/linden/indra/newview/llnetmap.cpp +++ b/linden/indra/newview/llnetmap.cpp @@ -73,7 +73,7 @@ const F32 MAP_SCALE_MIN = 32; const F32 MAP_SCALE_MID = 1024; const F32 MAP_SCALE_MAX = 4096; const F32 MAP_SCALE_INCREMENT = 16; -const F32 MAP_SCALE_ZOOM_FACTOR = 1.04f; // Zoom in factor per click of the scroll wheel (4%) +const F32 MAP_SCALE_ZOOM_FACTOR = 1.25f; // Zoom in factor per click of the scroll wheel (25%) const F32 MAP_MINOR_DIR_THRESHOLD = 0.08f; const F32 MIN_DOT_RADIUS = 3.5f; const F32 DOT_SCALE = 0.75f; @@ -345,6 +345,7 @@ void LLNetMap::draw() LLColor4 muted_color = gColors.getColor( "MapMuted" ); LLColor4 selected_color = gColors.getColor( "MapSelected" ); LLColor4 glyph_color; + F32 glyph_radius; std::vector avatar_ids; std::vector positions; @@ -357,20 +358,25 @@ void LLNetMap::draw() if (LLFloaterMap::getSelected() == avatar_ids[i]) { + glyph_radius = mDotRadius * 1.7f; glyph_color = selected_color; } - // Show them muted even if they're friends - else if (LLMuteList::getInstance()->isMuted(avatar_ids[i])) - { - glyph_color = muted_color; - } - else if (is_agent_friend(avatar_ids[i])) - { - glyph_color = friend_color; - } else { - glyph_color = avatar_color; + glyph_radius = mDotRadius; + // Show them muted even if they're friends + if (LLMuteList::getInstance()->isMuted(avatar_ids[i])) + { + glyph_color = muted_color; + } + else if (is_agent_friend(avatar_ids[i])) + { + glyph_color = friend_color; + } + else + { + glyph_color = avatar_color; + } } // [RLVa:KB] @@ -386,7 +392,7 @@ void LLNetMap::draw() pos_map.mV[VX], pos_map.mV[VY], glyph_color, pos_map.mV[VZ], - mDotRadius); + glyph_radius); F32 dist_to_cursor = dist_vec(LLVector2(pos_map.mV[VX], pos_map.mV[VY]), LLVector2(local_mouse_x,local_mouse_y)); if(dist_to_cursor < min_pick_dist && dist_to_cursor < closest_dist) diff --git a/linden/indra/newview/skins/default/textures/map_avatar_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_32.tga new file mode 100644 index 0000000..aebeab4 Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_avatar_32.tga differ diff --git a/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga new file mode 100644 index 0000000..65bd056 Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga differ diff --git a/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga new file mode 100644 index 0000000..496c44b Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga differ diff --git a/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga new file mode 100644 index 0000000..782207e Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga differ -- cgit v1.1