Merged 1.2.0-minimap-magnify into 1.2.0-radarzoom

7 files changed, 51 insertions, 29 deletions

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index a1c8624..2acb043 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -21,6 +21,7 @@ Aimee Trescothick
         VWR-8341
         VWR-8430
         VWR-9255
+        VWR-12748
 Alejandro Rosenthal
         VWR-1184
 Alissa Sabre
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 5fed08e..194e95e 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -5064,7 +5064,7 @@
     <key>MiniMapScale</key>
     <map>
       <key>Comment</key>
-      <string>Miniature world map zoom levle (pixels per region)</string>
+      <string>Miniature world map zoom level (pixels per region)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index c407f04..b8bf0cb 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -70,13 +70,15 @@
 #include "llglheaders.h"
 
 const F32 MAP_SCALE_MIN = 32;
-const F32 MAP_SCALE_MID = 172;
-const F32 MAP_SCALE_MAX = 512;
+const F32 MAP_SCALE_MID = 1024;
+const F32 MAP_SCALE_MAX = 4096;
 const F32 MAP_SCALE_INCREMENT = 16;
-const F32 MAP_MIN_PICK_DIST = 4;
+const F32 MAP_SCALE_ZOOM_FACTOR = 1.04f;                        // Zoom in factor per click of the scroll wheel (4%)
 const F32 MAP_MINOR_DIR_THRESHOLD = 0.08f;
+const F32 MIN_DOT_RADIUS = 3.5f;
+const F32 DOT_SCALE = 0.75f;
+const F32 MIN_PICK_SCALE = 2.f;
 const S32 SLOP = 2;
-
 const S32 TRACKING_RADIUS = 3;
 
 LLNetMap::LLNetMap(const std::string& name) :
@@ -92,6 +94,7 @@ LLNetMap::LLNetMap(const std::string& name) :
 {
         mScale = gSavedSettings.getF32("MiniMapScale");
         mPixelsPerMeter = mScale / LLWorld::getInstance()->getRegionWidthInMeters();
+        mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS);
 
         mObjectImageCenterGlobal = gAgent.getCameraPositionGlobal();
         
@@ -151,6 +154,7 @@ void LLNetMap::setScale( F32 scale )
         }
 
         mPixelsPerMeter = mScale / LLWorld::getInstance()->getRegionWidthInMeters();
+        mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS);
 
         mUpdateNow = TRUE;
 }
@@ -333,6 +337,7 @@ void LLNetMap::draw()
                 LLUI::getCursorPositionLocal(this, &local_mouse_x, &local_mouse_y);
                 mClosestAgentToCursor.setNull();
                 F32 closest_dist = F32_MAX;
+                F32 min_pick_dist = mDotRadius * MIN_PICK_SCALE; 
 
                 // Draw avatars
                 LLColor4 avatar_color = gColors.getColor( "MapAvatar" );
@@ -377,14 +382,14 @@ void LLNetMap::draw()
                         }
 // [/RLVa:KB]
 
-
                         LLWorldMapView::drawAvatar(
                                 pos_map.mV[VX], pos_map.mV[VY], 
                                 glyph_color, 
-                                pos_map.mV[VZ]);
+                                pos_map.mV[VZ],
+                                mDotRadius);
 
                         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 < MAP_MIN_PICK_DIST && dist_to_cursor < closest_dist)
+                        if(dist_to_cursor < min_pick_dist && dist_to_cursor < closest_dist)
                         {
                                 closest_dist = dist_to_cursor;
                                 mClosestAgentToCursor = avatar_ids[i];
@@ -413,10 +418,13 @@ void LLNetMap::draw()
                 // Draw dot for self avatar position
                 pos_global = gAgent.getPositionGlobal();
                 pos_map = globalPosToView(pos_global, rotate_map);
-                LLUIImagePtr you = LLWorldMapView::sAvatarYouSmallImage;
+                LLUIImagePtr you = LLWorldMapView::sAvatarYouLargeImage;
+                S32 dot_width = llround(mDotRadius * 2.f);
                 you->draw(
-                        llround(pos_map.mV[VX]) - you->getWidth()/2, 
-                        llround(pos_map.mV[VY]) - you->getHeight()/2);
+                        llround(pos_map.mV[VX] - mDotRadius),
+                        llround(pos_map.mV[VY] - mDotRadius),
+                        dot_width,
+                        dot_width);
 
                 // Draw frustum
                 F32 meters_to_pixels = mScale/ LLWorld::getInstance()->getRegionWidthInMeters();
@@ -557,8 +565,12 @@ LLVector3d LLNetMap::viewPosToGlobal( S32 x, S32 y, BOOL rotated )
 
 BOOL LLNetMap::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-        // note that clicks are reversed from what you'd think
-        setScale(llclamp(mScale - clicks*MAP_SCALE_INCREMENT, MAP_SCALE_MIN, MAP_SCALE_MAX));
+        // note that clicks are reversed from what you'd think: i.e. > 0  means zoom out, < 0 means zoom in
+        F32 scale = mScale;
+        
+        scale *= pow(MAP_SCALE_ZOOM_FACTOR, -clicks);
+        setScale(llclamp(scale, MAP_SCALE_MIN, MAP_SCALE_MAX));
+
         return TRUE;
 }
 
diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index 55fbe1f..800b825 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -95,7 +95,8 @@ private:
         F32                             mScale;                                 // Size of a region in pixels
         F32                             mPixelsPerMeter;                // world meters to map pixels
         F32                             mObjectMapTPM;                  // texels per meter on map
