I have refactored many things, including moving to a serviceLocator architecture for the main singletons (ui and raindropinstance), as I ran into problems with intialisation order of the UI.

Assets/LoadingCanvasPresenter.cs

@@ -1,26 +0,0 @@
-using Raindrop.Netcom;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-
-namespace Raindrop.Presenters
-{
-    public class LoadingCanvasPresenter : MonoBehaviour
-    {
-        private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
-        private RaindropNetcom netcom { get { return instance.Netcom; } }
-
-        // Start is called before the first frame update
-        void Start()
-        {
-            
-        }
-
-        // Update is called once per frame
-        void Update()
-        {
-
-        }
-    }
-}

Assets/Plugins/LibreMetaverse/AssetManager.cs

@@ -1088,6 +1088,8 @@ namespace OpenMetaverse
 
         public void RequestUploadBakedTexture(byte[] textureData, BakedTextureUploadedCallback callback)
         {
+            Logger.DebugLog("RequestUploadBakedTexture");
+
             CapsClient request = null;
             if(Client.Network.CurrentSim.Caps != null) {
                 request = Client.Network.CurrentSim.Caps.CreateCapsClient("UploadBakedTexture");

Assets/Plugins/LibreMetaverse/Capabilities/EventQueueClient.cs

@@ -91,7 +91,7 @@ namespace OpenMetaverse.Http
             _Running = true;
             _Request = request;
 
-            Logger.DebugLog("Capabilities event queue connected");
+            Logger.DebugLog("Capabilities event queue connected " + request.RequestUri.ToString());
 
             // The event queue is starting up for the first time
             if (OnConnected != null)

Assets/Plugins/LibreMetaverse/Caps.cs

@@ -275,7 +275,8 @@ namespace OpenMetaverse
 
                 if (_Caps.ContainsKey("EventQueueGet"))
                 {
-                    Logger.DebugLog("Starting event queue for " + Simulator, Simulator.Client);
+                    Logger.DebugLog("Starting event queue for " + Simulator + " with URI: " + _Caps["EventQueueGet"].ToString(), Simulator.Client );
+                    //Logger.DebugLog("Starting event queue for " + Simulator, Simulator.Client);
 
                     _EventQueueCap = new EventQueueClient(_Caps["EventQueueGet"]);
                     _EventQueueCap.OnConnected += EventQueueConnectedHandler;

Assets/Plugins/LibreMetaverse/Catnip/Drawing/Bitmap.cs

@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using Catnip.Drawing;
 using Catnip.Drawing.Imaging;
 using SixLabors.ImageSharp;
+using Unity.Collections;
 using UnityEngine;
 
 
@@ -37,33 +38,69 @@ namespace Catnip.Drawing
     }
 
 
-    public sealed class Bitmap //: Catnip.Drawing.Image
+    public sealed class Bitmap 
     {
         private Texture2D tex;
-        private TextureFormat texformat;
+        public TextureFormat Format => tex.format;
 
         //Initializes a new instance of the Bitmap class with the specified size and format.
-        public Bitmap(int width, int height, PixelFormat format32bppArgb)
+        public Bitmap(int width, int height, TextureFormat format)
         {
             Width = width;
             Height = height;
-            if (format32bppArgb == PixelFormat.Format32bppArgb)
-            {
-                texformat = TextureFormat.ARGB32;
-            }
+            tex = new Texture2D(width,height,format,false);
         }
 
+
+
         public Bitmap(int width, int height)
         {
             Width = width;
             Height = height;
+            tex = new Texture2D(width,height);
+            
+        }
+        public Bitmap(Texture2D tex)
+        {
+            Width = tex.width;
+            Height = tex.height;
+            this.tex = tex;
 
 
         }
 
+
+        public NativeArray<Color32> getAsNativeArray()
+        {
+            return tex.GetRawTextureData<Color32>();
+        }
+
+        public Bitmap FromFile(string fileName)
+        {
+            var myreader = new BMPLoader();
+            BMPImage myimg = myreader.LoadBMP(fileName);
+            Texture2D tex = myimg.ToTexture2D();
+            Bitmap fakebmp = new Bitmap(tex);
+
+            return fakebmp;
+        }
+        public UnityEngine.Color32 GetPixel(int x, int y)
+        {
+            return tex.GetPixel(x, y);
+        }
+
+        public void resize(int w, int h)
+        {
+            tex.Resize(w, h);
+        }
+
+        public void delete()
+        {
+            GameObject.Destroy(tex);
+        }
+
         public /*override*/ int Width { get; internal set; }
-        public /*override*/ int Height { get; internal set; }
-        public Catnip.Drawing.Imaging.PixelFormat PixelFormat { get; internal set; }
+        public /*override*/ int Height { get; internal set; }  
 
         public BitmapData LockBits(Rectangle rectangle, object readOnly, PixelFormat format32bppArgb)
         {
@@ -72,10 +109,6 @@ namespace Catnip.Drawing
         }
 
 
-        public void Dispose()
-        {
-            throw new NotImplementedException();
-        }
 
         public void UnlockBits(BitmapData outputData)
         {
@@ -105,13 +138,5 @@ namespace Catnip.Drawing
             tex.Apply();
         }
 
-        public static Bitmap FromFile(string fname)
-        {
-            var fileData = File.ReadAllBytes(fname);
-            var bmp = new Bitmap(5,5);
-            bmp.tex.LoadImage(fileData);
-
-            return bmp;
-        }
     }
 }

Assets/Plugins/LibreMetaverse/Catnip/Drawing/Color.cs

@@ -29,7 +29,7 @@ namespace Catnip.Drawing
         //
         // Summary:
         //     Red component of the color.
-        public float r;
+        public int r;
         //
         // Summary:
         //     Green component of the color.

Assets/Plugins/LibreMetaverse/Catnip/Drawing/Image.cs

@@ -1,57 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.IO;
-//using System.Linq;
-//using System.Runtime.Serialization;
-//using System.Text;
-//using System.Threading.Tasks;
-//using SixLabors.ImageSharp;
-//using UnityEngine; 
-
-
-////fake image class that actually just calls unity image internally. //modified 5/6/2021
-//namespace Catnip.Drawing
-//{
-//    public abstract class Image : MarshalByRefObject, IDisposable, ICloneable, ISerializable
-//    {
-
-//        private Texture2D tex;
-//        public abstract int Width { get; internal set; }
-//        public abstract int Height { get; internal set; }
-
-//        public static Image FromFile(string fname)
-//        {
-//            return FromFile(filename, false);
-//        }
-
-//        public static Image FromFile(string filename, bool useEmbeddedColorManagement)
-//        {
-//            if (!File.Exists(filename))
-//                throw new FileNotFoundException(filename);
-
-//            var fileData = File.ReadAllBytes(filename);
-//            //var tex = new Texture2D(2, 2);
-//            //tex.LoadImage(fileData);
-
-//            var image = SixLabors.ImageSharp.Image.Load(filename);
-
-//            return image;
-//        }
-
-//        public object Clone()
-//        {
-//            throw new NotImplementedException();
-//        }
-
-//        public void Dispose()
-//        {
-//            throw new NotImplementedException();
-//        }
-
-//        public void GetObjectData(SerializationInfo info, StreamingContext context)
-//        {
-//            throw new NotImplementedException();
-//        }
-         
-//    }
-//}

Assets/Plugins/LibreMetaverse/Catnip/Drawing/Imaging.cs

@@ -9,6 +9,8 @@ namespace Catnip.Drawing.Imaging
     //sealed=restrict the users from inheriting the class.
     public sealed class BitmapData
     {
+
+
         //Gets or sets the address of the first pixel data in the bitmap. This can also be thought of as the first scan line in the bitmap.
         public IntPtr Scan0 { get; set; }
         public int Stride { get; internal set; }

Assets/Plugins/LibreMetaverse/Imaging/BakeLayer.cs

@@ -31,6 +31,7 @@ using System.IO;
 //using System.Drawing;
 using OpenMetaverse.Assets;
 using Catnip.Drawing;
+using UnityEngine;
 
 namespace OpenMetaverse.Imaging
 {
@@ -354,7 +355,9 @@ namespace OpenMetaverse.Imaging
                     {
                         if (stream != null)
                         {
-                            bitmap = LoadTGAClass.LoadTGA(stream);
+
+                            var tex = TGALoader.LoadTGA(stream);
+                            bitmap = new Bitmap(tex);
                         }
                     }
                 }

Assets/Plugins/LibreMetaverse/Imaging/ManagedImage.cs

@@ -25,10 +25,11 @@
  */
 
 using System;
+using Unity.Collections;
 //using System.Drawing;
 //using System.Drawing.Imaging;
 using Catnip.Drawing;
-using Catnip.Drawing.Imaging;
+//using Catnip.Drawing.Imaging;
 using UnityEngine;
 
 namespace OpenMetaverse.Imaging
@@ -126,14 +127,16 @@ namespace OpenMetaverse.Imaging
         /// 
         /// </summary>
         /// <param name="bitmap"></param>
-        public ManagedImage(Bitmap bitmap)
+        /// 
+        //apparently this method only loads the image (.tga) as a bitmap, then returns it as a managed image. the bitmap is not used. perhaps we can skip this intermediary?
+        public ManagedImage(Bitmap tex)
         {
-            Width = bitmap.Width;
-            Height = bitmap.Height;
+            Width = tex.Width;
+            Height = tex.Height;
 
             int pixelCount = Width * Height;
 
-            if (bitmap.PixelFormat == PixelFormat.Format32bppArgb)
+            if (tex.Format == TextureFormat.ARGB32)   //PixelFormat.Format32bppArgb  --- 32 bits per pixel; 8 bits each are used for the alpha, red, green, and blue 
             {
                 Channels = ImageChannels.Alpha | ImageChannels.Color;
                 Red = new byte[pixelCount];
@@ -141,86 +144,116 @@ namespace OpenMetaverse.Imaging
                 Blue = new byte[pixelCount];
                 Alpha = new byte[pixelCount];
 
-                BitmapData bd = bitmap.LockBits(new Rectangle(0, 0, Width, Height),
-                    ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+                //BitmapData bd = bitmap.LockBits(new Rectangle(0, 0, Width, Height),
+                //    ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
 
-                unsafe
+                //unsafe
+                //{
+                //    byte* pixel = (byte*)bd.Scan0;
+
+                //    for (int i = 0; i < pixelCount; i++)
+                //    {
+                //        // GDI+ gives us BGRA and we need to turn that in to RGBA
+                //        Blue[i] = *(pixel++);
+                //        Green[i] = *(pixel++);
+                //        Red[i] = *(pixel++);
+                //        Alpha[i] = *(pixel++);
+                //    }
+                //}
+
+                //bitmap.UnlockBits(bd);
+
+                for (int i = 0; i < pixelCount; i++)
                 {
-                    byte* pixel = (byte*)bd.Scan0;
+                    Color32 bit = tex.GetPixel(i%Width , i / Width);
+                    Blue[i] = bit.b;
+                    Green[i] = bit.g;
+                    Red[i] = bit.r;
+                    Alpha[i] = bit.a;
 
-                    for (int i = 0; i < pixelCount; i++)
-                    {
-                        // GDI+ gives us BGRA and we need to turn that in to RGBA
-                        Blue[i] = *(pixel++);
-                        Green[i] = *(pixel++);
-                        Red[i] = *(pixel++);
-                        Alpha[i] = *(pixel++);
-                    }
                 }
-
-                bitmap.UnlockBits(bd);
             }
-            else if (bitmap.PixelFormat == PixelFormat.Format16bppGrayScale)
-            {
-                Channels = ImageChannels.Gray;
-                Red = new byte[pixelCount];
+            //else if (tex.format == TextureFormat.Alpha8)  // PixelFormat.Format16bppGrayScale --- 16 bits per pixel. The color information specifies 65536 shades of gray.
+            //{
+            //    Channels = ImageChannels.Gray;
+            //    Red = new byte[pixelCount];
 
-                throw new NotImplementedException("16bpp grayscale image support is incomplete");
-            }
-            else if (bitmap.PixelFormat == PixelFormat.Format24bppRgb)
+            //    throw new NotImplementedException("16bpp grayscale image support is incomplete");
+            //}
+            else if (tex.Format == TextureFormat.RGB24) //== PixelFormat.Format24bppRgb)
             {
                 Channels = ImageChannels.Color;
                 Red = new byte[pixelCount];
                 Green = new byte[pixelCount];
                 Blue = new byte[pixelCount];
 
-                BitmapData bd = bitmap.LockBits(new Rectangle(0, 0, Width, Height),
-                        ImageLockMode.ReadOnly, PixelFormat.Format24bppRgb);
+                //BitmapData bd = bitmap.LockBits(new Rectangle(0, 0, Width, Height),
+                //        ImageLockMode.ReadOnly, PixelFormat.Format24bppRgb);
 
-                unsafe
+                //unsafe
+                //{
+                //    byte* pixel = (byte*)bd.Scan0;
+
+                //    for (int i = 0; i < pixelCount; i++)
+                //    {
+                //        // GDI+ gives us BGR and we need to turn that in to RGB
+                //        Blue[i] = *(pixel++);
+                //        Green[i] = *(pixel++);
+                //        Red[i] = *(pixel++);
+                //    }
+                //}
+
+                //bitmap.UnlockBits(bd);
+
+                for (int i = 0; i < pixelCount; i++)
                 {
-                    byte* pixel = (byte*)bd.Scan0;
+                    int _x = i % Width;
+                    int _y = i / Width;
+                    Color32 bit = tex.GetPixel(i % Width, i / Width);
+                    Blue[i] = bit.b;
+                    Green[i] = bit.g;
+                    Red[i] = bit.r;
 
-                    for (int i = 0; i < pixelCount; i++)
-                    {
-                        // GDI+ gives us BGR and we need to turn that in to RGB
-                        Blue[i] = *(pixel++);
-                        Green[i] = *(pixel++);
-                        Red[i] = *(pixel++);
-                    }
                 }
-
-                bitmap.UnlockBits(bd);
             }
-			else if (bitmap.PixelFormat == PixelFormat.Format32bppRgb)
-			{
+			else if (tex.Format == TextureFormat.RGB24) // PixelFormat.Format32bppRgb) --- The remaining 8 bits are not used.
+            {
 				Channels = ImageChannels.Color;
 				Red = new byte[pixelCount];
 				Green = new byte[pixelCount];
 				Blue = new byte[pixelCount];
 
-				BitmapData bd = bitmap.LockBits(new Rectangle(0, 0, Width, Height),
-						ImageLockMode.ReadOnly, PixelFormat.Format32bppRgb);
+                //BitmapData bd = bitmap.LockBits(new Rectangle(0, 0, Width, Height),
+                //		ImageLockMode.ReadOnly, PixelFormat.Format32bppRgb);
 
-				unsafe
-				{
-					byte* pixel = (byte*)bd.Scan0;
+                //NativeArray<Color32> texture = tex.GetRawTextureData<Color32>();
 
-					for (int i = 0; i < pixelCount; i++)
+    //            unsafe
+				//{
+                    
+                    //byte* pixel = (byte*)bd.Scan0;
+
+                    for (int i = 0; i < pixelCount; i++)
 					{
-						// GDI+ gives us BGR and we need to turn that in to RGB
-						Blue[i] = *(pixel++);
-						Green[i] = *(pixel++);
-						Red[i] = *(pixel++);
-						pixel++;	// Skip over the empty byte where the Alpha info would normally be
+                    // GDI+ gives us BGR and we need to turn that in to RGB
+                        int _x = i % Width;
+                        int _y = i / Width;
+                        Color32 bit = tex.GetPixel(i % Width, i / Width);
+                        Blue[i] = bit.b;
+                        Green[i] = bit.g;
+						Red[i] = bit.r;
+						//Blue[i] = *(pixel++);
+						//Green[i] = *(pixel++);
+						//Red[i] = *(pixel++);
+						//pixel++;	// Skip over the empty byte where the Alpha info would normally be
 					}
-				}
+				//}
 
-				bitmap.UnlockBits(bd);
+				//bitmap.UnlockBits(bd);
 			}
 			else
             {
-                throw new NotSupportedException("Unrecognized pixel format: " + bitmap.PixelFormat.ToString());
+                throw new NotSupportedException("Unrecognized pixel format: " + tex.Format.ToString());
             }
         }
 #endif

Assets/Plugins/LibreMetaverse/Imaging/OpenJPEG.cs

@@ -31,6 +31,7 @@ using System.Runtime.InteropServices;
 //using Rectangle = System.Drawing.Rectangle;
 using Catnip.Drawing;
 using Catnip.Drawing.Imaging;
+using Unity.Collections;
 using UnityEngine;
 
 namespace OpenMetaverse.Imaging
@@ -390,9 +391,9 @@ namespace OpenMetaverse.Imaging
 
             lock (OpenJPEGLock)
             {
-                if (IntPtr.Size == 8)
+                if (IntPtr.Size == 8)  //64bit/x64
                     DotNetAllocEncoded64(ref marshalled);
-                else
+                else   //32bit/x86
                     DotNetAllocEncoded(ref marshalled);
 
                 Marshal.Copy(encoded, 0, marshalled.encoded, encoded.Length);
@@ -520,7 +521,8 @@ namespace OpenMetaverse.Imaging
         /// <returns>A byte array containing the source Bitmap object</returns>
         public unsafe static byte[] EncodeFromImage(Bitmap bitmap, bool lossless)
         {
-            BitmapData bd;
+            NativeArray<Color32> bd = bitmap.getAsNativeArray();
+
             ManagedImage decoded;
 
             int bitmapWidth = bitmap.Width;
@@ -528,63 +530,64 @@ namespace OpenMetaverse.Imaging
             int pixelCount = bitmapWidth * bitmapHeight;
             int i;
 
-            if ((bitmap.PixelFormat & PixelFormat.Alpha) != 0 || (bitmap.PixelFormat & PixelFormat.PAlpha) != 0)
+            //if ((bitmap.Format & PixelFormat.Alpha) != 0 || (bitmap.PixelFormat & PixelFormat.PAlpha) != 0)
+            if (bitmap.Format.Equals(TextureFormat.ARGB32)  )
             {
                 // Four layers, RGBA
                 decoded = new ManagedImage(bitmapWidth, bitmapHeight,
                     ManagedImage.ImageChannels.Color | ManagedImage.ImageChannels.Alpha);
-                bd = bitmap.LockBits(new Rectangle(0, 0, bitmapWidth, bitmapHeight),
-                    ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
-                byte* pixel = (byte*)bd.Scan0;
+                //bd = bitmap.LockBits(new Rectangle(0, 0, bitmapWidth, bitmapHeight),
+                //    ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+                //byte* pixel = (byte*)bd.Scan0;
 
                 for (i = 0; i < pixelCount; i++)
                 {
                     // GDI+ gives us BGRA and we need to turn that in to RGBA
-                    decoded.Blue[i] = *(pixel++);
-                    decoded.Green[i] = *(pixel++);
-                    decoded.Red[i] = *(pixel++);
-                    decoded.Alpha[i] = *(pixel++);
+                    decoded.Blue[i] = bd[i].b; // *(pixel++);
+                    decoded.Green[i] = bd[i].g; //*(pixel++);
+                    decoded.Red[i] = bd[i].r;  //*(pixel++);
+                    decoded.Alpha[i] = bd[i].a;
                 }
             }
-            else if (bitmap.PixelFormat == PixelFormat.Format16bppGrayScale)
-            {
-                // One layer
-                decoded = new ManagedImage(bitmapWidth, bitmapHeight,
-                    ManagedImage.ImageChannels.Color);
-                bd = bitmap.LockBits(new Rectangle(0, 0, bitmapWidth, bitmapHeight),
-                    ImageLockMode.ReadOnly, PixelFormat.Format16bppGrayScale);
-                byte* pixel = (byte*)bd.Scan0;
+            //else if (bitmap.PixelFormat == PixelFormat.Format16bppGrayScale)
+            //{
+            //    // One layer
+            //    decoded = new ManagedImage(bitmapWidth, bitmapHeight,
+            //        ManagedImage.ImageChannels.Color);
+            //    bd = bitmap.LockBits(new Rectangle(0, 0, bitmapWidth, bitmapHeight),
+            //        ImageLockMode.ReadOnly, PixelFormat.Format16bppGrayScale);
+            //    byte* pixel = (byte*)bd.Scan0;
 
-                for (i = 0; i < pixelCount; i++)
-                {
-                    // Normalize 16-bit data down to 8-bit
-                    ushort origVal = (byte)(*(pixel) + (*(pixel + 1) << 8));
-                    byte val = (byte)(((double)origVal / (double)UInt32.MaxValue) * (double)Byte.MaxValue);
+            //    for (i = 0; i < pixelCount; i++)
+            //    {
+            //        // Normalize 16-bit data down to 8-bit
+            //        ushort origVal = (byte)(*(pixel) + (*(pixel + 1) << 8));
+            //        byte val = (byte)(((double)origVal / (double)UInt32.MaxValue) * (double)Byte.MaxValue);
 
-                    decoded.Red[i] = val;
-                    decoded.Green[i] = val;
-                    decoded.Blue[i] = val;
-                    pixel += 2;
-                }
-            }
+            //        decoded.Red[i] = val;
+            //        decoded.Green[i] = val;
+            //        decoded.Blue[i] = val;
+            //        pixel += 2;
+            //    }
+            //}
             else
             {
                 // Three layers, RGB
                 decoded = new ManagedImage(bitmapWidth, bitmapHeight,
                     ManagedImage.ImageChannels.Color);
-                bd = bitmap.LockBits(new Rectangle(0, 0, bitmapWidth, bitmapHeight),
-                    ImageLockMode.ReadOnly, PixelFormat.Format24bppRgb);
-                byte* pixel = (byte*)bd.Scan0;
+                //bd = bitmap.LockBits(new Rectangle(0, 0, bitmapWidth, bitmapHeight),
+                //    ImageLockMode.ReadOnly, PixelFormat.Format24bppRgb);
+                //byte* pixel = (byte*)bd.Scan0;
 
                 for (i = 0; i < pixelCount; i++)
                 {
-                    decoded.Blue[i] = *(pixel++);
-                    decoded.Green[i] = *(pixel++);
-                    decoded.Red[i] = *(pixel++);
+                    decoded.Blue[i] = bd[i].b  ; // *(pixel++);
+                    decoded.Green[i] = bd[i].g; //*(pixel++);
+                    decoded.Red[i] = bd[i].r;  //*(pixel++);
                 }
             }
 
-            bitmap.UnlockBits(bd);
+            //bitmap.UnlockBits(bd);
             byte[] encoded = Encode(decoded, lossless);
             return encoded;
         }

Assets/Plugins/LibreMetaverse/Interfaces/IRendering.cs

@@ -26,7 +26,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
+
+using Catnip.Drawing;
 
 namespace OpenMetaverse.Rendering
 {

Assets/Plugins/LibreMetaverse/LibreMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs

@@ -33,12 +33,13 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
+//using System.Drawing;
 using System.IO;
 using OpenMetaverse.StructuredData;
 using LibreMetaverse.PrimMesher;
 using OMV = OpenMetaverse;
 using OMVR = OpenMetaverse.Rendering;
+using Catnip.Drawing;
 
 namespace OpenMetaverse.Rendering
 {

Assets/Plugins/LibreMetaverse/PrimMesher/SculptMap.cs

@@ -27,8 +27,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Drawing2D;
+//using System.Drawing;
+//using System.Drawing.Drawing2D;
+using Catnip.Drawing;
 
 namespace LibreMetaverse.PrimMesher
 {
@@ -71,8 +72,9 @@ namespace LibreMetaverse.PrimMesher
             try
             {
                 if (needsScaling)
-                    bm = ScaleImage(bm, width, height,
-                        InterpolationMode.NearestNeighbor);
+                    bm.resize(width,height);
+                    //bm = ScaleImage(bm, width, height,
+                    //    InterpolationMode.NearestNeighbor);
             }
 
             catch (Exception e)
@@ -101,9 +103,9 @@ namespace LibreMetaverse.PrimMesher
                     {
                         var c = bm.GetPixel(x, y);
 
-                        redBytes[byteNdx] = c.R;
-                        greenBytes[byteNdx] = c.G;
-                        blueBytes[byteNdx] = c.B;
+                        redBytes[byteNdx] = c.r;
+                        greenBytes[byteNdx] = c.g;
+                        blueBytes[byteNdx] = c.b;
 
                         ++byteNdx;
                     }
@@ -114,9 +116,9 @@ namespace LibreMetaverse.PrimMesher
                         var c = bm.GetPixel(x < width ? x * 2 : x * 2 - 1,
                             y < height ? y * 2 : y * 2 - 1);
 
-                        redBytes[byteNdx] = c.R;
-                        greenBytes[byteNdx] = c.G;
-                        blueBytes[byteNdx] = c.B;
+                        redBytes[byteNdx] = c.r;
+                        greenBytes[byteNdx] = c.g;
+                        blueBytes[byteNdx] = c.b;
 
                         ++byteNdx;
                     }
@@ -164,22 +166,22 @@ namespace LibreMetaverse.PrimMesher
             return rows;
         }
 
-        private Bitmap ScaleImage(Bitmap srcImage, int destWidth, int destHeight,
-            InterpolationMode interpMode)
-        {
-            var scaledImage = new Bitmap(srcImage, destWidth, destHeight);
-            scaledImage.SetResolution(96.0f, 96.0f);
+        //private Bitmap ScaleImage(Bitmap srcImage, int destWidth, int destHeight,
+        //    InterpolationMode interpMode)
+        //{
+        //    var scaledImage = new Bitmap(srcImage, destWidth, destHeight);
+        //    scaledImage.SetResolution(96.0f, 96.0f);
 
-            var grPhoto = Graphics.FromImage(scaledImage);
-            grPhoto.InterpolationMode = interpMode;
+        //    var grPhoto = Graphics.FromImage(scaledImage);
+        //    grPhoto.InterpolationMode = interpMode;
 
-            grPhoto.DrawImage(srcImage,
-                new Rectangle(0, 0, destWidth, destHeight),
-                new Rectangle(0, 0, srcImage.Width, srcImage.Height),
-                GraphicsUnit.Pixel);
+        //    grPhoto.DrawImage(srcImage,
+        //        new Rectangle(0, 0, destWidth, destHeight),
+        //        new Rectangle(0, 0, srcImage.Width, srcImage.Height),
+        //        GraphicsUnit.Pixel);
 
-            grPhoto.Dispose();
-            return scaledImage;
-        }
+        //    grPhoto.Dispose();
+        //    return scaledImage;
+        //}
     }
 }

Assets/Plugins/LibreMetaverse/PrimMesher/SculptMesh.cs

@@ -27,8 +27,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
+//using System.Drawing;
+using SixLabors;
 using System.IO;
+using Catnip.Drawing;
+using UnityEngine;
+
+//using Image = Catnip.Drawing.Image;
+
 
 namespace LibreMetaverse.PrimMesher
 {
@@ -52,9 +58,18 @@ namespace LibreMetaverse.PrimMesher
 
         public SculptMesh(string fileName, int sculptType, int lod, int viewerMode, int mirror, int invert)
         {
-            var bitmap = (Bitmap) Image.FromFile(fileName);
-            _SculptMesh(bitmap, (SculptType) sculptType, lod, viewerMode != 0, mirror != 0, invert != 0);
-            bitmap.Dispose();
+            //var bitmap = (Bitmap) Image.FromFile(fileName);
+            var myreader = new BMPLoader();
+            BMPImage myimg = myreader.LoadBMP(fileName);
+            Texture2D tex = myimg.ToTexture2D();
+            Bitmap fakebmp = new Bitmap(tex);
+
+            _SculptMesh(fakebmp, (SculptType) sculptType, lod, viewerMode != 0, mirror != 0, invert != 0);
+            //bitmap.Dispose();
+
+            fakebmp.delete();
+
+
         }
 
         /// <summary>
@@ -189,13 +204,13 @@ namespace LibreMetaverse.PrimMesher
             uvs = new List<UVCoord>(sm.uvs);
         }
 
-        public SculptMesh SculptMeshFromFile(string fileName, SculptType sculptType, int lod, bool viewerMode)
-        {
-            var bitmap = (Bitmap) Image.FromFile(fileName);
-            var sculptMesh = new SculptMesh(bitmap, sculptType, lod, viewerMode);
-            bitmap.Dispose();
-            return sculptMesh;
-        }
+        //public SculptMesh SculptMeshFromFile(string fileName, SculptType sculptType, int lod, bool viewerMode)
+        //{
+        //    var bitmap = (Bitmap) Image.FromFile(fileName);
+        //    var sculptMesh = new SculptMesh(bitmap, sculptType, lod, viewerMode);
+        //    bitmap.Dispose();
+        //    return sculptMesh;
+        //}
 
         /// <summary>
         ///     converts a bitmap to a list of lists of coords, while scaling the image.
@@ -207,90 +222,90 @@ namespace LibreMetaverse.PrimMesher
         /// <param name="scale"></param>
         /// <param name="mirror"></param>
         /// <returns></returns>
-        private List<List<Coord>> bitmap2Coords(Bitmap bitmap, int scale, bool mirror)
-        {
-            var numRows = bitmap.Height / scale;
-            var numCols = bitmap.Width / scale;
-            var rows = new List<List<Coord>>(numRows);
+        //private List<List<Coord>> bitmap2Coords(Bitmap bitmap, int scale, bool mirror)
+        //{
+        //    var numRows = bitmap.Height / scale;
+        //    var numCols = bitmap.Width / scale;
+        //    var rows = new List<List<Coord>>(numRows);
 
-            var pixScale = 1.0f / (scale * scale);
-            pixScale /= 255;
+        //    var pixScale = 1.0f / (scale * scale);
+        //    pixScale /= 255;
 
-            int imageX, imageY = 0;
+        //    int imageX, imageY = 0;
 
-            int rowNdx, colNdx;
+        //    int rowNdx, colNdx;
 
-            for (rowNdx = 0; rowNdx < numRows; rowNdx++)
-            {
-                var row = new List<Coord>(numCols);
-                for (colNdx = 0; colNdx < numCols; colNdx++)
-                {
-                    imageX = colNdx * scale;
-                    var imageYStart = rowNdx * scale;
-                    var imageYEnd = imageYStart + scale;
-                    var imageXEnd = imageX + scale;
-                    var rSum = 0.0f;
-                    var gSum = 0.0f;
-                    var bSum = 0.0f;
-                    for (; imageX < imageXEnd; imageX++)
-                    for (imageY = imageYStart; imageY < imageYEnd; imageY++)
-                    {
-                        var c = bitmap.GetPixel(imageX, imageY);
-                        if (c.A != 255)
-                        {
-                            bitmap.SetPixel(imageX, imageY, Color.FromArgb(255, c.R, c.G, c.B));
-                            c = bitmap.GetPixel(imageX, imageY);
-                        }
-                        rSum += c.R;
-                        gSum += c.G;
-                        bSum += c.B;
-                    }
-                    row.Add(mirror
-                        ? new Coord(-(rSum * pixScale - 0.5f), gSum * pixScale - 0.5f, bSum * pixScale - 0.5f)
-                        : new Coord(rSum * pixScale - 0.5f, gSum * pixScale - 0.5f, bSum * pixScale - 0.5f));
-                }
-                rows.Add(row);
-            }
-            return rows;
-        }
+        //    for (rowNdx = 0; rowNdx < numRows; rowNdx++)
+        //    {
+        //        var row = new List<Coord>(numCols);
+        //        for (colNdx = 0; colNdx < numCols; colNdx++)
+        //        {
+        //            imageX = colNdx * scale;
+        //            var imageYStart = rowNdx * scale;
+        //            var imageYEnd = imageYStart + scale;
+        //            var imageXEnd = imageX + scale;
+        //            var rSum = 0.0f;
+        //            var gSum = 0.0f;
+        //            var bSum = 0.0f;
+        //            for (; imageX < imageXEnd; imageX++)
+        //            for (imageY = imageYStart; imageY < imageYEnd; imageY++)
+        //            {
+        //                var c = bitmap.GetPixel(imageX, imageY);
+        //                if (c.A != 255)
+        //                {
+        //                    bitmap.SetPixel(imageX, imageY, Color.FromArgb(255, c.R, c.G, c.B));
+        //                    c = bitmap.GetPixel(imageX, imageY);
+        //                }
+        //                rSum += c.R;
+        //                gSum += c.G;
+        //                bSum += c.B;
+        //            }
+        //            row.Add(mirror
+        //                ? new Coord(-(rSum * pixScale - 0.5f), gSum * pixScale - 0.5f, bSum * pixScale - 0.5f)
+        //                : new Coord(rSum * pixScale - 0.5f, gSum * pixScale - 0.5f, bSum * pixScale - 0.5f));
+        //        }
+        //        rows.Add(row);
+        //    }
+        //    return rows;
+        //}
 
-        private List<List<Coord>> bitmap2CoordsSampled(Bitmap bitmap, int scale, bool mirror)
-        {
-            var numRows = bitmap.Height / scale;
-            var numCols = bitmap.Width / scale;
-            var rows = new List<List<Coord>>(numRows);
+        //private List<List<Coord>> bitmap2CoordsSampled(Bitmap bitmap, int scale, bool mirror)
+        //{
+        //    var numRows = bitmap.Height / scale;
+        //    var numCols = bitmap.Width / scale;
+        //    var rows = new List<List<Coord>>(numRows);
 
-            var pixScale = 1.0f / 256.0f;
+        //    var pixScale = 1.0f / 256.0f;
 
-            int imageX, imageY = 0;
+        //    int imageX, imageY = 0;
 
-            int rowNdx, colNdx;
+        //    int rowNdx, colNdx;
 
-            for (rowNdx = 0; rowNdx <= numRows; rowNdx++)
-            {
-                var row = new List<Coord>(numCols);
-                imageY = rowNdx * scale;
-                if (rowNdx == numRows) imageY--;
-                for (colNdx = 0; colNdx <= numCols; colNdx++)
-                {
-                    imageX = colNdx * scale;
-                    if (colNdx == numCols) imageX--;
+        //    for (rowNdx = 0; rowNdx <= numRows; rowNdx++)
+        //    {
+        //        var row = new List<Coord>(numCols);
+        //        imageY = rowNdx * scale;
+        //        if (rowNdx == numRows) imageY--;
+        //        for (colNdx = 0; colNdx <= numCols; colNdx++)
+        //        {
+        //            imageX = colNdx * scale;
+        //            if (colNdx == numCols) imageX--;
 
-                    var c = bitmap.GetPixel(imageX, imageY);
-                    if (c.A != 255)
-                    {
-                        bitmap.SetPixel(imageX, imageY, Color.FromArgb(255, c.R, c.G, c.B));
-                        c = bitmap.GetPixel(imageX, imageY);
-                    }
+        //            var c = bitmap.GetPixel(imageX, imageY);
+        //            if (c.A != 255)
+        //            {
+        //                bitmap.SetPixel(imageX, imageY, Color.FromArgb(255, c.R, c.G, c.B));
+        //                c = bitmap.GetPixel(imageX, imageY);
+        //            }
 
-                    row.Add(mirror
-                        ? new Coord(-(c.R * pixScale - 0.5f), c.G * pixScale - 0.5f, c.B * pixScale - 0.5f)
-                        : new Coord(c.R * pixScale - 0.5f, c.G * pixScale - 0.5f, c.B * pixScale - 0.5f));
-                }
-                rows.Add(row);
-            }
-            return rows;
-        }
+        //            row.Add(mirror
+        //                ? new Coord(-(c.R * pixScale - 0.5f), c.G * pixScale - 0.5f, c.B * pixScale - 0.5f)
+        //                : new Coord(c.R * pixScale - 0.5f, c.G * pixScale - 0.5f, c.B * pixScale - 0.5f));
+        //        }
+        //        rows.Add(row);
+        //    }
+        //    return rows;
+        //}
 
 
         private void _SculptMesh(Bitmap sculptBitmap, SculptType sculptType, int lod, bool viewerMode, bool mirror,

Assets/Plugins/LibreMetaverse/Settings.cs

@@ -46,7 +46,7 @@ namespace OpenMetaverse
         public const string ADITI_LOGIN_SERVER = "https://login.aditi.lindenlab.com/cgi-bin/login.cgi";
 
         /// <summary>The relative directory where external resources are kept</summary>
-        public static string RESOURCE_DIR = "openmetaverse_data";
+        public static string RESOURCE_DIR = "openmetaverse_data"; //in streamingassets folder...
 
         /// <summary>Login server to connect to</summary>
         public string LOGIN_SERVER = AGNI_LOGIN_SERVER;

Assets/Plugins/PrimMesher/PrimMesherASM.asmdef

@@ -1,14 +0,0 @@
-{
-    "name": "PrimMesherASM",
-    "rootNamespace": "",
-    "references": [],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": true,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [],
-    "noEngineReferences": false
-}

Assets/Raindrop/RaindropInstance.cs

@@ -39,10 +39,11 @@ using Raindrop.Netcom;
 using OpenMetaverse;
 using UnityEngine;
 using Logger = OpenMetaverse.Logger;
+using ServiceLocatorSample.ServiceLocator;
 
 namespace Raindrop
 {
-    public class RaindropInstance
+    public class RaindropInstance : IGameService
     {
         #region OnRadegastFormCreated
         //Actually this event is never subscribed to!
@@ -66,10 +67,11 @@ namespace Raindrop
         private string streaming_assets_dir;
 
         //private frmMain mainForm; //frmMain is a class that inherits RadegastForm. It seems to be the code-behind of the overall UI, that includes the view and buttons.
-        private UIManager ui_manager;
+        //private UIManager ui_manager;
         //private RaindropUnitySceneRenderer mainWorldRenderer;
 
         // Singleton, there can be only one instance
+
         private static RaindropInstance globalInstance = null;
         public static RaindropInstance GlobalInstance
         {
@@ -325,7 +327,7 @@ namespace Raindrop
             names = new NameManager(this);
             COF = new CurrentOutfitFolder(this);
 
-            ui_manager = new UIManager(this);
+            //ui_manager = new UIManager(this);
             //mainCanvas.InitializeControls();
 
             //mainCanvas.Load += new EventHandler(mainForm_Load);
@@ -686,10 +688,10 @@ namespace Raindrop
             get { return state; }
         }
 
-        public UIManager UI
-        {
-            get { return ui_manager; }
-        }
+        //public UIManager UI
+        //{
+        //    get { return ui_manager; }
+        //}
 
         public OpenMetaverse.Vector3 cameraLoc { get; internal set; }
 

Assets/Raindrop/Render/RenderSettings.cs

@@ -45,7 +45,7 @@ namespace Raindrop.Rendering
         /// <summary>Should we try to make sure that large prims that are > our draw distance are in view when we are standing on them</summary>
         public static bool HeavierDistanceChecking = true;
         /// <summary>Minimum time between rebuilding terrain mesh and texture</summary>
-        public static float MinimumTimeBetweenTerrainUpdated = 15f;
+        public static float MinimumTimeBetweenTerrainUpdated = 1000f;
         /// <summary>Are textures that don't have dimensions that are powers of two supported</summary>
         public static bool TextureNonPowerOfTwoSupported;
 

Assets/Raindrop/Render/RenderingHelpers.cs

@@ -32,24 +32,24 @@ using OpenMetaverse.Rendering;
 
 namespace Raindrop.Rendering
 {
-    //[StructLayout(LayoutKind.Sequential)]
-    //public struct Color4b
-    //{
-    //    public byte R;
-    //    public byte G;
-    //    public byte B;
-    //    public byte A;
-    //}
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Color4b
+    {
+        public byte R;
+        public byte G;
+        public byte B;
+        public byte A;
+    }
 
-    //[StructLayout(LayoutKind.Explicit)]
-    //public struct ColorVertex
-    //{
-    //    [FieldOffset(0)]
-    //    public Vertex Vertex;
-    //    [FieldOffset(32)]
-    //    public Color4b Color;
-    //    public static int Size = 36;
-    //}
+    [StructLayout(LayoutKind.Explicit)]
+    public struct ColorVertex
+    {
+        [FieldOffset(0)]
+        public Vertex Vertex;
+        [FieldOffset(32)]
+        public Color4b Color;
+        public static int Size = 36;
+    }
 
     //public class TextureInfo
     //{

Assets/Raindrop/Render/TerrainSplat.cs

@@ -46,7 +46,7 @@ using OpenMetaverse;
 using OpenMetaverse.Imaging;
 using Unity.Collections;
 using UnityEngine;
-using Color = Catnip.Drawing.Color;
+//using Color = Catnip.Drawing.Color;
 using Debug = System.Diagnostics.Debug;
 using Vector3 = OpenMetaverse.Vector3;
 
@@ -94,12 +94,12 @@ namespace Raindrop.Rendering
             ROCK_DETAIL
         };
 
-        private static readonly Color[] DEFAULT_TERRAIN_COLOR = new Color[]
+        private static readonly Color32[] DEFAULT_TERRAIN_COLOR = new Color32[]
         {
-            Color.FromArgb(255, 164, 136, 117),
-            Color.FromArgb(255, 65, 87, 47),
-            Color.FromArgb(255, 157, 145, 131),
-            Color.FromArgb(255, 125, 128, 130)
+            new Color32(164, 136, 117, 255),
+            new Color32(65, 87, 47, 255),
+            new Color32(157, 145, 131, 255),
+            new Color32(125, 128, 130, 255)
         };
 
         private static readonly UUID TERRAIN_CACHE_MAGIC = new UUID("2c0c7ef2-56be-4eb8-aacb-76712c535b4b");
@@ -363,7 +363,7 @@ namespace Raindrop.Rendering
             return output;
         }
 
-        private static void fillcolor(Texture2D tex2, Color color)
+        private static void fillcolor(Texture2D tex2, Color32 color)
         {
             //var fillColor : Color = Color(1, 0.0, 0.0);
             var fillColorArray = tex2.GetPixels();

Assets/Raindrop/ServiceLocator.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 08a24f3055f466642bcf3e7a1240f263
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Raindrop/ServiceLocator/Bootstrapper.cs

@@ -0,0 +1,35 @@
+using Raindrop;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace ServiceLocatorSample.ServiceLocator
+{
+    //This is like the main() function. it runs before everything else.
+    // inspired by https://medium.com/medialesson/simple-service-locator-for-your-unity-project-40e317aad307
+
+    public static class Bootstrapper
+    {
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterSceneLoad)]
+        public static void Initiailze()
+        {
+            // Initialize default service locator.
+            ServiceLocator.Initiailze();
+
+            // Register all your services next.
+            ServiceLocator.Current.Register<RaindropInstance>(new RaindropInstance( new OpenMetaverse.GridClient() ));
+            ServiceLocator.Current.Register<UIManager>(new UIManager( ));
+            //ServiceLocator.Current.Register<IMyGameServiceB>(new MyGameServiceB());
+            //ServiceLocator.Current.Register<IMyGameServiceC>(new MyGameServiceC());
+
+            // Application is ready to start, load your main scene.
+            SceneManager.LoadSceneAsync("UIscene", LoadSceneMode.Additive);
+
+
+        }
+    }
+}

Assets/Raindrop/ServiceLocator/Bootstrapper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d4624f0ac24806c4594a78f36da30bd9
+guid: ade599362d59a714ea3eb5d46c5414e4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Raindrop/ServiceLocator/IGameService.cs

@@ -0,0 +1,10 @@
+namespace ServiceLocatorSample.ServiceLocator
+{
+    /// <summary>
+    /// Base interface for our service locator to work with. Services implementing
+    /// this interface will be retrievable using the locator.
+    /// </summary> 
+    public interface IGameService
+    {
+    }
+}

Assets/Raindrop/ServiceLocator/IGameService.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 55c6aede8bf73ca48b10f0d9e2e771f0
+guid: 0abaeccceb2c7824ebc62aca204635a2
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Raindrop/ServiceLocator/ServiceLocator.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace ServiceLocatorSample.ServiceLocator
+{
+    /// <summary>
+    /// Simple service locator for <see cref="IGameService"/> instances.
+    /// </summary>
+    public class ServiceLocator
+    {
+        private ServiceLocator() { }
+
+        /// <summary>
+        /// currently registered services.
+        /// </summary>
+        private readonly Dictionary<string, IGameService> services = new Dictionary<string, IGameService>();
+
+        /// <summary>
+        /// Gets the currently active service locator instance.
+        /// </summary>
+        public static ServiceLocator Current { get; private set; }
+
+        /// <summary>
+        /// Initalizes the service locator with a new instance.
+        /// </summary>
+        public static void Initiailze()
+        {
+            Current = new ServiceLocator();
+        }
+
+        /// <summary>
+        /// Gets the service instance of the given type.
+        /// </summary>
+        /// <typeparam name="T">The type of the service to lookup.</typeparam>
+        /// <returns>The service instance.</returns>
+        public T Get<T>() where T : IGameService
+        {
+            string key = typeof(T).Name;
+            if (!services.ContainsKey(key))
+            {
+                Debug.LogError($"{key} not registered with {GetType().Name}");
+                throw new InvalidOperationException();
+            }
+
+            return (T)services[key];
+        }
+
+        /// <summary>
+        /// Registers the service with the current service locator.
+        /// </summary>
+        /// <typeparam name="T">Service type.</typeparam>
+        /// <param name="service">Service instance.</param>
+        public void Register<T>(T service) where T : IGameService
+        {
+            string key = typeof(T).Name;
+            if (services.ContainsKey(key))
+            {
+                Debug.LogError($"Attempted to register service of type {key} which is already registered with the {GetType().Name}.");
+                return;
+            }
+
+            services.Add(key, service);
+        }
+
+        /// <summary>
+        /// Unregisters the service from the current service locator.
+        /// </summary>
+        /// <typeparam name="T">Service type.</typeparam>
+        public void Unregister<T>() where T : IGameService
+        {
+            string key = typeof(T).Name;
+            if (!services.ContainsKey(key))
+            {
+                Debug.LogError($"Attempted to unregister service of type {key} which is not registered with the {GetType().Name}.");
+                return;
+            }
+
+            services.Remove(key);
+        }
+    }
+}

Assets/Raindrop/ServiceLocator/ServiceLocator.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ced40f64f9843d742b0bc8cce9b2650a
+guid: c8693a5c63900054886c1c855bbe043b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Raindrop/UI/CanvasHelpers/CanvasManager.cs

@@ -57,11 +57,11 @@ public class CanvasManager : Singleton<CanvasManager>
     }
     public void pushCanvas(string _type)
     {
-        pushCanvas(_type, false);
+        pushCanvasWithOrWithoutPop(_type, false);
     }
 
     //isPopCurrentActiveCanvas true will pop the current top canvas and then push the new desired one.
-    public void pushCanvas(string _type, bool isPopCurrentActiveCanvas)
+    public void pushCanvasWithOrWithoutPop(string _type, bool isPopCurrentActiveCanvas)
     {
         CanvasType theCanvasType = getCanvasTypeFromString(_type);
         if (theCanvasType ==CanvasType.UNKNOWN)

Assets/Raindrop/UI/UIBootstrapper.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace Raindrop
+{
+    class UIBootstrapper : MonoBehaviour
+    {
+        private void Awake()
+        {
+            ServiceLocatorSample.ServiceLocator.ServiceLocator.Current.Get<UIManager>().initialiseUI();
+        }
+
+
+    }
+}

Assets/Raindrop/UI/UIBootstrapper.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5dbfabecbcda5bb47b7800f9d748db3b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Raindrop/UI/internal/UIManager.cs

@@ -9,12 +9,13 @@ using OpenMetaverse.StructuredData;
 using OpenMetaverse.Assets;
 using Raindrop;
 using UnityEngine;
+using ServiceLocatorSample.ServiceLocator;
 
 namespace Raindrop
 {
-    public class UIManager
+    public class UIManager : IGameService
     {
-        //mainUImanager has dependencies:
+        //mainUImanager has responsibilities:
         //   CanvasManager - stores and manages the pops, push of views onto the ui stack.
         //   ModalManager - pops and shows modals.
         //  LoadingCanvasPresenter - this particular modal/screen is tricky; it appears only when the scene is loading.
@@ -23,12 +24,14 @@ namespace Raindrop
         private RaindropNetcom netcom { get { return instance.Netcom; } }
         private GridClient client { get { return instance.Client; } }
 
+        //public CanvasManager canvasManager { get { return CanvasManager.GetInstance(); } }
         public CanvasManager canvasManager { get { return CanvasManager.GetInstance(); } }
         public ModalManager modalManager { get { return ModalManager.GetInstance(); } }
 
-        public UIManager(RaindropInstance raindropInstance)
+        //This was the old contructor used when UIManager was being created(constructed) in RaindropInstance
+        public UIManager(/*RaindropInstance raindropInstance*/)
         {
-            this.instance = raindropInstance;
+            this.instance = RaindropInstance.GlobalInstance;
 
             // Callbacks
             netcom.ClientLoginStatus += new EventHandler<LoginProgressEventArgs>(netcom_ClientLoginStatus);
@@ -38,11 +41,32 @@ namespace Raindrop
 
             RegisterClientEvents(client);
 
-            initialiseUI();
+            //canvasManager = new CanvasManager();
+
 
         }
 
-        private void initialiseUI()
+        //private void Awake()
+        //{
+        //    Debug.Log("UIManager woken up");
+
+        //    this.instance = RaindropInstance.GlobalInstance;
+
+        //    // Callbacks
+        //    netcom.ClientLoginStatus += new EventHandler<LoginProgressEventArgs>(netcom_ClientLoginStatus);
+        //    netcom.ClientLoggedOut += new EventHandler(netcom_ClientLoggedOut);
+        //    netcom.ClientDisconnected += new EventHandler<DisconnectedEventArgs>(netcom_ClientDisconnected);
+        //    instance.Names.NameUpdated += new EventHandler<UUIDNameReplyEventArgs>(Names_NameUpdated);
+
+        //    RegisterClientEvents(client);
+
+        //    //canvasManager = new CanvasManager();
+
+        //    initialiseUI();
+        //}
+
+
+        public void initialiseUI()
         {
             canvasManager.pushCanvas(CanvasType.Welcome);
             modalManager.showSimpleModalBoxWithActionBtn("Disclaimer", "This software is a work in progress. There is no guarantee about its stability. ", "Accept");
@@ -145,6 +169,8 @@ namespace Raindrop
 
         void Self_MoneyBalance(object sender, BalanceEventArgs e)
         {
+            Debug.Log("you have moneybalance of " + e.Balance);
+
             int oldBalance = 0;
             int.TryParse(tlblMoneyBalanceText, out oldBalance);
             int delta = Math.Abs(oldBalance - e.Balance);
@@ -250,6 +276,13 @@ namespace Raindrop
             //    icoNoVoice.Visible = false;
         }
 
+        public object GetService(Type serviceType)
+        {
+
+
+            throw new NotImplementedException();
+        }
+
         //private void RefreshStatusBar()
         //{
         //    if (netcom.IsLoggedIn)

Assets/Raindrop/UI/unity/ChatPresenter.cs

@@ -107,7 +107,8 @@ namespace Raindrop.Presenters
 
         private void OnCloseBtnClick()
         {
-            instance.UI.canvasManager.popCanvas();
+            var uimanager = ServiceLocatorSample.ServiceLocator.ServiceLocator.Current.Get<UIManager>();
+            uimanager.canvasManager.popCanvas();
 
         }
 

Assets/Raindrop/UI/unity/GamePresenter.cs

@@ -28,6 +28,8 @@ namespace Raindrop.Presenters
         private RaindropNetcom netcom { get { return instance.Netcom; } }
         private GridClient client { get { return instance.Client; } }
 
+        private UIManager uimanager;
+
         bool Active => instance.Client.Network.Connected;
 
 
@@ -64,7 +66,8 @@ namespace Raindrop.Presenters
             ChatButton.onClick.AsObservable().Subscribe(_ => OnChatBtnClick()); //when clicked, runs this method.
             MapButton.onClick.AsObservable().Subscribe(_ => OnMapBtnClick()); //when clicked, runs this method.
 
-
+            //get uimanager service
+            uimanager = ServiceLocatorSample.ServiceLocator.ServiceLocator.Current.Get<UIManager>();
 
         }
 
@@ -92,13 +95,13 @@ namespace Raindrop.Presenters
 
         public void OnChatBtnClick()
         {
-            instance.UI.canvasManager.pushCanvas(CanvasType.Chat);
+            uimanager.canvasManager.pushCanvas(CanvasType.Chat);
 
 
         }
         public void OnMapBtnClick()
         {
-            instance.UI.canvasManager.pushCanvas(CanvasType.Map);
+            uimanager.canvasManager.pushCanvas(CanvasType.Map);
 
 
         }

Assets/Raindrop/UI/unity/LoginPresenter.cs

@@ -12,6 +12,7 @@ using UnityEngine.UI;
 using UniRx;
 using TMPro;
 using static Raindrop.LoginUtils;
+using ServiceLocatorSample.ServiceLocator;
 
 
 //view(unitytext) -- presenter(this) -- controller(this?) -- model (raindropinstance singleton)
@@ -31,6 +32,8 @@ namespace Raindrop.Presenters
     {
         private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
         private RaindropNetcom netcom { get { return instance.Netcom; } }
+        private UIManager uimanager;
+
 
         #region UI references
         public Button LoginButton;
@@ -129,12 +132,14 @@ namespace Raindrop.Presenters
             //4subscribe to events.
             AddNetcomEvents();
 
+            //get uimanager service
+            uimanager = ServiceLocatorSample.ServiceLocator.ServiceLocator.Current.Get<UIManager>();
 
         }
 
         private void UpdateModalText(string _)
         {
-            instance.UI.modalManager.setVisibleLoggingInModal(_);
+            uimanager.modalManager.setVisibleLoggingInModal(_);
         }
 
         private void AddNetcomEvents()
@@ -160,25 +165,25 @@ namespace Raindrop.Presenters
             {
                 case LoginStatus.ConnectingToLogin:
                     Login_msg.GetType().GetProperty("Value").SetValue(Login_msg, "Connecting to login server...");
-                    instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "close modal");
+                    uimanager.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "close modal");
                     //lblLoginStatus.ForeColor = Color.Black;
                     break;
 
                 case LoginStatus.ConnectingToSim:
                     Login_msg.Value = ("Connecting to region...");
-                    instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "close modal");
+                    uimanager.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "close modal");
                     //lblLoginStatus.ForeColor = Color.Black;
                     break;
 
                 case LoginStatus.Redirecting:
                     Login_msg.Value = "Redirecting...";
-                    instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "close modal");
+                    uimanager.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "close modal");
                     //lblLoginStatus.ForeColor = Color.Black;
                     break;
 
                 case LoginStatus.ReadingResponse:
                     Login_msg.Value = "Reading response...";
-                    instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "close modal");
+                    uimanager.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "close modal");
                     //lblLoginStatus.ForeColor = Color.Black;
                     break;
 
@@ -191,9 +196,9 @@ namespace Raindrop.Presenters
                     btnLoginEnabled.Value = false;
                     instance.Client.Groups.RequestCurrentGroups();
 
-                    instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...","Logged in !", "yay!");
-                    instance.UI.canvasManager.pushCanvas("Game", true); //refactor needed: better way to schedule push and pop as we are facing some issues here.
-                    instance.UI.canvasManager.popCanvas();
+                    uimanager.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...","Logged in !", "yay!");
+                    uimanager.canvasManager.pushCanvasWithOrWithoutPop("Game", true); //refactor needed: better way to schedule push and pop as we are facing some issues here.
+                    //instance.UI.canvasManager.popCanvas();
                     LoginButton.interactable = true;
                     break;
 
@@ -202,7 +207,7 @@ namespace Raindrop.Presenters
                     if (e.FailReason == "tos")
                     {
                         Login_msg.Value = "Must agree to Terms of Service before logging in";
-                        instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Logging in failed",Login_msg.Value, "ok");
+                        uimanager.modalManager.showSimpleModalBoxWithActionBtn("Logging in failed",Login_msg.Value, "ok");
                         //pnlTos.Visible = true;
                         //txtTOS.Text = e.Message.Replace("\n", "\r\n");
                         btnLoginEnabled.Value = true;
@@ -211,7 +216,7 @@ namespace Raindrop.Presenters
                     else
                     {
                         Login_msg.Value = e.Message;
-                        instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Logging in failed", Login_msg.Value, "ok");
+                        uimanager.modalManager.showSimpleModalBoxWithActionBtn("Logging in failed", Login_msg.Value, "ok");
                         btnLoginEnabled.Value = true;
                         LoginButton.interactable = true;
                     }
@@ -225,7 +230,7 @@ namespace Raindrop.Presenters
         public void netcom_ClientLoggedOut(object sender, EventArgs e)
         {
             Login_msg.Value = "logged out.";
-            instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Login status", Login_msg.Value, "ok");
+            uimanager.modalManager.showSimpleModalBoxWithActionBtn("Login status", Login_msg.Value, "ok");
             //pnlLoginPrompt.Visible = true;
             //pnlLoggingIn.Visible = false;
 
@@ -238,7 +243,7 @@ namespace Raindrop.Presenters
             btnLoginEnabled.Value = false;
 
             Login_msg.Value = "Logging out...";
-            instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Login status", Login_msg.Value, "ok");
+            uimanager.modalManager.showSimpleModalBoxWithActionBtn("Login status", Login_msg.Value, "ok");
             //lblLoginStatus.ForeColor = Color.FromKnownColor(KnownColor.ControlText);
 
             //proLogin.Visible = true;
@@ -247,7 +252,7 @@ namespace Raindrop.Presenters
         public void netcom_ClientLoggingIn(object sender, OverrideEventArgs e)
         {
             Login_msg.Value = "Logging in...";
-            instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Login status", Login_msg.Value, "ok");
+            uimanager.modalManager.showSimpleModalBoxWithActionBtn("Login status", Login_msg.Value, "ok");
             //lblLoginStatus.ForeColor = Color.FromKnownColor(KnownColor.ControlText);
 
             //proLogin.Visible = true;
@@ -497,6 +502,16 @@ namespace Raindrop.Presenters
             //placeholder to select SL as grid.
             netcom.LoginOptions.Grid = instance.GridManger.Grids[0]; //0 means sl i think
 
+            instance.Client.Settings.CAPS_TIMEOUT = 13*1000; //expect to see the error every 13 seconds now!
+
+            /*
+             * debug section: fuck that caps problem.
+             * 
+             * */
+
+
+            //note: setting this ridiculously low yields log: "< >: Login status: Failed: A task was canceled."
+
             if (netcom.LoginOptions.Grid.Platform != "SecondLife")
             {
                 instance.Client.Settings.MULTIPLE_SIMS = true;

Assets/Raindrop/UI/unity/MapPresenter.cs

@@ -73,13 +73,13 @@ public class MapPresenter : MonoBehaviour
 
     public void OnChatBtnClick()
     {
-        instance.UI.canvasManager.pushCanvas(CanvasType.Chat);
+        //instance.UI.canvasManager.pushCanvas(CanvasType.Chat);
 
 
     }
     public void OnMapBtnClick()
     {
-        instance.UI.canvasManager.pushCanvas(CanvasType.Map);
+        //instance.UI.canvasManager.pushCanvas(CanvasType.Map);
 
 
     }

Assets/Raindrop/UI/unity/MinimapModule.cs

@@ -32,7 +32,7 @@ namespace Raindrop.Presenters
 
         MinimapModule()
         {
-            MiniMapButton.onClick.AsObservable().Subscribe(_ => OnMinimapClick()); //when clicked, runs this method.
+            //MiniMapButton.onClick.AsObservable().Subscribe(_ => OnMinimapClick()); //when clicked, runs this method.
 
 
 
@@ -47,13 +47,7 @@ namespace Raindrop.Presenters
 
         }
 
-
-        private void OnMinimapClick()
-        {
-            //what happend when minimap is clicked?
-            instance.UI.canvasManager.pushCanvas(CanvasType.Map);
-            Debug.Log("clicked minimap");
-        }
+         
 
         private void Network_OnCurrentSimChanged(object sender, SimChangedEventArgs e)
         {

Assets/Raindrop/Unity/MainEntryPoint.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using Raindrop;
-
-public class MainEntryPoint : MonoBehaviour
-{
-    //public GameObject CanvasManagerObject;
-    //public CanvasManager CanvasManagerRef;
-
-    //this static-new is like a globally accessible instance without a singleton! :)
-    public RaindropInstance MainRaindropInstance;
-    //this one manages the viewmodels and the stacking of UI modals.
-    //public MonoViewModel RaindropVM;
-
-
-    public string app_data_Path { get; private set; }
-
-    private void Awake()
-    {
-
-        MainRaindropInstance = RaindropInstance.GlobalInstance;
-    }
-
-}

Assets/Raindrop/Unity3D/TerrainMeshUpdater.cs

@@ -8,6 +8,8 @@ using UnityEngine;
 using Raindrop.Rendering;
 using OpenMetaverse;
 using System.Threading;
+using RenderSettings = Raindrop.Rendering.RenderSettings;
+using OpenMetaverse.Rendering;
 
 namespace Raindrop.Unity3D
 {
@@ -15,37 +17,104 @@ namespace Raindrop.Unity3D
     class TerrainMeshUpdater : MonoBehaviour
     {
         private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
+        private GridClient Client { get { return instance.Client; } }
         private RaindropNetcom netcom { get { return instance.Netcom; } }
         bool Active => instance.Client.Network.Connected;
 
-
-
-        public bool Modified = true;
-        float[,] heightTable = new float[256, 256];
-        bool fetchingTerrainTexture = false;
+        //unity DS
         Texture2D terrainImage = null;
         MeshRenderer meshRenderer;
-        bool terrainTextureNeedsUpdate = false;
+        MeshFilter meshFilter;
+        UnityEngine.Mesh terrainMesh;
+
+        UnityEngine.Vector3[] newVertices;
+        UnityEngine.Vector2[] newUV;
+        int[] newTriangles;
+
+
+        bool Modified = true;                    //is the terrain data in OSL(backend) modified since our rendering?
+        float[,] heightTable = new float[256, 256];     //heightmap of terrain
+        bool fetchingTerrainTexture = false;            //semaphore for reading terrain tex.
+        bool terrainTextureNeedsUpdate = false;         //does the texture need to be redrawn?
         private OpenMetaverse.Simulator knownCurrentSim;
+        float terrainTimeSinceUpdate = Rendering.RenderSettings.MinimumTimeBetweenTerrainUpdated + 1f; // Update terrain om first run
+        bool terrainInProgress = false;
+        MeshmerizerR renderer;
+        //private float lastTimeItRendered = 0f;
+
+        Simulator sim => instance.Client.Network.CurrentSim;
+
+        Face terrainFace; //seems like a 'face' is the secondlife kind of face (where each prim can have up to 8 faces.)
+        ColorVertex[] terrainVertices;
+        uint[] terrainIndices;
 
         private void Awake()
         {
-            MeshRenderer meshRenderer = gameObject.AddComponent<MeshRenderer>();
+            //1 mesh renderer component
+            meshRenderer = gameObject.AddComponent<MeshRenderer>();
             meshRenderer.sharedMaterial = new UnityEngine.Material(Shader.Find("Standard")); //hopefully this not use reflection.
 
+            //2 mesh filter component (owns the mesh)
+            meshFilter = gameObject.AddComponent<MeshFilter>();
+            
+            //2.1 make terrain mesh of 256*256 at zero height and pass to meshfilter
+            terrainMesh = new UnityEngine.Mesh(); //make the mesh.
+            GetComponent<MeshFilter>().mesh = terrainMesh;         //assign this mesh to the meshfiltercomponent
+
+            //mesh.vertices = newVertices;
+            //mesh.uv = newUV;
+            //mesh.triangles = newTriangles;
+            buildBasicLandMesh();
+
+
         }
 
+        private void Start()
+        {
+
+
+            Client.Terrain.LandPatchReceived += new EventHandler<LandPatchReceivedEventArgs>(Terrain_LandPatchReceived);
+
+
+        }
+
+
+        void Terrain_LandPatchReceived(object sender, LandPatchReceivedEventArgs e)
+        {
+            if (e.Simulator.Handle == Client.Network.CurrentSim.Handle)
+            {
+                this.Modified = true;
+            }
+        }
+
+        private void buildBasicLandMesh()
+        {
+
+            int step = 1;
+            for (int x = 0; x < 256; x += step)
+            {
+                for (int y = 0; y < 256; y += step)
+                {
+                    float z = 0;
+                    UnityEngine.Vector3[] newVertices;
+
+                    heightTable[x, y] = z;
+                }
+            }
+        }
+
+
         private void Update()
         {
-            if (! Active)
+            if (! Active) //guard clause: don't continue if disconnected
             {
                 return;
             }
 
-            if (instance.Client.Network.CurrentSim != knownCurrentSim)
+            if (instance.Client.Network.CurrentSim != knownCurrentSim) //different sim now.
             {
                 knownCurrentSim = instance.Client.Network.CurrentSim;
-                resetMesh();
+                ResetTerrain();
             }
 
 
@@ -54,9 +123,117 @@ namespace Raindrop.Unity3D
                 UpdateTerrainTexture();
             }
 
+            render(Time.deltaTime);
+
         }
 
-        private void resetMesh()
+        //this performs re-meshing and re-texturing. ONLY IF MODIFIED and sufficient time elapsed.
+        private void render(float timeSinceLastFrame)
+        {
+            terrainTimeSinceUpdate += timeSinceLastFrame;
+
+            if (sim.Terrain == null)
+            {
+                return;
+            } 
+
+            if (Modified && terrainTimeSinceUpdate > RenderSettings.MinimumTimeBetweenTerrainUpdated)
+            {
+                Debug.Log("Processing new rendering of terrain!");
+
+                if (!terrainInProgress)
+                {
+                    terrainInProgress = true;
+                    ResetTerrain(/*false*/);
+                    UpdateTerrain();
+                }
+            }
+
+            if (terrainTextureNeedsUpdate)
+            {
+                UpdateTerrainTexture();
+            }
+
+
+            if (terrainIndices == null || terrainVertices == null)
+            {
+                Debug.Log("terrain indices is null");
+                return;
+            }
+
+            //set texture to mesh
+
+
+
+            //update / draw new mesh.
+
+
+        }
+        private void UpdateTerrain()
+        {
+            if (sim == null || sim.Terrain == null)
+            {
+                Debug.Log("update terrain failed as the sim or terrain is null");
+                return;
+            }
+
+            Debug.Log("putting into threadpool");
+
+            ThreadPool.QueueUserWorkItem(sync =>
+            {
+                Debug.Log("QueueUserWorkItem");
+                int step = 1;
+
+                for (int x = 0; x < 256; x += step)
+                {
+                    for (int y = 0; y < 256; y += step)
+                    {
+                        float z = 0;
+                        int patchNr = ((int)x / 16) * 16 + (int)y / 16;
+                        if (sim.Terrain[patchNr] != null
+                            && sim.Terrain[patchNr].Data != null)
+                        {
+                            float[] data = sim.Terrain[patchNr].Data;
+                            z = data[(int)x % 16 * 16 + (int)y % 16];
+                        }
+                        heightTable[x, y] = z;
+                    }
+                }
+
+                terrainFace = renderer.TerrainMesh(heightTable, 0f, 255f, 0f, 255f); //generate mesh with heights //the result is a huge struct 'Face'
+
+                Debug.Log("terrainFace geenerated");
+                //generate mesh with colors
+                terrainVertices = new ColorVertex[terrainFace.Vertices.Count];
+                for (int i = 0; i < terrainFace.Vertices.Count; i++) //for each vert in terrainFace, append the vert to terraiVerticies
+                {
+                    byte[] part = Utils.IntToBytes(i);
+                    terrainVertices[i] = new ColorVertex()
+                    {
+                        Vertex = terrainFace.Vertices[i],
+                        Color = new Color4b()
+                        {
+                            R = part[0],
+                            G = part[1],
+                            B = part[2],
+                            A = 253 // terrain picking
+                        }
+                    };
+                }
+                terrainIndices = new uint[terrainFace.Indices.Count];
+                for (int i = 0; i < terrainIndices.Length; i++)
+                {
+                    terrainIndices[i] = terrainFace.Indices[i];
+                }
+                terrainInProgress = false;
+                Modified = false;
+                terrainTextureNeedsUpdate = true;
+                terrainTimeSinceUpdate = 0f;
+            });
+        }
+
+        //delete terrain tex 
+        private void ResetTerrain()
         {
             if (terrainImage != null)
             {
@@ -66,6 +243,9 @@ namespace Raindrop.Unity3D
 
             fetchingTerrainTexture = false;
             Modified = true;
+
+            //temporary
+            //terrainTextureNeedsUpdate = true;
         }
 
 
@@ -84,6 +264,7 @@ namespace Raindrop.Unity3D
 
                     fetchingTerrainTexture = false;
                     terrainTextureNeedsUpdate = false;
+                    meshRenderer.material.mainTexture = terrainImage;
                 });
             }
         }

Assets/Scenes/3Dscene.unity

@@ -0,0 +1,390 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 9
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 0
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 12
+  m_GIWorkflowMode: 1
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 1
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 1
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 500
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 500
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 2
+    m_PVRDenoiserTypeDirect: 0
+    m_PVRDenoiserTypeIndirect: 0
+    m_PVRDenoiserTypeAO: 0
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 0
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 0}
+  m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 2
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    accuratePlacement: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &558395079
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 558395080}
+  - component: {fileID: 558395082}
+  - component: {fileID: 558395081}
+  m_Layer: 0
+  m_Name: MainCamera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &558395080
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 558395079}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 1.14, y: 1, z: -2.92}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!81 &558395081
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 558395079}
+  m_Enabled: 1
+--- !u!20 &558395082
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 558395079}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0.45490196, g: 0.7254902, b: 1, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!1 &1332679519
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1332679523}
+  - component: {fileID: 1332679522}
+  - component: {fileID: 1332679521}
+  - component: {fileID: 1332679520}
+  - component: {fileID: 1332679524}
+  m_Layer: 0
+  m_Name: MainAgent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!136 &1332679520
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1332679519}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.5
+  m_Height: 2
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &1332679521
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1332679519}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1332679522
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1332679519}
+  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &1332679523
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1332679519}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1332679524
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1332679519}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5e54be4f9b460e64cbe1a7a1a8f900f9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &1735618709
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1735618710}
+  m_Layer: 0
+  m_Name: ===Scene===
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1735618710
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1735618709}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1917910577
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1917910580}
+  - component: {fileID: 1917910579}
+  m_Layer: 0
+  m_Name: terrain
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1917910579
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1917910577}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 273bea64f85319b47951a7be20af4cc6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &1917910580
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1917910577}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 127.15117, y: 32.323757, z: 133.57854}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Scenes/3Dscene.unity.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 76f8bd3fe0677274192d7e8f6b160b17
-AssemblyDefinitionImporter:
+guid: e4b15a01227c10445b0a25ca88394bb4
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/Scenes/UIscene.unity

