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

Compare commits

base: ReFuel:50552914c12e0e95c83985950b61f003718446c1
Branches Tags
ReFuel:master
ReFuel:dashboard2
ReFuel:db-refactor-2024
ReFuel:blurg-test
..
compare: ReFuel:9b2f0859e539900ba3f6d09702deec919f1533f7
Branches Tags
ReFuel:dashboard2
ReFuel:db-refactor-2024
ReFuel:blurg-test
ReFuel:master

No commits in common. "50552914c12e0e95c83985950b61f003718446c1" and "9b2f0859e539900ba3f6d09702deec919f1533f7" have entirely different histories.
50552914c1 ... 9b2f0859e5

45 changed files with 305 additions and 301 deletions
Show Stats Expand all files Collapse all files

4
Dashboard.BlurgText/BlurgCommand.cs
View File

@ -12,13 +12,13 @@ namespace Dashboard.BlurgText
{
BlurgRect rect = result[i];
Rectangle pos = new Rectangle()
QRectangle pos = new QRectangle()
{
Min = origin + new Vector2(rect.X, rect.Y),
Size = new Vector2(rect.Width, rect.Height)
};
Rectangle uv = new Rectangle(rect.U1, rect.V1, rect.U0, rect.V0);
QRectangle uv = new QRectangle(rect.U1, rect.V1, rect.U0, rect.V0);
list.Image(blurg.Images[(int)rect.UserData], pos, uv);
}

4
Dashboard.BlurgText/DashboardBlurg.cs
View File

@ -20,7 +20,7 @@ namespace Dashboard.BlurgText
private nint TextureAllocationCallback(int width, int height)
{
QImageBuffer image = new QImageBuffer(ImageFormat.RgbaU8, width, height);
QImageBuffer image = new QImageBuffer(QImageFormat.RgbaU8, width, height);
images.Add(image);
return images.Count - 1;
}
@ -30,7 +30,7 @@ namespace Dashboard.BlurgText
if (width == 0 || height == 0)
return;
QImageLock src = new QImageLock(ImageFormat.RgbaU8, width, height, 1, buffer);
QImageLock src = new QImageLock(QImageFormat.RgbaU8, width, height, 1, buffer);
QImageBuffer image = images[(int)userData];
image.LockBits2d(out QImageLock dest, QImageLockOptions.Default);

2
Dashboard.Media.Defaults/Fallback/FallbackFontDatabase.cs
View File

@ -5,7 +5,7 @@ using System.Linq;
using System.Text.Json.Serialization;
using System.Text.Json;
using ReFuel.FreeType;
using Dashboard.Media.Fonts;
using Dashboard.Media.Font;
using Dashboard.PAL;
using Dashboard.Media.Defaults.Linux;

2
Dashboard.Media.Defaults/FontDatabaseProvider.cs
View File

@ -6,7 +6,7 @@ using System.Text;
using ReFuel.FreeType;
using Dashboard.Media.Defaults.Fallback;
using Dashboard.Media.Defaults.Linux;
using Dashboard.Media.Fonts;
using Dashboard.Media.Font;
using Dashboard.PAL;
namespace Dashboard.Media.Defaults

4
Dashboard.Media.Defaults/FreeTypeFontFactory.cs
View File

