ReFuel/Dashboard
ReFuel/Dashboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: ReFuel:7cb47c721b1aa474763fcb2a953a63f9d9fd4678
Branches Tags
ReFuel:master
ReFuel:dashboard2
ReFuel:db-refactor-2024
ReFuel:blurg-test
..
compare: ReFuel:3484dce8c5644536a44f4d3c0e54a9d79eafba1f
Branches Tags
ReFuel:dashboard2
ReFuel:db-refactor-2024
ReFuel:blurg-test
ReFuel:master

No commits in common. "7cb47c721b1aa474763fcb2a953a63f9d9fd4678" and "3484dce8c5644536a44f4d3c0e54a9d79eafba1f" have entirely different histories.
7cb47c721b ... 3484dce8c5

3 changed files with 10 additions and 18 deletions
Show Stats Expand all files Collapse all files

4
Quik/Mouse.cs
View File

@ -2,7 +2,7 @@ using System;
namespace Quik namespace Quik
{ {
public enum MouseButton : byte public enum MouseButton
{ {
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 << 7, Auxilliary5 = 1 << 8,
} }
public struct MouseState public struct MouseState

8
Quik/QuikApplication.cs
View File

@ -49,7 +49,6 @@ 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)
@ -102,12 +101,5 @@ namespace Quik
} }
} }
} }
public static QuikApplication Current { get; private set; }
public static void SetCurrentApplication(QuikApplication application)
{
Current = application;
}
} }
} }

16
Quik/VertexGenerator/VertexCommandEngine.cs
View File

@ -1050,20 +1050,20 @@ namespace Quik.VertexGenerator
DrawQueue.RestoreOffset(); DrawQueue.RestoreOffset();
QuikVertex vertex = ImageVertex; QuikVertex vertex = ImageVertex;
vertex.Position = new QVec2(rect.Left, rect.Top); vertex.Position = new QVec2(rect.Top, rect.Left);
vertex.TextureCoordinates = new QVec2(uvs.Left, uvs.Top); vertex.TextureCoordinates = new QVec2(uvs.Top, uvs.Left);
DrawQueue.AddVertex(vertex); DrawQueue.AddVertex(vertex);
vertex.Position = new QVec2(rect.Left, rect.Bottom); vertex.Position = new QVec2(rect.Bottom, rect.Left);
vertex.TextureCoordinates = new QVec2(uvs.Left, uvs.Bottom); vertex.TextureCoordinates = new QVec2(uvs.Bottom, uvs.Left);
DrawQueue.AddVertex(vertex); DrawQueue.AddVertex(vertex);
vertex.Position = new QVec2(rect.Right, rect.Bottom); vertex.Position = new QVec2(rect.Bottom, rect.Right);
vertex.TextureCoordinates = new QVec2(uvs.Right, uvs.Bottom); vertex.TextureCoordinates = new QVec2(uvs.Bottom, uvs.Right);
DrawQueue.AddVertex(vertex); DrawQueue.AddVertex(vertex);
vertex.Position = new QVec2(rect.Right, rect.Top); vertex.Position = new QVec2(rect.Top, rect.Right);
vertex.TextureCoordinates = new QVec2(uvs.Right, uvs.Right); vertex.TextureCoordinates = new QVec2(uvs.Top, 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);