OpenSimulator GForge > Projects > IdealistViewer > SVN

Diff of /trunk/IdealistViewer/Application/BaseIdealistViewer.cs

-revision 21, Tue Oct 28 10:14:35 2008 UTC
+revision 22, Tue Oct 28 10:48:26 2008 UTC
 Line 38
          private static Queue<VObject> objectModQueue = new Queue<VObject>();
          private static Queue<VObject> UnAssignedChildObjectModQueue = new Queue<VObject>();
+         private static Queue<TextureComplete> assignTextureQueue = new Queue<TextureComplete>();
          private static Simulator currentSim;
-Line 242
+Line 244
              device.OnEvent += new OnEventDelegate(device_OnEvent);
              if (loadTextures)
+             {
              textureMan = new TextureManager(device, driver, "IdealistCache", avatarConnection);
+                 textureMan.OnTextureLoaded += textureCompleteCallback;
+             }
              //guienv.AddStaticText("Hello World! This is the Irrlicht Software engine!",
              //    new Rect(new Position2D(10, 10), new Dimension2D(200, 22)), true, false, guienv.RootElement, -1, false);
-Line 360
+Line 365
                  {
                      doObjectMods(5);
                      CheckAndApplyParent(5);
+                     doTextureMods();
                  }
                  //Thread.Sleep(50);
                  int frameTime = System.Environment.TickCount - tickcount;
-Line 372
+Line 378
          }
+         private void doTextureMods()
+         {
+             lock (assignTextureQueue)
+             {
+                 while (assignTextureQueue.Count > 0)
+                 {
+                     TextureComplete tx = assignTextureQueue.Dequeue();
+                     Texture tex = driver.GetTexture(tx.texture);
+                     if (tx.node != null)
+                     {
+                         textureMan.applyTexture(tex, tx.node);
+                     }
+                 }
+             }
+         }
          #region Object Management
          public void enqueueVObject(VObject newObject)
-Line 1642
+Line 1664
          #endregion
+         public void textureCompleteCallback(string tex, SceneNode node)
+         {
+             TextureComplete tx = new TextureComplete();
+             tx.texture = tex;
+             tx.node = node;
+             assignTextureQueue.Enqueue(tx);
+         }
+     }
+     public struct TextureComplete
+     {
+         public SceneNode node;
+         public string texture;
      }
  }

 Legend:



Removed from v.21
 


changed lines


 
Added in v.22
 Legend:



Removed from v.21
 


changed lines


 
Added in v.22
-Removed from v.21
+Added in v.22

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

IdealistViewer

Diff of /trunk/IdealistViewer/Application/BaseIdealistViewer.cs