@ -7,11 +7,11 @@ namespace Dashboard.Media.Defaults
{
public class FreeTypeFontFactory : IFontFactory
{
public bool TryOpen(Stream stream, [NotNullWhen(true)] out Font font)
public bool TryOpen(Stream stream, [NotNullWhen(true)] out QFont font)
{
try
{
font = new FontFreeType(stream);
font = new QFontFreeType(stream);
return true;
}
catch

2
Dashboard.Media.Defaults/Linux/FontConfigFontDatabase.cs
View File

@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using ReFuel.FreeType;
using Dashboard.Media.Fonts;
using Dashboard.Media.Font;
using Dashboard.PAL;
namespace Dashboard.Media.Defaults.Linux

12
Dashboard.Media.Defaults/FontFreeType.cs → Dashboard.Media.Defaults/QFontFreeType.cs
View File

@ -3,19 +3,19 @@ using System.Buffers;
using System.IO;
using ReFuel.FreeType;
using Dashboard.Media.Color;
using Dashboard.Media.Fonts;
using Dashboard.Media.Font;
using OpenTK.Mathematics;
namespace Dashboard.Media.Defaults
{
public class FontFreeType : Font
public class QFontFreeType : QFont
{
private MemoryStream ms;
private FTFace face;
public override FontFace Face => throw new NotImplementedException();
public FontFreeType(Stream stream)
public QFontFreeType(Stream stream)
{
ms = new MemoryStream();
stream.CopyTo(ms);
@ -32,7 +32,7 @@ namespace Dashboard.Media.Defaults
return FT.GetCharIndex(face, (ulong)rune) != 0;
}
protected override Image Render(out GlyphMetrics metrics, int codepoint, float size, in FontRasterizerOptions options)
protected override QImage Render(out QGlyphMetrics metrics, int codepoint, float size, in FontRasterizerOptions options)
{
FT.SetCharSize(face, 0, (long)Math.Round(64*size), 0, (uint)Math.Round(options.Resolution));
@ -40,7 +40,7 @@ namespace Dashboard.Media.Defaults
FT.LoadGlyph(face, index, FTLoadFlags.Default);
ref readonly FTGlyphMetrics ftmetrics = ref face.Glyph.Metrics;
metrics = new GlyphMetrics(codepoint,
metrics = new QGlyphMetrics(codepoint,
new Vector2(ftmetrics.Width/64f, ftmetrics.Height/64f),
new Vector2(ftmetrics.HorizontalBearingX/64f, ftmetrics.HorizontalBearingY/64f),
new Vector2(ftmetrics.VerticalBearingX/64f, ftmetrics.VerticalBearingY/64f),
@ -55,7 +55,7 @@ namespace Dashboard.Media.Defaults
return null;
}
QImageBuffer image = new QImageBuffer(ImageFormat.AlphaU8, (int)bitmap.Width, (int)bitmap.Rows);
QImageBuffer image = new QImageBuffer(QImageFormat.AlphaU8, (int)bitmap.Width, (int)bitmap.Rows);
image.LockBits2d(out QImageLock lk, QImageLockOptions.Default);
unsafe

18
Dashboard.Media.Defaults/ImageStbi.cs → Dashboard.Media.Defaults/QImageStbi.cs
View File

@ -5,7 +5,7 @@ using ReFuel.Stb;
namespace Dashboard.Media.Defaults
{
public unsafe class ImageStbi : Image
public unsafe class QImageStbi : QImage
{
private readonly StbImage image;
private QImageBuffer buffer;
@ -17,9 +17,9 @@ namespace Dashboard.Media.Defaults
public override int Depth => 1;
public override bool IsSdf => isSdf;
public override ImageFormat InternalFormat => Stb2QImageFormat(image.Format);
public override QImageFormat InternalFormat => Stb2QImageFormat(image.Format);
public ImageStbi(Stream source)
public QImageStbi(Stream source)
{
// According to the stbi documentation, only a specific type of PNG
// files are premultiplied out of the box (iPhone PNG). Take the
@ -30,15 +30,15 @@ namespace Dashboard.Media.Defaults
image = StbImage.Load(source);
}
public static ImageFormat Stb2QImageFormat(StbiImageFormat src)
public static QImageFormat Stb2QImageFormat(StbiImageFormat src)
{
switch (src)
{
case StbiImageFormat.Grey: return ImageFormat.RedU8;
case StbiImageFormat.Rgb: return ImageFormat.RgbU8;
case StbiImageFormat.Rgba: return ImageFormat.RgbaU8;
case StbiImageFormat.GreyAlpha: return ImageFormat.RaU8;
default: return ImageFormat.Undefined;
case StbiImageFormat.Grey: return QImageFormat.RedU8;
case StbiImageFormat.Rgb: return QImageFormat.RgbU8;
case StbiImageFormat.Rgba: return QImageFormat.RgbaU8;
case StbiImageFormat.GreyAlpha: return QImageFormat.RaU8;
default: return QImageFormat.Undefined;
}
}

2
Dashboard.Media.Defaults/StbMediaLoader.cs
View File

@ -4,7 +4,7 @@ using System.Collections;
using System.IO;
using System.Linq;
using System.Net;
using Dashboard.Media.Fonts;
using Dashboard.Media.Font;
// WebRequest is obsolete but runs on .NET framework.
#pragma warning disable SYSLIB0014

4
Dashboard.OpenTK/OpenTKPlatform.cs
View File

@ -10,13 +10,13 @@ using System.Collections.Generic;
namespace Dashboard.OpenTK
{
public class OpenTKPlatform : IDbPlatform
public class OpenTKPlatform : IDashboardPlatform
{
private readonly List<OpenTKPort> _ports = new List<OpenTKPort>();
// These shall remain a sad nop for now.
public string? Title { get; set; }
public Media.Image? Icon { get; set; } = null;
public QImage? Icon { get; set; } = null;
public event EventHandler? EventRaised;

2
Dashboard.OpenTK/OpenTKPort.cs
View File

@ -68,7 +68,7 @@ namespace Dashboard.OpenTK
public void Paint(DrawList queue)
{
Rectangle view = new Rectangle(Size, new Vector2(0, 0));
QRectangle view = new QRectangle(Size, new Vector2(0, 0));
_vertexEngine.Reset();
_vertexEngine.ProcessCommands(view, queue);

2
Dashboard/Controls/Label.cs
View File

@ -8,7 +8,7 @@ namespace Dashboard.Controls
public class Label : Control
{
public string Text { get; set; } = string.Empty;
public Font? Font { get; set; }
public QFont? Font { get; set; }
public float TextSize { get; set; }
public bool AutoSize { get; set; } = true;

8
Dashboard/Controls/UIBase.cs
View File

@ -14,9 +14,9 @@ namespace Dashboard.Controls
public UIBase? Parent { get; protected set; }
public string? Id { get; set; }
public Rectangle Bounds
public QRectangle Bounds
{
get => new Rectangle(Position + Size, Position);
get => new QRectangle(Position + Size, Position);
set
{
Size = value.Size;
@ -38,7 +38,7 @@ namespace Dashboard.Controls
}
}
public Rectangle AbsoluteBounds
public QRectangle AbsoluteBounds
{
get
{
@ -48,7 +48,7 @@ namespace Dashboard.Controls
}
else
{
return new Rectangle(Bounds.Max + Parent.Position, Bounds.Min + Parent.Position);
return new QRectangle(Bounds.Max + Parent.Position, Bounds.Min + Parent.Position);
}
}
}

6
Dashboard/DbApplication.cs
View File

@ -17,7 +17,7 @@ namespace Dashboard
/// <summary>
/// The application platform driver.
/// </summary>
public IDbPlatform Platform { get; }
public IDashboardPlatform Platform { get; }
/// <summary>
/// Title of the application.
@ -31,7 +31,7 @@ namespace Dashboard
/// <summary>
/// Application icon.
/// </summary>
public Image? Icon
public QImage? Icon
{
get => Platform.Icon;
set => Platform.Icon = value;
@ -46,7 +46,7 @@ namespace Dashboard
/// </summary>
public List<MediaLoader> MediaLoaders { get; } = new List<MediaLoader>();
public DbApplication(IDbPlatform platform)
public DbApplication(IDashboardPlatform platform)
{
Platform = platform;
FontProvider = new FontProvider(this);

26
Dashboard/Geometry.cs
View File

@ -8,7 +8,7 @@ namespace Dashboard
/// A bezier curve segment.
/// </summary>
[DebuggerDisplay("{Start} -- {ControlA} -- {ControlB} -- {End}")]
public struct Bezier
public struct QBezier
{
/// <summary>
/// Segment start point.
@ -37,7 +37,7 @@ namespace Dashboard
0.5f * (End - Start).Length +
0.5f * ((ControlA - Start).Length + (ControlB - ControlA).Length + (End - ControlB).Length);
public Bezier(Vector2 start, Vector2 controlA, Vector2 controlB, Vector2 end)
public QBezier(Vector2 start, Vector2 controlA, Vector2 controlB, Vector2 end)
{
Start = start;
ControlA = controlA;
@ -45,7 +45,7 @@ namespace Dashboard
End = end;
}
public Bezier(
public QBezier(
float startX,
float startY,
float controlAx,
@ -104,7 +104,7 @@ namespace Dashboard
/// A line segment.
/// </summary>
[DebuggerDisplay("{Start} -- {End}")]
public struct Line
public struct QLine
{
/// <summary>
/// Start point.
@ -116,13 +116,13 @@ namespace Dashboard
/// </summary>
public Vector2 End;
public Line(Vector2 start, Vector2 end)
public QLine(Vector2 start, Vector2 end)
{
Start = start;
End = end;
}
public Line(float startX, float startY, float endX, float endY)
public QLine(float startX, float startY, float endX, float endY)
{
Start.X = startX;
Start.Y = startY;
@ -145,7 +145,7 @@ namespace Dashboard
/// A rectangle.
/// </summary>
[DebuggerDisplay("({Left}, {Top}, {Right}, {Bottom})")]
public struct Rectangle
public struct QRectangle
{
/// <summary>
/// Position maximum point.
@ -187,13 +187,13 @@ namespace Dashboard
set => Max = Min + value;
}
public Rectangle(Vector2 max, Vector2 min)
public QRectangle(Vector2 max, Vector2 min)
{
Max = max;
Min = min;
}
public Rectangle(float r, float b, float l, float t)
public QRectangle(float r, float b, float l, float t)
{
Max = new Vector2(r, b);
Min = new Vector2(l, t);
@ -212,8 +212,8 @@ namespace Dashboard
Max += offset;
}
public static Rectangle Intersect(in Rectangle a, in Rectangle b) =>
new Rectangle(
public static QRectangle Intersect(in QRectangle a, in QRectangle b) =>
new QRectangle(
Math.Max(a.Right, b.Right),
Math.Max(a.Bottom, b.Bottom)
,
@ -226,7 +226,7 @@ namespace Dashboard
/// </summary>
/// <remarks>It is undefined to have an ellipse with non-orthogonal axes.</remarks>
[DebuggerDisplay("{Center} ellipse {AxisA}; {AxisB}")]
public struct Ellipse
public struct QEllipse
{
/// <summary>
/// Ellipse center point.
@ -248,7 +248,7 @@ namespace Dashboard
/// A triangle.
/// </summary>
[DebuggerDisplay("{A} -- {B} -- {C}")]
public struct Triangle
public struct QTriangle
{
/// <summary>
/// First vertex.

16
Dashboard/ImmediateDraw/DrawEngine.cs
View File

@ -10,14 +10,14 @@ namespace Dashboard.ImmediateDraw
private readonly Stack<int> _zStack = new Stack<int>();
public int ZIndex => _zIndex;
private Rectangle _viewport;
private readonly Stack<Rectangle> _viewportStack = new Stack<Rectangle>();
private QRectangle _viewport;
private readonly Stack<QRectangle> _viewportStack = new Stack<QRectangle>();
private readonly Stack<Matrix4> _matrixStack = new Stack<Matrix4>();
private Command _customCommandBase = Command.CustomCommandBase;
private readonly List<CommandHandler> _customCommands = new List<CommandHandler>();
public Rectangle Viewport => _viewport;
public QRectangle Viewport => _viewport;
public Matrix4 ActiveTransforms { get; }
@ -35,7 +35,7 @@ namespace Dashboard.ImmediateDraw
return id;
}
public void ProcessCommands(Rectangle bounds, DrawList queue)
public void ProcessCommands(QRectangle bounds, DrawList queue)
{
DrawQueue iterator = queue.GetEnumerator();
@ -74,13 +74,13 @@ namespace Dashboard.ImmediateDraw
_viewportStack.Push(_viewport);
break;
case Command.IntersectViewport:
_viewport = Rectangle.Intersect((Rectangle)iterator.Dequeue(), _viewport);
_viewport = QRectangle.Intersect((QRectangle)iterator.Dequeue(), _viewport);
break;
case Command.StoreViewport:
_viewport = (Rectangle)iterator.Dequeue();
_viewport = (QRectangle)iterator.Dequeue();
break;
case Command.PopViewport:
_viewport = _viewportStack.TryPop(out Rectangle viewport) ? viewport : bounds;
_viewport = _viewportStack.TryPop(out QRectangle viewport) ? viewport : bounds;
break;
case Command.PushZ:
_zStack.Push(_zIndex);
@ -123,7 +123,7 @@ namespace Dashboard.ImmediateDraw
_zIndex = 0;
_zStack.Clear();
_viewport = new Rectangle(float.MaxValue, float.MinValue, float.MinValue, float.MaxValue);
_viewport = new QRectangle(float.MaxValue, float.MinValue, float.MinValue, float.MaxValue);
_viewportStack.Clear();
_matrixStack.Clear();

48
Dashboard/ImmediateDraw/DrawList.cs
View File

@ -49,13 +49,13 @@ namespace Dashboard.ImmediateDraw
Enqueue(Command.PushViewport);
}
public void IntersectViewport(in Rectangle viewport)
public void IntersectViewport(in QRectangle viewport)
{
Enqueue(Command.IntersectViewport);
Enqueue(viewport);
}
public void StoreViewport(in Rectangle viewport)
public void StoreViewport(in QRectangle viewport)
{
Enqueue(Command.StoreViewport);
Enqueue(viewport);
@ -126,21 +126,21 @@ namespace Dashboard.ImmediateDraw
Enqueue(Command.PopStyle);
}
public void Line(in Line line)
public void Line(in QLine line)
{
Enqueue(Command.Line);
Enqueue(line);
}
public void Line(params Line[] lines)
public void Line(params QLine[] lines)
{
Enqueue(Command.Line);
Enqueue((Frame)lines.Length);
foreach (Line line in lines)
foreach (QLine line in lines)
Enqueue(line);
}
public void Bezier(in Bezier bezier)
public void Bezier(in QBezier bezier)
{
Frame a, b;
Frame.Create(bezier, out a, out b);
@ -150,14 +150,14 @@ namespace Dashboard.ImmediateDraw
Enqueue(b);
}
public void Bezier(params Bezier[] beziers)
public void Bezier(params QBezier[] beziers)
{
Frame a, b;
Enqueue(Command.Bezier);
Enqueue((Frame)beziers.Length);
foreach (Bezier bezier in beziers)
foreach (QBezier bezier in beziers)
{
Frame.Create(bezier, out a, out b);
Enqueue(a);
@ -165,21 +165,21 @@ namespace Dashboard.ImmediateDraw
}
}
public void Rectangle(in Rectangle rectangle)
public void Rectangle(in QRectangle rectangle)
{
Enqueue(Command.Rectangle);
Enqueue(rectangle);
}
public void Rectangle(Rectangle[] rectangles)
public void Rectangle(QRectangle[] rectangles)
{
Enqueue(Command.Rectangle);
Enqueue((Frame)rectangles.Length);
foreach (Rectangle rectangle in rectangles)
foreach (QRectangle rectangle in rectangles)
Enqueue(rectangle);
}
public void Ellipse(in Ellipse ellipse)
public void Ellipse(in QEllipse ellipse)
{
Frame a, b;
Frame.Create(ellipse, out a, out b);
@ -189,12 +189,12 @@ namespace Dashboard.ImmediateDraw
Enqueue(b);
}
public void Ellipse(params Ellipse[] ellipses)
public void Ellipse(params QEllipse[] ellipses)
{
Frame a, b;
Enqueue(Command.Ellipse);
Enqueue((Frame)ellipses.Length);
foreach (Ellipse ellipse in ellipses)
foreach (QEllipse ellipse in ellipses)
{
Frame.Create(ellipse, out a, out b);
Enqueue(a);
@ -202,7 +202,7 @@ namespace Dashboard.ImmediateDraw
}
}
public void Triangle(in Triangle triangle)
public void Triangle(in QTriangle triangle)
{
Enqueue(Command.Triangle);
Enqueue(triangle.A);
@ -210,11 +210,11 @@ namespace Dashboard.ImmediateDraw
Enqueue(triangle.C);
}
public void Triangle(params Triangle[] triangles)
public void Triangle(params QTriangle[] triangles)
{
Enqueue(Command.Triangle);
Enqueue((Frame)triangles.Length);
foreach (Triangle triangle in triangles)
foreach (QTriangle triangle in triangles)
{
Enqueue(triangle.A);
Enqueue(triangle.B);
@ -232,7 +232,7 @@ namespace Dashboard.ImmediateDraw
}
}
public void Image(Image texture, in Rectangle rectangle)
public void Image(QImage texture, in QRectangle rectangle)
{
Enqueue(Command.Image);
Enqueue((Frame)(int)ImageCommandFlags.Single);
@ -240,7 +240,7 @@ namespace Dashboard.ImmediateDraw
Enqueue(rectangle);
}
public void Image(Image texture, in Rectangle rectangle, in Rectangle uv)
public void Image(QImage texture, in QRectangle rectangle, in QRectangle uv)
{
Enqueue(Command.Image);
Enqueue((Frame)(int)(ImageCommandFlags.Single | ImageCommandFlags.UVs));
@ -249,7 +249,7 @@ namespace Dashboard.ImmediateDraw
Enqueue(uv);
}
public void Image(Image texture, ReadOnlySpan<Rectangle> rectangles, bool interleavedUV = false)
public void Image(QImage texture, ReadOnlySpan<QRectangle> rectangles, bool interleavedUV = false)
{
int count = rectangles.Length;
ImageCommandFlags flags = ImageCommandFlags.None;
@ -264,13 +264,13 @@ namespace Dashboard.ImmediateDraw
Enqueue(new Frame((int)flags, count));
Enqueue(new Frame(texture));
foreach (Rectangle rectangle in rectangles)
foreach (QRectangle rectangle in rectangles)
{
Enqueue(rectangle);
}
}
public void Image(Image texture, ReadOnlySpan<Rectangle> rectangles, ReadOnlySpan<Rectangle> uvs)
public void Image(QImage texture, ReadOnlySpan<QRectangle> rectangles, ReadOnlySpan<QRectangle> uvs)
{
int count = Math.Min(rectangles.Length, uvs.Length);
Enqueue(Command.Image);
@ -284,7 +284,7 @@ namespace Dashboard.ImmediateDraw
}
}
public void Image3D(Image texture, in Image3DCall call)
public void Image3D(QImage texture, in Image3DCall call)
{
Enqueue(Command.Image);
Enqueue(new Frame(ImageCommandFlags.Image3d | ImageCommandFlags.Single));
@ -294,7 +294,7 @@ namespace Dashboard.ImmediateDraw
Enqueue(new Frame(call.Layer));
}
public void Image3D(Image texture, ReadOnlySpan<Image3DCall> calls)
public void Image3D(QImage texture, ReadOnlySpan<Image3DCall> calls)
{
Enqueue(Command.Image);
Enqueue(new Frame((int)ImageCommandFlags.Image3d, calls.Length));

20
Dashboard/ImmediateDraw/Frame.cs
View File

@ -312,29 +312,29 @@ namespace Dashboard.ImmediateDraw
}
}
public static explicit operator Rectangle(in Frame frame)
public static explicit operator QRectangle(in Frame frame)
{
switch (frame.Type)
{
default:
throw new InvalidCastException();
case FrameType.IVec4:
return new Rectangle(frame._i1, frame._i2, frame._i3, frame._i4);
return new QRectangle(frame._i1, frame._i2, frame._i3, frame._i4);
case FrameType.Vec4:
return new Rectangle(frame._f1, frame._f2, frame._f3, frame._f4);
return new QRectangle(frame._f1, frame._f2, frame._f3, frame._f4);
}
}
public static explicit operator Line(in Frame frame)
public static explicit operator QLine(in Frame frame)
{
switch (frame.Type)
{
default:
throw new InvalidCastException();
case FrameType.IVec4:
return new Line(frame._i1, frame._i2, frame._i3, frame._i4);
return new QLine(frame._i1, frame._i2, frame._i3, frame._i4);
case FrameType.Vec4:
return new Line(frame._f1, frame._f2, frame._f3, frame._f4);
return new QLine(frame._f1, frame._f2, frame._f3, frame._f4);
}
}
#endregion
@ -344,16 +344,16 @@ namespace Dashboard.ImmediateDraw
public static implicit operator Frame(Command cmd) => new Frame(cmd);
public static implicit operator Frame(in Vector2 vector) => new Frame(vector.X, vector.Y);
public static implicit operator Frame(in Color4 color) => new Frame(color.R, color.G, color.B, color.A);
public static implicit operator Frame(in Rectangle rect) => new Frame(rect.Max.X, rect.Max.Y, rect.Min.X, rect.Min.Y);
public static implicit operator Frame(in Line line) => new Frame(line.Start.X, line.Start.Y, line.End.X, line.Start.Y);
public static implicit operator Frame(in QRectangle rect) => new Frame(rect.Max.X, rect.Max.Y, rect.Min.X, rect.Min.Y);
public static implicit operator Frame(in QLine line) => new Frame(line.Start.X, line.Start.Y, line.End.X, line.Start.Y);
public static void Create(in Bezier bezier, out Frame a, out Frame b)
public static void Create(in QBezier bezier, out Frame a, out Frame b)
{
a = new Frame(bezier.Start.X, bezier.Start.Y, bezier.End.X, bezier.End.Y);
b = new Frame(bezier.ControlA.X, bezier.ControlA.Y, bezier.ControlB.X, bezier.ControlB.Y);
}
public static void Create(in Ellipse ellipse, out Frame a, out Frame b)
public static void Create(in QEllipse ellipse, out Frame a, out Frame b)
{
a = new Frame(ellipse.Center.X, ellipse.Center.Y);
b = new Frame(ellipse.AxisA.X, ellipse.AxisA.Y, ellipse.AxisB.X, ellipse.AxisB.Y);

4
Dashboard/ImmediateDraw/Image.cs
View File

@ -11,8 +11,8 @@ namespace Dashboard.ImmediateDraw
public struct Image3DCall
{
public Rectangle Rectangle;
public Rectangle UVs;
public QRectangle Rectangle;
public QRectangle UVs;
public int Layer;
}
}

12
Dashboard/Media/Color/FormatConvert.cs
View File

@ -9,12 +9,12 @@ namespace Dashboard.Media.Color
{
switch (image.Format)
{
case ImageFormat.RaF:
case ImageFormat.RaU8:
case ImageFormat.RgbF:
case ImageFormat.RgbU8:
case ImageFormat.RgbaF:
case ImageFormat.RgbaU8:
case QImageFormat.RaF:
case QImageFormat.RaU8:
case QImageFormat.RgbF:
case QImageFormat.RgbU8:
case QImageFormat.RgbaF:
case QImageFormat.RgbaU8:
break;
default:
return;

6
Dashboard/Media/Color/ImageBuffer.cs
View File

@ -3,19 +3,19 @@ using System.Runtime.InteropServices;
namespace Dashboard.Media.Color
{
public class QImageBuffer : Image
public class QImageBuffer : QImage
{
private byte[] buffer;
GCHandle handle;
private bool isSdf = false;
public override ImageFormat InternalFormat { get; }
public override QImageFormat InternalFormat { get; }
public override int Width { get; }
public override int Height { get; }
public override int Depth { get; }
public override bool IsSdf => isSdf;
public QImageBuffer(ImageFormat format, int width, int height, int depth = 1)
public QImageBuffer(QImageFormat format, int width, int height, int depth = 1)
{
InternalFormat = format;
Width = width;

44
Dashboard/Media/Color/LockIO.cs
View File

@ -9,7 +9,7 @@ namespace Dashboard.Media.Color
public int Width => Lock.Width;
public int Height => Lock.Height;
public int Depth => Depth;
public ImageFormat Format => Lock.Format;
public QImageFormat Format => Lock.Format;
public LockIO(QImageLock imageLock)
{
@ -29,11 +29,11 @@ namespace Dashboard.Media.Color
switch (Format)
{
default:
case ImageFormat.RedU8: return new Color4(ptr[0], 0, 0, 255);
case ImageFormat.AlphaU8: return new Color4(0, 0, 0, ptr[0]);
case ImageFormat.RaU8: return new Color4(ptr[0], 0, 0, ptr[1]);
case ImageFormat.RgbU8: return new Color4(ptr[0], ptr[1], ptr[2], 255);
case ImageFormat.RgbaU8: return new Color4(ptr[0], ptr[1], ptr[2], ptr[3]);
case QImageFormat.RedU8: return new Color4(ptr[0], 0, 0, 255);
case QImageFormat.AlphaU8: return new Color4(0, 0, 0, ptr[0]);
case QImageFormat.RaU8: return new Color4(ptr[0], 0, 0, ptr[1]);
case QImageFormat.RgbU8: return new Color4(ptr[0], ptr[1], ptr[2], 255);
case QImageFormat.RgbaU8: return new Color4(ptr[0], ptr[1], ptr[2], ptr[3]);
}
}
@ -45,22 +45,22 @@ namespace Dashboard.Media.Color
switch (Format)
{
default:
case ImageFormat.RedU8:
case QImageFormat.RedU8:
ptr[0] = (byte)(value.R * 255);
break;
case ImageFormat.AlphaU8:
case QImageFormat.AlphaU8:
ptr[0] = (byte)(value.A * 255);
break;
case ImageFormat.RaU8:
case QImageFormat.RaU8:
ptr[0] = (byte)(value.R * 255);
ptr[1] = (byte)(value.A * 255);
break;
case ImageFormat.RgbU8:
case QImageFormat.RgbU8:
ptr[0] = (byte)(value.R * 255);
ptr[1] = (byte)(value.G * 255);
ptr[2] = (byte)(value.B * 255);
break;
case ImageFormat.RgbaU8:
case QImageFormat.RgbaU8:
ptr[0] = (byte)(value.R * 255);
ptr[1] = (byte)(value.G * 255);
ptr[2] = (byte)(value.B * 255);
@ -82,7 +82,7 @@ namespace Dashboard.Media.Color
public int Width => Lock.Width;
public int Height => Lock.Height;
public int Depth => Depth;
public ImageFormat Format => Lock.Format;
public QImageFormat Format => Lock.Format;
public LockIOF(QImageLock imageLock)
{
@ -102,11 +102,11 @@ namespace Dashboard.Media.Color
switch (Format)
{
default:
case ImageFormat.RedU8: return new Color4(ptr[0], 0, 0, 1);
case ImageFormat.AlphaU8: return new Color4(0, 0, 0, ptr[0]);
case ImageFormat.RaU8: return new Color4(ptr[0], 0, 0, ptr[1]);
case ImageFormat.RgbU8: return new Color4(ptr[0], ptr[1], ptr[2], 1);
case ImageFormat.RgbaU8: return new Color4(ptr[0], ptr[1], ptr[2], ptr[3]);
case QImageFormat.RedU8: return new Color4(ptr[0], 0, 0, 1);
case QImageFormat.AlphaU8: return new Color4(0, 0, 0, ptr[0]);
case QImageFormat.RaU8: return new Color4(ptr[0], 0, 0, ptr[1]);
case QImageFormat.RgbU8: return new Color4(ptr[0], ptr[1], ptr[2], 1);
case QImageFormat.RgbaU8: return new Color4(ptr[0], ptr[1], ptr[2], ptr[3]);
}
}
@ -118,22 +118,22 @@ namespace Dashboard.Media.Color
switch (Format)
{
default:
case ImageFormat.RedU8:
case QImageFormat.RedU8:
ptr[0] = value.R;
break;
case ImageFormat.AlphaU8:
case QImageFormat.AlphaU8:
ptr[0] = value.A;
break;
case ImageFormat.RaU8:
case QImageFormat.RaU8:
ptr[0] = value.R;
ptr[1] = value.A;
break;
case ImageFormat.RgbU8:
case QImageFormat.RgbU8:
ptr[0] = value.R;
ptr[1] = value.G;
ptr[2] = value.B;
break;
case ImageFormat.RgbaU8:
case QImageFormat.RgbaU8:
ptr[0] = value.R;
ptr[1] = value.G;
ptr[2] = value.B;

68
Dashboard/Media/Extensions.cs
View File

@ -2,68 +2,68 @@ namespace Dashboard.Media
{
public static class Extensions
{
public static bool IsU8(this ImageFormat format)
public static bool IsU8(this QImageFormat format)
{
switch (format)
{
case ImageFormat.AlphaU8:
case ImageFormat.RedU8:
case ImageFormat.RaU8:
case ImageFormat.RgbU8:
case ImageFormat.RgbaU8:
case QImageFormat.AlphaU8:
case QImageFormat.RedU8:
case QImageFormat.RaU8:
case QImageFormat.RgbU8:
case QImageFormat.RgbaU8:
return true;
default:
return false;
}
}
public static bool IsFloat(this ImageFormat format)
public static bool IsFloat(this QImageFormat format)
{
switch (format)
{
case ImageFormat.AlphaF:
case ImageFormat.RedF:
case ImageFormat.RaF:
case ImageFormat.RgbF:
case ImageFormat.RgbaF:
case QImageFormat.AlphaF:
case QImageFormat.RedF:
case QImageFormat.RaF:
case QImageFormat.RgbF:
case QImageFormat.RgbaF:
return true;
default:
return false;
}
}
public static int BytesPerPixel(this ImageFormat format)
public static int BytesPerPixel(this QImageFormat format)
{
switch (format)
{
case ImageFormat.AlphaU8: return sizeof(byte);
case ImageFormat.RedU8: return sizeof(byte);
case ImageFormat.RaU8: return 2 * sizeof(byte);
case ImageFormat.RgbU8: return 3 * sizeof(byte);
case ImageFormat.RgbaU8: return 4 * sizeof(byte);
case ImageFormat.AlphaF: return sizeof(float);
case ImageFormat.RedF: return sizeof(float);
case ImageFormat.RaF: return 2 * sizeof(float);
case ImageFormat.RgbF: return 3 * sizeof(float);
case ImageFormat.RgbaF: return 4 * sizeof(float);
case QImageFormat.AlphaU8: return sizeof(byte);
case QImageFormat.RedU8: return sizeof(byte);
case QImageFormat.RaU8: return 2 * sizeof(byte);
case QImageFormat.RgbU8: return 3 * sizeof(byte);
case QImageFormat.RgbaU8: return 4 * sizeof(byte);
case QImageFormat.AlphaF: return sizeof(float);
case QImageFormat.RedF: return sizeof(float);
case QImageFormat.RaF: return 2 * sizeof(float);
case QImageFormat.RgbF: return 3 * sizeof(float);
case QImageFormat.RgbaF: return 4 * sizeof(float);
default: return 0;
}
}
public static int Channels(this ImageFormat format)
public static int Channels(this QImageFormat format)
{
switch (format)
{
case ImageFormat.AlphaU8: return 1;
case ImageFormat.RedU8: return 1;
case ImageFormat.RaU8: return 2;
case ImageFormat.RgbU8: return 3;
case ImageFormat.RgbaU8: return 4;
case ImageFormat.AlphaF: return 1;
case ImageFormat.RedF: return 1;
case ImageFormat.RaF: return 2;
case ImageFormat.RgbF: return 3;
case ImageFormat.RgbaF: return 4;
case QImageFormat.AlphaU8: return 1;
case QImageFormat.RedU8: return 1;
case QImageFormat.RaU8: return 2;
case QImageFormat.RgbU8: return 3;
case QImageFormat.RgbaU8: return 4;
case QImageFormat.AlphaF: return 1;
case QImageFormat.RedF: return 1;
case QImageFormat.RaF: return 2;
case QImageFormat.RgbF: return 3;
case QImageFormat.RgbaF: return 4;
default: return 0;
}
}

12
Dashboard/Media/Font/FontAtlas.cs
View File

@ -3,13 +3,13 @@ using System.Collections.Generic;
using Dashboard.Media.Color;
using OpenTK.Mathematics;
namespace Dashboard.Media.Fonts
namespace Dashboard.Media.Font
{
public struct FontAtlasGlyphInfo
{
public int Codepoint;
public Image Image;
public Rectangle UVs;
public QImage Image;
public QRectangle UVs;
}
public class FontAtlas
@ -109,7 +109,7 @@ namespace Dashboard.Media.Fonts
private class AtlasPage : IDisposable
{
public Image Image;
public QImage Image;
public int PointerX, PointerY;
public int RowHeight;
public int Expansion;
@ -118,7 +118,7 @@ namespace Dashboard.Media.Fonts
public AtlasPage(int width, int height, int expansion)
{
Image = new QImageBuffer(ImageFormat.AlphaU8, width, height);
Image = new QImageBuffer(QImageFormat.AlphaU8, width, height);
Expansion = expansion;
Reset();
}
@ -136,7 +136,7 @@ namespace Dashboard.Media.Fonts
Vector2 size = new Vector2((float)src.Width/Image.Width, (float)src.Height/Image.Height);
prototype.Image = Image;
prototype.UVs = new Rectangle(min + size, min);
prototype.UVs = new QRectangle(min + size, min);
AdvanceColumn(src.Width, src.Height);
}

2
Dashboard/Media/Font/FontFace.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Text;
namespace Dashboard.Media.Fonts
namespace Dashboard.Media.Font
{
public readonly struct FontFace : IEquatable<FontFace>
{

2
Dashboard/Media/Font/FontSlant.cs
View File

@ -1,4 +1,4 @@
namespace Dashboard.Media.Fonts
namespace Dashboard.Media.Font
{
public enum FontSlant
{

2
Dashboard/Media/Font/FontStretch.cs
View File

@ -1,4 +1,4 @@
namespace Dashboard.Media.Fonts
namespace Dashboard.Media.Font
{
/// <summary>
/// Enumeration of font stretch values.

2
Dashboard/Media/Font/FontWeight.cs
View File

@ -1,6 +1,6 @@
using System;
namespace Dashboard.Media.Fonts
namespace Dashboard.Media.Font
{
public enum FontWeight
{

2
Dashboard/Media/Font/SystemFontFamily.cs
View File

@ -1,4 +1,4 @@
namespace Dashboard.Media.Fonts
namespace Dashboard.Media.Font
{
public enum SystemFontFamily
{

2
Dashboard/Media/ImageFormat.cs
View File

@ -2,7 +2,7 @@ using System;
namespace Dashboard.Media
{
public enum ImageFormat
public enum QImageFormat
{
Undefined,
RedU8,

20
Dashboard/Media/Font.cs → Dashboard/Media/QFont.cs
View File

@ -2,14 +2,14 @@ using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using Dashboard.Media;
using Dashboard.Media.Fonts;
using Dashboard.Media.Font;
namespace Dashboard.Media
{
/// <summary>
/// Abstract class that represents a font.
/// </summary>
public abstract class Font : IDisposable
public abstract class QFont : IDisposable
{
public abstract FontFace Face { get; }
public string Family => Face.Family;
@ -18,7 +18,7 @@ namespace Dashboard.Media
public FontStretch Stretch => Face.Stretch;
public abstract bool HasRune(int rune);
protected abstract Image Render(out GlyphMetrics metrics, int codepoint, float size, in FontRasterizerOptions options);
protected abstract QImage Render(out QGlyphMetrics metrics, int codepoint, float size, in FontRasterizerOptions options);
private readonly Dictionary<float, SizedFontCollection> _atlasses = new Dictionary<float, SizedFontCollection>();
@ -69,13 +69,13 @@ namespace Dashboard.Media
atlas = new FontAtlas(width, height, DbApplication.Current.FontProvider.RasterizerOptions.Sdf);
}
public void Get(int codepoint, out FontGlyph glyph, Font font)
public void Get(int codepoint, out FontGlyph glyph, QFont font)
{
if (glyphs.TryGetValue(codepoint, out glyph))
return;
Image image = font.Render(
out GlyphMetrics metrics,
QImage image = font.Render(
out QGlyphMetrics metrics,
codepoint,
Size,
DbApplication.Current.FontProvider.RasterizerOptions);
@ -102,11 +102,11 @@ namespace Dashboard.Media
public readonly struct FontGlyph
{
public readonly int CodePoint;
public readonly Image? Image;
public readonly GlyphMetrics Metrics;
public readonly Rectangle UVs;
public readonly QImage? Image;
public readonly QGlyphMetrics Metrics;
public readonly QRectangle UVs;
public FontGlyph(int codepoint, Image? image, in GlyphMetrics metrics, in Rectangle uvs)
public FontGlyph(int codepoint, QImage? image, in QGlyphMetrics metrics, in QRectangle uvs)
{
CodePoint = codepoint;
Image = image;

4
Dashboard/Media/GlyphMetrics.cs → Dashboard/Media/QGlyphMetrics.cs
View File

@ -5,7 +5,7 @@ namespace Dashboard.Media
/// <summary>
/// Glyph properties with metrics based on FreeType glyph metrics.
/// </summary>
public struct GlyphMetrics
public struct QGlyphMetrics
{
/// <summary>
/// The code point for the character.
@ -32,7 +32,7 @@ namespace Dashboard.Media
/// </summary>
public Vector2 Advance { get; }
public GlyphMetrics(
public QGlyphMetrics(
int character,
Vector2 size,
Vector2 horizontalBearing,

14
Dashboard/Media/Image.cs → Dashboard/Media/QImage.cs
View File

@ -1,12 +1,12 @@
using System;
namespace Dashboard.Media
{
public abstract class Image : IDisposable
public abstract class QImage : IDisposable
{
public abstract int Width { get; }
public abstract int Height { get; }
public abstract int Depth { get; }
public abstract ImageFormat InternalFormat { get; }
public abstract QImageFormat InternalFormat { get; }
public virtual int MipMapLevels => 0;
public virtual bool Premultiplied => false;
public virtual bool IsSdf => false;
@ -32,12 +32,12 @@ namespace Dashboard.Media
public struct QImageLockOptions
{
public ImageFormat Format { get; }
public QImageFormat Format { get; }
public bool Premultiply { get; }
public int MipLevel { get; }
public static QImageLockOptions Default { get; } = new QImageLockOptions(ImageFormat.RgbaU8, true, 0);
public static QImageLockOptions Default { get; } = new QImageLockOptions(QImageFormat.RgbaU8, true, 0);
public QImageLockOptions(ImageFormat format, bool premultiply, int level)
public QImageLockOptions(QImageFormat format, bool premultiply, int level)
{
Format = format;
Premultiply = premultiply;
@ -47,13 +47,13 @@ namespace Dashboard.Media
public struct QImageLock
{
public ImageFormat Format { get; }
public QImageFormat Format { get; }
public int Width { get; }
public int Height { get; }
public int Depth { get; }
public IntPtr ImagePtr { get; }
public QImageLock(ImageFormat format, int width, int height, int depth, IntPtr ptr)
public QImageLock(QImageFormat format, int width, int height, int depth, IntPtr ptr)
{
Format = format;
Width = width;

60
Dashboard/OpenGL/GL21Driver.cs
View File

@ -87,7 +87,7 @@ namespace Dashboard.OpenGL
if (!IsInit) throw new InvalidOperationException("Initialize the driver first.");
}
public void Draw(DrawCallQueue queue, in Rectangle view)
public void Draw(DrawCallQueue queue, in QRectangle view)
{
AssertInit();
@ -331,15 +331,15 @@ namespace Dashboard.OpenGL
internal class TextureManager : IDisposable
{
private readonly Dictionary<Image, int> textures = new Dictionary<Image, int>();
private readonly HashSet<Image> imagesNotUsed = new HashSet<Image>();
private readonly Dictionary<QImage, int> textures = new Dictionary<QImage, int>();
private readonly HashSet<QImage> imagesNotUsed = new HashSet<QImage>();
private bool isDisposed = false;
public void BeginFrame()
{
if (imagesNotUsed.Count > 0)
{
foreach (Image image in imagesNotUsed)
foreach (QImage image in imagesNotUsed)
{
GL.DeleteTexture(textures[image]);
}
@ -347,13 +347,13 @@ namespace Dashboard.OpenGL
imagesNotUsed.Clear();
}
foreach (Image image in textures.Keys)
foreach (QImage image in textures.Keys)
{
imagesNotUsed.Add(image);
}
}
public int GetTexture(Image image)
public int GetTexture(QImage image)
{
if (textures.TryGetValue(image, out int texture))
{
@ -372,7 +372,7 @@ namespace Dashboard.OpenGL
return textures[image] = texture;
}
public int UploadTexture3d(Image image3d)
public int UploadTexture3d(QImage image3d)
{
int texture = GL.GenTexture();
@ -388,7 +388,7 @@ namespace Dashboard.OpenGL
return texture;
}
public int UploadTexture2d(Image image2d)
public int UploadTexture2d(QImage image2d)
{
int texture = GL.GenTexture();
@ -403,15 +403,15 @@ namespace Dashboard.OpenGL
switch (image2d.InternalFormat)
{
case ImageFormat.RedU8:
case ImageFormat.RedF:
case QImageFormat.RedU8:
case QImageFormat.RedF:
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleR, (int)All.Red);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleG, (int)All.Red);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleB, (int)All.Red);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleA, (int)All.One);
break;
case ImageFormat.AlphaU8:
case ImageFormat.AlphaF:
case QImageFormat.AlphaU8:
case QImageFormat.AlphaF:
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleR, (int)All.One);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleG, (int)All.One);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleB, (int)All.One);
@ -433,28 +433,28 @@ namespace Dashboard.OpenGL
GL.DeleteTextures(ids.Length, ref ids[0]);
}
private static readonly Dictionary<ImageFormat, PixelFormat> s_InternalFormat = new Dictionary<ImageFormat, PixelFormat>()
private static readonly Dictionary<QImageFormat, PixelFormat> s_InternalFormat = new Dictionary<QImageFormat, PixelFormat>()
{
[ImageFormat.AlphaF] = PixelFormat.Alpha,
[ImageFormat.AlphaU8] = PixelFormat.Alpha,
[ImageFormat.RedF] = PixelFormat.Red,
[ImageFormat.RedU8] = PixelFormat.Red,
[ImageFormat.RgbF] = PixelFormat.Rgb,
[ImageFormat.RgbU8] = PixelFormat.Rgb,
[ImageFormat.RgbaU8] = PixelFormat.Rgba,
[ImageFormat.RgbaF] = PixelFormat.Rgba,
[QImageFormat.AlphaF] = PixelFormat.Alpha,
[QImageFormat.AlphaU8] = PixelFormat.Alpha,
[QImageFormat.RedF] = PixelFormat.Red,
[QImageFormat.RedU8] = PixelFormat.Red,
[QImageFormat.RgbF] = PixelFormat.Rgb,
[QImageFormat.RgbU8] = PixelFormat.Rgb,
[QImageFormat.RgbaU8] = PixelFormat.Rgba,
[QImageFormat.RgbaF] = PixelFormat.Rgba,
};
private static readonly Dictionary<ImageFormat, PixelType> s_PixelType = new Dictionary<ImageFormat, PixelType>()
private static readonly Dictionary<QImageFormat, PixelType> s_PixelType = new Dictionary<QImageFormat, PixelType>()
{
[ImageFormat.AlphaF] = PixelType.Float,
[ImageFormat.RedF] = PixelType.Float,
[ImageFormat.RgbF] = PixelType.Float,
[ImageFormat.RgbaF] = PixelType.Float,
[ImageFormat.AlphaU8] = PixelType.UnsignedByte,
[ImageFormat.RedU8] = PixelType.UnsignedByte,
[ImageFormat.RgbU8] = PixelType.UnsignedByte,
[ImageFormat.RgbaU8] = PixelType.UnsignedByte,
[QImageFormat.AlphaF] = PixelType.Float,
[QImageFormat.RedF] = PixelType.Float,
[QImageFormat.RgbF] = PixelType.Float,
[QImageFormat.RgbaF] = PixelType.Float,
[QImageFormat.AlphaU8] = PixelType.UnsignedByte,
[QImageFormat.RedU8] = PixelType.UnsignedByte,
[QImageFormat.RgbU8] = PixelType.UnsignedByte,
[QImageFormat.RgbaU8] = PixelType.UnsignedByte,
};
}
}

14
Dashboard/PAL/Dash.cs
View File

@ -1,7 +1,11 @@
using Dashboard.ImmediateDraw;
using OpenTK.Mathematics;
using Dashboard.ImmediateDraw;
using Dashboard.Controls;
using OpenTK.Mathematics;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Dashboard.PAL
{
@ -11,7 +15,7 @@ namespace Dashboard.PAL
public class Dash
{
private readonly IDashHandle handle;
private readonly IDbPlatform platform;
private readonly IDashboardPlatform platform;
public string Title
{
@ -47,7 +51,7 @@ namespace Dashboard.PAL
}
}
public Dash(IDbPlatform platform)
public Dash(IDashboardPlatform platform)
{
this.platform = platform;
handle = platform.CreatePort();
@ -75,7 +79,7 @@ namespace Dashboard.PAL
list ??= new DrawList();
list.Clear();
UIElement.Bounds = new Rectangle(Size, new Vector2(0,0));
UIElement.Bounds = new QRectangle(Size, new Vector2(0,0));
UIElement.Paint(list);
platform.PortPaint(handle, list);
}

4
Dashboard/PAL/IDbPlatform.cs → Dashboard/PAL/IDashboardPlatform.cs
View File

@ -15,7 +15,7 @@ namespace Dashboard.PAL
/// <summary>
/// The primary primary platform abstraction interface for dashboard hosts.
/// </summary>
public interface IDbPlatform : IDisposable
public interface IDashboardPlatform : IDisposable
{
/// <summary>
/// The title of the application.
@ -25,7 +25,7 @@ namespace Dashboard.PAL
/// <summary>
/// The default icon for the application.
/// </summary>
Image? Icon { get; set; }
QImage? Icon { get; set; }
/// <summary>
/// The event raised when an event is received.

2
Dashboard/PAL/IFontDatabase.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using Dashboard.Media.Fonts;
using Dashboard.Media.Font;
namespace Dashboard.PAL
{

2
Dashboard/PAL/IFontFactory.cs
View File

@ -7,6 +7,6 @@ namespace Dashboard.PAL
{
public interface IFontFactory
{
bool TryOpen(Stream stream, [NotNullWhen(true)] out Font font);
bool TryOpen(Stream stream, [NotNullWhen(true)] out QFont font);
}
}

20
Dashboard/Style.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using Dashboard.Media;
using Dashboard.Media.Fonts;
using Dashboard.Media.Font;
using OpenTK.Mathematics;
namespace Dashboard
@ -110,9 +110,9 @@ namespace Dashboard
set => this["list-marker-position"] = value;
}
public Image? ListMarkerImage
public QImage? ListMarkerImage
{
get => (Image?)this["list-marker-image"];
get => (QImage?)this["list-marker-image"];
set => this["list-marker-image"] = value;
}
@ -209,7 +209,7 @@ namespace Dashboard
/// <summary>
/// A line stipple pattern.
/// </summary>
public struct StipplePattern
public struct QuikStipplePattern
{
/// <summary>
/// The stipple pitch value.
@ -221,19 +221,19 @@ namespace Dashboard
/// </summary>
public float DutyCycle;
public StipplePattern(float pitch, float dutyCycle)
public QuikStipplePattern(float pitch, float dutyCycle)
{
Pitch = pitch;
DutyCycle = dutyCycle;
}
public static StipplePattern None => new StipplePattern(0.0f, 1.0f);
public static QuikStipplePattern None => new QuikStipplePattern(0.0f, 1.0f);
}
/// <summary>
/// Stroke style for lines and borders.
/// </summary>
public class StrokeStyle
public class QuikStrokeStyle
{
/// <summary>
/// Stroke color.
@ -250,11 +250,11 @@ namespace Dashboard
// /// </summary>
// public QuikStipplePattern StipplePattern { get; set; }
public StrokeStyle()
public QuikStrokeStyle()
{
}
public StrokeStyle(Color4 color, float width /*, QuikStipplePattern pattern*/)
public QuikStrokeStyle(Color4 color, float width /*, QuikStipplePattern pattern*/)
{
Color = color;
Width = width;
@ -269,7 +269,7 @@ namespace Dashboard
/// <summary>
/// Fill style for rectangles and the like.
/// </summary>
public class FillStyle
public class QuikFillStyle
{
public Color4 Color { get; set; }
}

14
Dashboard/Typography/FontProvider.cs
View File

@ -1,5 +1,5 @@
using Dashboard.Media;
using Dashboard.Media.Fonts;
using Dashboard.Media.Font;
using Dashboard.PAL;
using System;
using System.Collections.Generic;
@ -13,18 +13,18 @@ namespace Dashboard.Typography
/// </summary>
public class FontProvider : IDisposable
{
private Dictionary<FontFace, Font> Fonts { get; } = new Dictionary<FontFace, Font>();
private HashSet<Font> UsedFonts { get; } = new HashSet<Font>();
private Dictionary<FontFace, QFont> Fonts { get; } = new Dictionary<FontFace, QFont>();
private HashSet<QFont> UsedFonts { get; } = new HashSet<QFont>();
public readonly FontRasterizerOptions RasterizerOptions;
public IFontDataBase? Database { get; set; }
public IFontFactory? FontFactory { get; set; }
private readonly DbApplication App;
public Font this[FontFace info]
public QFont this[FontFace info]
{
get
{
if (!Fonts.TryGetValue(info, out Font? font))
if (!Fonts.TryGetValue(info, out QFont? font))
{
using Stream str = Database?.Open(info) ?? throw new Exception("Font could not be found.");
@ -43,7 +43,7 @@ namespace Dashboard.Typography
}
}
public Font this[SystemFontFamily family]
public QFont this[SystemFontFamily family]
{
get
{
@ -99,7 +99,7 @@ namespace Dashboard.Typography
if (isDisposed) return;
isDisposed = true;
foreach (Font font in Fonts.Values)
foreach (QFont font in Fonts.Values)
{
font.Dispose();
}

16
Dashboard/Typography/TextLayout.cs
View File

@ -227,7 +227,7 @@ namespace Dashboard.Typography
pen.Y -= PostSpace;
group.BoundingBox = new Rectangle(width, pen.Y, 0, 0);
group.BoundingBox = new QRectangle(width, pen.Y, 0, 0);
group.Translate(-pen);
}
@ -354,15 +354,15 @@ namespace Dashboard.Typography
public struct TypesetCharacter
{
public int Character;
public Image Texture;
public Rectangle Position;
public Rectangle UV;
public QImage Texture;
public QRectangle Position;
public QRectangle UV;
public TypesetCharacter(
int chr,
Image texture,
in Rectangle position,
in Rectangle uv)
QImage texture,
in QRectangle position,
in QRectangle uv)
{
Character = chr;
Texture = texture;
@ -376,7 +376,7 @@ namespace Dashboard.Typography
private int _count = 0;
private TypesetCharacter[] _array = Array.Empty<TypesetCharacter>();
public Rectangle BoundingBox;
public QRectangle BoundingBox;
public int Count => _count;

18
Dashboard/Typography/Typesetter.cs
View File

@ -75,7 +75,7 @@ namespace Dashboard.Typography
}
}
public static Vector2 MeasureHorizontal(ReadOnlySpan<char> str, float size, Font font)
public static Vector2 MeasureHorizontal(ReadOnlySpan<char> str, float size, QFont font)
{
var enumerator = new LineEnumerator(str);
@ -103,9 +103,9 @@ namespace Dashboard.Typography
return new Vector2(width, height);
}
public static void TypesetHorizontalDirect(this DrawList list, ReadOnlySpan<char> str, Vector2 origin, float size, Font font)
public static void TypesetHorizontalDirect(this DrawList list, ReadOnlySpan<char> str, Vector2 origin, float size, QFont font)
{
Dictionary<Image, FontDrawInfo> drawInfo = new Dictionary<Image, FontDrawInfo>();
Dictionary<QImage, FontDrawInfo> drawInfo = new Dictionary<QImage, FontDrawInfo>();
var enumerator = new LineEnumerator(str);
Vector2 pen = origin;
@ -135,8 +135,8 @@ namespace Dashboard.Typography
int codepoint = r.Value;
font.Get(codepoint, size, out FontGlyph glyph);
ref readonly GlyphMetrics metrics = ref glyph.Metrics;
Image? image = glyph.Image;
ref readonly QGlyphMetrics metrics = ref glyph.Metrics;
QImage? image = glyph.Image;
if (image == null)
{
@ -148,11 +148,11 @@ namespace Dashboard.Typography
{
info = new FontDrawInfo();
info.Image = image;
info.rectangles = new List<Rectangle>();
info.rectangles = new List<QRectangle>();
drawInfo[image] = info;
}
Rectangle dest = new Rectangle(
QRectangle dest = new QRectangle(
pen + new Vector2(metrics.HorizontalBearing.X + metrics.Size.X, metrics.Size.Y - metrics.HorizontalBearing.Y),
pen + new Vector2(metrics.HorizontalBearing.X, -metrics.HorizontalBearing.Y));
@ -175,8 +175,8 @@ namespace Dashboard.Typography
private struct FontDrawInfo
{
public Image Image;
public List<Rectangle> rectangles;
public QImage Image;
public List<QRectangle> rectangles;
}
}
}

18
Dashboard/VertexGenerator/DrawCallQueue.cs → Dashboard/VertexGenerator/DrawQueue.cs
View File

@ -13,8 +13,8 @@ namespace Dashboard.VertexGenerator
private readonly List<DrawCall> _drawCalls = new List<DrawCall>();
private int _start;
private int _baseOffset;
private Rectangle _bounds;
private Image? _texture;
private QRectangle _bounds;
private QImage? _texture;
public int ZDepth { get; private set; }
public DbVertex[] VertexArray => _vertices.InternalArray;
@ -33,7 +33,7 @@ namespace Dashboard.VertexGenerator
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void StartDrawCall(in Rectangle bounds, Image? texture, int baseOffset)
public void StartDrawCall(in QRectangle bounds, QImage? texture, int baseOffset)
{
_start = ElementCount;
_texture = texture;
@ -42,13 +42,13 @@ namespace Dashboard.VertexGenerator
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void StartDrawCall(in Rectangle bounds) => StartDrawCall(bounds, null, _vertices.Count);
public void StartDrawCall(in QRectangle bounds) => StartDrawCall(bounds, null, _vertices.Count);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void StartDrawCall(in Rectangle bounds, int baseOffset) => StartDrawCall(bounds, null, baseOffset);
public void StartDrawCall(in QRectangle bounds, int baseOffset) => StartDrawCall(bounds, null, baseOffset);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void StartDrawCall(in Rectangle bounds, Image texture) => StartDrawCall(bounds, texture, _vertices.Count);
public void StartDrawCall(in QRectangle bounds, QImage texture) => StartDrawCall(bounds, texture, _vertices.Count);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void AddVertex(in DbVertex vertex)
@ -99,10 +99,10 @@ namespace Dashboard.VertexGenerator
{
public int Start { get; }
public int Count { get; }
public Rectangle Bounds { get; }
public Image? Texture { get; }
public QRectangle Bounds { get; }
public QImage? Texture { get; }
public DrawCall(int start, int count, in Rectangle bounds, Image? texture)
public DrawCall(int start, int count, in QRectangle bounds, QImage? texture)
{
Start = start;
Count = count;

56
Dashboard/VertexGenerator/VertexDrawingEngine.cs
View File

@ -66,7 +66,7 @@ namespace Dashboard.VertexGenerator
return (int) Math.Ceiling(arc * radius * CurveGranularity);
}
private readonly List<Line> LineList = new List<Line>();
private readonly List<QLine> LineList = new List<QLine>();
private void LineProc(DrawQueue queue)
{
Frame frame = queue.Dequeue();
@ -79,12 +79,12 @@ namespace Dashboard.VertexGenerator
for (int i = 0; i < count; i++)
{
frame = queue.Dequeue();
LineList.Add((Line)frame);
LineList.Add((QLine)frame);
}
}
else
{
LineList.Add((Line)frame);
LineList.Add((QLine)frame);
}
float width = Style.StrokeWidth ?? 1;
@ -93,7 +93,7 @@ namespace Dashboard.VertexGenerator
LineInfo prevBase, nextBase = default;
for (int i = 0; i < LineList.Count; i++)
{
Line line = LineList[i];
QLine line = LineList[i];
// A line segment needs a start cap if it is the first segment in
// the list, or the last end point is not the current start point.
bool isStart = (i == 0 || line.Start != LineList[i - 1].End);
@ -124,7 +124,7 @@ namespace Dashboard.VertexGenerator
DrawQueue.EndDrawCall();
}
private LineInfo GenerateLineSegment(in Line line)
private LineInfo GenerateLineSegment(in QLine line)
{
DbVertex vertex = StrokeVertex;
DbVertex a, b, c, d;
@ -291,7 +291,7 @@ namespace Dashboard.VertexGenerator
}
}
private readonly List<Bezier> BezierList = new List<Bezier>();
private readonly List<QBezier> BezierList = new List<QBezier>();
private void BezierProc(DrawQueue queue)
{
Frame a = queue.Dequeue();
@ -308,7 +308,7 @@ namespace Dashboard.VertexGenerator
b = queue.Dequeue();
BezierList.Add(
new Bezier(
new QBezier(
new Vector2(a.GetF(0), a.GetF(1)),
new Vector2(b.GetF(0), b.GetF(1)),
new Vector2(b.GetF(2), b.GetF(3)),
@ -322,7 +322,7 @@ namespace Dashboard.VertexGenerator
b = queue.Dequeue();
BezierList.Add(
new Bezier(
new QBezier(
new Vector2(a.GetF(0), a.GetF(1)),
new Vector2(b.GetF(0), b.GetF(1)),
new Vector2(b.GetF(2), b.GetF(3)),
@ -337,7 +337,7 @@ namespace Dashboard.VertexGenerator
LineInfo prevBase, nextBase = default;
for (int i = 0; i < LineList.Count; i++)
{
Bezier bezier = BezierList[i];
QBezier bezier = BezierList[i];
// A line segment needs a start cap if it is the first segment in
// the list, or the last end point is not the current start point.
bool isStart = (i == 0 || bezier.Start != BezierList[i - 1].End);
@ -368,7 +368,7 @@ namespace Dashboard.VertexGenerator
DrawQueue.EndDrawCall();
}
private LineInfo GenerateBezierSegment(in Bezier bezier)
private LineInfo GenerateBezierSegment(in QBezier bezier)
{
Vector2 startTangent = bezier.GetBezierTangent(0);
Vector2 endTangent = bezier.GetBezierTangent(1);
@ -408,7 +408,7 @@ namespace Dashboard.VertexGenerator
return new LineInfo(vbase, 0, 1, index - 2, index - 1);
}
private readonly List<Rectangle> RectangleList = new List<Rectangle>();
private readonly List<QRectangle> RectangleList = new List<QRectangle>();
private void RectangleProc(DrawQueue queue)
{
Frame frame = queue.Dequeue();
@ -419,12 +419,12 @@ namespace Dashboard.VertexGenerator
for (int i = 0; i < count; i++)
{
frame = queue.Dequeue();
RectangleList.Add((Rectangle)frame);
RectangleList.Add((QRectangle)frame);
}
}
else
{
RectangleList.Add((Rectangle)frame);
RectangleList.Add((QRectangle)frame);
}
float stroke = Style.StrokeWidth ?? 1.0f;
@ -432,8 +432,8 @@ namespace Dashboard.VertexGenerator
DrawQueue.StartDrawCall(Viewport);
for (int i = 0; i < RectangleList.Count; i++)
{
Rectangle outer = RectangleList[i];
Rectangle inner = new Rectangle(
QRectangle outer = RectangleList[i];
QRectangle inner = new QRectangle(
outer.Right - stroke, outer.Bottom - stroke,
outer.Left + stroke, outer.Top + stroke);
@ -457,7 +457,7 @@ namespace Dashboard.VertexGenerator
DrawQueue.EndDrawCall();
}
private void GenerateRectangleBase(in Rectangle rectangle, float radius)
private void GenerateRectangleBase(in QRectangle rectangle, float radius)
{
/*
+--j-------i--+
@ -599,7 +599,7 @@ namespace Dashboard.VertexGenerator
DrawQueue.AddElement(1); DrawQueue.AddElement(previous); DrawQueue.AddElement(6);
}
private void GenerateRectangleStripStraight(in Rectangle rectangle)
private void GenerateRectangleStripStraight(in QRectangle rectangle)
{
/*
h---------g
@ -649,7 +649,7 @@ namespace Dashboard.VertexGenerator
DrawQueue.AddElement(4); DrawQueue.AddElement(3); DrawQueue.AddElement(7); // SWW
}
private void GenerateRectangleStripNarrow(in Rectangle rectangle, float radius)
private void GenerateRectangleStripNarrow(in QRectangle rectangle, float radius)
{
/*
v-j---i-u
@ -843,7 +843,7 @@ namespace Dashboard.VertexGenerator
DrawQueue.AddElement(16); DrawQueue.AddElement(previous); DrawQueue.AddElement(17);
}
private void GenerateRectangleStripWide(in Rectangle rectangle, float radius)
private void GenerateRectangleStripWide(in QRectangle rectangle, float radius)
{
/*
l---k
@ -1016,7 +1016,7 @@ namespace Dashboard.VertexGenerator
{
Frame frame = queue.Dequeue();
ImageCommandFlags flags = (ImageCommandFlags)frame.I1;
Image image = queue.Dequeue().As<Image>();
QImage image = queue.Dequeue().As<QImage>();
int count = flags.HasFlag(ImageCommandFlags.Single) ? 1 : frame.I2;
if (flags.HasFlag(ImageCommandFlags.Image3d))
@ -1029,22 +1029,22 @@ namespace Dashboard.VertexGenerator
}
}
private void Image2d(DrawQueue queue, Image image, int count, bool uv)
private void Image2d(DrawQueue queue, QImage image, int count, bool uv)
{
DrawQueue.StartDrawCall(Viewport, image);
for (int i = 0; i < count; i++)
{
Rectangle rect = (Rectangle)queue.Dequeue();
Rectangle uvs;
QRectangle rect = (QRectangle)queue.Dequeue();
QRectangle uvs;
if (uv)
{
uvs = (Rectangle)queue.Dequeue();
uvs = (QRectangle)queue.Dequeue();
}
else
{
uvs = new Rectangle(1, 1, 0, 0);
uvs = new QRectangle(1, 1, 0, 0);
}
DrawQueue.RestoreOffset();
@ -1073,14 +1073,14 @@ namespace Dashboard.VertexGenerator
DrawQueue.EndDrawCall();
}
private void Image3d(DrawQueue queue, Image image, int count)
private void Image3d(DrawQueue queue, QImage image, int count)
{
DrawQueue.StartDrawCall(Viewport, image);
for (int i = 0; i < count; i++)
{
Rectangle rect = (Rectangle)queue.Dequeue();
Rectangle uvs = (Rectangle)queue.Dequeue();
QRectangle rect = (QRectangle)queue.Dequeue();
QRectangle uvs = (QRectangle)queue.Dequeue();
int layer = (int)queue.Dequeue();
DrawQueue.RestoreOffset();

4
tests/Dashboard.Demo/Program.cs
View File

@ -20,7 +20,7 @@ namespace Dashboard.Demo
public class EmptyView : View
{
private Font? font;
private QFont? font;
DashboardBlurg dblurg = new DashboardBlurg();
BlurgResult? result;
// private readonly Label Label = new Label() { Text = "Hello world!", Position = new QVec2(300, 300) };
@ -43,7 +43,7 @@ namespace Dashboard.Demo
}
cmd.PutBlurgText(dblurg, result!, new Vector2(300, 300));
cmd.Rectangle(new Rectangle(16, 16, 0, 0));
cmd.Rectangle(new QRectangle(16, 16, 0, 0));
// Label.Paint(cmd);
}
}