@@ -812,7 +812,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &83400467
 GameObject:
@@ -975,7 +975,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &87325354
 GameObject:
@@ -2404,36 +2404,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 234840926}
   m_CullTransparentMesh: 1
---- !u!1 &244426248
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 244426249}
-  m_Layer: 0
-  m_Name: ===Managers and entrypoints===
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &244426249
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 244426248}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &274049924
 GameObject:
   m_ObjectHideFlags: 0
@@ -2642,7 +2612,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
       propertyPath: m_AnchorMax.x
@@ -2999,89 +2969,6 @@ MonoBehaviour:
     Duration: 0
     Target: {fileID: 8300000, guid: 622df6012652bdb498c7ec99b1b8a532, type: 3}
     Volume: 1
---- !u!1 &344191852
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 344191853}
-  - component: {fileID: 344191855}
-  - component: {fileID: 344191854}
-  m_Layer: 0
-  m_Name: FAKEcamera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &344191853
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 344191852}
-  m_LocalRotation: {x: -0.3767847, y: -0.47403342, z: 0.2217192, w: -0.7643077}
-  m_LocalPosition: {x: 1.14, y: 0.6, z: -2.92}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 1704212244}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 51.828, y: 424.44, z: 1.696}
---- !u!81 &344191854
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 344191852}
-  m_Enabled: 1
---- !u!20 &344191855
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 344191852}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 2
-  m_BackGroundColor: {r: 0.45490196, g: 0.7254902, b: 1, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
 --- !u!1 &349949368
 GameObject:
   m_ObjectHideFlags: 0
@@ -3489,6 +3376,89 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 384628818}
   m_CullTransparentMesh: 1