-        F32                             mObjectMapPixels;               // Width of object map in pixels;
+        F32                             mObjectMapPixels;               // Width of object map in pixels
+        F32                             mDotRadius;                             // Size of avatar markers
         F32                             mTargetPanX;
         F32                             mTargetPanY;
         F32                             mCurPanX;
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 90977ed..947bdfd 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -71,9 +71,10 @@ const S32 SCROLL_HINT_WIDTH = 65;
 const F32 BIG_DOT_RADIUS = 5.f;
 BOOL LLWorldMapView::sHandledLastClick = FALSE;
 
-LLUIImagePtr LLWorldMapView::sAvatarYouSmallImage = NULL;
 LLUIImagePtr LLWorldMapView::sAvatarSmallImage = NULL;
-LLUIImagePtr LLWorldMapView::sAvatarLargeImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarYouImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarYouLargeImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarLevelImage = NULL;
 LLUIImagePtr LLWorldMapView::sAvatarAboveImage = NULL;
 LLUIImagePtr LLWorldMapView::sAvatarBelowImage = NULL;
 
@@ -113,11 +114,12 @@ std::map<std::string,std::string> LLWorldMapView::sStringsMap;
 
 void LLWorldMapView::initClass()
 {
-        sAvatarYouSmallImage =  LLUI::getUIImage("map_avatar_you_8.tga");
         sAvatarSmallImage =     LLUI::getUIImage("map_avatar_8.tga");
-        sAvatarLargeImage =     LLUI::getUIImage("map_avatar_16.tga");
-        sAvatarAboveImage =     LLUI::getUIImage("map_avatar_above_8.tga");
-        sAvatarBelowImage =     LLUI::getUIImage("map_avatar_below_8.tga");
+        sAvatarYouImage =               LLUI::getUIImage("map_avatar_16.tga");
+        sAvatarYouLargeImage =  LLUI::getUIImage("map_avatar_you_32.tga");
+        sAvatarLevelImage =     LLUI::getUIImage("map_avatar_32.tga");
+        sAvatarAboveImage =     LLUI::getUIImage("map_avatar_above_32.tga");
+        sAvatarBelowImage =     LLUI::getUIImage("map_avatar_below_32.tga");
 
         sHomeImage =                    LLUI::getUIImage("map_home.tga");
         sTelehubImage =                 LLUI::getUIImage("map_telehub.tga");
@@ -137,9 +139,10 @@ void LLWorldMapView::initClass()
 // static
 void LLWorldMapView::cleanupClass()
 {
-        sAvatarYouSmallImage = NULL;
         sAvatarSmallImage = NULL;
-        sAvatarLargeImage = NULL;
+        sAvatarYouImage = NULL;
+        sAvatarYouLargeImage = NULL;
+        sAvatarLevelImage = NULL;
         sAvatarAboveImage = NULL;
         sAvatarBelowImage = NULL;
 
@@ -764,7 +767,7 @@ void LLWorldMapView::draw()
 
         // Now draw your avatar after all that other stuff.
         LLVector3d pos_global = gAgent.getPositionGlobal();
-        drawImage(pos_global, sAvatarLargeImage);
+        drawImage(pos_global, sAvatarYouImage);
 
         LLVector3 pos_map = globalPosToView(pos_global);
         if (!pointInView(llround(pos_map.mV[VX]), llround(pos_map.mV[VY])))
@@ -1273,7 +1276,7 @@ void LLWorldMapView::drawAvatar(F32 x_pixels,
                                                                 F32 dot_radius)
 {
         const F32 HEIGHT_THRESHOLD = 7.f;
-        LLUIImagePtr dot_image = sAvatarSmallImage;
+        LLUIImagePtr dot_image = sAvatarLevelImage;
         if(relative_z < -HEIGHT_THRESHOLD) 
         {
                 dot_image = sAvatarBelowImage; 
@@ -1282,9 +1285,13 @@ void LLWorldMapView::drawAvatar(F32 x_pixels,
         { 
                 dot_image = sAvatarAboveImage;
         }
+
+        S32 dot_width = llround(dot_radius * 2.f);
         dot_image->draw(
-                llround(x_pixels) - dot_image->getWidth()/2,
-                llround(y_pixels) - dot_image->getHeight()/2, 
+                llround(x_pixels - dot_radius),
+                llround(y_pixels - dot_radius),
+                dot_width,
+                dot_width,
                 color);
 }
 
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h
index b97dfb5..b6ab855 100644
--- a/linden/indra/newview/llworldmapview.h
+++ b/linden/indra/newview/llworldmapview.h
@@ -136,11 +136,13 @@ protected:
 public:
         LLColor4                mBackgroundColor;
 
-        static LLUIImagePtr     sAvatarYouSmallImage;
         static LLUIImagePtr     sAvatarSmallImage;
-        static LLUIImagePtr     sAvatarLargeImage;
+        static LLUIImagePtr     sAvatarYouImage;
+        static LLUIImagePtr     sAvatarYouLargeImage;
+        static LLUIImagePtr     sAvatarLevelImage;
         static LLUIImagePtr     sAvatarAboveImage;
         static LLUIImagePtr     sAvatarBelowImage;
+
         static LLUIImagePtr     sTelehubImage;
         static LLUIImagePtr     sInfohubImage;
         static LLUIImagePtr     sHomeImage;
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index 4800048..9b0e4c7 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -150,7 +150,6 @@
   
   <texture name="map_avatar_16.tga"/>
   <texture name="map_avatar_8.tga"/>
-  <texture name="map_avatar_you_8.tga"/>
   <texture name="map_event.tga"/>
   <texture name="map_event_mature.tga"/>
   <texture name="map_home.tga"/>