From 2537311dfe71571b7bdb401ad4943cd932573747 Mon Sep 17 00:00:00 2001
From: Latif Khalifa <latifer@streamgrid.net>
Date: Mon, 31 May 2010 03:41:28 +0000
Subject: [PATCH] Show location of people on the map.

git-svn-id: https://radegast.googlecode.com/svn/branches/legacy_map@662 f7a694da-4d33-11de-9ad6-1127a62b9fcd
---
 Radegast/Core/Types/MapControl.cs         | 136 +++++++++++++++++++++++++-----
 Radegast/Properties/Resources.Designer.cs |   7 ++
 Radegast/Properties/Resources.resx        |   3 +
 Radegast/Radegast.csproj                  |   1 +
 Radegast/Resources/map_dot.png            | Bin 0 -> 2927 bytes
 5 files changed, 125 insertions(+), 22 deletions(-)
 create mode 100644 Radegast/Resources/map_dot.png

diff --git a/Radegast/Core/Types/MapControl.cs b/Radegast/Core/Types/MapControl.cs
index a510a8e..73a7eaa 100644
--- a/Radegast/Core/Types/MapControl.cs
+++ b/Radegast/Core/Types/MapControl.cs
@@ -26,15 +26,19 @@ namespace Radegast
         Font textFont;
         Brush textBrush;
         Brush textBackgroudBrush;
+        Brush dotBrush;
+        Pen blackPen;
         uint regionSize = 256;
         float pixelsPerMeter;
         double centerX, centerY, targetX, targetY;
-        #pragma warning disable 0649
+#pragma warning disable 0649
         GridRegion targetRegion, nullRegion;
         bool centered = false;
         int PixRegS;
-        float maxZoom = 8f, minZoom = 0.5f;
+        float maxZoom = 6f, minZoom = 0.5f;
         string targetParcelName = null;
+        System.Threading.Timer repaint;
+        bool needRepaint = false;
 
         public bool UseExternalTiles = false;
         public event EventHandler<MapTargetChangedEventArgs> MapTargetChanged;
@@ -54,8 +58,12 @@ namespace Radegast
             background = Color.FromArgb(4, 4, 75);
             textFont = new Font(FontFamily.GenericSansSerif, 8.0f, FontStyle.Bold);
             textBrush = new SolidBrush(Color.FromArgb(255, 200, 200, 200));
+            dotBrush = new SolidBrush(Color.FromArgb(255, 30, 210, 30));
+            blackPen = new Pen(Color.Black, 2.0f);
             textBackgroudBrush = new SolidBrush(Color.Black);
 
+            repaint = new System.Threading.Timer(RepaintTick, null, 1000, 1000);
+
             Instance.ClientChanged += new EventHandler<ClientChangedEventArgs>(Instance_ClientChanged);
             RegisterClientEvents();
         }
@@ -64,14 +72,28 @@ namespace Radegast
         {
             UnregisterClientEvents(Client);
 
-            downloader.Dispose();
+            if (repaint != null)
+            {
+                repaint.Dispose();
+                repaint = null;
+            }
 
-            lock (regionTiles)
+            if (downloader != null)
             {
-                foreach (Image img in regionTiles.Values)
-                    if (img != null)
-                        img.Dispose();
-                regionTiles.Clear();
+                downloader.Dispose();
+                downloader = null;
+            }
+
+            if (regionTiles != null)
+            {
+                lock (regionTiles)
+                {
+                    foreach (Image img in regionTiles.Values)
+                        if (img != null)
+                            img.Dispose();
+                    regionTiles.Clear();
+                }
+                regionTiles = null;
             }
         }
 
@@ -91,25 +113,45 @@ namespace Radegast
             Client.Grid.GridLayer -= new EventHandler<GridLayerEventArgs>(Grid_GridLayer);
         }
 
+        void RepaintTick(object sync)
+        {
+            if (needRepaint)
+            {
+                needRepaint = false;
+                SafeInvalidate();
+            }
+        }
+
         void Grid_GridLayer(object sender, GridLayerEventArgs e)
         {
-            // int foo = 1;
         }
 
