Some styling for Draw classes
This commit is contained in:
1 parent
5587a322be
commit
914f15f0ad
2 files changed
+20
-32
No files matched your search
@@ -246,8 +246,8 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
// The window was minimized, so restore it to the last known size
|
// The window was minimized, so restore it to the last known size
|
||||||
if (ClientSize.Width == 0 || ClientSize.Height == 0)
|
if (ClientSize.Width == 0 || ClientSize.Height == 0)
|
||||||
ClientSize = _SizeBeforeMinimize;
|
ClientSize = _SizeBeforeMinimize;
|
||||||
if (_Run)
|
if (!_Run)
|
||||||
{
|
return;
|
||||||
_H = ClientSize.Height;
|
_H = ClientSize.Height;
|
||||||
_W = ClientSize.Width;
|
_W = ClientSize.Width;
|
||||||
_Y = 0;
|
_Y = 0;
|
||||||
@@ -280,7 +280,6 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
//Store size so it can get restored after the window gets minimized
|
//Store size so it can get restored after the window gets minimized
|
||||||
_SizeBeforeMinimize = ClientSize;
|
_SizeBeforeMinimize = ClientSize;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Triggers the Fullscreen mode
|
/// Triggers the Fullscreen mode
|
||||||
|
|||||||
@@ -440,10 +440,6 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
}
|
}
|
||||||
|
|
||||||
while (_Run)
|
while (_Run)
|
||||||
{
|
|
||||||
Application.DoEvents();
|
|
||||||
|
|
||||||
if (_Run)
|
|
||||||
{
|
{
|
||||||
ClearScreen();
|
ClearScreen();
|
||||||
if (!CGraphics.Draw())
|
if (!CGraphics.Draw())
|
||||||
@@ -453,7 +449,7 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
|
|
||||||
_Control.SwapBuffers();
|
_Control.SwapBuffers();
|
||||||
|
|
||||||
if ((CSettings.IsFullScreen && !_Fullscreen) || (!CSettings.IsFullScreen && _Fullscreen))
|
if (CSettings.IsFullScreen != _Fullscreen)
|
||||||
_ToggleFullScreen();
|
_ToggleFullScreen();
|
||||||
|
|
||||||
_CheckQueue();
|
_CheckQueue();
|
||||||
@@ -466,7 +462,8 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
|
|
||||||
CTime.CalculateFPS();
|
CTime.CalculateFPS();
|
||||||
CTime.Restart();
|
CTime.Restart();
|
||||||
}
|
|
||||||
|
Application.DoEvents();
|
||||||
}
|
}
|
||||||
Close();
|
Close();
|
||||||
}
|
}
|
||||||
@@ -505,11 +502,10 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
{
|
{
|
||||||
CTexture texture = _GetNewTexture(_W, _H);
|
CTexture texture = _GetNewTexture(_W, _H);
|
||||||
|
|
||||||
int id = GL.GenTexture();
|
texture.ID = GL.GenTexture();
|
||||||
GL.BindTexture(TextureTarget.Texture2D, id);
|
GL.BindTexture(TextureTarget.Texture2D, texture.ID);
|
||||||
texture.ID = id;
|
|
||||||
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, texture.W2, texture.H2, 0, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
|
|
||||||
|
|
||||||
|
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, texture.W2, texture.H2, 0, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
|
||||||
GL.CopyTexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, _X, _Y, _W, _H);
|
GL.CopyTexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, _X, _Y, _W, _H);
|
||||||
|
|
||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
|
||||||
@@ -540,7 +536,7 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
{
|
{
|
||||||
GL.BindTexture(TextureTarget.Texture2D, texture.ID);
|
GL.BindTexture(TextureTarget.Texture2D, texture.ID);
|
||||||
|
|
||||||
GL.CopyTexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, 0, 0, texture.UsedWidth, texture.UsedHeight);
|
GL.CopyTexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, 0, 0, GetScreenWidth(), GetScreenHeight());
|
||||||
|
|
||||||
GL.BindTexture(TextureTarget.Texture2D, 0);
|
GL.BindTexture(TextureTarget.Texture2D, 0);
|
||||||
}
|
}
|
||||||
@@ -715,9 +711,8 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
|
|
||||||
CTexture texture = new CTexture(bmp.Width, bmp.Height, w, h, true);
|
CTexture texture = new CTexture(bmp.Width, bmp.Height, w, h, true);
|
||||||
|
|
||||||
int id = GL.GenTexture();
|
texture.ID = GL.GenTexture();
|
||||||
GL.BindTexture(TextureTarget.Texture2D, id);
|
GL.BindTexture(TextureTarget.Texture2D, texture.ID);
|
||||||
texture.ID = id;
|
|
||||||
Bitmap bmp2 = null;
|
Bitmap bmp2 = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -751,10 +746,9 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
|
|
||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
|
||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear);
|
||||||
//GL.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
|
||||||
GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
||||||
|
|
||||||
|
GL.BindTexture(TextureTarget.Texture2D, 0);
|
||||||
// Add to Texture List
|
// Add to Texture List
|
||||||
texture.TexturePath = String.Empty;
|
texture.TexturePath = String.Empty;
|
||||||
|
|
||||||
@@ -800,23 +794,18 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int id = GL.GenTexture();
|
texture.ID = GL.GenTexture();
|
||||||
GL.BindTexture(TextureTarget.Texture2D, id);
|
GL.BindTexture(TextureTarget.Texture2D, texture.ID);
|
||||||
texture.ID = id;
|
|
||||||
|
|
||||||
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, texture.W2, texture.H2, 0, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
|
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, texture.W2, texture.H2, 0, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
|
||||||
|
|
||||||
GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, w, h, PixelFormat.Bgra, PixelType.UnsignedByte, data);
|
GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, w, h, PixelFormat.Bgra, PixelType.UnsignedByte, data);
|
||||||
|
|
||||||
|
|
||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)TextureParameterName.ClampToEdge);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)TextureParameterName.ClampToEdge);
|
||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)TextureParameterName.ClampToEdge);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)TextureParameterName.ClampToEdge);
|
||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
|
||||||
//GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear);
|
|
||||||
|
|
||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear);
|
||||||
//GL.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
|
||||||
GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
||||||
|
|
||||||
GL.BindTexture(TextureTarget.Texture2D, 0);
|
GL.BindTexture(TextureTarget.Texture2D, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -857,6 +846,7 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
GL.UnmapBuffer(BufferTarget.PixelUnpackBuffer);
|
GL.UnmapBuffer(BufferTarget.PixelUnpackBuffer);
|
||||||
|
|
||||||
GL.BindTexture(TextureTarget.Texture2D, texture.ID);
|
GL.BindTexture(TextureTarget.Texture2D, texture.ID);
|
||||||
|
|
||||||
GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, w, h, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
|
GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, w, h, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
|
||||||
|
|
||||||
GL.BindTexture(TextureTarget.Texture2D, 0);
|
GL.BindTexture(TextureTarget.Texture2D, 0);
|
||||||
@@ -869,14 +859,13 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
|
|
||||||
GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, w, h, PixelFormat.Bgra, PixelType.UnsignedByte, data);
|
GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, w, h, PixelFormat.Bgra, PixelType.UnsignedByte, data);
|
||||||
|
|
||||||
//GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)TextureParameterName.ClampToEdge);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)TextureParameterName.ClampToEdge);
|
||||||
//GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)TextureParameterName.ClampToEdge);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)TextureParameterName.ClampToEdge);
|
||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
|
||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear);
|
||||||
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear);
|
||||||
|
GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
||||||
|
|
||||||
//GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear);
|
|
||||||
//GL.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
|
||||||
//GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
|
||||||
GL.BindTexture(TextureTarget.Texture2D, 0);
|
GL.BindTexture(TextureTarget.Texture2D, 0);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
Reference in new issue
Block a user