+--- !u!1 &394034789
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 394034792}
+  - component: {fileID: 394034791}
+  - component: {fileID: 394034790}
+  m_Layer: 0
+  m_Name: Camera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &394034790
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 394034789}
+  m_Enabled: 1
+--- !u!20 &394034791
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 394034789}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &394034792
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 394034789}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 18.044964, y: 33.13624, z: 48.727985}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &403228333
 GameObject:
   m_ObjectHideFlags: 0
@@ -4864,89 +4834,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 556119608}
   m_CullTransparentMesh: 1
---- !u!1 &558395079
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 558395080}
-  - component: {fileID: 558395082}
-  - component: {fileID: 558395081}
-  m_Layer: 0
-  m_Name: FAKEcamera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &558395080
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 558395079}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 1.14, y: 1, z: -2.92}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 2094826594}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!81 &558395081
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 558395079}
-  m_Enabled: 1
---- !u!20 &558395082
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 558395079}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 2
-  m_BackGroundColor: {r: 0.45490196, g: 0.7254902, b: 1, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
 --- !u!1 &580970142
 GameObject:
   m_ObjectHideFlags: 0
@@ -7096,7 +6983,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &721455755
 GameObject:
@@ -9556,7 +9443,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &902984666
 GameObject:
@@ -10930,89 +10817,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 954444553}
   m_CullTransparentMesh: 1