-        Dictionary<ulong, MapItem> regionMapItems = new Dictionary<ulong, MapItem>();
+        Dictionary<ulong, List<MapItem>> regionMapItems = new Dictionary<ulong, List<MapItem>>();
         Dictionary<ulong, GridRegion> regions = new Dictionary<ulong, GridRegion>();
 
         void Grid_GridItems(object sender, GridItemsEventArgs e)
         {
             foreach (MapItem item in e.Items)
             {
-                regionMapItems[item.RegionHandle] = item;
+                if (item is MapAgentLocation)
+                {
+                    MapAgentLocation loc = (MapAgentLocation)item;
+                    lock (regionMapItems)
+                    {
+                        if (!regionMapItems.ContainsKey(item.RegionHandle))
+                        {
+                            regionMapItems[loc.RegionHandle] = new List<MapItem>();
+                        }
+                        regionMapItems[loc.RegionHandle].Add(loc);
+                    }
+                    if (loc.AvatarCount > 0) needRepaint = true;
+                }
             }
-
         }
 
         void Grid_GridRegion(object sender, GridRegionEventArgs e)
         {
+            needRepaint = true;
             regions[e.Region.RegionHandle] = e.Region;
             if (!UseExternalTiles
                 && e.Region.Access != SimAccess.NonExistent
@@ -145,11 +187,10 @@ namespace Radegast
         {
             targetRegion = nullRegion;
             targetX = targetY = -5000000000d;
-            SafeInvalidate();
             ThreadPool.QueueUserWorkItem(sync =>
                 {
                     Thread.Sleep(500);
-                    SafeInvalidate();
+                    needRepaint = true;
                 }
             );
         }
@@ -180,6 +221,11 @@ namespace Radegast
             centerX = (double)regionX * 256 + (double)localX;
             centerY = (double)regionY * 256 + (double)localY;
             centered = true;
+            // opensim grids need extra push
+            if (!Instance.Netcom.Grid.ID.ToLower().Contains("secondlife"))
+            {
+                Client.Grid.RequestMapLayer(GridLayerType.Objects);
+            }
             SafeInvalidate();
         }
 
@@ -234,7 +280,7 @@ namespace Radegast
                     if (OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(Client.Assets.Cache.GetCachedAssetBytes(imageID), out mi, out img))
                     {
                         regionTiles[handle] = img;
-                        SafeInvalidate();
+                        needRepaint = true;
                     }
                     lock (tileRequests)
                         if (tileRequests.Contains(handle))
@@ -256,7 +302,7 @@ namespace Radegast
                                 if (OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(responseData, out mi, out img))
                                 {
                                     regionTiles[handle] = img;
-                                    SafeInvalidate();
+                                    needRepaint = true;
                                     Client.Assets.Cache.SaveAssetToCache(imageID, responseData);
                                 }
                             }
@@ -287,7 +333,7 @@ namespace Radegast
                                 if (OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(assetTexture.AssetData, out mi, out img))
                                 {
                                     regionTiles[handle] = img;
-                                    SafeInvalidate();
+                                    needRepaint = true;
                                 }
                             }
                             goto default;
@@ -347,7 +393,7 @@ namespace Radegast
                                     lock (regionTiles)
                                     {
                                         regionTiles[handle] = Image.FromStream(s);
-                                        SafeInvalidate();
+                                        needRepaint = true;
                                     }
                                 }
                             }
@@ -377,6 +423,7 @@ namespace Radegast
             string name = GetRegionName(handle);
             Image tile = null;
 
+            // Get and draw image tile
             if (UseExternalTiles)
                 tile = GetRegionTileExternal(handle);
             else
@@ -385,7 +432,7 @@ namespace Radegast
             if (tile != null)
             {
                 int targetSize = 256;
-                for (targetSize = 128; targetSize > PixRegS; targetSize /= 2);
+                for (targetSize = 128; targetSize > PixRegS; targetSize /= 2) ;
                 targetSize *= 2;
                 if (targetSize != 256)
                 {
@@ -409,12 +456,15 @@ namespace Radegast
                 g.DrawImage(tile, new Rectangle(x, y - PixRegS, PixRegS, PixRegS));
             }
 
+            // Print region name
             if (!string.IsNullOrEmpty(name) && zoom < 3f)
+            {
                 Print(g, x + 2, y - 16, name);
-
+            }
         }
 
         List<string> requestedBlocks = new List<string>();
