OpenSimulator GForge > Projects > Xenki Viewer > SVN

Diff of /trunk/DefaultRenderer/DefaultRenderer.cs

-revision 101, Wed Dec 24 01:46:48 2008 UTC
+revision 102, Wed Dec 24 10:45:27 2008 UTC
 Line 17
  using log4net;
  using System.Reflection;
  using Xenki.References;
+ using System.Timers;
  namespace Xenki.DefaultRenderer
  {
+     public delegate void NeedDownloadTexture(UUID textureid);
-     class DefaultRenderer : IRenderer
+     public class DefaultRenderer : IRenderer
      {
          private readonly Viewport3D m_viewport;
          private readonly PerspectiveCamera m_camera;
          private CameraControl m_cameracontrol;
          private IRendering m_mesher;
-         private DefaultTexture m_textureManager;
+         //private DefaultTexture m_textureManager;
+         public event NeedDownloadTexture OnNeedDownloadTexture;
          private DefaultDataControl m_primitiveData;
          private HotkeyDispatcher m_HotkeyDispatcher = HotkeyDispatcher.GetInstance();
-Line 42
+Line 46
          private double[,] m_heightmap = new double[256,256];
          private ModelVisual3D m_terrain;
+         private double[,] m_terrainpatch = new double[256, 256];
+         private Timer m_terrainSetTimer = new Timer(1000);
+         private Timer m_cameraTimer = new Timer(1000);
          private readonly DiffuseMaterial m_terrainMaterial;
          private string textureImageFolderPath = EnvironmentSettings.TextureTempFolder;
-Line 50
+Line 58
          private int EnvirementCircleLength = References.EnvironmentSettings.EnvirementCircleLength;
+         private uint m_MySelfLocalID;
+         public uint MySelfLocalID
+         {
+             get { return m_MySelfLocalID; }
+             set { m_MySelfLocalID = value; }
+         }
          private GridClient gridClient;
          public GridClient Gridclient
-Line 58
+Line 73
              set
              {
                  gridClient = value;
-                 m_textureManager = DefaultTexture.SingleTextureManager();
-                 m_textureManager.GridClient = Gridclient;
-                 m_textureManager.OnDownloadFinished = OnTextureDownloaded;
-                 m_textureManager.StartDownload();
              }
          }
-Line 137
+Line 147
              //m_viewport.Children.Add(DefaultUtil.CreateCube(new Point3D(0,0,0), new Point3D(256,256,20),
              //    material));
+             //m_terrainSetTimer.Elapsed += m_terrainSetTimer_Elapsed;
+             //m_cameraTimer.Elapsed += m_cameraTimer_Elapsed;
          }
-Line 300
+Line 313
                   Avatar avatar = data as Avatar;
                  v = CreateModel_Avatar(data);
-                 if (data.LocalID == gridClient.Self.LocalID)
+                 if (data.LocalID == MySelfLocalID)
                  {
                      avatarManager.Myself.avatar = avatar;
                       Vector3D direction = new Vector3D( m_camera.LookDirection.X, m_camera.LookDirection.Y, 0);
-Line 517
+Line 530
                          triangleModel = new GeometryModel3D(
                              mesh, new DiffuseMaterial(new SolidColorBrush(col)));
+                         if(OnNeedDownloadTexture!=null)
-                         m_textureManager.RequestTexture(DefaultTexture.TextureID);
+                             OnNeedDownloadTexture(DefaultTexture.TextureID);
                          m_primitiveData.AddNeedTextureModel(LocalID, DefaultTexture.TextureID);
                      }
                  }
-Line 713
+Line 726
          public void SetTerrain(int x, int y, double val)
          {
              m_heightmap[x, y] = val;
          }
          public void SetTerrain(double[,] map)
          {
+             //if (width != 16)
+             //    return;
+             //x *= 16;
+             //y *= 16;
+             //int i = 0;
+             //for (int tx = 0; tx < 16; tx++)
+             //{
+             //    for (int ty = 0; ty < 16; ty++)
+             //    {
+             //        m_terrainpatch[x + ty, y + tx] = data[i++];
+             //    }
+             //}
+             //m_terrainSetTimer.Stop();
+             //m_terrainSetTimer.AutoReset = false;
+             //m_terrainSetTimer.Start();
              m_heightmap = map;
              m_viewport.Dispatcher.Invoke(
-Line 734
+Line 768
                  );
          }
+         void m_terrainSetTimer_Elapsed(object sender, ElapsedEventArgs e)
+         {
+             //log("Refreshing terrain...");
+            // m_renderer.SetTerrain(m_terrainpatch);
+         }
          void avatarManager_OnAvatarPosChanged(uint avatarid, Point3D oldpos, Point3D newpos, Vector3D avatarlookdirection)
          {
              ShowModelAround(newpos, this.EnvirementCircleLength);

 Legend:



Removed from v.101
 


changed lines


 
Added in v.102
 Legend:



Removed from v.101
 


changed lines


 
Added in v.102
-Removed from v.101
+Added in v.102

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

Xenki Viewer

Diff of /trunk/DefaultRenderer/DefaultRenderer.cs