Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add more queue and update functions

Browse Source 
Add CopyTexture function
Document CDraw
This commit is contained in:
Flamefire committed 2014-09-22 15:08:45 +02:00
1 parent be67b039d6
commit c9c907e3f0
12 files changed
+652 -361
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/CDraw.cs
+273 -87
View File
@@ -20,7 +20,6 @@ using System.Drawing;
using Vocaluxe.Lib.Draw;
using VocaluxeLib;
using VocaluxeLib.Draw;
using VocaluxeLib.Menu;
namespace Vocaluxe.Base
{
@@ -28,6 +27,10 @@ namespace Vocaluxe.Base
{
private static IDraw _Draw;
/// <summary>
/// Initializes the Driver selected in the config
/// </summary>
/// <returns></returns>
public static bool Init()
{
if (_Draw != null)
@@ -74,12 +77,20 @@ namespace Vocaluxe.Base
return _Draw.Init();
}
/// <summary>
/// Has to be called to start rendering <br />
/// Will only return if program is closed <br />
/// Also inits the first screen
/// </summary>
public static void MainLoop()
{
CGraphics.InitFirstScreen();
_Draw.MainLoop();
}
/// <summary>
/// Unloads the current driver, e.g. to switch to another one
/// </summary>
public static void Unload()
{
if (_Draw != null)
@@ -89,87 +100,158 @@ namespace Vocaluxe.Base
}
}
/// <summary>
/// Gets the width of the rendering area
/// </summary>
/// <returns></returns>
public static int GetScreenWidth()
{
return _Draw.GetScreenWidth();
}
/// <summary>
/// Gets the height of the rendering area
/// </summary>
/// <returns></returns>
public static int GetScreenHeight()
{
return _Draw.GetScreenHeight();
}
public static void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2)
{
_Draw.DrawLine(a, r, g, b, w, x1, y1, x2, y2);
}
public static void DrawRect(SColorF color, SRectF rect, float thickness)
{
if (thickness <= 0f)
return;
_Draw.DrawColor(color, new SRectF(rect.X - thickness / 2, rect.Y - thickness / 2, rect.W + thickness, thickness, rect.Z));
_Draw.DrawColor(color, new SRectF(rect.X - thickness / 2, rect.Y + rect.H - thickness / 2, rect.W + thickness, thickness, rect.Z));
_Draw.DrawColor(color, new SRectF(rect.X - thickness / 2, rect.Y - thickness / 2, thickness, rect.H + thickness, rect.Z));
_Draw.DrawColor(color, new SRectF(rect.X + rect.W - thickness / 2, rect.Y - thickness / 2, thickness, rect.H + thickness, rect.Z));
}
public static void DrawColor(SColorF color, SRectF rect)
{
_Draw.DrawColor(color, rect);
}
public static void DrawColorReflection(SColorF color, SRectF rect, float space, float height)
{
_Draw.DrawColorReflection(color, rect, space, height);
}
public static void ClearScreen()
{
_Draw.ClearScreen();
}
public static CTextureRef CopyScreen()
{
return _Draw.CopyScreen();
}
public static void CopyScreen(ref CTextureRef texture)
{
_Draw.CopyScreen(ref texture);
}
/// <summary>
/// Takes a screenshot and saves it to the Screenshot folder
/// </summary>
public static void MakeScreenShot()
{
_Draw.MakeScreenShot();
}
/// <summary>
/// Gets the current screen content as a texture
/// </summary>
/// <returns></returns>
public static CTextureRef CopyScreen()
{
return _Draw.CopyScreen();
}
/// <summary>
/// Gets the current screen content updating the given texture
/// </summary>
/// <param name="texture"></param>
public static void CopyScreen(ref CTextureRef texture)
{
_Draw.CopyScreen(ref texture);
}
/// <summary>
/// Adds a texture from a Bitmap and returns a reference to it<br />
/// Must be called from main thread!
/// </summary>
/// <param name="bitmap"></param>
/// <returns>Reference to texture</returns>
public static CTextureRef AddTexture(Bitmap bitmap)
{
return _Draw.AddTexture(bitmap);
}
/// <summary>
/// Adds a texture from an image file given by its file path<br />
/// Must be called from main thread!
/// </summary>
/// <param name="texturePath"></param>
/// <returns>Reference to texture or null on error</returns>
public static CTextureRef AddTexture(string texturePath)
{
return _Draw.AddTexture(texturePath);
}
/// <summary>
/// Adds a texture from a byte array<br />
/// Must be called from main thread!
/// </summary>
/// <param name="w">Width of the image</param>
/// <param name="h">Height of the image</param>
/// <param name="data">Array of 4 byte values for each pixel</param>
/// <returns>Reference to texture</returns>
public static CTextureRef AddTexture(int w, int h, byte[] data)
{
return _Draw.AddTexture(w, h, data);
}
/// <summary>
/// Requests aadding a texture from a byte array <br />
/// Use this if you add textures from another thread or don't need it immediatelly
/// </summary>
/// <param name="w">Width of the image</param>
/// <param name="h">Height of the image</param>
/// <param name="data">Array of 4 byte values for each pixel</param>
/// <returns>Reference to texture</returns>
public static CTextureRef EnqueueTexture(int w, int h, byte[] data)
{
return _Draw.EnqueueTexture(w, h, data);
}
public static void UpdateTexture(CTextureRef texture, int w, int h, byte[] data)
/// <summary>
/// Requests adding a texture from a bitmap <br />
/// Use this if you add textures from another thread or don't need it immediatelly
/// </summary>
/// <param name="bmp"></param>
/// <returns>Reference to texture</returns>
public static CTextureRef EnqueueTexture(Bitmap bmp)
{
_Draw.UpdateTexture(texture, w, h, data);
return _Draw.EnqueueTexture(bmp);
}
/// <summary>
/// Requests updating a texture from a bitmap<br />
/// Use this if you add textures from another thread or don't need it immediatelly
/// </summary>
/// <param name="textureRef">Reference to the texture to update</param>
/// <param name="bmp"></param>
public static void EnqueueTextureUpdate(CTextureRef textureRef, Bitmap bmp)
{
_Draw.EnqueueTextureUpdate(textureRef, bmp);
}
/// <summary>
/// Creates a copy of the texture <br />
/// Updates to the copy do not affect the original texture
/// </summary>
/// <param name="textureRef">Original texture reference</param>
/// <returns>New texture reference of the copy</returns>
public static CTextureRef CopyTexture(CTextureRef textureRef)
{
return _Draw.CopyTexture(textureRef);
}
/// <summary>
/// Updates a texture, filling it with the new data
/// </summary>
/// <param name="textureRef"></param>
/// <param name="w">Width of the image</param>
/// <param name="h">Height of the image</param>
/// <param name="data">Array of 4 byte values for each pixel</param>
public static void UpdateTexture(CTextureRef textureRef, int w, int h, byte[] data)
{
_Draw.UpdateTexture(textureRef, w, h, data);
}
/// <summary>
/// Updates a texture, filling it with the new data from the bitmap
/// </summary>
/// <param name="textureRef"></param>
/// <param name="bmp"></param>
public static void UpdateTexture(CTextureRef textureRef, Bitmap bmp)
{
_Draw.UpdateTexture(textureRef, bmp);
}
/// <summary>
/// Removes a texture from the VRAM and sets it to null to avoid accidential usage <br />
/// Note: You can also use its Dispose method to do the same as this gets automaticly called from the Dispose method and destructor of a texture reference
/// </summary>
/// <param name="texture"></param>
public static void RemoveTexture(ref CTextureRef texture)
{
// Disposed textures call this, possibly at program end!
@@ -177,52 +259,156 @@ namespace Vocaluxe.Base
_Draw.RemoveTexture(ref texture);
}
public static void DrawTexture(CTextureRef texture)
{
_Draw.DrawTexture(texture);
}
public static void DrawTexture(CTextureRef texture, SRectF rect)
{
_Draw.DrawTexture(texture, rect);
}
public static void DrawTexture(CTextureRef texture, SRectF rect, SColorF color, bool mirrored = false)
{
_Draw.DrawTexture(texture, rect, color, mirrored);
}
public static void DrawTexture(CTextureRef texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored = false)
{
_Draw.DrawTexture(texture, rect, color, bounds, mirrored);
}
public static void DrawTexture(CTextureRef texture, SRectF rect, SColorF color, float begin, float end)
{
_Draw.DrawTexture(texture, rect, color, begin, end);
}
public static void DrawTexture(CStatic staticBounds, CTextureRef texture, EAspect aspect)
{
if (texture == null)
return;
var bounds = new RectangleF(staticBounds.Rect.X, staticBounds.Rect.Y, staticBounds.Rect.W, staticBounds.Rect.H);
RectangleF rect;
CHelper.SetRect(bounds, out rect, texture.OrigAspect, aspect);
DrawTexture(texture, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, staticBounds.Rect.Z),
texture.Color, new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f));
}
public static void DrawTextureReflection(CTextureRef texture, SRectF rect, SColorF color, SRectF bounds, float space, float height)
{
_Draw.DrawTextureReflection(texture, rect, color, bounds, space, height);
}
/// <summary>
/// Returns the number of textures in the VRAM (textures might get reused so this might not be the actual number of textures in use)
/// </summary>
/// <returns></returns>
public static int TextureCount()
{
return _Draw.GetTextureCount();
}
/// <summary>
/// Draws a simple line
/// </summary>
/// <param name="color"></param>
/// <param name="w">Width of the line</param>
/// <param name="x1"></param>
/// <param name="y1"></param>
/// <param name="x2"></param>
/// <param name="y2"></param>
public static void DrawLine(SColorF color, float w, int x1, int y1, int x2, int y2)
{
_Draw.DrawLine(color, w, x1, y1, x2, y2);
}
/// <summary>
/// Draws the outline of a rectangle
/// </summary>
/// <param name="color"></param>
/// <param name="rect"></param>
/// <param name="thickness">Width of the lines</param>
public static void DrawRectOutline(SColorF color, SRectF rect, float thickness)
{
if (thickness <= 0f)
return;
int x1 = (int)rect.X;
int x2 = (int)(rect.X + rect.W);
int y1 = (int)rect.Y;
int y2 = (int)(rect.Y + rect.H);
_Draw.DrawLine(color, thickness, x1, y1, x2, y1);
_Draw.DrawLine(color, thickness, x2, y1, x2, y2);
_Draw.DrawLine(color, thickness, x2, y2, x1, y2);
_Draw.DrawLine(color, thickness, x1, y2, x1, y1);
}
/// <summary>
/// Draws a simple (filled) rectangle with the given color
/// </summary>
/// <param name="color"></param>
/// <param name="rect"></param>
public static void DrawRect(SColorF color, SRectF rect)
{
_Draw.DrawRect(color, rect);
}
/// <summary>
/// Draws the reflection of a filled rectangle with the given color
/// </summary>
/// <param name="color"></param>
/// <param name="rect">(Original) rectangle to draw the reflection for</param>
/// <param name="space">Spacing between the rect and the reflection</param>
/// <param name="height">Height of the reflection</param>
public static void DrawRectReflection(SColorF color, SRectF rect, float space, float height)
{
_Draw.DrawRectReflection(color, rect, space, height);
}
/// <summary>
/// Draws a texture at its position and with its color
/// </summary>
/// <param name="texture">The texture to be drawn</param>
public static void DrawTexture(CTextureRef texture)
{
DrawTexture(texture, texture.Rect);
}
/// <summary>
/// Draws a texture with its color at the given position
/// </summary>
/// <param name="textureRef">The texture to be drawn</param>
/// <param name="rect">A rectangle with the destination coordinates</param>
public static void DrawTexture(CTextureRef textureRef, SRectF rect)
{
DrawTexture(textureRef, rect, textureRef.Color);
}
/// <summary>
/// Draws a texture at the given position with the given color
/// </summary>
/// <param name="textureRef"></param>
/// <param name="rect"></param>
/// <param name="color"></param>
/// <param name="mirrored">True to mirror the texture on the y axis</param>
public static void DrawTexture(CTextureRef textureRef, SRectF rect, SColorF color, bool mirrored = false)
{
_Draw.DrawTexture(textureRef, rect, color, mirrored);
}
/// <summary>
/// Draws a texture at the given position with the given color
/// </summary>
/// <param name="textureRef"></param>
/// <param name="rect"></param>
/// <param name="color"></param>
/// <param name="bounds">Bounds to draw the texture in (rest gets cropped off)</param>
/// <param name="mirrored">True to mirror the texture on the y axis</param>
public static void DrawTexture(CTextureRef textureRef, SRectF rect, SColorF color, SRectF bounds, bool mirrored = false)
{
_Draw.DrawTexture(textureRef, rect, color, bounds, mirrored);
}
/// <summary>
/// Draws a part of a texture at the given position with the given color
/// </summary>
/// <param name="textureRef"></param>
/// <param name="rect"></param>
/// <param name="color"></param>
/// <param name="begin">Normalized start x-coordinate (0..1)</param>
/// <param name="end">Normalized end x-coordinate (0..1)</param>
public static void DrawTexture(CTextureRef textureRef, SRectF rect, SColorF color, float begin, float end)
{
_Draw.DrawTexture(textureRef, rect, color, begin, end);
}
/// <summary>
/// Draws a texture fitting it within the given bounds with the method specified by aspect
/// </summary>
/// <param name="textureRef"></param>
/// <param name="bounds">Where to draw the texture</param>
/// <param name="aspect">How to fit a texture in the bounds if the size differs</param>
public static void DrawTexture(CTextureRef textureRef, SRectF bounds, EAspect aspect)
{
if (textureRef == null)
return;
SRectF rect;
CHelper.SetRect(bounds, out rect, textureRef.OrigAspect, aspect);
DrawTexture(textureRef, rect);
}
/// <summary>
/// Draws the reflection of a texture at the given position and with the given color
/// </summary>
/// <param name="textureRef"></param>
/// <param name="rect">(Original) rectangle to draw the reflection for</param>
/// <param name="color"></param>
/// <param name="bounds"></param>
/// <param name="space">Spacing between the rect and the reflection</param>
/// <param name="height">Height of the reflection</param>
public static void DrawTextureReflection(CTextureRef textureRef, SRectF rect, SColorF color, SRectF bounds, float space, float height)
{
_Draw.DrawTextureReflection(textureRef, rect, color, bounds, space, height);
}
}
}
Vocaluxe/Base/CGraphics.cs
+1 -1
View File
@@ -660,7 +660,7 @@ namespace Vocaluxe.Base
foreach (string txt in debugOutput)
{
RectangleF rect = new RectangleF(CSettings.RenderW - CFonts.GetTextWidth(txt), y, CFonts.GetTextWidth(txt), CFonts.GetTextHeight(txt));
CDraw.DrawColor(gray, new SRectF(rect.X, rect.Top, rect.Width, rect.Height, CSettings.ZNear));
CDraw.DrawRect(gray, new SRectF(rect.X, rect.Top, rect.Width, rect.Height, CSettings.ZNear));
CFonts.DrawText(txt, rect.X, rect.Y, CSettings.ZNear);
y += rect.Height;
}
Vocaluxe/Base/CMain.cs
+2 -2
View File
@@ -440,12 +440,12 @@ namespace Vocaluxe.Base
public void DrawColor(SColorF color, SRectF rect)
{
CDraw.DrawColor(color, rect);
CDraw.DrawRect(color, rect);
}
public void DrawColorReflection(SColorF color, SRectF rect, float space, float height)
{
CDraw.DrawColorReflection(color, rect, space, height);
CDraw.DrawRectReflection(color, rect, space, height);
}
}
Vocaluxe/Lib/Draw/CDirect3D.cs
+10 -12
View File
@@ -530,23 +530,21 @@ namespace Vocaluxe.Lib.Draw
/// <summary>
/// Draws a line
/// </summary>
/// <param name="a">The alpha value from 0-255</param>
/// <param name="r">The red value from 0-255</param>
/// <param name="g">The red value from 0-255</param>
/// <param name="b">The red value from 0-255</param>
/// <param name="color"></param>
/// <param name="w">The width of the line</param>
/// <param name="x1">The start x-value</param>
/// <param name="y1">The start y-value</param>
/// <param name="x2">The end x-value</param>
/// <param name="y2">The end y-value</param>
public void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2)
public void DrawLine(SColorF color, float w, int x1, int y1, int x2, int y2)
{
var lineVector = new Vector2[] {new Vector2(x1, y1), new Vector2(x2, y2)};
using (var line = new Line(_Device))
{
line.Antialias = true;
line.Width = w;
line.Begin();
line.Draw(lineVector, new Color4((float)a / 255, (float)r / 255, (float)g / 255, (float)b / 255));
line.Draw(lineVector, new Color4(color.AsColor()));
line.End();
}
}
@@ -556,7 +554,7 @@ namespace Vocaluxe.Lib.Draw
/// </summary>
/// <param name="color">The color in which the rectangle will be drawn in</param>
/// <param name="rect">The coordinates in a SRectF struct</param>
public void DrawColor(SColorF color, SRectF rect)
public void DrawRect(SColorF color, SRectF rect)
{
DrawTexture(_BlankTexture, rect, color);
}
@@ -568,7 +566,7 @@ namespace Vocaluxe.Lib.Draw
/// <param name="rect">The coordinates in a SRectF struct</param>
/// <param name="space">The space between the texture and the reflection</param>
/// <param name="height">The height of the reflection</param>
public void DrawColorReflection(SColorF color, SRectF rect, float space, float height)
public void DrawRectReflection(SColorF color, SRectF rect, float space, float height)
{
DrawTextureReflection(_BlankTexture, rect, color, rect, space, height);
}
@@ -609,7 +607,7 @@ namespace Vocaluxe.Lib.Draw
/// <param name="rect">A SRectF struct containing the destination coordinates</param>
/// <param name="color">A SColorF struct containing a color which the texture will be colored in</param>
/// <param name="mirrored">True if the texture should be mirrored</param>
public override void DrawTexture(CTextureRef textureRef, SRectF rect, SColorF color, bool mirrored = false)
public void DrawTexture(CTextureRef textureRef, SRectF rect, SColorF color, bool mirrored = false)
{
if (rect.W < 1 || rect.H < 1)
return;
@@ -619,9 +617,9 @@ namespace Vocaluxe.Lib.Draw
return;
//Calculate the position
float x1 = 0;
const float x1 = 0;
float x2 = texture.WidthRatio;
float y1 = 0;
const float y1 = 0;
float y2 = texture.HeightRatio;
//Calculate the size
@@ -636,7 +634,7 @@ namespace Vocaluxe.Lib.Draw
if (mirrored)
{
y1 = -y1;
//y1 = -y1;
y2 = -y2;
}
var vert = new STexturedColoredVertex[4];
Vocaluxe/Lib/Draw/CDrawBase.cs
+260 -185
View File
@@ -15,17 +15,38 @@ namespace Vocaluxe.Lib.Draw
{
abstract class CDrawBase<TTextureType> where TTextureType : CTextureBase, IDisposable
{
private enum EQueueAction
{
Add,
Update
}
private struct STextureQueue
{
public readonly int TextureID;
public readonly WeakReference TextureRef;
public readonly Size DataSize;
//Use either Data or DataBmp!
public readonly byte[] Data;
//This is disposed after use
public readonly Bitmap DataBmp;
public readonly EQueueAction Action;
public STextureQueue(int textureID, Size dataSize, byte[] data)
public STextureQueue(CTextureRef textureRef, EQueueAction action, Size dataSize, byte[] data)
{
TextureID = textureID;
TextureRef = new WeakReference(textureRef);
Action = action;
DataSize = dataSize;
Data = data;
DataBmp = null;
}
public STextureQueue(CTextureRef textureRef, EQueueAction action, Bitmap bmp)
{
TextureRef = new WeakReference(textureRef);
Action = action;
DataSize = new Size(bmp.Width, bmp.Height);
Data = null;
DataBmp = bmp;
}
}
@@ -151,6 +172,8 @@ namespace Vocaluxe.Lib.Draw
}
#region Textures
#region private/protected
protected abstract void _WriteDataToTexture(TTextureType texture, byte[] data);
protected virtual void _WriteDataToTexture(TTextureType texture, IntPtr data)
@@ -181,17 +204,75 @@ namespace Vocaluxe.Lib.Draw
}
/// <summary>
/// Creates the texture specified by the reference and fills it with the given data<br />
/// Data has to be a pointer to an array of size W*H with 4 Byte values for each pixel (e.g. bmpData.Scan0)
/// Writes the specified bitmap to the texture, creating it if null<br />
/// Also does the resizing if required
/// </summary>
/// <param name="dataSize"></param>
/// <param name="data"></param>
/// <returns></returns>
private TTextureType _CreateAndFillTexture(Size dataSize, IntPtr data)
/// <param name="texture"></param>
/// <param name="bmp"></param>
private void _WriteBitmapToTexture(ref TTextureType texture, Bitmap bmp)
{
TTextureType texture = _CreateTexture(dataSize);
_WriteDataToTexture(texture, data);
return texture;
int maxSize;
//Apply the right max size
switch (CConfig.TextureQuality)
{
case ETextureQuality.TR_CONFIG_TEXTURE_LOWEST:
maxSize = 128;
break;
case ETextureQuality.TR_CONFIG_TEXTURE_LOW:
maxSize = 256;
break;
case ETextureQuality.TR_CONFIG_TEXTURE_MEDIUM:
maxSize = 512;
break;
case ETextureQuality.TR_CONFIG_TEXTURE_HIGH:
maxSize = 1024;
break;
case ETextureQuality.TR_CONFIG_TEXTURE_HIGHEST:
maxSize = 2048;
break;
default:
maxSize = 512;
break;
}
// Make sure maxSize is a power of 2 if required
maxSize = _CheckForNextPowerOf2(maxSize);
Bitmap bmp2 = null;
try
{
// Do not stretch the texture, only make it smaller
int w = Math.Min(bmp.Width, maxSize);
int h = Math.Min(bmp.Height, maxSize);
if (bmp.Width != w || bmp.Height != h)
{
//Create a new Bitmap with the new sizes
bmp2 = new Bitmap(w, h);
//Scale the texture
using (Graphics g = Graphics.FromImage(bmp2))
{
g.InterpolationMode = InterpolationMode.HighQualityBicubic;
g.SmoothingMode = SmoothingMode.HighQuality;
g.DrawImage(bmp, new Rectangle(0, 0, bmp2.Width, bmp2.Height));
}
bmp = bmp2;
}
//Fill the new Bitmap with the texture data
BitmapData bmpData = bmp.LockBits(new Rectangle(0, 0, w, h), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
Size size = new Size(w, h);
if (texture == null)
texture = _CreateTexture(size);
else
texture.DataSize = size;
_WriteDataToTexture(texture, bmpData.Scan0);
bmp.UnlockBits(bmpData);
}
finally
{
if (bmp2 != null)
bmp2.Dispose();
}
}
private void _AddToCache(TTextureType texture, Size origSize, string texturePath)
@@ -223,6 +304,122 @@ namespace Vocaluxe.Lib.Draw
return null;
}
/// <summary>
/// Method used to add a texture to the texture list and return a TextureRef to it<br />
/// Important: This should be the only function to ever write to _Textures
/// </summary>
/// <param name="origSize"></param>
/// <param name="texture"></param>
/// <returns></returns>
protected CTextureRef _GetTextureReference(Size origSize, TTextureType texture)
{
Debug.Assert(origSize.Width > 0 && origSize.Height > 0);
int id;
lock (_MutexID)
{
id = _NextID++;
}
CTextureRef textureRef = new CTextureRef(id, origSize);
if (texture != null)
texture.RefCount++;
if (texture == null || texture.RefCount == 1)
_TextureCount++;
lock (_Textures)
{
_Textures.Add(id, texture);
}
return textureRef;
}
/// <summary>
/// Method used to add a texture to the texture list and return a TextureRef to it<br />
/// Convenience method
/// </summary>
/// <param name="origWidth"></param>
/// <param name="origHeight"></param>
/// <param name="texture"></param>
/// <returns></returns>
protected CTextureRef _GetTextureReference(int origWidth, int origHeight, TTextureType texture)
{
return _GetTextureReference(new Size(origWidth, origHeight), texture);
}
private static bool _IsTextureUsable(TTextureType texture, int dataWidth, int dataHeight)
{
if (texture == null)
return false;
if (texture.DataSize.Width != dataWidth || texture.DataSize.Height != dataHeight)
{
if (texture.W2 > dataWidth || texture.H2 > dataHeight)
return false; // Texture memory to small
if (texture.W2 * 0.9 < dataWidth || texture.H2 * 0.9 < dataHeight)
return false; // Texture memory to big
}
return true;
}
protected bool _GetTexture(CTextureRef textureRef, out TTextureType texture)
{
if (textureRef == null)
{
texture = null;
return false;
}
lock (_Textures)
{
return _Textures.TryGetValue(textureRef.ID, out texture) && texture != null;
}
}
/// <summary>
/// Decreases the RefCount of a texture and disposes it if necessary
/// </summary>
/// <param name="texture"></param>
private void _DisposeTexture(TTextureType texture)
{
if (texture != null && --texture.RefCount <= 0)
{
if (texture.TexturePath != null)
_TextureCache.Remove(texture.TexturePath);
texture.Dispose();
_TextureCount--;
}
}
private void _CheckQueue()
{
lock (_Textures)
{
while (_TexturesToLoad.Count > 0)
{
STextureQueue q = _TexturesToLoad.Dequeue();
Debug.Assert(q.Data != null ^ q.DataBmp != null);
CTextureRef textureRef = q.TextureRef.Target as CTextureRef;
if (!q.TextureRef.IsAlive || textureRef == null || !_Textures.ContainsKey(textureRef.ID))
continue;
if (q.Action == EQueueAction.Add)
{
TTextureType texture = null;
if (q.Data == null)
_WriteBitmapToTexture(ref texture, q.DataBmp);
else
texture = _CreateAndFillTexture(q.DataSize, q.Data);
texture.RefCount = 1; //Just created, so only 1 reference
_Textures[textureRef.ID] = texture;
}
else
{
if (q.Data == null)
UpdateTexture(textureRef, q.DataBmp);
else
UpdateTexture(textureRef, q.DataSize.Width, q.DataSize.Height, q.Data);
}
}
}
}
#endregion private/protected
/// <summary>
/// Adds a texture and stores it in the VRam
/// </summary>
@@ -275,65 +472,11 @@ namespace Vocaluxe.Lib.Draw
{
if (bmp.Height == 0 || bmp.Width == 0)
return null;
int maxSize;
//Apply the right max size
switch (CConfig.TextureQuality)
{
case ETextureQuality.TR_CONFIG_TEXTURE_LOWEST:
maxSize = 128;
break;
case ETextureQuality.TR_CONFIG_TEXTURE_LOW:
maxSize = 256;
break;
case ETextureQuality.TR_CONFIG_TEXTURE_MEDIUM:
maxSize = 512;
break;
case ETextureQuality.TR_CONFIG_TEXTURE_HIGH:
maxSize = 1024;
break;
case ETextureQuality.TR_CONFIG_TEXTURE_HIGHEST:
maxSize = 2048;
break;
default:
maxSize = 512;
break;
}
Size origSize = new Size(bmp.Width, bmp.Height);
Bitmap bmp2 = null;
TTextureType texture;
try
{
// Make sure maxSize is a power of 2 if required
maxSize = _CheckForNextPowerOf2(maxSize);
// Do not stretch the texture, only make it smaller
int w = Math.Min(bmp.Width, maxSize);
int h = Math.Min(bmp.Height, maxSize);
if (bmp.Width != w || bmp.Height != h)
{
//Create a new Bitmap with the new sizes
bmp2 = new Bitmap(w, h);
//Scale the texture
using (Graphics g = Graphics.FromImage(bmp2))
{
g.InterpolationMode = InterpolationMode.HighQualityBicubic;
g.SmoothingMode = SmoothingMode.HighQuality;
g.DrawImage(bmp, new Rectangle(0, 0, bmp2.Width, bmp2.Height));
}
bmp = bmp2;
}
//Fill the new Bitmap with the texture data
BitmapData bmpData = bmp.LockBits(new Rectangle(0, 0, w, h), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
texture = _CreateAndFillTexture(new Size(w, h), bmpData.Scan0);
bmp.UnlockBits(bmpData);
}
finally
{
if (bmp2 != null)
bmp2.Dispose();
}
TTextureType texture = null;
_WriteBitmapToTexture(ref texture, bmp);
_AddToCache(texture, origSize, texturePath);
return _GetTextureReference(origSize, texture);
@@ -345,56 +488,34 @@ namespace Vocaluxe.Lib.Draw
return _GetTextureReference(w, h, texture);
}
/// <summary>
/// Method used to add a texture to the texture list and return a TextureRef to it<br />
/// Important: This should be the only function to ever write to _Textures
/// </summary>
/// <param name="origSize"></param>
/// <param name="texture"></param>
/// <returns></returns>
protected CTextureRef _GetTextureReference(Size origSize, TTextureType texture)
{
Debug.Assert(origSize.Width > 0 && origSize.Height > 0);
int id;
lock (_MutexID)
{
id = _NextID++;
}
CTextureRef textureRef = new CTextureRef(id, origSize);
if (texture != null)
texture.RefCount++;
if (texture == null || texture.RefCount == 1)
_TextureCount++;
lock (_Textures)
{
_Textures.Add(id, texture);
}
return textureRef;
}
/// <summary>
/// Method used to add a texture to the texture list and return a TextureRef to it<br />
/// Convenience method
/// </summary>
/// <param name="origWidth"></param>
/// <param name="origHeight"></param>
/// <param name="texture"></param>
/// <returns></returns>
protected CTextureRef _GetTextureReference(int origWidth, int origHeight, TTextureType texture)
{
return _GetTextureReference(new Size(origWidth, origHeight), texture);
}
public CTextureRef EnqueueTexture(int w, int h, byte[] data)
{
lock (_Textures)
{
CTextureRef textureRef = _GetTextureReference(w, h, null);
_TexturesToLoad.Enqueue(new STextureQueue(textureRef.ID, new Size(w, h), data));
_TexturesToLoad.Enqueue(new STextureQueue(textureRef, EQueueAction.Add, new Size(w, h), data));
return textureRef;
}
}
public CTextureRef EnqueueTexture(Bitmap bmp)
{
lock (_Textures)
{
CTextureRef textureRef = _GetTextureReference(bmp.Width, bmp.Height, null);
_TexturesToLoad.Enqueue(new STextureQueue(textureRef, EQueueAction.Add, bmp));
return textureRef;
}
}
public void EnqueueTextureUpdate(CTextureRef textureRef, Bitmap bmp)
{
lock (_Textures)
{
_TexturesToLoad.Enqueue(new STextureQueue(textureRef, EQueueAction.Update, bmp));
}
}
/// <summary>
/// Updates the data of a texture
/// </summary>
@@ -406,57 +527,53 @@ namespace Vocaluxe.Lib.Draw
public void UpdateTexture(CTextureRef textureRef, int w, int h, byte[] data)
{
TTextureType texture;
if (_GetTexture(textureRef, out texture))
if (!_GetTexture(textureRef, out texture))
return;
bool reuseTexture = true;
if (texture.DataSize.Width != w || texture.DataSize.Height != h)
bool reuseTexture = _IsTextureUsable(texture, w, h);
if (reuseTexture)
{
if (texture.W2 > w || texture.H2 > h)
reuseTexture = false; // Texture memory to small
else if (texture.W2 * 0.9 < w || texture.H2 * 0.9 < h)
reuseTexture = false; // Texture memory to big
else
texture.DataSize = new Size(w, h);
texture.DataSize = new Size(w, h);
_WriteDataToTexture(texture, data);
}
if (!reuseTexture)
else
{
_DisposeTexture(texture);
texture = _CreateAndFillTexture(new Size(w, h), data);
texture.RefCount = 1;
lock (_Textures)
{
_Textures[textureRef.ID] = texture;
}
}
}
public void UpdateTexture(CTextureRef textureRef, Bitmap bmp)
{
TTextureType texture;
if (!_GetTexture(textureRef, out texture))
return;
bool reuseTexture = _IsTextureUsable(texture, bmp.Width, bmp.Height);
if (reuseTexture)
_WriteBitmapToTexture(ref texture, bmp);
else
_WriteDataToTexture(texture, data);
}
protected bool _GetTexture(CTextureRef textureRef, out TTextureType texture)
{
if (textureRef == null)
{
_DisposeTexture(texture);
texture = null;
return false;
}
lock (_Textures)
{
return _Textures.TryGetValue(textureRef.ID, out texture) && texture != null;
_WriteBitmapToTexture(ref texture, bmp);
texture.RefCount = 1;
lock (_Textures)
{
_Textures[textureRef.ID] = texture;
}
}
}
/// <summary>
/// Decreases the RefCount of a texture and disposes it if necessary
/// </summary>
/// <param name="texture"></param>
private void _DisposeTexture(TTextureType texture)
public CTextureRef CopyTexture(CTextureRef textureRef)
{
if (texture != null && --texture.RefCount <= 0)
{
if (texture.TexturePath != null)
_TextureCache.Remove(texture.TexturePath);
texture.Dispose();
_TextureCount--;
}
TTextureType texture;
if (!_GetTexture(textureRef, out texture))
return null;
return _GetTextureReference(textureRef.OrigSize, texture);
}
/// <summary>
@@ -475,57 +592,15 @@ namespace Vocaluxe.Lib.Draw
_DisposeTexture(t);
_Textures.Remove(textureRef.ID);
}
textureRef.ID = -1;
textureRef.SetRemoved();
}
textureRef = null;
}
private void _CheckQueue()
{
lock (_Textures)
{
while (_TexturesToLoad.Count > 0)
{
STextureQueue q = _TexturesToLoad.Dequeue();
if (!_Textures.ContainsKey(q.TextureID))
continue;
TTextureType texture = _CreateAndFillTexture(q.DataSize, q.Data);
texture.RefCount = 1; //Currently no more than 1 reference to queued textures is possible
_Textures[q.TextureID] = texture;
}
}
}
public int GetTextureCount()
{
return _TextureCount;
}
/// <summary>
/// Draws a texture
/// </summary>
/// <param name="texture">The texture to be drawn</param>
public void DrawTexture(CTextureRef texture)
{
if (texture == null)
return;
DrawTexture(texture, texture.Rect, texture.Color);
}
/// <summary>
/// Draws a texture
/// </summary>
/// <param name="texture">The texture to be drawn</param>
/// <param name="rect">A SRectF struct containing the destination coordinates</param>
public void DrawTexture(CTextureRef texture, SRectF rect)
{
if (texture == null)
return;
DrawTexture(texture, rect, texture.Color);
}
public abstract void DrawTexture(CTextureRef textureRef, SRectF rect, SColorF color, bool mirrored = false);
#endregion
/// <summary>
Vocaluxe/Lib/Draw/CDrawWinForm.cs
+25 -13
View File
@@ -307,14 +307,14 @@ namespace Vocaluxe.Lib.Draw
_Backbuffer.Save(file, ImageFormat.Png);
}
public void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2)
public void DrawLine(SColorF color, float w, int x1, int y1, int x2, int y2)
{
_G.DrawLine(new Pen(Color.FromArgb(a, r, g, b), w), new Point(x1, y1), new Point(x2, y2));
_G.DrawLine(new Pen(color.AsColor(), w), new Point(x1, y1), new Point(x2, y2));
}
public void DrawColor(SColorF color, SRectF rect) {}
public void DrawRect(SColorF color, SRectF rect) {}
public void DrawColorReflection(SColorF color, SRectF rect, float space, float height) {}
public void DrawRectReflection(SColorF color, SRectF rect, float space, float height) {}
public CTextureRef AddTexture(Bitmap bmp)
{
@@ -356,12 +356,20 @@ namespace Vocaluxe.Lib.Draw
return texture != null && _Textures.ContainsKey(texture.ID);
}
public CTextureRef CopyTexture(CTextureRef textureRef)
{
if (_TextureExists(textureRef))
return AddTexture(_Bitmaps[textureRef.ID]);
return null;
}
public void RemoveTexture(ref CTextureRef texture)
{
if (_TextureExists(texture))
{
_Bitmaps[texture.ID].Dispose();
_Textures.Remove(texture.ID);
texture.SetRemoved();
}
texture = null;
}
@@ -371,6 +379,16 @@ namespace Vocaluxe.Lib.Draw
return AddTexture(w, h, data);
}
public CTextureRef EnqueueTexture(Bitmap bmp)
{
return AddTexture(bmp);
}
public void EnqueueTextureUpdate(CTextureRef textureRef, Bitmap bmp)
{
UpdateTexture(textureRef, bmp);
}
public CTextureRef AddTexture(int w, int h, byte[] data)
{
using (var bmp = new Bitmap(w, h))
@@ -393,16 +411,10 @@ namespace Vocaluxe.Lib.Draw
}
}
public void DrawTexture(CTextureRef texture)
public void UpdateTexture(CTextureRef textureRef, Bitmap bmp)
{
if (texture != null)
DrawTexture(texture, texture.Rect, texture.Color);
}
public void DrawTexture(CTextureRef texture, SRectF rect)
{
if (texture != null)
DrawTexture(texture, rect, texture.Color);
if (_TextureExists(textureRef))
_Bitmaps[textureRef.ID] = bmp;
}
public void DrawTexture(CTextureRef texture, SRectF rect, SColorF color, bool mirrored = false)
Vocaluxe/Lib/Draw/COpenGL.cs
+41 -32
View File
@@ -253,9 +253,7 @@ namespace Vocaluxe.Lib.Draw
{
return _Control.Height;
}
#endregion main stuff
#region Basic Draw Methods
public override void ClearScreen()
{
GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
@@ -268,6 +266,27 @@ namespace Vocaluxe.Lib.Draw
GL.Ortho(-CConfig.BorderLeft, CConfig.BorderRight + CSettings.RenderW, CConfig.BorderBottom + CSettings.RenderH, -CConfig.BorderTop, CSettings.ZNear, CSettings.ZFar);
}
public void MakeScreenShot()
{
string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.bmp");
int width = GetScreenWidth();
int height = GetScreenHeight();
using (var screen = new Bitmap(width, height))
{
BitmapData bmpData = screen.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
GL.ReadPixels(0, 0, width, height, PixelFormat.Bgra, PixelType.UnsignedByte, bmpData.Scan0);
screen.UnlockBits(bmpData);
screen.RotateFlip(RotateFlipType.RotateNoneFlipY);
screen.Save(file, ImageFormat.Bmp);
}
}
#endregion main stuff
#region Basic Draw Methods
public CTextureRef CopyScreen()
{
//TODO: Check if _W,_H needs to be used or not
@@ -298,30 +317,11 @@ namespace Vocaluxe.Lib.Draw
}
}
public void MakeScreenShot()
{
string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.bmp");
int width = GetScreenWidth();
int height = GetScreenHeight();
using (var screen = new Bitmap(width, height))
{
BitmapData bmpData = screen.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
GL.ReadPixels(0, 0, width, height, PixelFormat.Bgra, PixelType.UnsignedByte, bmpData.Scan0);
screen.UnlockBits(bmpData);
screen.RotateFlip(RotateFlipType.RotateNoneFlipY);
screen.Save(file, ImageFormat.Bmp);
}
}
public void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2)
public void DrawLine(SColorF color, float w, int x1, int y1, int x2, int y2)
{
GL.Enable(EnableCap.Blend);
GL.Color4(r, g, b, a * CGraphics.GlobalAlpha);
GL.Color4(color.R, color.G, color.B, color.A * CGraphics.GlobalAlpha);
GL.LineWidth(w);
GL.Begin(BeginMode.Lines);
GL.Vertex3(x1, y1, CGraphics.ZOffset);
GL.Vertex3(x2, y2, CGraphics.ZOffset);
@@ -330,22 +330,30 @@ namespace Vocaluxe.Lib.Draw
GL.Disable(EnableCap.Blend);
}
public void DrawColor(SColorF color, SRectF rect)
public void DrawRect(SColorF color, SRectF rect)
{
GL.Enable(EnableCap.Blend);
GL.Color4(color.R, color.G, color.B, color.A * CGraphics.GlobalAlpha);
GL.Begin(BeginMode.Quads);
GL.MatrixMode(MatrixMode.Texture);
GL.PushMatrix();
if (Math.Abs(rect.Rotation) > 0.001)
{
GL.Translate(0.5f, 0.5f, 0);
GL.Rotate(-rect.Rotation, 0f, 0f, 1f);
GL.Translate(-0.5f, -0.5f, 0);
}
GL.Vertex3(rect.X, rect.Y, rect.Z + CGraphics.ZOffset);
GL.Vertex3(rect.X, rect.Y + rect.H, rect.Z + CGraphics.ZOffset);
GL.Vertex3(rect.X + rect.W, rect.Y + rect.H, rect.Z + CGraphics.ZOffset);
GL.Vertex3(rect.X + rect.W, rect.Y, rect.Z + CGraphics.ZOffset);
GL.End();
GL.PopMatrix();
GL.Disable(EnableCap.Blend);
}
public void DrawColorReflection(SColorF color, SRectF rect, float space, float height)
public void DrawRectReflection(SColorF color, SRectF rect, float space, float height)
{
if (rect.H < height)
height = rect.H;
@@ -369,7 +377,8 @@ namespace Vocaluxe.Lib.Draw
GL.Enable(EnableCap.Blend);
GL.MatrixMode(MatrixMode.Texture);
GL.PushMatrix();
if (Math.Abs(rect.Rotation) > 0.001)
{
GL.Translate(0.5f, 0.5f, 0);
@@ -392,7 +401,7 @@ namespace Vocaluxe.Lib.Draw
GL.Vertex3(rx1, ry1, rect.Z + CGraphics.ZOffset);
GL.End();
GL.PopMatrix();
GL.Disable(EnableCap.Blend);
}
#endregion Basic Draw Methods
@@ -435,7 +444,7 @@ namespace Vocaluxe.Lib.Draw
}
#region drawing
public override void DrawTexture(CTextureRef textureRef, SRectF rect, SColorF color, bool mirrored = false)
public void DrawTexture(CTextureRef textureRef, SRectF rect, SColorF color, bool mirrored = false)
{
COGLTexture texture;
if (!_GetTexture(textureRef, out texture))
@@ -446,9 +455,9 @@ namespace Vocaluxe.Lib.Draw
GL.BindTexture(TextureTarget.Texture2D, texture.Name);
float x1 = 0;
const float x1 = 0;
float x2 = texture.WidthRatio;
float y1 = 0;
const float y1 = 0;
float y2 = texture.HeightRatio;
float rx1 = rect.X;
Vocaluxe/Lib/Draw/IDraw.cs
+7 -6
View File
@@ -32,7 +32,6 @@ namespace Vocaluxe.Lib.Draw
int GetTextureCount();
void ClearScreen();
CTextureRef CopyScreen();
void CopyScreen(ref CTextureRef texture);
void MakeScreenShot();
@@ -41,16 +40,18 @@ namespace Vocaluxe.Lib.Draw
CTextureRef AddTexture(Bitmap bitmap);
CTextureRef AddTexture(int w, int h, byte[] data);
CTextureRef EnqueueTexture(int w, int h, byte[] data);
CTextureRef EnqueueTexture(Bitmap bmp);
void EnqueueTextureUpdate(CTextureRef textureRef, Bitmap bmp);
void UpdateTexture(CTextureRef texture, int w, int h, byte[] data);
void UpdateTexture(CTextureRef texture, Bitmap bmp);
CTextureRef CopyTexture(CTextureRef textureRef);
void RemoveTexture(ref CTextureRef texture);
// Basic Draw Methods
void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2);
void DrawColor(SColorF color, SRectF rect);
void DrawColorReflection(SColorF color, SRectF rect, float space, float height);
void DrawLine(SColorF color, float w, int x1, int y1, int x2, int y2);
void DrawRect(SColorF color, SRectF rect);
void DrawRectReflection(SColorF color, SRectF rect, float space, float height);
void DrawTexture(CTextureRef texture);
void DrawTexture(CTextureRef texture, SRectF rect);
void DrawTexture(CTextureRef texture, SRectF rect, SColorF color, bool mirrored = false);
void DrawTexture(CTextureRef texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored = false);
void DrawTexture(CTextureRef texture, SRectF rect, SColorF color, float begin, float end);
Vocaluxe/Screens/CPopupScreenPlayerControl.cs
+1 -1
View File
@@ -195,7 +195,7 @@ namespace Vocaluxe.Screens
return false;
_Statics[_StaticCover].Texture = CBackgroundMusic.Cover;
if (CBackgroundMusic.VideoEnabled && _VideoPreview && CBackgroundMusic.SongHasVideo)
CDraw.DrawTexture(_Statics[_StaticCover], CBackgroundMusic.GetVideoTexture(), EAspect.Crop);
CDraw.DrawTexture(CBackgroundMusic.GetVideoTexture(), _Statics[_StaticCover].Rect, EAspect.Crop);
_Buttons[_ButtonPause].Visible = CBackgroundMusic.IsPlaying;
_Buttons[_ButtonPlay].Visible = !CBackgroundMusic.IsPlaying;
_Texts[_TextCurrentSong].Text = CBackgroundMusic.ArtistAndTitle;
Vocaluxe/Screens/CScreenCredits.cs
+1 -1
View File
@@ -360,7 +360,7 @@ namespace Vocaluxe.Screens
base.Draw();
//Draw background
CDraw.DrawColor(new SColorF(0, 0.18f, 0.474f, 1), new SRectF(0, 0, CSettings.RenderW, CSettings.RenderH, 0));
CDraw.DrawRect(new SColorF(0, 0.18f, 0.474f, 1), new SRectF(0, 0, CSettings.RenderW, CSettings.RenderH, 0));
//Draw stars
_StarsBlue.Draw();
VocaluxeLib/CHelper.cs
+11 -11
View File
@@ -120,20 +120,20 @@ namespace VocaluxeLib
return result;
}
public static void SetRect(SRectF bounds, out SRectF rect, float rectAspect, EAspect aspect)
public static void SetRect(SRectF bounds, out SRectF rect, float aspectRatio, EAspect aspect)
{
var bounds2 = new RectangleF(bounds.X, bounds.Y, bounds.W, bounds.H);
RectangleF rect2;
SetRect(bounds2, out rect2, rectAspect, aspect);
SetRect(bounds2, out rect2, aspectRatio, aspect);
rect = new SRectF(rect2.X, rect2.Y, rect2.Width, rect2.Height, bounds.Z);
}
public static void SetRect(RectangleF bounds, out RectangleF rect, float rectAspect, EAspect aspect)
public static void SetRect(RectangleF bounds, out RectangleF rect, float aspectRatio, EAspect aspect)
{
float boundsW = bounds.Width;
float boundsH = bounds.Height;
float boundsAspect = boundsW / boundsH;
float boundsAspectRatio = boundsW / boundsH;
float scaledWidth;
float scaledHeight;
@@ -141,27 +141,27 @@ namespace VocaluxeLib
switch (aspect)
{
case EAspect.Crop:
if (boundsAspect >= rectAspect)
if (boundsAspectRatio >= aspectRatio)
{
scaledWidth = boundsW;
scaledHeight = boundsW / rectAspect;
scaledHeight = boundsW / aspectRatio;
}
else
{
scaledHeight = boundsH;
scaledWidth = boundsH * rectAspect;
scaledWidth = boundsH * aspectRatio;
}
break;
case EAspect.LetterBox:
if (boundsAspect <= rectAspect)
if (boundsAspectRatio <= aspectRatio)
{
scaledWidth = boundsW;
scaledHeight = boundsW / rectAspect;
scaledHeight = boundsW / aspectRatio;
}
else
{
scaledHeight = boundsH;
scaledWidth = boundsH * rectAspect;
scaledWidth = boundsH * aspectRatio;
}
break;
default:
@@ -179,7 +179,7 @@ namespace VocaluxeLib
/// <summary>
/// Returns a list with all files in the given path that match a given pattern
/// </summary>
/// <param name="path">Path to search for</param>
/// <param name="path">Path to search</param>
/// <param name="searchPattern">Pattern to match (e.g. "*.jpg")</param>
/// <param name="recursive">Search directories recursively</param>
/// <param name="fullpath">False for just file names, True for full path</param>
VocaluxeLib/Draw/CTextureRef.cs
+20 -10
View File
@@ -15,6 +15,7 @@
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
#endregion
using System;
using System.Drawing;
namespace VocaluxeLib.Draw
@@ -22,10 +23,9 @@ namespace VocaluxeLib.Draw
/// <summary>
/// Reference to a texture in the drawing driver
/// </summary>
public class CTextureRef
public class CTextureRef : IDisposable
{
public int ID;
public int ID { get; private set; }
/// <summary>
/// Size of original image (e.g. of bmp)
/// </summary>
@@ -56,22 +56,32 @@ namespace VocaluxeLib.Draw
Rect = new SRectF(0f, 0f, origSize.Width, origSize.Height, 0f);
}
public void CopyFieldsFrom(CTextureRef other)
~CTextureRef()
{
ID = other.ID;
OrigSize = other.OrigSize;
Rect = other.Rect;
Color = other.Color;
Dispose();
}
~CTextureRef()
public void Dispose()
{
if (ID >= 0)
{
//Free textures that are no longer reference
//Free textures that are no longer referenced
CTextureRef tmp = this;
CBase.Drawing.RemoveTexture(ref tmp);
}
SetRemoved();
}
/// <summary>
/// Call this from the graphics driver to denote that this reference is remove and no longer valid <br />
/// This avoids the finalizer
/// </summary>
public void SetRemoved()
{
if (ID < 0)
throw new ObjectDisposedException(GetType().Name);
ID = -1;
GC.SuppressFinalize(this);
}
}
}