+        List<ulong> requestedLocations = new List<ulong>();
 
         private void MapControl_Paint(object sender, PaintEventArgs e)
         {
@@ -456,7 +506,15 @@ namespace Radegast
                     int pixY = pixCenterRegionY - (ry - (int)regY) * PixRegS;
                     ulong handle = Utils.UIntsToLong((uint)rx * regionSize, (uint)ry * regionSize);
 
-                    //Client.Grid.RequestMapItems(handle, OpenMetaverse.GridItemType.AgentLocations, GridLayerType.Objects);
+                    lock (requestedLocations)
+                    {
+                        if (!requestedLocations.Contains(handle))
+                        {
+                            requestedLocations.Add(handle);
+                            Client.Grid.RequestMapItems(handle, OpenMetaverse.GridItemType.AgentLocations, GridLayerType.Objects);
+                        }
+                    }
+
                     DrawRegion(g,
                         pixX,
                         pixY,
@@ -474,6 +532,40 @@ namespace Radegast
 
             float ratio = (float)PixRegS / (float)regionSize;
 
+            // Draw agent dots
+            for (int ry = regBottom; ry <= regYMax; ry++)
+            {
+                for (int rx = regLeft; rx <= regXMax; rx++)
+                {
+                    int pixX = pixCenterRegionX - ((int)regX - rx) * PixRegS;
+                    int pixY = pixCenterRegionY - (ry - (int)regY) * PixRegS;
+                    ulong handle = Utils.UIntsToLong((uint)rx * regionSize, (uint)ry * regionSize);
+
+                    lock (regionMapItems)
+                    {
+                        if (regionMapItems.ContainsKey(handle))
+                        {
+                            foreach (MapItem i in regionMapItems[handle])
+                            {
+                                if (i is MapAgentLocation)
+                                {
+                                    MapAgentLocation loc = (MapAgentLocation)i;
+                                    if (loc.AvatarCount == 0) continue;
+                                    int dotX = pixX + (int)((float)loc.LocalX * ratio);
+                                    int dotY = pixY - (int)((float)loc.LocalY * ratio);
+                                    for (int j = 0; j < loc.AvatarCount; j++)
+                                    {
+                                        g.FillEllipse(dotBrush, dotX, dotY - (j * 3), 7, 7);
+                                        g.DrawEllipse(blackPen, dotX, dotY - (j * 3), 7, 7);
+                                        //g.DrawImageUnscaled(Properties.Resources.map_dot, dotX, dotY - (j * 4));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
             if (foundMyPos)
             {
                 int myPosX = (int)(myRegX + Client.Self.SimPosition.X * ratio);
@@ -564,7 +656,7 @@ namespace Radegast
                         {
                             targetParcelName = e.Parcel.Name;
                             done.Set();
-                            SafeInvalidate();
+                            needRepaint = true;
                         }
                     };
                     Client.Parcels.ParcelInfoReply += handler;
diff --git a/Radegast/Properties/Resources.Designer.cs b/Radegast/Properties/Resources.Designer.cs
index 7689981..819d4aa 100644
--- a/Radegast/Properties/Resources.Designer.cs
+++ b/Radegast/Properties/Resources.Designer.cs
@@ -568,6 +568,13 @@ namespace Radegast.Properties {
             }
         }
         
+        public static System.Drawing.Bitmap map_dot {
+            get {
+                object obj = ResourceManager.GetObject("map_dot", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         public static System.Drawing.Bitmap mic {
             get {
                 object obj = ResourceManager.GetObject("mic", resourceCulture);
diff --git a/Radegast/Properties/Resources.resx b/Radegast/Properties/Resources.resx
index 90ba3b4..32ecf4f 100644
--- a/Radegast/Properties/Resources.resx
+++ b/Radegast/Properties/Resources.resx
@@ -379,4 +379,7 @@
   <data name="target_map_pos" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\target_map_pos.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="map_dot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\map_dot.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Radegast/Radegast.csproj b/Radegast/Radegast.csproj
index c1b9d27..995c743 100644
--- a/Radegast/Radegast.csproj
+++ b/Radegast/Radegast.csproj
@@ -1117,6 +1117,7 @@
     <None Include="Resources\client_signatures.txt" />
     <None Include="Resources\mic.png" />
     <None Include="Resources\my_map_pos.png" />
+    <None Include="Resources\map_dot.png" />
     <Content Include="Resources\radegast_large.png" />
     <None Include="Resources\target_map_pos.png" />
     <Content Include="worldmap.html">
diff --git a/Radegast/Resources/map_dot.png b/Radegast/Resources/map_dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bcf4f4a091bbd9a8e09ef99a6420ee93d5b259e
GIT binary patch
literal 2927
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
Z2LLD$F`pxQ+~EKK002ovPDHLkV1fwXYlr{<

literal 0
HcmV?d00001

-- 
2.11.0