---- !u!1 &963194225
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 963194228}
-  - component: {fileID: 963194227}
-  - component: {fileID: 963194226}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!81 &963194226
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 963194225}
-  m_Enabled: 1
---- !u!20 &963194227
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 963194225}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 2
-  m_BackGroundColor: {r: 0.45490196, g: 0.7254902, b: 1, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!4 &963194228
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 963194225}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 9
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &970949438
 GameObject:
   m_ObjectHideFlags: 0
@@ -14644,102 +14448,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1313977366}
   m_CullTransparentMesh: 1
---- !u!1 &1332679519
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1332679523}
-  - component: {fileID: 1332679522}
-  - component: {fileID: 1332679521}
-  - component: {fileID: 1332679520}
-  m_Layer: 0
-  m_Name: MainAgent
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!136 &1332679520
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1332679519}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.5
-  m_Height: 2
-  m_Direction: 1
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &1332679521
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1332679519}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &1332679522
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1332679519}
-  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
---- !u!4 &1332679523
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1332679519}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 7
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1336933096
 GameObject:
   m_ObjectHideFlags: 0
@@ -15899,7 +15607,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0.0026245117}
+  m_AnchoredPosition: {x: 0, y: 0.0026855469}
   m_SizeDelta: {x: -283.6416, y: -213.12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1430441572
@@ -18445,6 +18153,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1661772798}
+  - component: {fileID: 1661772799}
   m_Layer: 0
   m_Name: UI
   m_TagString: Untagged
