Merge remote-tracking branch 'remotes/hessbe/master' into release-0.1
This commit is contained in:
commit
7dd37b1608
1 file changed
+19
-36
@@ -46,7 +46,7 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
private SClientRect _restore;
|
private SClientRect _restore;
|
||||||
private bool _fullscreen = false;
|
private bool _fullscreen = false;
|
||||||
|
|
||||||
private List<STexture> _Textures;
|
private Dictionary<int, STexture> _Textures;
|
||||||
private Queue<int> _IDs;
|
private Queue<int> _IDs;
|
||||||
private List<STextureQueque> _Queque;
|
private List<STextureQueque> _Queque;
|
||||||
|
|
||||||
@@ -65,7 +65,7 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
{
|
{
|
||||||
this.Icon = new System.Drawing.Icon(Path.Combine(System.Environment.CurrentDirectory, CSettings.sIcon));
|
this.Icon = new System.Drawing.Icon(Path.Combine(System.Environment.CurrentDirectory, CSettings.sIcon));
|
||||||
|
|
||||||
_Textures = new List<STexture>();
|
_Textures = new Dictionary<int, STexture>();
|
||||||
_Queque = new List<STextureQueque>();
|
_Queque = new List<STextureQueque>();
|
||||||
_IDs = new Queue<int>(1000000);
|
_IDs = new Queue<int>(1000000);
|
||||||
|
|
||||||
@@ -456,7 +456,6 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
if (_Run)
|
if (_Run)
|
||||||
{
|
{
|
||||||
ClearScreen();
|
ClearScreen();
|
||||||
|
|
||||||
_Run = _Run && CGraphics.Draw();
|
_Run = _Run && CGraphics.Draw();
|
||||||
|
|
||||||
_Run = CGraphics.UpdateGameLogic(_Keys, _Mouse);
|
_Run = CGraphics.UpdateGameLogic(_Keys, _Mouse);
|
||||||
@@ -483,11 +482,13 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
|
|
||||||
public bool Unload()
|
public bool Unload()
|
||||||
{
|
{
|
||||||
while (_Textures.Count > 0)
|
STexture[] textures = new STexture[_Textures.Count];
|
||||||
|
_Textures.Values.CopyTo(textures, 0);
|
||||||
|
for (int i = 0; i < _Textures.Count; i++ )
|
||||||
{
|
{
|
||||||
STexture tex = _Textures[0];
|
RemoveTexture(ref textures[i]);
|
||||||
RemoveTexture(ref tex);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -554,7 +555,7 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
lock (MutexTexture)
|
lock (MutexTexture)
|
||||||
{
|
{
|
||||||
texture.index = _IDs.Dequeue();
|
texture.index = _IDs.Dequeue();
|
||||||
_Textures.Add(texture);
|
_Textures[texture.index] = texture;
|
||||||
}
|
}
|
||||||
|
|
||||||
return texture;
|
return texture;
|
||||||
@@ -758,7 +759,7 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
lock (MutexTexture)
|
lock (MutexTexture)
|
||||||
{
|
{
|
||||||
texture.index = _IDs.Dequeue();
|
texture.index = _IDs.Dequeue();
|
||||||
_Textures.Add(texture);
|
_Textures[texture.index] = texture;
|
||||||
}
|
}
|
||||||
|
|
||||||
return texture;
|
return texture;
|
||||||
@@ -822,7 +823,7 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
lock (MutexTexture)
|
lock (MutexTexture)
|
||||||
{
|
{
|
||||||
texture.index = _IDs.Dequeue();
|
texture.index = _IDs.Dequeue();
|
||||||
_Textures.Add(texture);
|
_Textures[texture.index] = texture;
|
||||||
}
|
}
|
||||||
|
|
||||||
return texture;
|
return texture;
|
||||||
@@ -887,7 +888,7 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
lock (MutexTexture)
|
lock (MutexTexture)
|
||||||
{
|
{
|
||||||
texture.index = _IDs.Dequeue();
|
texture.index = _IDs.Dequeue();
|
||||||
_Textures.Add(texture);
|
_Textures[texture.index] = texture;
|
||||||
}
|
}
|
||||||
|
|
||||||
return texture;
|
return texture;
|
||||||
@@ -907,7 +908,7 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
texture.index = _IDs.Dequeue();
|
texture.index = _IDs.Dequeue();
|
||||||
queque.ID = texture.index;
|
queque.ID = texture.index;
|
||||||
_Queque.Add(queque);
|
_Queque.Add(queque);
|
||||||
_Textures.Add(texture);
|
_Textures[texture.index] = texture;
|
||||||
}
|
}
|
||||||
|
|
||||||
return texture;
|
return texture;
|
||||||
@@ -1026,22 +1027,14 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
if ((Texture.index > 0) && (_Textures.Count > 0))
|
if ((Texture.index > 0) && (_Textures.Count > 0))
|
||||||
{
|
{
|
||||||
lock (MutexTexture)
|
lock (MutexTexture)
|
||||||
{
|
|
||||||
for (int i = 0; i < _Textures.Count; i++)
|
|
||||||
{
|
|
||||||
if (_Textures[i].index == Texture.index)
|
|
||||||
{
|
{
|
||||||
_IDs.Enqueue(Texture.index);
|
_IDs.Enqueue(Texture.index);
|
||||||
|
|
||||||
GL.DeleteTexture(Texture.ID);
|
GL.DeleteTexture(Texture.ID);
|
||||||
if (Texture.PBO > 0)
|
if (Texture.PBO > 0)
|
||||||
GL.DeleteBuffers(1, ref Texture.PBO);
|
GL.DeleteBuffers(1, ref Texture.PBO);
|
||||||
_Textures.RemoveAt(i);
|
_Textures.Remove(Texture.index);
|
||||||
Texture.index = -1;
|
Texture.index = -1;
|
||||||
Texture.ID = -1;
|
Texture.ID = -1;
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1050,17 +1043,13 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
{
|
{
|
||||||
lock (MutexTexture)
|
lock (MutexTexture)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < _Textures.Count; i++)
|
if(_Textures.ContainsKey((Texture.index)))
|
||||||
{
|
{
|
||||||
if (Texture.index == _Textures[i].index)
|
if(_Textures[Texture.index].ID > 0)
|
||||||
{
|
{
|
||||||
if (_Textures[i].ID > 0)
|
Texture = _Textures[Texture.index];
|
||||||
{
|
|
||||||
Texture = _Textures[i];
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@@ -1338,15 +1327,9 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
|
|
||||||
STextureQueque q = _Queque[0];
|
STextureQueque q = _Queque[0];
|
||||||
STexture texture = new STexture(-1);
|
STexture texture = new STexture(-1);
|
||||||
int index = -1;
|
if (_Textures.ContainsKey(q.ID))
|
||||||
for (int i = 0; i < _Textures.Count; i++)
|
|
||||||
{
|
{
|
||||||
if (_Textures[i].index == q.ID)
|
texture = _Textures[q.ID];
|
||||||
{
|
|
||||||
texture = _Textures[i];
|
|
||||||
index = i;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (texture.index < 1)
|
if (texture.index < 1)
|
||||||
@@ -1396,7 +1379,7 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
texture.rect = new SRectF(0f, 0f, texture.width, texture.height, 0f);
|
texture.rect = new SRectF(0f, 0f, texture.width, texture.height, 0f);
|
||||||
texture.TexturePath = String.Empty;
|
texture.TexturePath = String.Empty;
|
||||||
|
|
||||||
_Textures[index] = texture;
|
_Textures[texture.index] = texture;
|
||||||
q.data = null;
|
q.data = null;
|
||||||
_Queque.RemoveAt(0);
|
_Queque.RemoveAt(0);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user