Compare commits

...

3 Commits

3 changed files with 18 additions and 10 deletions

View File

@ -2,7 +2,7 @@ using System;
namespace Quik namespace Quik
{ {
public enum MouseButton public enum MouseButton : byte
{ {
Primary = 1 << 0, Primary = 1 << 0,
Secondary = 1 << 1, Secondary = 1 << 1,
@ -11,7 +11,7 @@ namespace Quik
Auxilliary2 = 1 << 4, Auxilliary2 = 1 << 4,
Auxilliary3 = 1 << 5, Auxilliary3 = 1 << 5,
Auxilliary4 = 1 << 6, Auxilliary4 = 1 << 6,
Auxilliary5 = 1 << 8, Auxilliary5 = 1 << 7,
} }
public struct MouseState public struct MouseState

View File

@ -49,6 +49,7 @@ namespace Quik
{ {
Platform = platform; Platform = platform;
FontProvider = new FontProvider(this); FontProvider = new FontProvider(this);
Current = this;
} }
public IDisposable GetMedia(object key, MediaHint hint) public IDisposable GetMedia(object key, MediaHint hint)
@ -101,5 +102,12 @@ namespace Quik
} }
} }
} }
public static QuikApplication Current { get; private set; }
public static void SetCurrentApplication(QuikApplication application)
{
Current = application;
}
} }
} }

View File

@ -1050,20 +1050,20 @@ namespace Quik.VertexGenerator
DrawQueue.RestoreOffset(); DrawQueue.RestoreOffset();
QuikVertex vertex = ImageVertex; QuikVertex vertex = ImageVertex;
vertex.Position = new QVec2(rect.Top, rect.Left); vertex.Position = new QVec2(rect.Left, rect.Top);
vertex.TextureCoordinates = new QVec2(uvs.Top, uvs.Left); vertex.TextureCoordinates = new QVec2(uvs.Left, uvs.Top);
DrawQueue.AddVertex(vertex); DrawQueue.AddVertex(vertex);
vertex.Position = new QVec2(rect.Bottom, rect.Left); vertex.Position = new QVec2(rect.Left, rect.Bottom);
vertex.TextureCoordinates = new QVec2(uvs.Bottom, uvs.Left); vertex.TextureCoordinates = new QVec2(uvs.Left, uvs.Bottom);
DrawQueue.AddVertex(vertex); DrawQueue.AddVertex(vertex);
vertex.Position = new QVec2(rect.Bottom, rect.Right); vertex.Position = new QVec2(rect.Right, rect.Bottom);
vertex.TextureCoordinates = new QVec2(uvs.Bottom, uvs.Right); vertex.TextureCoordinates = new QVec2(uvs.Right, uvs.Bottom);
DrawQueue.AddVertex(vertex); DrawQueue.AddVertex(vertex);
vertex.Position = new QVec2(rect.Top, rect.Right); vertex.Position = new QVec2(rect.Right, rect.Top);
vertex.TextureCoordinates = new QVec2(uvs.Top, uvs.Right); vertex.TextureCoordinates = new QVec2(uvs.Right, uvs.Right);
DrawQueue.AddVertex(vertex); DrawQueue.AddVertex(vertex);
DrawQueue.AddElement(0); DrawQueue.AddElement(2); DrawQueue.AddElement(3); DrawQueue.AddElement(0); DrawQueue.AddElement(2); DrawQueue.AddElement(3);