@@ -18470,8 +18179,20 @@ Transform:
   - {fileID: 2036252509}
   - {fileID: 1577540113}
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1661772799
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1661772797}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5dbfabecbcda5bb47b7800f9d748db3b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1668809821
 GameObject:
   m_ObjectHideFlags: 0
@@ -18828,7 +18549,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.00012207031, y: 0.000042951364}
+  m_AnchoredPosition: {x: -0.00012207031, y: 0.00039465618}
   m_SizeDelta: {x: 0, y: 240}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1696326125
@@ -19005,37 +18726,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1696932006}
   m_CullTransparentMesh: 1
---- !u!1 &1704212243
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1704212244}
-  m_Layer: 0
-  m_Name: LoginScene
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1704212244
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1704212243}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 344191853}
-  m_Father: {fileID: 0}
-  m_RootOrder: 8
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1705436869
 GameObject:
   m_ObjectHideFlags: 0
@@ -19197,7 +18887,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 1570.9, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: -1570.9, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1705877574
@@ -19637,36 +19327,6 @@ MonoBehaviour:
     Duration: 0
     Target: {fileID: 8300000, guid: 622df6012652bdb498c7ec99b1b8a532, type: 3}
     Volume: 1
---- !u!1 &1735618709
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1735618710}
-  m_Layer: 0
-  m_Name: ===Scene===
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1735618710
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1735618709}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 6
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1738246286
 GameObject:
   m_ObjectHideFlags: 0
@@ -21517,49 +21177,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1880999496}
   m_CullTransparentMesh: 1
---- !u!1 &1889810039
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1889810040}
-  - component: {fileID: 1889810042}
-  m_Layer: 0
-  m_Name: MetaverseClient
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1889810040
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1889810039}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1889810042
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1889810039}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55c6aede8bf73ca48b10f0d9e2e771f0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1889936407
 GameObject:
   m_ObjectHideFlags: 0
@@ -24596,7 +24213,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 234840928}
   m_HandleRect: {fileID: 234840927}
   m_Direction: 0
-  m_Value: 0
+  m_Value: 1
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -25004,103 +24621,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
---- !u!1 &2094826590
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2094826594}
-  - component: {fileID: 2094826593}
-  - component: {fileID: 2094826592}
-  - component: {fileID: 2094826591}
-  m_Layer: 0
-  m_Name: FAKEUSER
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!136 &2094826591
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2094826590}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.5
-  m_Height: 2
-  m_Direction: 1
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &2094826592
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2094826590}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &2094826593
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2094826590}
-  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
---- !u!4 &2094826594
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2094826590}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 558395080}
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2106375842
 GameObject:
   m_ObjectHideFlags: 0
@@ -25553,7 +25073,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 2056656629}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.99999774
+  m_Size: 0.9995705
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -25734,7 +25254,6 @@ GameObject:
   - component: {fileID: 2117146650}
   - component: {fileID: 2117146649}
   - component: {fileID: 2117146648}
-  - component: {fileID: 2117146651}
   m_Layer: 5
   m_Name: LoadingCanvas
   m_TagString: Untagged
@@ -25823,18 +25342,6 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 30
   m_TargetDisplay: 0
---- !u!114 &2117146651
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2117146646}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d4624f0ac24806c4594a78f36da30bd9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &2138745510
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/empttyscene.unity

@@ -0,0 +1,125 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 9
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 0
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 12
+  m_GIWorkflowMode: 1
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 1
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 1
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 1
+    m_PVRDenoiserTypeDirect: 1
+    m_PVRDenoiserTypeIndirect: 1
+    m_PVRDenoiserTypeAO: 1
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 0}
+  m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 2
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    accuratePlacement: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}

Assets/Scenes/empttyscene.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a9f35cb3e179fef4389cf769af057e55
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Tests/RaindropTests.cs

@@ -39,7 +39,8 @@ namespace Raindrop.Tests
 
             //get viewmodel to login.
             //getCurrentForeground gives us the loginVM, which we then call onloginbtnclick from.
-            GameObject temp = (GameObject)instance.UI.getCurrentForegroundPresenter();
+            var servicer = ServiceLocatorSample.ServiceLocator.ServiceLocator.Current;
+            GameObject temp = (GameObject)servicer.Get<UIManager>().getCurrentForegroundPresenter();
             if (temp == null)
             {
 

Assets/csc.rsp

@@ -0,0 +1 @@
+-r:System.Web.dll

Assets/csc.rsp.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f64d16735d0730b4dae296641e1b13c2
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/EditorBuildSettings.asset

@@ -9,6 +9,6 @@ EditorBuildSettings:
     path: Assets/Scenes/SampleScene.unity
     guid: 9fc0d4010bbf28b4594072e72b8655ab
   - enabled: 1
-    path: Assets/Scenes/newUI.unity
+    path: Assets/Scenes/UIscene.unity
     guid: a72b6cd7ea683e5459da82491579217e
   m_configObjects: {}

ProjectSettings/ProjectSettings.asset

@@ -692,7 +692,7 @@ PlayerSettings:
   assemblyVersionValidation: 1
   gcWBarrierValidation: 0
   apiCompatibilityLevelPerPlatform:
-    Android: 3
+    Android: 6
     Standalone: 6
   m_RenderingPath: 1
   m_MobileRenderingPath: 1