Compare commits
50 Commits
ccb0c6ffe7
...
db-refacto
| Author | SHA1 | Date | |
|---|---|---|---|
| c6a9dd8008 | |||
| ff3b3ee961 | |||
| 9b6a15c6ec | |||
| 50552914c1 | |||
| d959c42e99 | |||
| 9b2f0859e5 | |||
| 831c93b916 | |||
| 42782b8a71 | |||
| 1301868269 | |||
| 21591c3d11 | |||
| 3856b3c66e | |||
| 92fb8f06a7 | |||
| 468648de95 | |||
| 3f1875252e | |||
| 65609bf685 | |||
| a95ddb46ad | |||
| dadd9f137a | |||
| 23fc485b2a | |||
| c6c76aa8be | |||
| 6670667ff6 | |||
| d06264e424 | |||
| a1f4e6a4dc | |||
| 470475092a | |||
| 1ee492ccd4 | |||
| 3b52649ad2 | |||
| f8a4c73367 | |||
| 88e060a92b | |||
| 1ccab1c85a | |||
| 55e9d775cd | |||
| 8fd00257d3 | |||
| 82d2027cf3 | |||
| 9b16e015f6 | |||
| ff4a158cdb | |||
| 29829fd299 | |||
| 19cc765955 | |||
| ce2a569a20 | |||
| ab1849a891 | |||
| 3ae107c83e | |||
| bd69c0d93f | |||
| 279e619c3b | |||
| 7cb47c721b | |||
| 9105b16df8 | |||
| 3b73090f79 | |||
| 3484dce8c5 | |||
| 3418537b43 | |||
| d831c9b72d | |||
| 66644be699 | |||
| 39dfca18f2 | |||
| 75a11adbe7 | |||
| 21233c8173 |
8
.gitmodules
vendored
8
.gitmodules
vendored
@@ -1,8 +0,0 @@
|
||||
[submodule "lib/stb"]
|
||||
path = lib/stb
|
||||
url = https://github.com/nothings/stb.git
|
||||
[submodule "lib/freetype"]
|
||||
path = lib/freetype
|
||||
url = https://gitlab.freedesktop.org/freetype/freetype.git
|
||||
[submodule "freetype"]
|
||||
branch = VER-2-9-1
|
||||
27
Dashboard.BlurgText/BlurgCommand.cs
Normal file
27
Dashboard.BlurgText/BlurgCommand.cs
Normal file
@@ -0,0 +1,27 @@
|
||||
using BlurgText;
|
||||
using Dashboard.ImmediateDraw;
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Dashboard.BlurgText
|
||||
{
|
||||
public static class BlurgCommand
|
||||
{
|
||||
public static void PutBlurgText(this DrawList list, DashboardBlurg blurg, BlurgResult result, Vector2 origin)
|
||||
{
|
||||
for (int i = 0; i < result.Count; i++)
|
||||
{
|
||||
BlurgRect rect = result[i];
|
||||
|
||||
Rectangle pos = new Rectangle()
|
||||
{
|
||||
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);
|
||||
|
||||
list.Image(blurg.Images[(int)rect.UserData], pos, uv);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
14
Dashboard.BlurgText/Dashboard.BlurgText.csproj
Normal file
14
Dashboard.BlurgText/Dashboard.BlurgText.csproj
Normal file
@@ -0,0 +1,14 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Dashboard\Dashboard.csproj" />
|
||||
<PackageReference Include="BlurgText" Version="0.1.0-nightly-4" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
63
Dashboard.BlurgText/DashboardBlurg.cs
Normal file
63
Dashboard.BlurgText/DashboardBlurg.cs
Normal file
@@ -0,0 +1,63 @@
|
||||
|
||||
using BlurgText;
|
||||
using Dashboard.Media;
|
||||
using Dashboard.Media.Color;
|
||||
|
||||
namespace Dashboard.BlurgText
|
||||
{
|
||||
public class DashboardBlurg : IDisposable
|
||||
{
|
||||
private readonly List<QImageBuffer> images = new List<QImageBuffer>();
|
||||
|
||||
public Blurg Blurg { get; }
|
||||
|
||||
public IReadOnlyList<QImageBuffer> Images => images.AsReadOnly();
|
||||
|
||||
public DashboardBlurg()
|
||||
{
|
||||
Blurg = new Blurg(TextureAllocationCallback, TextureUpdateCallback);
|
||||
}
|
||||
|
||||
private nint TextureAllocationCallback(int width, int height)
|
||||
{
|
||||
QImageBuffer image = new QImageBuffer(ImageFormat.RgbaU8, width, height);
|
||||
images.Add(image);
|
||||
return images.Count - 1;
|
||||
}
|
||||
|
||||
private void TextureUpdateCallback(nint userData, nint buffer, int x, int y, int width, int height)
|
||||
{
|
||||
if (width == 0 || height == 0)
|
||||
return;
|
||||
|
||||
QImageLock src = new QImageLock(ImageFormat.RgbaU8, width, height, 1, buffer);
|
||||
QImageBuffer image = images[(int)userData];
|
||||
image.LockBits2d(out QImageLock dest, QImageLockOptions.Default);
|
||||
|
||||
src.CopyTo(dest, x, y);
|
||||
image.UnlockBits();
|
||||
}
|
||||
|
||||
private bool _isDisposed = false;
|
||||
private void Dispose(bool disposing)
|
||||
{
|
||||
if (_isDisposed) return;
|
||||
|
||||
if (disposing)
|
||||
{
|
||||
Blurg.Dispose();
|
||||
|
||||
foreach (QImageBuffer image in images)
|
||||
{
|
||||
image.Dispose();
|
||||
}
|
||||
|
||||
images.Clear();
|
||||
}
|
||||
|
||||
_isDisposed = true;
|
||||
}
|
||||
|
||||
public void Dispose() => Dispose(true);
|
||||
}
|
||||
}
|
||||
19
Dashboard.Media.Defaults/Dashboard.Media.Defaults.csproj
Normal file
19
Dashboard.Media.Defaults/Dashboard.Media.Defaults.csproj
Normal file
@@ -0,0 +1,19 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<LanguageVersion>7.3</LanguageVersion>
|
||||
<Nullable>disable</Nullable>
|
||||
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="ReFuel.FreeType" Version="0.1.0-rc.5" />
|
||||
<PackageReference Include="ReFuel.StbImage" Version="2.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Dashboard\Dashboard.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
13
Dashboard.Media.Defaults/EnvironmentVariables.cs
Normal file
13
Dashboard.Media.Defaults/EnvironmentVariables.cs
Normal file
@@ -0,0 +1,13 @@
|
||||
namespace Dashboard.Media.Defaults
|
||||
{
|
||||
internal static class EnvironmentVariables
|
||||
{
|
||||
public const string SerifFont = "QUIK_SERIF_FONT";
|
||||
public const string SansFont = "QUIK_SANS_FONT";
|
||||
public const string MonospaceFont = "QUIK_MONOSPACE_FONT";
|
||||
public const string CursiveFont = "QUIK_CURSIVE_FONT";
|
||||
public const string FantasyFont = "QUIK_FANTASY_FONT";
|
||||
|
||||
public const string FallbackFontDatabase = "QUIK_FALLBACK_FONT_DB";
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using Quik.FreeType;
|
||||
using ReFuel.FreeType;
|
||||
|
||||
namespace Quik.Media.Defaults
|
||||
namespace Dashboard.Media.Defaults
|
||||
{
|
||||
public static class FTProvider
|
||||
{
|
||||
269
Dashboard.Media.Defaults/Fallback/FallbackFontDatabase.cs
Normal file
269
Dashboard.Media.Defaults/Fallback/FallbackFontDatabase.cs
Normal file
@@ -0,0 +1,269 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text.Json.Serialization;
|
||||
using System.Text.Json;
|
||||
using ReFuel.FreeType;
|
||||
using Dashboard.Media.Fonts;
|
||||
using Dashboard.PAL;
|
||||
using Dashboard.Media.Defaults.Linux;
|
||||
|
||||
namespace Dashboard.Media.Defaults.Fallback
|
||||
{
|
||||
public class FallbackFontDatabase : IFontDataBase
|
||||
{
|
||||
private readonly string DbPath =
|
||||
Environment.GetEnvironmentVariable(EnvironmentVariables.FallbackFontDatabase) ??
|
||||
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "QUIK/fontdb.json");
|
||||
|
||||
private Dictionary<FontFace, FileInfo> FilesMap { get; } = new Dictionary<FontFace, FileInfo>();
|
||||
private Dictionary<string, List<FontFace>> ByFamily { get; } = new Dictionary<string, List<FontFace>>();
|
||||
private Dictionary<SystemFontFamily, FontFace> SystemFonts { get; } = new Dictionary<SystemFontFamily, FontFace>();
|
||||
private List<FontFace> All { get; } = new List<FontFace>();
|
||||
|
||||
IEnumerable<FontFace> IFontDataBase.All => this.All;
|
||||
|
||||
public FallbackFontDatabase(bool rebuild = false)
|
||||
{
|
||||
// Load existing database if desired.
|
||||
List<DbEntry> database;
|
||||
|
||||
if(!rebuild)
|
||||
{
|
||||
database = LoadDatabase();
|
||||
}
|
||||
else
|
||||
{
|
||||
database = new List<DbEntry>();
|
||||
}
|
||||
|
||||
VerifyDatabase(database);
|
||||
FlushDatabase(database);
|
||||
|
||||
database.ForEach(x => AddFont(x.Face, new FileInfo(x.FilePath)));
|
||||
|
||||
(FontFace, FileInfo) serif = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.SerifFont, LinuxFonts.DefaultSerifFamilies, this);
|
||||
SystemFonts[SystemFontFamily.Serif] = serif.Item1;
|
||||
(FontFace, FileInfo) sans = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.SansFont, LinuxFonts.DefaultSansFamilies, this);
|
||||
SystemFonts[SystemFontFamily.Sans] = sans.Item1;
|
||||
(FontFace, FileInfo) mono = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.MonospaceFont, LinuxFonts.DefaultMonospaceFamilies, this);
|
||||
SystemFonts[SystemFontFamily.Monospace] = mono.Item1;
|
||||
(FontFace, FileInfo) cursive = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.CursiveFont, LinuxFonts.DefaultCursiveFamilies, this);
|
||||
SystemFonts[SystemFontFamily.Cursive] = cursive.Item1;
|
||||
(FontFace, FileInfo) fantasy = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.FantasyFont, LinuxFonts.DefaultFantasyFamilies, this);
|
||||
SystemFonts[SystemFontFamily.Fantasy] = fantasy.Item1;
|
||||
}
|
||||
|
||||
public FileInfo FontFileInfo(FontFace face)
|
||||
{
|
||||
if (FilesMap.TryGetValue(face, out FileInfo info))
|
||||
return info;
|
||||
else
|
||||
return null;
|
||||
}
|
||||
|
||||
public Stream Open(FontFace face)
|
||||
{
|
||||
return FontFileInfo(face)?.OpenRead() ?? throw new FileNotFoundException();
|
||||
}
|
||||
|
||||
public IEnumerable<FontFace> Search(FontFace prototype, FontMatchCriteria criteria = FontMatchCriteria.All)
|
||||
{
|
||||
// A bit scuffed and LINQ heavy but it should work.
|
||||
IEnumerable<FontFace> candidates;
|
||||
|
||||
if (criteria.HasFlag(FontMatchCriteria.Family))
|
||||
{
|
||||
List<FontFace> siblings;
|
||||
|
||||
if (!ByFamily.TryGetValue(prototype.Family, out siblings))
|
||||
{
|
||||
return Enumerable.Empty<FontFace>();
|
||||
}
|
||||
|
||||
candidates = siblings;
|
||||
}
|
||||
else
|
||||
{
|
||||
candidates = All;
|
||||
}
|
||||
|
||||
return
|
||||
candidates
|
||||
.Where(x =>
|
||||
implies(criteria.HasFlag(FontMatchCriteria.Slant), prototype.Slant == x.Slant) ||
|
||||
implies(criteria.HasFlag(FontMatchCriteria.Weight), prototype.Weight == x.Weight) ||
|
||||
implies(criteria.HasFlag(FontMatchCriteria.Stretch), prototype.Stretch == x.Stretch)
|
||||
)
|
||||
.OrderByDescending(x =>
|
||||
|
||||
(prototype.Slant == x.Slant ? 1 : 0) +
|
||||
(prototype.Weight == x.Weight ? 1 : 0) +
|
||||
(prototype.Stretch == x.Stretch ? 1 : 0) +
|
||||
confidence(prototype.Family, x.Family) * 3
|
||||
);
|
||||
|
||||
// a => b = a'+b
|
||||
static bool implies(bool a, bool b)
|
||||
{
|
||||
return !a || b;
|
||||
}
|
||||
|
||||
static int confidence(string target, string testee)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < target.Length && i < testee.Length && target[i] == testee[i]; i++);
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
public FontFace GetSystemFontFace(SystemFontFamily family)
|
||||
{
|
||||
return SystemFonts[family];
|
||||
}
|
||||
|
||||
private void AddFont(FontFace face, FileInfo file)
|
||||
{
|
||||
if (!All.Contains(face))
|
||||
All.Add(face);
|
||||
|
||||
FilesMap.TryAdd(face, file);
|
||||
|
||||
if (!ByFamily.TryGetValue(face.Family, out List<FontFace> siblings))
|
||||
{
|
||||
siblings = new List<FontFace>();
|
||||
ByFamily.Add(face.Family, siblings);
|
||||
}
|
||||
|
||||
if (!siblings.Contains(face))
|
||||
siblings.Add(face);
|
||||
}
|
||||
|
||||
private List<DbEntry> LoadDatabase()
|
||||
{
|
||||
FileInfo info = new FileInfo(DbPath);
|
||||
|
||||
if (!info.Exists)
|
||||
return new List<DbEntry>();
|
||||
|
||||
using Stream str = info.OpenRead();
|
||||
try
|
||||
{
|
||||
return JsonSerializer.Deserialize<List<DbEntry>>(str);
|
||||
}
|
||||
catch
|
||||
{
|
||||
return new List<DbEntry>();
|
||||
}
|
||||
}
|
||||
|
||||
private void VerifyDatabase(List<DbEntry> db)
|
||||
{
|
||||
// Very slow way to do this but how many fonts could a system have on average?
|
||||
Dictionary<string, DbEntry> entires = new Dictionary<string, DbEntry>();
|
||||
|
||||
foreach (DbEntry entry in db)
|
||||
{
|
||||
FileInfo info = new FileInfo(entry.FilePath);
|
||||
|
||||
// Reprocess fonts that appear like this.
|
||||
if (!info.Exists) continue;
|
||||
else if (info.LastWriteTime > entry.AccessTime) continue;
|
||||
}
|
||||
|
||||
string fontpath = null;
|
||||
try
|
||||
{
|
||||
fontpath = Environment.GetFolderPath(Environment.SpecialFolder.Fonts);
|
||||
if (string.IsNullOrEmpty(fontpath))
|
||||
throw new Exception();
|
||||
}
|
||||
catch
|
||||
{
|
||||
foreach (string path in FontPaths)
|
||||
{
|
||||
if (Directory.Exists(path))
|
||||
{
|
||||
fontpath = path;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// rip
|
||||
if (string.IsNullOrEmpty(fontpath))
|
||||
return;
|
||||
}
|
||||
|
||||
SearchPathForFonts(entires, fontpath);
|
||||
|
||||
db.Clear();
|
||||
db.AddRange(entires.Values);
|
||||
}
|
||||
|
||||
private static void SearchPathForFonts(Dictionary<string, DbEntry> entries, string path)
|
||||
{
|
||||
DirectoryInfo dir = new DirectoryInfo(path);
|
||||
|
||||
foreach (FileInfo file in dir.EnumerateFiles())
|
||||
{
|
||||
SearchFileForFonts(entries, file);
|
||||
}
|
||||
|
||||
foreach (DirectoryInfo directory in dir.EnumerateDirectories())
|
||||
{
|
||||
SearchPathForFonts(entries, directory.FullName);
|
||||
}
|
||||
}
|
||||
|
||||
private static void SearchFileForFonts(Dictionary<string, DbEntry> entries, FileInfo file)
|
||||
{
|
||||
if (entries.ContainsKey(file.FullName))
|
||||
return;
|
||||
|
||||
if (FT.NewFace(FTProvider.Ft, file.FullName, 0, out FTFace face) != FTError.None)
|
||||
return;
|
||||
|
||||
FontFace facename = FontFace.Parse(face.FamilyName, face.StyleName);
|
||||
|
||||
DbEntry entry = new DbEntry(facename, file.FullName);
|
||||
entries.Add(file.FullName, entry);
|
||||
FT.DoneFace(face);
|
||||
}
|
||||
|
||||
private void FlushDatabase(List<DbEntry> db)
|
||||
{
|
||||
FileInfo info = new FileInfo(DbPath);
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(DbPath));
|
||||
using Stream str = info.Open(FileMode.Create);
|
||||
JsonSerializer.Serialize(str, db);
|
||||
}
|
||||
|
||||
private static readonly string[] FontPaths = new string[] {
|
||||
"/usr/share/fonts",
|
||||
};
|
||||
|
||||
[JsonSerializable(typeof(DbEntry))]
|
||||
private class DbEntry
|
||||
{
|
||||
[JsonIgnore] public FontFace Face => new FontFace(Family, Slant, Weight, Stretch);
|
||||
public string Family { get; set; }
|
||||
public FontSlant Slant { get; set; }
|
||||
public FontWeight Weight { get; set; }
|
||||
public FontStretch Stretch { get; set; }
|
||||
public string FilePath { get; set; }
|
||||
public DateTime AccessTime { get; set; }
|
||||
|
||||
public DbEntry() {}
|
||||
public DbEntry(FontFace face, string path)
|
||||
{
|
||||
Family = face.Family;
|
||||
Slant = face.Slant;
|
||||
Weight = face.Weight;
|
||||
Stretch = face.Stretch;
|
||||
FilePath = path;
|
||||
AccessTime = DateTime.Now;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
93
Dashboard.Media.Defaults/FontDatabaseProvider.cs
Normal file
93
Dashboard.Media.Defaults/FontDatabaseProvider.cs
Normal file
@@ -0,0 +1,93 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using ReFuel.FreeType;
|
||||
using Dashboard.Media.Defaults.Fallback;
|
||||
using Dashboard.Media.Defaults.Linux;
|
||||
using Dashboard.Media.Fonts;
|
||||
using Dashboard.PAL;
|
||||
|
||||
namespace Dashboard.Media.Defaults
|
||||
{
|
||||
public static class FontDataBaseProvider
|
||||
{
|
||||
public static IFontDataBase Instance { get; }
|
||||
|
||||
static FontDataBaseProvider()
|
||||
{
|
||||
try
|
||||
{
|
||||
// TODO: add as other operating systems are supported.
|
||||
if (OperatingSystem.IsLinux())
|
||||
{
|
||||
Instance = new FontConfigFontDatabase();
|
||||
}
|
||||
else
|
||||
{
|
||||
Instance = new FallbackFontDatabase();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
throw new NotSupportedException("Could not load a suitable font database implementation.", ex);
|
||||
}
|
||||
}
|
||||
|
||||
public static (FontFace, FileInfo) ResolveSystemFont(string envVar, string defaults, IFontDataBase db)
|
||||
{
|
||||
StringBuilder builder = new StringBuilder();
|
||||
|
||||
string user = Environment.GetEnvironmentVariable(envVar);
|
||||
if (user != null)
|
||||
{
|
||||
builder.Append(user);
|
||||
builder.Append(':');
|
||||
}
|
||||
|
||||
builder.Append(defaults);
|
||||
|
||||
string[] list = builder.ToString().Split(':');
|
||||
|
||||
foreach (string item in list)
|
||||
{
|
||||
if (File.Exists(item))
|
||||
{
|
||||
// Process file.
|
||||
if (FT.NewFace(FTProvider.Ft, item, 0, out FTFace ftface) != FTError.None)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
FontFace face = FontFace.Parse(ftface.FamilyName, ftface.StyleName);
|
||||
FT.DoneFace(ftface);
|
||||
|
||||
return (face, new FileInfo(item));
|
||||
}
|
||||
else
|
||||
{
|
||||
IEnumerable<FontFace> faces = db.Search(
|
||||
new FontFace(item, FontSlant.Normal, FontWeight.Normal, FontStretch.Normal),
|
||||
FontMatchCriteria.Family);
|
||||
|
||||
if (faces.Any())
|
||||
{
|
||||
FontFace face = faces.First();
|
||||
return (face, db.FontFileInfo(face));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
FontFace face = db.GetSystemFontFace(SystemFontFamily.Sans);
|
||||
return (face, db.FontFileInfo(face));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
throw new NotImplementedException("No fallback font yet.", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
84
Dashboard.Media.Defaults/FontFreeType.cs
Normal file
84
Dashboard.Media.Defaults/FontFreeType.cs
Normal file
@@ -0,0 +1,84 @@
|
||||
using System;
|
||||
using System.Buffers;
|
||||
using System.IO;
|
||||
using ReFuel.FreeType;
|
||||
using Dashboard.Media.Color;
|
||||
using Dashboard.Media.Fonts;
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Dashboard.Media.Defaults
|
||||
{
|
||||
public class FontFreeType : Font
|
||||
{
|
||||
private MemoryStream ms;
|
||||
private FTFace face;
|
||||
|
||||
public override FontFace Face => throw new NotImplementedException();
|
||||
|
||||
public FontFreeType(Stream stream)
|
||||
{
|
||||
ms = new MemoryStream();
|
||||
stream.CopyTo(ms);
|
||||
|
||||
FTError e = FT.NewMemoryFace(Ft, ms.GetBuffer(), ms.Length, 0, out face);
|
||||
if (e != FTError.None)
|
||||
{
|
||||
throw new Exception("Could not load font face from stream.");
|
||||
}
|
||||
}
|
||||
|
||||
public override bool HasRune(int rune)
|
||||
{
|
||||
return FT.GetCharIndex(face, (ulong)rune) != 0;
|
||||
}
|
||||
|
||||
protected override Image Render(out GlyphMetrics metrics, int codepoint, float size, in FontRasterizerOptions options)
|
||||
{
|
||||
FT.SetCharSize(face, 0, (long)Math.Round(64*size), 0, (uint)Math.Round(options.Resolution));
|
||||
|
||||
uint index = FT.GetCharIndex(face, (ulong)codepoint);
|
||||
FT.LoadGlyph(face, index, FTLoadFlags.Default);
|
||||
|
||||
ref readonly FTGlyphMetrics ftmetrics = ref face.Glyph.Metrics;
|
||||
metrics = new GlyphMetrics(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),
|
||||
new Vector2(ftmetrics.HorizontalAdvance/64f, ftmetrics.VerticalAdvance/64f)
|
||||
);
|
||||
|
||||
FT.RenderGlyph(face.Glyph, options.Sdf ? FTRenderMode.Sdf : FTRenderMode.Normal);
|
||||
ref readonly FTBitmap bitmap = ref face.Glyph.Bitmap;
|
||||
|
||||
if (bitmap.Width == 0 || bitmap.Pitch == 0 || bitmap.Buffer == IntPtr.Zero)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
QImageBuffer image = new QImageBuffer(ImageFormat.AlphaU8, (int)bitmap.Width, (int)bitmap.Rows);
|
||||
image.LockBits2d(out QImageLock lk, QImageLockOptions.Default);
|
||||
|
||||
unsafe
|
||||
{
|
||||
Buffer.MemoryCopy((void*)bitmap.Buffer, (void*)lk.ImagePtr, lk.Width * lk.Height, bitmap.Width * bitmap.Rows);
|
||||
}
|
||||
|
||||
image.UnlockBits();
|
||||
return image;
|
||||
}
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
base.Dispose(disposing);
|
||||
|
||||
if (disposing)
|
||||
{
|
||||
ms.Dispose();
|
||||
}
|
||||
|
||||
FT.DoneFace(face);
|
||||
}
|
||||
|
||||
private static FTLibrary Ft => FTProvider.Ft;
|
||||
}
|
||||
}
|
||||
24
Dashboard.Media.Defaults/FreeTypeFontFactory.cs
Normal file
24
Dashboard.Media.Defaults/FreeTypeFontFactory.cs
Normal file
@@ -0,0 +1,24 @@
|
||||
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.IO;
|
||||
using Dashboard.PAL;
|
||||
|
||||
namespace Dashboard.Media.Defaults
|
||||
{
|
||||
public class FreeTypeFontFactory : IFontFactory
|
||||
{
|
||||
public bool TryOpen(Stream stream, [NotNullWhen(true)] out Font font)
|
||||
{
|
||||
try
|
||||
{
|
||||
font = new FontFreeType(stream);
|
||||
return true;
|
||||
}
|
||||
catch
|
||||
{
|
||||
font = null;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,13 +1,11 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Runtime.InteropServices;
|
||||
using Quik.Media;
|
||||
using Quik.Media.Color;
|
||||
using Quik.Stb;
|
||||
using Dashboard.Media.Color;
|
||||
using ReFuel.Stb;
|
||||
|
||||
namespace Quik.Media.Defaults
|
||||
namespace Dashboard.Media.Defaults
|
||||
{
|
||||
public unsafe class QImageStbi : QImage
|
||||
public unsafe class ImageStbi : Image
|
||||
{
|
||||
private readonly StbImage image;
|
||||
private QImageBuffer buffer;
|
||||
@@ -19,9 +17,9 @@ namespace Quik.Media.Defaults
|
||||
|
||||
public override int Depth => 1;
|
||||
public override bool IsSdf => isSdf;
|
||||
public override QImageFormat InternalFormat => Stb2QImageFormat(image.Format);
|
||||
public override ImageFormat InternalFormat => Stb2QImageFormat(image.Format);
|
||||
|
||||
public QImageStbi(Stream source)
|
||||
public ImageStbi(Stream source)
|
||||
{
|
||||
// According to the stbi documentation, only a specific type of PNG
|
||||
// files are premultiplied out of the box (iPhone PNG). Take the
|
||||
@@ -32,15 +30,15 @@ namespace Quik.Media.Defaults
|
||||
image = StbImage.Load(source);
|
||||
}
|
||||
|
||||
public static QImageFormat Stb2QImageFormat(StbiImageFormat src)
|
||||
public static ImageFormat Stb2QImageFormat(StbiImageFormat src)
|
||||
{
|
||||
switch (src)
|
||||
{
|
||||
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;
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
230
Dashboard.Media.Defaults/Linux/FontConfig.cs
Normal file
230
Dashboard.Media.Defaults/Linux/FontConfig.cs
Normal file
@@ -0,0 +1,230 @@
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Text;
|
||||
using Dashboard;
|
||||
|
||||
namespace Dashboard.Media.Defaults
|
||||
{
|
||||
public static unsafe class FontConfig
|
||||
{
|
||||
private const string fontconfig = "fontconfig";
|
||||
|
||||
public static bool Exists { get; }
|
||||
|
||||
public static IntPtr FAMILY { get; } = Marshal.StringToHGlobalAnsi("family");
|
||||
public static IntPtr STYLE { get; } = Marshal.StringToHGlobalAnsi("style");
|
||||
public static IntPtr FILE { get; } = Marshal.StringToHGlobalAnsi("file");
|
||||
public static IntPtr WEIGHT { get; } = Marshal.StringToHGlobalAnsi("weight");
|
||||
public static IntPtr SLANT { get; } = Marshal.StringToHGlobalAnsi("slant");
|
||||
|
||||
|
||||
static FontConfig()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (FcInitLoadConfigAndFonts() == null)
|
||||
{
|
||||
Exists = false;
|
||||
}
|
||||
Exists = true;
|
||||
}
|
||||
catch
|
||||
{
|
||||
Exists = false;
|
||||
}
|
||||
}
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcInitLoadConfigAndFonts")]
|
||||
public static extern FcConfig* FcInitLoadConfigAndFonts();
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcConfigGetCurrent")]
|
||||
public static extern FcConfig ConfigGetCurrent();
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcPatternCreate")]
|
||||
public static extern FcPattern PatternCreate();
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcPatternCreate")]
|
||||
public static extern bool FcPatternAdd(FcPattern pattern, IntPtr what, FcValue value, bool append);
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcObjectSetBuild", CallingConvention = CallingConvention.Cdecl)]
|
||||
public static extern FcObjectSet ObjectSetBuild(IntPtr i1, IntPtr i2, IntPtr i3, IntPtr i4, IntPtr i5, IntPtr i6);
|
||||
|
||||
public static FcObjectSet ObjectSetBuild(IntPtr i1)
|
||||
{
|
||||
return ObjectSetBuild(i1, IntPtr.Zero);
|
||||
}
|
||||
|
||||
public static FcObjectSet ObjectSetBuild(IntPtr i1, IntPtr i2)
|
||||
{
|
||||
return ObjectSetBuild(i1, i2, IntPtr.Zero);
|
||||
}
|
||||
public static FcObjectSet ObjectSetBuild(IntPtr i1, IntPtr i2, IntPtr i3)
|
||||
{
|
||||
return ObjectSetBuild(i1, i2, i3, IntPtr.Zero);
|
||||
}
|
||||
public static FcObjectSet ObjectSetBuild(IntPtr i1, IntPtr i2, IntPtr i3, IntPtr i4)
|
||||
{
|
||||
return ObjectSetBuild(i1, i2, i3, i4, IntPtr.Zero);
|
||||
}
|
||||
public static FcObjectSet ObjectSetBuild(IntPtr i1, IntPtr i2, IntPtr i3, IntPtr i4, IntPtr i5)
|
||||
{
|
||||
return ObjectSetBuild(i1, i2, i3, i4, i5, IntPtr.Zero);
|
||||
}
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcFontList")]
|
||||
public static extern FcFontSet FontList(FcConfig config, FcPattern pattern, FcObjectSet objectSet);
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcNameUnparse")]
|
||||
public static extern IntPtr NameUnparse(FcPattern pat);
|
||||
|
||||
public static string NameUnparseStr(FcPattern pat) => Marshal.PtrToStringAnsi(NameUnparse(pat));
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcPatternGetString")]
|
||||
public static extern FcResult PatternGetString(FcPattern p, IntPtr what, int n, out IntPtr val);
|
||||
|
||||
public static FcResult PatternGetString(FcPattern p, IntPtr what, out string str)
|
||||
{
|
||||
FcResult i = PatternGetString(p, what, 0, out IntPtr ptr);
|
||||
|
||||
if (i == FcResult.Match)
|
||||
{
|
||||
str = Marshal.PtrToStringAnsi(ptr);
|
||||
}
|
||||
else
|
||||
{
|
||||
str = null;
|
||||
}
|
||||
|
||||
Marshal.FreeHGlobal(ptr);
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcPatternGet")]
|
||||
public static extern FcResult PatternGet(FcPattern p, IntPtr what, int id, out FcValue value);
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcFontSetDestroy")]
|
||||
public static extern void FontSetDestroy(FcFontSet fs);
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcObjectSetDestroy")]
|
||||
public static extern void ObjectSetDestroy (FcObjectSet os);
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcConfigDestroy")]
|
||||
public static extern void ConfigDestroy (FcConfig cfg);
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcPatternDestroy")]
|
||||
public static extern void PatternDestroy (FcPattern os);
|
||||
|
||||
#region Range
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcRangeCreateDouble")]
|
||||
public static extern IntPtr RangeCreateDouble(double begin, double end);
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcRangeCreateInteger")]
|
||||
public static extern IntPtr RangeCreateInteger (int begin, int end);
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcRangeDestroy")]
|
||||
public static extern void RangeDestroy(IntPtr range);
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcRangeCopy")]
|
||||
public static extern IntPtr RangeCopy (IntPtr range);
|
||||
|
||||
[DllImport(fontconfig, EntryPoint = "FcRangeGetDouble")]
|
||||
public static extern bool RangeGetDouble(IntPtr range, out double start, out double end);
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
public enum FcResult
|
||||
{
|
||||
Match,
|
||||
NoMatch,
|
||||
TypeMismatch,
|
||||
NoId,
|
||||
OutOfMemory
|
||||
}
|
||||
|
||||
public struct FcConfig
|
||||
{
|
||||
public readonly IntPtr Handle;
|
||||
}
|
||||
|
||||
public struct FcPattern
|
||||
{
|
||||
public readonly IntPtr Handle;
|
||||
}
|
||||
|
||||
public unsafe struct FcObjectSet
|
||||
{
|
||||
public readonly IntPtr Handle;
|
||||
|
||||
private Accessor* AsPtr => (Accessor*)Handle;
|
||||
|
||||
public int NObject => AsPtr->nobject;
|
||||
|
||||
public int SObject => AsPtr->sobject;
|
||||
|
||||
#pragma warning disable CS0649 // Will always have default value.
|
||||
private struct Accessor
|
||||
{
|
||||
public int nobject;
|
||||
public int sobject;
|
||||
public byte** objects;
|
||||
}
|
||||
#pragma warning restore CS0649
|
||||
}
|
||||
|
||||
public unsafe struct FcFontSet
|
||||
{
|
||||
public readonly IntPtr Handle;
|
||||
private Accessor* AsPtr => (Accessor*)Handle;
|
||||
|
||||
public int NFont => AsPtr->nfont;
|
||||
public int SFont => AsPtr->sfont;
|
||||
|
||||
public FcPattern this[int i]
|
||||
{
|
||||
get
|
||||
{
|
||||
if (i < 0 || i >= NFont)
|
||||
throw new IndexOutOfRangeException();
|
||||
|
||||
return AsPtr->fonts[i];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma warning disable CS0649 // Will always have default value.
|
||||
private struct Accessor
|
||||
{
|
||||
public int nfont;
|
||||
public int sfont;
|
||||
public FcPattern* fonts;
|
||||
}
|
||||
#pragma warning restore CS0649
|
||||
}
|
||||
|
||||
public enum FcType
|
||||
{
|
||||
Unknown = -1,
|
||||
Void,
|
||||
Integer,
|
||||
Double,
|
||||
String,
|
||||
Bool,
|
||||
Matrix,
|
||||
CharSet,
|
||||
FTFace,
|
||||
LangSet,
|
||||
Range
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Explicit)]
|
||||
public readonly struct FcValue
|
||||
{
|
||||
[FieldOffset(0)] public readonly FcType Type;
|
||||
[FieldOffset(sizeof(FcType))] public readonly IntPtr Pointer;
|
||||
[FieldOffset(sizeof(FcType))] public readonly int Int;
|
||||
[FieldOffset(sizeof(FcType))] public readonly double Double;
|
||||
}
|
||||
}
|
||||
168
Dashboard.Media.Defaults/Linux/FontConfigFontDatabase.cs
Normal file
168
Dashboard.Media.Defaults/Linux/FontConfigFontDatabase.cs
Normal file
@@ -0,0 +1,168 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using ReFuel.FreeType;
|
||||
using Dashboard.Media.Fonts;
|
||||
using Dashboard.PAL;
|
||||
|
||||
namespace Dashboard.Media.Defaults.Linux
|
||||
{
|
||||
/// <summary>
|
||||
/// Font database for Linux libfontconfig systems.
|
||||
/// </summary>
|
||||
public class FontConfigFontDatabase : IFontDataBase
|
||||
{
|
||||
private Dictionary<FontFace, FileInfo> FilesMap { get; } = new Dictionary<FontFace, FileInfo>();
|
||||
private Dictionary<string, List<FontFace>> ByFamily { get; } = new Dictionary<string, List<FontFace>>();
|
||||
private Dictionary<SystemFontFamily, FontFace> SystemFonts { get; } = new Dictionary<SystemFontFamily, FontFace>();
|
||||
private List<FontFace> All { get; } = new List<FontFace>();
|
||||
|
||||
IEnumerable<FontFace> IFontDataBase.All => this.All;
|
||||
|
||||
public FontConfigFontDatabase()
|
||||
{
|
||||
if (!FontConfig.Exists)
|
||||
{
|
||||
throw new NotSupportedException("This host doesn't have fontconfig installed.");
|
||||
}
|
||||
|
||||
FcConfig config = FontConfig.ConfigGetCurrent();
|
||||
FcPattern pattern = FontConfig.PatternCreate();
|
||||
FcObjectSet os = FontConfig.ObjectSetBuild(FontConfig.FAMILY, FontConfig.STYLE, FontConfig.FILE);
|
||||
FcFontSet fs = FontConfig.FontList(config, pattern, os);
|
||||
|
||||
for (int i = 0; i < fs.NFont; i++)
|
||||
{
|
||||
FcPattern current = fs[i];
|
||||
|
||||
if (
|
||||
FontConfig.PatternGetString(current, FontConfig.FAMILY, 0, out IntPtr pFamily) != FcResult.Match ||
|
||||
FontConfig.PatternGetString(current, FontConfig.STYLE, 0, out IntPtr pStyle) != FcResult.Match)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
string family = Marshal.PtrToStringUTF8(pFamily);
|
||||
string style = Marshal.PtrToStringUTF8(pStyle);
|
||||
|
||||
FontFace face = FontFace.Parse(family, style);
|
||||
|
||||
FontConfig.PatternGetString(current, FontConfig.FILE, 0, out IntPtr pFile);
|
||||
string file = Marshal.PtrToStringAnsi(pFile);
|
||||
|
||||
AddFont(face, new FileInfo(file));
|
||||
}
|
||||
|
||||
FontConfig.FontSetDestroy(fs);
|
||||
FontConfig.ObjectSetDestroy(os);
|
||||
FontConfig.PatternDestroy(pattern);
|
||||
|
||||
(FontFace, FileInfo) serif = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.SerifFont, LinuxFonts.DefaultSerifFamilies, this);
|
||||
SystemFonts[SystemFontFamily.Serif] = serif.Item1;
|
||||
(FontFace, FileInfo) sans = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.SansFont, LinuxFonts.DefaultSansFamilies, this);
|
||||
SystemFonts[SystemFontFamily.Sans] = sans.Item1;
|
||||
(FontFace, FileInfo) mono = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.MonospaceFont, LinuxFonts.DefaultMonospaceFamilies, this);
|
||||
SystemFonts[SystemFontFamily.Monospace] = mono.Item1;
|
||||
(FontFace, FileInfo) cursive = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.CursiveFont, LinuxFonts.DefaultCursiveFamilies, this);
|
||||
SystemFonts[SystemFontFamily.Cursive] = cursive.Item1;
|
||||
(FontFace, FileInfo) fantasy = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.FantasyFont, LinuxFonts.DefaultFantasyFamilies, this);
|
||||
SystemFonts[SystemFontFamily.Fantasy] = fantasy.Item1;
|
||||
|
||||
AddFont(serif.Item1, serif.Item2);
|
||||
AddFont(sans.Item1, sans.Item2);
|
||||
AddFont(mono.Item1, mono.Item2);
|
||||
AddFont(cursive.Item1, cursive.Item2);
|
||||
AddFont(fantasy.Item1, fantasy.Item2);
|
||||
|
||||
}
|
||||
|
||||
private void AddFont(FontFace face, FileInfo file)
|
||||
{
|
||||
if (!All.Contains(face))
|
||||
All.Add(face);
|
||||
|
||||
FilesMap.TryAdd(face, file);
|
||||
|
||||
if (!ByFamily.TryGetValue(face.Family, out List<FontFace> siblings))
|
||||
{
|
||||
siblings = new List<FontFace>();
|
||||
ByFamily.Add(face.Family, siblings);
|
||||
}
|
||||
|
||||
if (!siblings.Contains(face))
|
||||
siblings.Add(face);
|
||||
}
|
||||
|
||||
public IEnumerable<FontFace> Search(FontFace prototype, FontMatchCriteria criteria = FontMatchCriteria.All)
|
||||
{
|
||||
// A bit scuffed and LINQ heavy but it should work.
|
||||
IEnumerable<FontFace> candidates;
|
||||
|
||||
if (criteria.HasFlag(FontMatchCriteria.Family))
|
||||
{
|
||||
List<FontFace> siblings;
|
||||
|
||||
if (!ByFamily.TryGetValue(prototype.Family, out siblings))
|
||||
{
|
||||
return Enumerable.Empty<FontFace>();
|
||||
}
|
||||
|
||||
candidates = siblings;
|
||||
}
|
||||
else
|
||||
{
|
||||
candidates = All;
|
||||
}
|
||||
|
||||
return
|
||||
candidates
|
||||
.Where(x =>
|
||||
implies(criteria.HasFlag(FontMatchCriteria.Slant), prototype.Slant == x.Slant) ||
|
||||
implies(criteria.HasFlag(FontMatchCriteria.Weight), prototype.Weight == x.Weight) ||
|
||||
implies(criteria.HasFlag(FontMatchCriteria.Stretch), prototype.Stretch == x.Stretch)
|
||||
)
|
||||
.OrderByDescending(x =>
|
||||
|
||||
(prototype.Slant == x.Slant ? 1 : 0) +
|
||||
(prototype.Weight == x.Weight ? 1 : 0) +
|
||||
(prototype.Stretch == x.Stretch ? 1 : 0) +
|
||||
confidence(prototype.Family, x.Family) * 3
|
||||
);
|
||||
|
||||
// a => b = a'+b
|
||||
static bool implies(bool a, bool b)
|
||||
{
|
||||
return !a || b;
|
||||
}
|
||||
|
||||
static int confidence(string target, string testee)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < target.Length && i < testee.Length && target[i] == testee[i]; i++);
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
public FileInfo FontFileInfo(FontFace face)
|
||||
{
|
||||
if (FilesMap.TryGetValue(face, out FileInfo info))
|
||||
return info;
|
||||
else
|
||||
return null;
|
||||
}
|
||||
|
||||
public Stream Open(FontFace face)
|
||||
{
|
||||
return FontFileInfo(face)?.OpenRead() ?? throw new FileNotFoundException();
|
||||
}
|
||||
|
||||
public FontFace GetSystemFontFace(SystemFontFamily family)
|
||||
{
|
||||
return SystemFonts[family];
|
||||
}
|
||||
}
|
||||
}
|
||||
11
Dashboard.Media.Defaults/Linux/LinuxFonts.cs
Normal file
11
Dashboard.Media.Defaults/Linux/LinuxFonts.cs
Normal file
@@ -0,0 +1,11 @@
|
||||
namespace Dashboard.Media.Defaults.Linux
|
||||
{
|
||||
internal static class LinuxFonts
|
||||
{
|
||||
public const string DefaultSerifFamilies = "Noto Serif:Nimbus Roman:Liberation Serif:FreeSerif:Times:Times New Roman";
|
||||
public const string DefaultSansFamilies = "Noto Sans:Nimbus Sans:Droid Sans:Liberation Sans:FreeSans:Helvetica Neue:Helvetica:Arial";
|
||||
public const string DefaultMonospaceFamilies = "Noto Mono:Nimbus Mono PS:Liberation Mono:DejaVu Mono:FreeMono:Lucida Console:Consolas:Courier:Courier New";
|
||||
public const string DefaultCursiveFamilies = "";
|
||||
public const string DefaultFantasyFamilies = "";
|
||||
}
|
||||
}
|
||||
@@ -4,14 +4,14 @@ using System.Collections;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using Quik.Media;
|
||||
using Dashboard.Media.Fonts;
|
||||
|
||||
// WebRequest is obsolete but runs on .NET framework.
|
||||
#pragma warning disable SYSLIB0014
|
||||
|
||||
namespace Quik.Media.Defaults
|
||||
namespace Dashboard.Media.Defaults
|
||||
{
|
||||
public class StbMediaLoader : MediaLoader<string>, MediaLoader<Uri>, MediaLoader<FileInfo>, MediaLoader<FontInfo>
|
||||
public class StbMediaLoader : MediaLoader<string>, MediaLoader<Uri>, MediaLoader<FileInfo>, MediaLoader<FontFace>
|
||||
{
|
||||
public bool AllowRemoteTransfers { get; set; } = false;
|
||||
private readonly ArrayPool<byte> ByteArrays = ArrayPool<byte>.Create();
|
||||
@@ -31,9 +31,9 @@ namespace Quik.Media.Defaults
|
||||
{
|
||||
return GetMedia((FileInfo)key, hint);
|
||||
}
|
||||
else if (t == typeof(FontInfo))
|
||||
else if (t == typeof(FontFace))
|
||||
{
|
||||
return GetMedia((FontInfo)key, hint);
|
||||
return GetMedia((FontFace)key, hint);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -56,7 +56,7 @@ namespace Quik.Media.Defaults
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public IDisposable GetMedia(FontInfo key, MediaHint hint)
|
||||
public IDisposable GetMedia(FontFace key, MediaHint hint)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
151
Dashboard.Media.Defaults/Win32/EnumerateFonts.cs
Normal file
151
Dashboard.Media.Defaults/Win32/EnumerateFonts.cs
Normal file
@@ -0,0 +1,151 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
#if false
|
||||
namespace Quik.Media.Defaults.Win32
|
||||
{
|
||||
|
||||
public class EnumerateFonts
|
||||
{
|
||||
private const byte DEFAULT_CHARSET = 1;
|
||||
|
||||
public static void Enumerate(FontFace font)
|
||||
{
|
||||
/* It's windows, just borrow the desktop window. */
|
||||
IntPtr hdc = GetDC(GetDesktopWindow());
|
||||
|
||||
List<(LogFontA, TextMetricA)> list = new List<(LogFontA, TextMetricA)>();
|
||||
|
||||
LogFontA font2 = new LogFontA()
|
||||
{
|
||||
//FaceName = font.Family,
|
||||
Weight = ((font.Style & FontStyle.Bold) != 0) ? FontWeight.Bold : FontWeight.Regular,
|
||||
Italic = (font.Style & FontStyle.Italic) != 0,
|
||||
CharSet = DEFAULT_CHARSET
|
||||
};
|
||||
|
||||
Console.WriteLine(font2.FaceName);
|
||||
|
||||
EnumFontFamiliesExProc proc = (in LogFontA font, in TextMetricA metric, int type, IntPtr lparam) =>
|
||||
{
|
||||
list.Add((font, metric));
|
||||
return 0;
|
||||
};
|
||||
|
||||
EnumFontFamiliesExA(hdc, font2, proc, IntPtr.Zero, 0);
|
||||
}
|
||||
|
||||
private const string gdi32 = "Gdi32.dll";
|
||||
private const string user32 = "User32.dll";
|
||||
|
||||
[DllImport(gdi32)]
|
||||
private static extern int EnumFontFamiliesExA(
|
||||
IntPtr hdc,
|
||||
in LogFontA font,
|
||||
[MarshalAs(UnmanagedType.FunctionPtr)] EnumFontFamiliesExProc proc,
|
||||
IntPtr lparam,
|
||||
int flags /* Should be zero. */);
|
||||
|
||||
[DllImport(user32)]
|
||||
private static extern IntPtr /* HWND */ GetDesktopWindow();
|
||||
|
||||
[DllImport(user32)]
|
||||
private static extern IntPtr /* HDC */ GetDC(IntPtr hwnd);
|
||||
|
||||
private delegate int EnumFontFamiliesExProc(in LogFontA font, in TextMetricA metric, int fontType, IntPtr lParam);
|
||||
|
||||
private struct LogFontA
|
||||
{
|
||||
public long Height;
|
||||
public long Width;
|
||||
public long Escapement;
|
||||
public long Orientation;
|
||||
public FontWeight Weight;
|
||||
[MarshalAs(UnmanagedType.U1)]
|
||||
public bool Italic;
|
||||
[MarshalAs(UnmanagedType.U1)]
|
||||
public bool Underline;
|
||||
[MarshalAs(UnmanagedType.U1)]
|
||||
public bool StrikeOut;
|
||||
public byte CharSet;
|
||||
public byte OutPrecision;
|
||||
public byte ClipPrecision;
|
||||
public byte PitchAndFamily;
|
||||
private unsafe fixed byte aFaceName[32];
|
||||
public unsafe string FaceName
|
||||
{
|
||||
get
|
||||
{
|
||||
fixed (byte* str = aFaceName)
|
||||
{
|
||||
int len = 0;
|
||||
for (; str[len] != 0 && len < 32; len++) ;
|
||||
return Encoding.UTF8.GetString(str, len);
|
||||
}
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
fixed (byte *str = aFaceName)
|
||||
{
|
||||
Span<byte> span = new Span<byte>(str, 32);
|
||||
Encoding.UTF8.GetBytes(value, span);
|
||||
span[31] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct TextMetricA
|
||||
{
|
||||
public long Height;
|
||||
public long Ascent;
|
||||
public long Descent;
|
||||
public long InternalLeading;
|
||||
public long ExternalLeading;
|
||||
public long AveCharWidth;
|
||||
public long MaxCharWidth;
|
||||
public long Weight;
|
||||
public long Overhang;
|
||||
public long DigitizedAspectX;
|
||||
public long DigitizedAspectY;
|
||||
public byte FirstChar;
|
||||
public byte LastChar;
|
||||
public byte DefaultChar;
|
||||
public byte BreakChar;
|
||||
public byte Italic;
|
||||
public byte Underlined;
|
||||
public byte StruckOut;
|
||||
public byte PitchAndFamily;
|
||||
public byte CharSet;
|
||||
}
|
||||
|
||||
private enum FontWeight : long
|
||||
{
|
||||
DontCare = 0,
|
||||
Thin = 100,
|
||||
ExtraLight = 200,
|
||||
UltraLight = 200,
|
||||
Light = 300,
|
||||
Normal = 400,
|
||||
Regular = 400,
|
||||
Medium = 500,
|
||||
Semibold = 600,
|
||||
Demibold = 600,
|
||||
Bold = 700,
|
||||
Extrabold = 800,
|
||||
Ultrabold = 800,
|
||||
Heavy = 900,
|
||||
Black = 900
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endif
|
||||
@@ -2,8 +2,7 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<Nullable>disable</Nullable>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -11,7 +10,7 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Quik\Quik.csproj" />
|
||||
<ProjectReference Include="..\Dashboard\Dashboard.csproj" />
|
||||
<EmbeddedResource Include="glsl\**"/>
|
||||
</ItemGroup>
|
||||
|
||||
105
Dashboard.OpenTK/OpenTKPlatform.cs
Normal file
105
Dashboard.OpenTK/OpenTKPlatform.cs
Normal file
@@ -0,0 +1,105 @@
|
||||
using Dashboard.ImmediateDraw;
|
||||
using Dashboard.Media;
|
||||
using Dashboard.PAL;
|
||||
using OpenTK.Graphics.OpenGL4;
|
||||
using OpenTK.Mathematics;
|
||||
using OpenTK.Windowing.Desktop;
|
||||
using OpenTK.Windowing.GraphicsLibraryFramework;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Dashboard.OpenTK
|
||||
{
|
||||
public class OpenTKPlatform : IDbPlatform
|
||||
{
|
||||
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 event EventHandler? EventRaised;
|
||||
|
||||
public NativeWindowSettings DefaultSettings { get; set; } = NativeWindowSettings.Default;
|
||||
|
||||
public IReadOnlyList<OpenTKPort> Ports => _ports;
|
||||
|
||||
private bool IsGLInitialized = false;
|
||||
|
||||
public IDashHandle CreatePort()
|
||||
{
|
||||
NativeWindow window = new NativeWindow(DefaultSettings);
|
||||
OpenTKPort port = new OpenTKPort(window);
|
||||
_ports.Add(port);
|
||||
|
||||
if (!IsGLInitialized)
|
||||
{
|
||||
window.Context.MakeCurrent();
|
||||
GL.LoadBindings(new GLFWBindingsContext());
|
||||
IsGLInitialized = true;
|
||||
}
|
||||
|
||||
window.Closing += (ea) =>
|
||||
{
|
||||
Environment.Exit(0);
|
||||
};
|
||||
|
||||
return port;
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
// FIXME: dispose pattern here!
|
||||
|
||||
// Copy the array to prevent collection modification exceptions.
|
||||
foreach (OpenTKPort port in _ports.ToArray())
|
||||
{
|
||||
port.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
public void ProcessEvents(bool block)
|
||||
{
|
||||
NativeWindow.ProcessWindowEvents(block);
|
||||
}
|
||||
|
||||
public void DestroyPort(IDashHandle port) => ((OpenTKPort)port).Dispose();
|
||||
|
||||
public string PortGetTitle(IDashHandle port) => ((OpenTKPort)port).Title;
|
||||
|
||||
public void PortSetTitle(IDashHandle port, string title) => ((OpenTKPort)port).Title = title;
|
||||
|
||||
public Vector2 PortGetSize(IDashHandle port) => ((OpenTKPort)port).Size;
|
||||
|
||||
public void PortSetSize(IDashHandle port, Vector2 size) => ((OpenTKPort)port).Size = size;
|
||||
|
||||
public Vector2 PortGetPosition(IDashHandle port) => ((OpenTKPort)port).Position;
|
||||
|
||||
public void PortSetPosition(IDashHandle port, Vector2 position) => ((OpenTKPort)port).Position = position;
|
||||
|
||||
public bool PortIsValid(IDashHandle port) => ((OpenTKPort)port).IsValid;
|
||||
|
||||
public void PortSubscribeEvent(IDashHandle port, EventHandler handler) => ((OpenTKPort)port).EventRaised += handler;
|
||||
|
||||
public void PortUnsubscribeEvent(IDashHandle port, EventHandler handler) => ((OpenTKPort)port).EventRaised -= handler;
|
||||
|
||||
public void PortFocus(IDashHandle port) => ((OpenTKPort)port).Focus();
|
||||
|
||||
public void PortShow(IDashHandle port, bool shown = true) => ((OpenTKPort)port).Show(shown);
|
||||
|
||||
public void PortPaint(IDashHandle port, DrawList commands) => ((OpenTKPort)port).Paint(commands);
|
||||
|
||||
public void GetMaximumImage(out int width, out int height)
|
||||
{
|
||||
GL.GetInteger(GetPName.MaxTextureSize, out int value);
|
||||
width = height = value;
|
||||
}
|
||||
|
||||
public void GetMaximumImage(out int width, out int height, out int depth)
|
||||
{
|
||||
GetMaximumImage(out width, out height);
|
||||
GL.GetInteger(GetPName.MaxArrayTextureLayers, out int value);
|
||||
depth = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,18 +1,19 @@
|
||||
using System;
|
||||
using OpenTK.Mathematics;
|
||||
using OpenTK.Windowing.Desktop;
|
||||
using Quik.OpenGL;
|
||||
using Quik.CommandMachine;
|
||||
using Quik.PAL;
|
||||
using Quik.VertexGenerator;
|
||||
using OpenTK.Graphics.OpenGL4;
|
||||
using Dashboard.OpenGL;
|
||||
using Dashboard.ImmediateDraw;
|
||||
using Dashboard.PAL;
|
||||
using Dashboard.VertexGenerator;
|
||||
|
||||
namespace Quik.OpenTK
|
||||
namespace Dashboard.OpenTK
|
||||
{
|
||||
public class OpenTKPort : IQuikPortHandle
|
||||
public class OpenTKPort : IDashHandle
|
||||
{
|
||||
private readonly NativeWindow _window;
|
||||
private readonly GL21Driver _glDriver;
|
||||
private readonly VertexGeneratorEngine _vertexEngine;
|
||||
private readonly VertexDrawingEngine _vertexEngine;
|
||||
|
||||
public string Title
|
||||
{
|
||||
@@ -20,12 +21,12 @@ namespace Quik.OpenTK
|
||||
set => _window.Title = value;
|
||||
}
|
||||
|
||||
public QVec2 Size
|
||||
public Vector2 Size
|
||||
{
|
||||
get
|
||||
{
|
||||
Vector2i size = _window.ClientSize;
|
||||
return new QVec2(size.X, size.Y);
|
||||
return new Vector2(size.X, size.Y);
|
||||
}
|
||||
set
|
||||
{
|
||||
@@ -35,12 +36,12 @@ namespace Quik.OpenTK
|
||||
_window.Size = size;
|
||||
}
|
||||
}
|
||||
public QVec2 Position
|
||||
public Vector2 Position
|
||||
{
|
||||
get
|
||||
{
|
||||
Vector2i location = _window.Location;
|
||||
return new QVec2(location.X, location.Y);
|
||||
return new Vector2(location.X, location.Y);
|
||||
}
|
||||
set
|
||||
{
|
||||
@@ -51,13 +52,13 @@ namespace Quik.OpenTK
|
||||
|
||||
public bool IsValid => !isDisposed;
|
||||
|
||||
public event EventHandler EventRaised;
|
||||
public event EventHandler? EventRaised;
|
||||
|
||||
public OpenTKPort(NativeWindow window)
|
||||
{
|
||||
_window = window;
|
||||
_glDriver = new GL21Driver();
|
||||
_vertexEngine = new VertexGeneratorEngine();
|
||||
_vertexEngine = new VertexDrawingEngine();
|
||||
}
|
||||
|
||||
public void Focus()
|
||||
@@ -65,9 +66,9 @@ namespace Quik.OpenTK
|
||||
_window.Focus();
|
||||
}
|
||||
|
||||
public void Paint(CommandList queue)
|
||||
public void Paint(DrawList queue)
|
||||
{
|
||||
QRectangle view = new QRectangle(Size, new QVec2(0, 0));
|
||||
Rectangle view = new Rectangle(Size, new Vector2(0, 0));
|
||||
|
||||
_vertexEngine.Reset();
|
||||
_vertexEngine.ProcessCommands(view, queue);
|
||||
@@ -78,6 +79,7 @@ namespace Quik.OpenTK
|
||||
if (!_glDriver.IsInit)
|
||||
_glDriver.Init();
|
||||
|
||||
GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
|
||||
_glDriver.Draw(_vertexEngine.DrawQueue, view);
|
||||
|
||||
_window.Context.SwapBuffers();
|
||||
51
Dashboard.sln
Normal file
51
Dashboard.sln
Normal file
@@ -0,0 +1,51 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.0.31903.59
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard", "Dashboard\Dashboard.csproj", "{4FE772DD-F424-4EAC-BF88-CB8F751B4926}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard.Media.Defaults", "Dashboard.Media.Defaults\Dashboard.Media.Defaults.csproj", "{3798F6DD-8F84-4B7D-A810-B0D4B5ACB672}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard.OpenTK", "Dashboard.OpenTK\Dashboard.OpenTK.csproj", "{2013470A-915C-46F2-BDD3-FCAA39C845EE}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{40F3B724-88A1-4D4F-93AB-FE0DC07A347E}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard.Demo", "tests\Dashboard.Demo\Dashboard.Demo.csproj", "{EAA5488E-ADF0-4D68-91F4-FAE98C8691FC}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard.BlurgText", "Dashboard.BlurgText\Dashboard.BlurgText.csproj", "{D05A9DEA-A5D1-43DC-AB41-36B07598B749}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{4FE772DD-F424-4EAC-BF88-CB8F751B4926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{4FE772DD-F424-4EAC-BF88-CB8F751B4926}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{4FE772DD-F424-4EAC-BF88-CB8F751B4926}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4FE772DD-F424-4EAC-BF88-CB8F751B4926}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{3798F6DD-8F84-4B7D-A810-B0D4B5ACB672}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{3798F6DD-8F84-4B7D-A810-B0D4B5ACB672}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{3798F6DD-8F84-4B7D-A810-B0D4B5ACB672}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{3798F6DD-8F84-4B7D-A810-B0D4B5ACB672}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{2013470A-915C-46F2-BDD3-FCAA39C845EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{2013470A-915C-46F2-BDD3-FCAA39C845EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{2013470A-915C-46F2-BDD3-FCAA39C845EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2013470A-915C-46F2-BDD3-FCAA39C845EE}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{EAA5488E-ADF0-4D68-91F4-FAE98C8691FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{EAA5488E-ADF0-4D68-91F4-FAE98C8691FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{EAA5488E-ADF0-4D68-91F4-FAE98C8691FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{EAA5488E-ADF0-4D68-91F4-FAE98C8691FC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{D05A9DEA-A5D1-43DC-AB41-36B07598B749}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{D05A9DEA-A5D1-43DC-AB41-36B07598B749}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{D05A9DEA-A5D1-43DC-AB41-36B07598B749}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{D05A9DEA-A5D1-43DC-AB41-36B07598B749}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{EAA5488E-ADF0-4D68-91F4-FAE98C8691FC} = {40F3B724-88A1-4D4F-93AB-FE0DC07A347E}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
56
Dashboard/Controls/CommonEnums.cs
Normal file
56
Dashboard/Controls/CommonEnums.cs
Normal file
@@ -0,0 +1,56 @@
|
||||
|
||||
using System;
|
||||
|
||||
namespace Dashboard.Controls
|
||||
{
|
||||
public enum Dock
|
||||
{
|
||||
None,
|
||||
Top,
|
||||
Left,
|
||||
Bottom,
|
||||
Right,
|
||||
Center
|
||||
}
|
||||
|
||||
[Flags]
|
||||
public enum Anchor
|
||||
{
|
||||
None = 0,
|
||||
Top = 1 << 0,
|
||||
Left = 1 << 1,
|
||||
Bottom = 1 << 2,
|
||||
Right = 1 << 3,
|
||||
All = Top | Left | Bottom | Right
|
||||
}
|
||||
|
||||
public enum Direction
|
||||
{
|
||||
Vertical,
|
||||
Horizontal
|
||||
}
|
||||
|
||||
public enum TextAlignment
|
||||
{
|
||||
Left,
|
||||
Center,
|
||||
Right,
|
||||
Justify,
|
||||
}
|
||||
|
||||
public enum VerticalAlignment
|
||||
{
|
||||
Top,
|
||||
Center,
|
||||
Bottom,
|
||||
Justify,
|
||||
}
|
||||
|
||||
public enum HorizontalAlignment
|
||||
{
|
||||
Left,
|
||||
Center,
|
||||
Right,
|
||||
Justify
|
||||
}
|
||||
}
|
||||
86
Dashboard/Controls/ContainerControl.cs
Normal file
86
Dashboard/Controls/ContainerControl.cs
Normal file
@@ -0,0 +1,86 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Dashboard.Controls
|
||||
{
|
||||
public abstract class ContainerControl : Control, ICollection<Control>
|
||||
{
|
||||
private readonly List<Control> children = new List<Control>();
|
||||
|
||||
public int Count => children.Count;
|
||||
|
||||
public bool IsReadOnly => false;
|
||||
|
||||
public event EventHandler<ChildEventArgs>? ChildAdded;
|
||||
public event EventHandler<ChildEventArgs>? ChildRemoved;
|
||||
|
||||
public void Add(Control item)
|
||||
{
|
||||
children.Add(item);
|
||||
OnChildAdded(new ChildEventArgs(item));
|
||||
}
|
||||
|
||||
public void Clear()
|
||||
{
|
||||
foreach (Control child in this)
|
||||
{
|
||||
OnChildRemoved(new ChildEventArgs(child));
|
||||
}
|
||||
|
||||
children.Clear();
|
||||
}
|
||||
|
||||
public bool Contains(Control item)
|
||||
{
|
||||
return children.Contains(item);
|
||||
}
|
||||
|
||||
public void CopyTo(Control[] array, int arrayIndex)
|
||||
{
|
||||
children.CopyTo(array, arrayIndex);
|
||||
}
|
||||
|
||||
public IEnumerator<Control> GetEnumerator()
|
||||
{
|
||||
return children.GetEnumerator();
|
||||
}
|
||||
|
||||
public bool Remove(Control item)
|
||||
{
|
||||
if (children.Remove(item))
|
||||
{
|
||||
OnChildRemoved(new ChildEventArgs(item));
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public virtual void OnChildAdded(ChildEventArgs ea)
|
||||
{
|
||||
Adopt(ea.Child, this);
|
||||
ChildAdded?.Invoke(this, ea);
|
||||
}
|
||||
|
||||
public virtual void OnChildRemoved(ChildEventArgs ea)
|
||||
{
|
||||
Adopt(ea.Child, null);
|
||||
ChildRemoved?.Invoke(this, ea);
|
||||
}
|
||||
|
||||
IEnumerator IEnumerable.GetEnumerator()
|
||||
{
|
||||
return children.GetEnumerator();
|
||||
}
|
||||
}
|
||||
public class ChildEventArgs : EventArgs
|
||||
{
|
||||
public Control Child { get; }
|
||||
|
||||
public ChildEventArgs(Control child)
|
||||
{
|
||||
Child = child;
|
||||
}
|
||||
}
|
||||
}
|
||||
142
Dashboard/Controls/Control.cs
Normal file
142
Dashboard/Controls/Control.cs
Normal file
@@ -0,0 +1,142 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Dashboard.ImmediateDraw;
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Dashboard.Controls
|
||||
{
|
||||
public abstract class Control : UIBase
|
||||
{
|
||||
private readonly DrawList drawCommands = new DrawList();
|
||||
|
||||
public string? Id { get; set; }
|
||||
|
||||
public override Vector2 Position
|
||||
{
|
||||
get => base.Position;
|
||||
set
|
||||
{
|
||||
base.Position = value;
|
||||
InvalidateLayout();
|
||||
}
|
||||
}
|
||||
|
||||
public Style Style { get; set; } = new Style();
|
||||
public float Padding
|
||||
{
|
||||
get => (float)(Style["padding"] ?? 0.0f);
|
||||
set => Style["padding"] = value;
|
||||
}
|
||||
|
||||
public bool IsVisualsValid { get; private set; } = false;
|
||||
public bool IsLayoutValid { get; private set; } = false;
|
||||
|
||||
protected bool IsLayoutSuspended { get; private set; } = false;
|
||||
|
||||
protected ResizedEventArgs? LastResizeEvent { get; private set; }
|
||||
|
||||
public void InvalidateVisual()
|
||||
{
|
||||
IsVisualsValid = false;
|
||||
OnVisualsInvalidated(this, EventArgs.Empty);
|
||||
}
|
||||
|
||||
public void InvalidateLayout()
|
||||
{
|
||||
IsLayoutValid = false;
|
||||
OnLayoutInvalidated(this, EventArgs.Empty);
|
||||
}
|
||||
|
||||
public void SuspendLayout()
|
||||
{
|
||||
IsLayoutSuspended = true;
|
||||
}
|
||||
|
||||
public void ResumeLayout()
|
||||
{
|
||||
IsLayoutSuspended = false;
|
||||
InvalidateLayout();
|
||||
}
|
||||
|
||||
protected abstract void ValidateVisual(DrawList cmd);
|
||||
protected abstract void ValidateLayout();
|
||||
|
||||
protected override void PaintBegin(DrawList cmd)
|
||||
{
|
||||
base.PaintBegin(cmd);
|
||||
|
||||
if (!IsLayoutValid && !IsLayoutSuspended)
|
||||
{
|
||||
ValidateLayout();
|
||||
OnLayoutValidated(this, EventArgs.Empty);
|
||||
IsLayoutValid = true;
|
||||
|
||||
InvalidateVisual();
|
||||
}
|
||||
|
||||
if (!IsVisualsValid)
|
||||
{
|
||||
ValidateVisual(drawCommands);
|
||||
OnVisualsValidated(this, EventArgs.Empty);
|
||||
IsVisualsValid = true;
|
||||
}
|
||||
|
||||
cmd.PushStyle(Style);
|
||||
cmd.PushViewport();
|
||||
cmd.StoreViewport(AbsoluteBounds);
|
||||
|
||||
cmd.Splice(drawCommands);
|
||||
|
||||
if (this is IEnumerable<Control> children)
|
||||
{
|
||||
foreach (Control child in children)
|
||||
{
|
||||
child.Paint(cmd);
|
||||
}
|
||||
}
|
||||
|
||||
cmd.PopViewport();
|
||||
cmd.PopStyle();
|
||||
}
|
||||
|
||||
public event EventHandler? StyleChanged;
|
||||
public event EventHandler? VisualsInvalidated;
|
||||
public event EventHandler? VisualsValidated;
|
||||
public event EventHandler? LayoutInvalidated;
|
||||
public event EventHandler? LayoutValidated;
|
||||
|
||||
protected virtual void OnStyleChanged(object sender, EventArgs ea)
|
||||
{
|
||||
StyleChanged?.Invoke(sender, ea);
|
||||
InvalidateLayout();
|
||||
}
|
||||
|
||||
protected virtual void OnVisualsInvalidated(object sender, EventArgs ea)
|
||||
{
|
||||
VisualsInvalidated?.Invoke(sender, ea);
|
||||
}
|
||||
|
||||
protected virtual void OnVisualsValidated(object sender, EventArgs ea)
|
||||
{
|
||||
VisualsValidated?.Invoke(sender, ea);
|
||||
}
|
||||
|
||||
protected virtual void OnLayoutInvalidated(object sender, EventArgs ea)
|
||||
{
|
||||
LayoutInvalidated?.Invoke(sender, ea);
|
||||
}
|
||||
|
||||
protected virtual void OnLayoutValidated(object sender, EventArgs ea)
|
||||
{
|
||||
LayoutValidated?.Invoke(sender, ea);
|
||||
}
|
||||
|
||||
public override void OnResized(object sender, ResizedEventArgs ea)
|
||||
{
|
||||
base.OnResized(sender, ea);
|
||||
|
||||
LastResizeEvent = ea;
|
||||
InvalidateLayout();
|
||||
}
|
||||
}
|
||||
}
|
||||
100
Dashboard/Controls/FlowBox.cs
Normal file
100
Dashboard/Controls/FlowBox.cs
Normal file
@@ -0,0 +1,100 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Dashboard.ImmediateDraw;
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Dashboard.Controls
|
||||
{
|
||||
public class FlowBox : ContainerControl
|
||||
{
|
||||
public Direction FlowDirection { get; set; }
|
||||
public bool AllowWrap { get; set; }
|
||||
public VerticalAlignment VerticalAlignment { get; set; }
|
||||
public HorizontalAlignment HorizontalAlignment { get; set; }
|
||||
public float ItemPadding { get; set; } = 4f;
|
||||
|
||||
protected override void ValidateLayout()
|
||||
{
|
||||
}
|
||||
|
||||
protected override void ValidateVisual(DrawList cmd)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
private void FlowHorizontal()
|
||||
{
|
||||
IEnumerator<Control> controls = this.GetEnumerator();
|
||||
List<Control> row;
|
||||
}
|
||||
|
||||
// Enumerate a row.
|
||||
private bool EnumerateRows(IEnumerator<Control> iterator, List<Control> row)
|
||||
{
|
||||
float width = 0;
|
||||
|
||||
do
|
||||
{
|
||||
if (width + iterator.Current.Size.X < Size.X)
|
||||
{
|
||||
row.Add(iterator.Current);
|
||||
width += iterator.Current.Size.X + ItemPadding;
|
||||
}
|
||||
else
|
||||
{
|
||||
return true;
|
||||
}
|
||||
} while (iterator.MoveNext());
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
// Flows a row of children.
|
||||
private void FlowRow(List<Control> line, Vector2 offset, Vector2 size, float packedWidth)
|
||||
{
|
||||
Vector2 pointer = offset;
|
||||
|
||||
pointer.X += hstart();
|
||||
|
||||
foreach (Control child in line)
|
||||
{
|
||||
child.Position = pointer;
|
||||
pointer += new Vector2(child.Size.X + hoffset(child), voffset(child));
|
||||
}
|
||||
|
||||
float hstart()
|
||||
{
|
||||
return HorizontalAlignment switch {
|
||||
HorizontalAlignment.Center => (size.Y - packedWidth) / 2,
|
||||
HorizontalAlignment.Right => size.Y - packedWidth,
|
||||
_ => 0f
|
||||
};
|
||||
}
|
||||
|
||||
float hoffset(Control child)
|
||||
{
|
||||
if (line.Count == 1)
|
||||
return 0;
|
||||
else if (HorizontalAlignment == HorizontalAlignment.Justify)
|
||||
{
|
||||
return ItemPadding + ((size.Y - packedWidth) / (line.Count - 1));
|
||||
}
|
||||
else
|
||||
{
|
||||
return ItemPadding;
|
||||
}
|
||||
}
|
||||
|
||||
float voffset(Control child)
|
||||
{
|
||||
return VerticalAlignment switch {
|
||||
VerticalAlignment.Top => 0f,
|
||||
VerticalAlignment.Bottom => size.Y - child.Size.Y,
|
||||
_ => (size.Y - child.Size.Y) / 2,
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
31
Dashboard/Controls/GridBox.cs
Normal file
31
Dashboard/Controls/GridBox.cs
Normal file
@@ -0,0 +1,31 @@
|
||||
|
||||
using Dashboard.ImmediateDraw;
|
||||
using Dashboard.Layout;
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Dashboard.Controls
|
||||
{
|
||||
public class GridBox : ContainerControl
|
||||
{
|
||||
protected override void ValidateLayout()
|
||||
{
|
||||
if (LastResizeEvent != null)
|
||||
{
|
||||
foreach (Control child in this)
|
||||
{
|
||||
GridLayoutAttribute attribute = GridLayoutAttribute.GetGridLayout(child);
|
||||
|
||||
attribute.Evaluate(LastResizeEvent, child.Bounds, out Rectangle newBounds);
|
||||
child.Bounds = newBounds;
|
||||
|
||||
child.InvalidateLayout();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected override void ValidateVisual(DrawList cmd)
|
||||
{
|
||||
cmd.Rectangle(new Rectangle(Size, Vector2.Zero));
|
||||
}
|
||||
}
|
||||
}
|
||||
32
Dashboard/Controls/Label.cs
Normal file
32
Dashboard/Controls/Label.cs
Normal file
@@ -0,0 +1,32 @@
|
||||
using Dashboard.ImmediateDraw;
|
||||
using Dashboard.Media;
|
||||
using Dashboard.Typography;
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Dashboard.Controls
|
||||
{
|
||||
public class Label : Control
|
||||
{
|
||||
public string Text { get; set; } = string.Empty;
|
||||
public Font? Font { get; set; }
|
||||
public float TextSize { get; set; }
|
||||
public bool AutoSize { get; set; } = true;
|
||||
|
||||
protected override void ValidateLayout()
|
||||
{
|
||||
if (AutoSize)
|
||||
{
|
||||
Vector2 size = Typesetter.MeasureHorizontal(Text, TextSize, Font!);
|
||||
Size = size;
|
||||
}
|
||||
}
|
||||
|
||||
protected override void ValidateVisual(DrawList cmd)
|
||||
{
|
||||
float padding = Padding;
|
||||
Vector2 origin = new Vector2(padding, padding);
|
||||
|
||||
cmd.TypesetHorizontalDirect(Text, origin, TextSize, Font!);
|
||||
}
|
||||
}
|
||||
}
|
||||
151
Dashboard/Controls/UIBase.cs
Normal file
151
Dashboard/Controls/UIBase.cs
Normal file
@@ -0,0 +1,151 @@
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Dashboard.ImmediateDraw;
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Dashboard.Controls
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Bases for all UI elements.
|
||||
/// </summary>
|
||||
public abstract class UIBase : IDbAttribute
|
||||
{
|
||||
private Vector2 size;
|
||||
|
||||
public UIBase? Parent { get; protected set; }
|
||||
public Rectangle Bounds
|
||||
{
|
||||
get => new Rectangle(Position + Size, Position);
|
||||
set
|
||||
{
|
||||
Size = value.Size;
|
||||
Position = value.Min;
|
||||
}
|
||||
}
|
||||
|
||||
public virtual Vector2 Position { get; set; }
|
||||
|
||||
public Vector2 Size
|
||||
{
|
||||
get => size;
|
||||
set
|
||||
{
|
||||
Vector2 oldSize = size;
|
||||
size = value;
|
||||
|
||||
OnResized(this, new ResizedEventArgs(size, oldSize));
|
||||
}
|
||||
}
|
||||
|
||||
public Rectangle AbsoluteBounds
|
||||
{
|
||||
get
|
||||
{
|
||||
if (Parent == null)
|
||||
{
|
||||
return Bounds;
|
||||
}
|
||||
else
|
||||
{
|
||||
return new Rectangle(Bounds.Max + Parent.Position, Bounds.Min + Parent.Position);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public Vector2 MaximumSize { get; set; } = new Vector2(-1, -1);
|
||||
public Vector2 MinimumSize { get; set; } = new Vector2(-1, -1);
|
||||
|
||||
public bool IsMaximumSizeSet => MaximumSize != new Vector2(-1, -1);
|
||||
public bool IsMinimumSizeSet => MinimumSize != new Vector2(-1, -1);
|
||||
|
||||
public Dictionary<string, object> Attributes { get; } = new Dictionary<string, object>();
|
||||
|
||||
public virtual void NotifyEvent(object? sender, EventArgs args)
|
||||
{
|
||||
}
|
||||
|
||||
protected virtual void PaintBegin(DrawList cmd)
|
||||
{
|
||||
cmd.PushViewport();
|
||||
cmd.StoreViewport(AbsoluteBounds);
|
||||
cmd.PushZ();
|
||||
}
|
||||
|
||||
protected virtual void PaintEnd(DrawList cmd)
|
||||
{
|
||||
cmd.PopViewport();
|
||||
}
|
||||
|
||||
public void Paint(DrawList cmd)
|
||||
{
|
||||
PaintBegin(cmd);
|
||||
PaintEnd(cmd);
|
||||
}
|
||||
|
||||
public event EventHandler<ResizedEventArgs>? Resized;
|
||||
public event EventHandler<AdoptedEventArgs>? Adopted;
|
||||
|
||||
public virtual void OnResized(object sender, ResizedEventArgs ea)
|
||||
{
|
||||
Resized?.Invoke(sender, ea);
|
||||
}
|
||||
|
||||
protected virtual void OnAdopted(UIBase? parent)
|
||||
{
|
||||
Adopted?.Invoke(this, new AdoptedEventArgs(parent));
|
||||
}
|
||||
|
||||
public bool IsDisposed { get; private set; } = false;
|
||||
|
||||
protected virtual void Dispose(bool disposing)
|
||||
{
|
||||
foreach (object userdata in Attributes.Values)
|
||||
{
|
||||
if (userdata is IDisposable disposable)
|
||||
disposable.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
protected void DisposeInvoker(bool disposing)
|
||||
{
|
||||
if (IsDisposed)
|
||||
return;
|
||||
|
||||
IsDisposed = true;
|
||||
|
||||
Dispose(disposing);
|
||||
}
|
||||
|
||||
public void Dispose() => DisposeInvoker(true);
|
||||
|
||||
protected static void Adopt(UIBase child, UIBase? parent)
|
||||
{
|
||||
child.Parent = parent;
|
||||
child.OnAdopted(parent);
|
||||
}
|
||||
}
|
||||
|
||||
public class ResizedEventArgs : EventArgs
|
||||
{
|
||||
public Vector2 NewSize { get; }
|
||||
public Vector2 OldSize { get; }
|
||||
|
||||
public ResizedEventArgs(Vector2 newSize, Vector2 oldSize)
|
||||
{
|
||||
NewSize = newSize;
|
||||
OldSize = oldSize;
|
||||
}
|
||||
}
|
||||
|
||||
public class AdoptedEventArgs : EventArgs
|
||||
{
|
||||
public UIBase? Parent { get; }
|
||||
|
||||
public AdoptedEventArgs(UIBase? parent = null)
|
||||
{
|
||||
Parent = parent;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
using System;
|
||||
|
||||
namespace Quik.Controls
|
||||
namespace Dashboard.Controls
|
||||
{
|
||||
public class View : UIBase
|
||||
{
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<Nullable>disable</Nullable>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<Nullable>enable</Nullable>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -11,4 +11,9 @@
|
||||
<EmbeddedResource Include="res/**" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="OpenTK.Graphics" Version="4.8.2" />
|
||||
<PackageReference Include="OpenTK.Mathematics" Version="4.8.2" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -1,27 +1,28 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Quik.CommandMachine;
|
||||
using Quik.Controls;
|
||||
using Quik.Media;
|
||||
using Quik.PAL;
|
||||
using Quik.Typography;
|
||||
using System.Threading;
|
||||
using Dashboard.ImmediateDraw;
|
||||
using Dashboard.Controls;
|
||||
using Dashboard.Media;
|
||||
using Dashboard.PAL;
|
||||
using Dashboard.Typography;
|
||||
|
||||
namespace Quik
|
||||
namespace Dashboard
|
||||
{
|
||||
/// <summary>
|
||||
/// Main class for Quik applications.
|
||||
/// Main class for Dashboard applications.
|
||||
/// </summary>
|
||||
public class QuikApplication
|
||||
public class DbApplication
|
||||
{
|
||||
/// <summary>
|
||||
/// The application platform driver.
|
||||
/// </summary>
|
||||
public IQuikPlatform Platform { get; }
|
||||
public IDbPlatform Platform { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Title of the application.
|
||||
/// </summary>
|
||||
public string Title
|
||||
public string? Title
|
||||
{
|
||||
get => Platform.Title;
|
||||
set => Platform.Title = value;
|
||||
@@ -30,13 +31,13 @@ namespace Quik
|
||||
/// <summary>
|
||||
/// Application icon.
|
||||
/// </summary>
|
||||
public QImage Icon
|
||||
public Image? Icon
|
||||
{
|
||||
get => Platform.Icon;
|
||||
set => Platform.Icon = value;
|
||||
}
|
||||
|
||||
public QuikPort MainPort { get; private set; } = null;
|
||||
public PAL.Dash? MainPort { get; private set; } = null;
|
||||
|
||||
public FontProvider FontProvider { get; }
|
||||
|
||||
@@ -45,15 +46,16 @@ namespace Quik
|
||||
/// </summary>
|
||||
public List<MediaLoader> MediaLoaders { get; } = new List<MediaLoader>();
|
||||
|
||||
public QuikApplication(IQuikPlatform platform)
|
||||
public DbApplication(IDbPlatform platform)
|
||||
{
|
||||
Platform = platform;
|
||||
FontProvider = new FontProvider(this);
|
||||
Current = this;
|
||||
}
|
||||
|
||||
public IDisposable GetMedia(object key, MediaHint hint)
|
||||
public IDisposable? GetMedia(object key, MediaHint hint)
|
||||
{
|
||||
IDisposable disposable = null;
|
||||
IDisposable? disposable = null;
|
||||
|
||||
foreach (MediaLoader loader in MediaLoaders)
|
||||
{
|
||||
@@ -66,9 +68,9 @@ namespace Quik
|
||||
return disposable;
|
||||
}
|
||||
|
||||
public IDisposable GetMedia<T>(T key, MediaHint hint)
|
||||
public IDisposable? GetMedia<T>(T key, MediaHint hint)
|
||||
{
|
||||
IDisposable disposable = null;
|
||||
IDisposable? disposable = null;
|
||||
|
||||
foreach (MediaLoader loader in MediaLoaders)
|
||||
{
|
||||
@@ -84,22 +86,48 @@ namespace Quik
|
||||
return disposable;
|
||||
}
|
||||
|
||||
public void Run(View mainView)
|
||||
{
|
||||
MainPort = new QuikPort(Platform) { UIElement = mainView };
|
||||
CommandList cmd = new CommandList();
|
||||
private DrawList cmd = new DrawList();
|
||||
|
||||
public void Run(View mainView, bool yield = true)
|
||||
{
|
||||
Init(mainView);
|
||||
|
||||
while (RunSync())
|
||||
{
|
||||
if (yield)
|
||||
{
|
||||
Thread.Yield();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void Init(View mainView)
|
||||
{
|
||||
MainPort = new PAL.Dash(Platform) { UIElement = mainView };
|
||||
MainPort.EventRaised += (sender, ea) => mainView.NotifyEvent(sender, ea);
|
||||
}
|
||||
|
||||
while (MainPort.IsValid)
|
||||
public bool RunSync()
|
||||
{
|
||||
if (!MainPort!.IsValid)
|
||||
return false;
|
||||
|
||||
Platform.ProcessEvents(false);
|
||||
|
||||
if (MainPort.IsValid)
|
||||
{
|
||||
cmd.Clear();
|
||||
MainPort.Paint(cmd);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public static DbApplication Current { get; private set; } = null!;
|
||||
|
||||
public static void SetCurrentApplication(DbApplication application)
|
||||
{
|
||||
Current = application;
|
||||
}
|
||||
}
|
||||
}
|
||||
268
Dashboard/Geometry.cs
Normal file
268
Dashboard/Geometry.cs
Normal file
@@ -0,0 +1,268 @@
|
||||
using OpenTK.Mathematics;
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace Dashboard
|
||||
{
|
||||
/// <summary>
|
||||
/// A bezier curve segment.
|
||||
/// </summary>
|
||||
[DebuggerDisplay("{Start} -- {ControlA} -- {ControlB} -- {End}")]
|
||||
public struct Bezier
|
||||
{
|
||||
/// <summary>
|
||||
/// Segment start point.
|
||||
/// </summary>
|
||||
public Vector2 Start;
|
||||
|
||||
/// <summary>
|
||||
/// Start point control point.
|
||||
/// </summary>
|
||||
public Vector2 ControlA;
|
||||
|
||||
/// <summary>
|
||||
/// End point control point.
|
||||
/// </summary>
|
||||
public Vector2 ControlB;
|
||||
|
||||
/// <summary>
|
||||
/// Segment end point.
|
||||
/// </summary>
|
||||
public Vector2 End;
|
||||
|
||||
/// <summary>
|
||||
/// An approximation of the arc length of the bezier curve, for calculating rasterization resolution.
|
||||
/// </summary>
|
||||
public float RasterizationArc =>
|
||||
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)
|
||||
{
|
||||
Start = start;
|
||||
ControlA = controlA;
|
||||
ControlB = controlB;
|
||||
End = end;
|
||||
}
|
||||
|
||||
public Bezier(
|
||||
float startX,
|
||||
float startY,
|
||||
float controlAx,
|
||||
float controlAy,
|
||||
float controlBx,
|
||||
float controlBy,
|
||||
float endX,
|
||||
float endY)
|
||||
: this(
|
||||
new Vector2(startX, startY),
|
||||
new Vector2(controlAx, controlAy),
|
||||
new Vector2(controlBx, controlBy),
|
||||
new Vector2(endX, endY))
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get a point in the curve segment.
|
||||
/// </summary>
|
||||
/// <param name="t">Control parameter (between 0 and 1)</param>
|
||||
/// <returns>The point on the curve.</returns>
|
||||
public Vector2 GetBezierPoint(float t)
|
||||
{
|
||||
float T = 1 - t;
|
||||
return
|
||||
T * T * T * Start +
|
||||
3 * T * T * t * ControlA +
|
||||
3 * T * t * t * ControlB +
|
||||
t * t * t * End;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get the tangent on the curve.
|
||||
/// </summary>
|
||||
/// <param name="t">Control parameter (between 0 and 1)</param>
|
||||
/// <returns>The tangent curve.</returns>
|
||||
public Vector2 GetBezierTangent(float t)
|
||||
{
|
||||
float T = 1 - t;
|
||||
return
|
||||
(
|
||||
3 * T * T * (ControlA - Start) +
|
||||
6 * T * t * (ControlB - ControlA) +
|
||||
3 * t * t * (End - ControlB)
|
||||
).Normalized();
|
||||
}
|
||||
|
||||
internal Vector2 GetBezierNormal(float t)
|
||||
{
|
||||
Vector2 tangent = GetBezierTangent(t);
|
||||
return new Vector2(-tangent.Y, tangent.X);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A line segment.
|
||||
/// </summary>
|
||||
[DebuggerDisplay("{Start} -- {End}")]
|
||||
public struct Line
|
||||
{
|
||||
/// <summary>
|
||||
/// Start point.
|
||||
/// </summary>
|
||||
public Vector2 Start;
|
||||
|
||||
/// <summary>
|
||||
/// End point.
|
||||
/// </summary>
|
||||
public Vector2 End;
|
||||
|
||||
public Line(Vector2 start, Vector2 end)
|
||||
{
|
||||
Start = start;
|
||||
End = end;
|
||||
}
|
||||
|
||||
public Line(float startX, float startY, float endX, float endY)
|
||||
{
|
||||
Start.X = startX;
|
||||
Start.Y = startY;
|
||||
End.X = endX;
|
||||
End.Y = endY;
|
||||
}
|
||||
|
||||
public Vector2 Normal()
|
||||
{
|
||||
Vector2 tangent = Tangent();
|
||||
return new Vector2(-tangent.Y, tangent.X);
|
||||
}
|
||||
public Vector2 Tangent()
|
||||
{
|
||||
return (End - Start).Normalized();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A rectangle.
|
||||
/// </summary>
|
||||
[DebuggerDisplay("({Left}, {Top}, {Right}, {Bottom})")]
|
||||
public struct Rectangle
|
||||
{
|
||||
/// <summary>
|
||||
/// Position maximum point.
|
||||
/// </summary>
|
||||
public Vector2 Max;
|
||||
|
||||
/// <summary>
|
||||
/// Position minimum point.
|
||||
/// </summary>
|
||||
public Vector2 Min;
|
||||
|
||||
public float Left
|
||||
{
|
||||
get => Min.X;
|
||||
set => Min.X = value;
|
||||
}
|
||||
|
||||
public float Right
|
||||
{
|
||||
get => Max.X;
|
||||
set => Max.X = value;
|
||||
}
|
||||
|
||||
public float Top
|
||||
{
|
||||
get => Min.Y;
|
||||
set => Min.Y = value;
|
||||
}
|
||||
|
||||
public float Bottom
|
||||
{
|
||||
get => Max.Y;
|
||||
set => Max.Y = value;
|
||||
}
|
||||
|
||||
public Vector2 Size
|
||||
{
|
||||
get => Max - Min;
|
||||
set => Max = Min + value;
|
||||
}
|
||||
|
||||
public Rectangle(Vector2 max, Vector2 min)
|
||||
{
|
||||
Max = max;
|
||||
Min = min;
|
||||
}
|
||||
|
||||
public Rectangle(float r, float b, float l, float t)
|
||||
{
|
||||
Max = new Vector2(r, b);
|
||||
Min = new Vector2(l, t);
|
||||
}
|
||||
|
||||
public bool Contains(Vector2 point)
|
||||
{
|
||||
return
|
||||
point.X > Left && point.X < Right &&
|
||||
point.Y > Bottom && point.Y < Top;
|
||||
}
|
||||
|
||||
internal void Translate(in Vector2 offset)
|
||||
{
|
||||
Min += offset;
|
||||
Max += offset;
|
||||
}
|
||||
|
||||
public static Rectangle Intersect(in Rectangle a, in Rectangle b) =>
|
||||
new Rectangle(
|
||||
Math.Max(a.Right, b.Right),
|
||||
Math.Max(a.Bottom, b.Bottom)
|
||||
,
|
||||
Math.Min(a.Left, b.Left),
|
||||
Math.Min(a.Top, b.Top));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// An ellipse.
|
||||
/// </summary>
|
||||
/// <remarks>It is undefined to have an ellipse with non-orthogonal axes.</remarks>
|
||||
[DebuggerDisplay("{Center} ellipse {AxisA}; {AxisB}")]
|
||||
public struct Ellipse
|
||||
{
|
||||
/// <summary>
|
||||
/// Ellipse center point.
|
||||
/// </summary>
|
||||
public Vector2 Center;
|
||||
|
||||
/// <summary>
|
||||
/// First ellipse axis.
|
||||
/// </summary>
|
||||
public Vector2 AxisA;
|
||||
|
||||
/// <summary>
|
||||
/// Second ellipse axis.
|
||||
/// </summary>
|
||||
public Vector2 AxisB;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A triangle.
|
||||
/// </summary>
|
||||
[DebuggerDisplay("{A} -- {B} -- {C}")]
|
||||
public struct Triangle
|
||||
{
|
||||
/// <summary>
|
||||
/// First vertex.
|
||||
/// </summary>
|
||||
public Vector2 A;
|
||||
|
||||
/// <summary>
|
||||
/// Second vertex.
|
||||
/// </summary>
|
||||
public Vector2 B;
|
||||
|
||||
/// <summary>
|
||||
/// Third vertex.
|
||||
/// </summary>
|
||||
public Vector2 C;
|
||||
}
|
||||
}
|
||||
21
Dashboard/IDbAttribute.cs
Normal file
21
Dashboard/IDbAttribute.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Dashboard
|
||||
{
|
||||
/// <summary>
|
||||
/// Common interface for Dashboard objects that accept attributes.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Dashboard will call dispose on any and all objects which implement IDisposable.
|
||||
/// If this is an issue, please guard your object against this using a wrapper.
|
||||
/// </remarks
|
||||
public interface IDbAttribute : IDisposable
|
||||
{
|
||||
/// <summary>
|
||||
/// Attribute dictionary.
|
||||
/// </summary>
|
||||
public Dictionary<string, object> Attributes { get; }
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace Quik.CommandMachine
|
||||
namespace Dashboard.ImmediateDraw
|
||||
{
|
||||
/// <summary>
|
||||
/// Enumeration of built-in Quik commands.
|
||||
8
Dashboard/ImmediateDraw/CommandHandler.cs
Normal file
8
Dashboard/ImmediateDraw/CommandHandler.cs
Normal file
@@ -0,0 +1,8 @@
|
||||
namespace Dashboard.ImmediateDraw
|
||||
{
|
||||
/// <summary>
|
||||
/// A delegate for a Dashboard engine command.
|
||||
/// </summary>
|
||||
/// <param name="stack">The current stack.</param>
|
||||
public delegate void CommandHandler(DrawingEngine state, DrawQueue queue);
|
||||
}
|
||||
233
Dashboard/ImmediateDraw/DrawEngine.cs
Normal file
233
Dashboard/ImmediateDraw/DrawEngine.cs
Normal file
@@ -0,0 +1,233 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Dashboard.ImmediateDraw
|
||||
{
|
||||
public class DrawingEngine
|
||||
{
|
||||
private int _zIndex = 0;
|
||||
private readonly Stack<int> _zStack = new Stack<int>();
|
||||
public int ZIndex => _zIndex;
|
||||
|
||||
private Rectangle _viewport;
|
||||
private readonly Stack<Rectangle> _viewportStack = new Stack<Rectangle>();
|
||||
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 Matrix4 ActiveTransforms { get; }
|
||||
|
||||
public StyleStack Style { get; } = new StyleStack(new Style());
|
||||
|
||||
protected DrawingEngine()
|
||||
{
|
||||
Reset();
|
||||
}
|
||||
|
||||
public Command RegisterCustomCommand(CommandHandler handler)
|
||||
{
|
||||
Command id = _customCommandBase++;
|
||||
_customCommands.Insert(id - Command.CustomCommandBase, handler);
|
||||
return id;
|
||||
}
|
||||
|
||||
public void ProcessCommands(Rectangle bounds, DrawList queue)
|
||||
{
|
||||
DrawQueue iterator = queue.GetEnumerator();
|
||||
|
||||
if (!iterator.Peek().IsCommand)
|
||||
throw new ArgumentException("The first element in the iterator must be a command frame.");
|
||||
|
||||
Reset();
|
||||
|
||||
_viewport = bounds;
|
||||
_viewportStack.Push(_viewport);
|
||||
|
||||
Frame frame;
|
||||
while (iterator.TryDequeue(out frame))
|
||||
{
|
||||
Command cmd = (Command)frame;
|
||||
switch (cmd)
|
||||
{
|
||||
default:
|
||||
if (cmd > Command.CustomCommandBase)
|
||||
{
|
||||
_customCommands[cmd - Command.CustomCommandBase].Invoke(this, iterator);
|
||||
}
|
||||
else
|
||||
{
|
||||
ChildProcessCommand(cmd, iterator);
|
||||
}
|
||||
break;
|
||||
|
||||
case Command.ConditionalBegin: ConditionalHandler(iterator); break;
|
||||
case Command.ConditionalEnd: /* nop */ break;
|
||||
|
||||
case Command.Invoke:
|
||||
iterator.Dequeue().As<CommandHandler>().Invoke(this, iterator);
|
||||
break;
|
||||
case Command.PushViewport:
|
||||
_viewportStack.Push(_viewport);
|
||||
break;
|
||||
case Command.IntersectViewport:
|
||||
_viewport = Rectangle.Intersect((Rectangle)iterator.Dequeue(), _viewport);
|
||||
break;
|
||||
case Command.StoreViewport:
|
||||
_viewport = (Rectangle)iterator.Dequeue();
|
||||
break;
|
||||
case Command.PopViewport:
|
||||
_viewport = _viewportStack.TryPop(out Rectangle viewport) ? viewport : bounds;
|
||||
break;
|
||||
case Command.PushZ:
|
||||
_zStack.Push(_zIndex);
|
||||
break;
|
||||
case Command.IncrementZ:
|
||||
_zIndex++;
|
||||
break;
|
||||
case Command.AddZ:
|
||||
_zIndex += (int)iterator.Dequeue();
|
||||
break;
|
||||
case Command.StoreZ:
|
||||
_zIndex = (int)iterator.Dequeue();
|
||||
break;
|
||||
case Command.DecrementZ:
|
||||
_zIndex--;
|
||||
break;
|
||||
case Command.PopZ:
|
||||
_zIndex = _zStack.TryPop(out int zindex) ? zindex : 0;
|
||||
break;
|
||||
case Command.PushStyle:
|
||||
Style.Push(iterator.Dequeue().As<Style>());
|
||||
break;
|
||||
case Command.StoreStyle:
|
||||
Style.Pop();
|
||||
Style.Push(iterator.Dequeue().As<Style>());
|
||||
break;
|
||||
case Command.PopStyle:
|
||||
Style.Pop();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void ChildProcessCommand(Command name, DrawQueue queue)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Reset()
|
||||
{
|
||||
_zIndex = 0;
|
||||
_zStack.Clear();
|
||||
|
||||
_viewport = new Rectangle(float.MaxValue, float.MinValue, float.MinValue, float.MaxValue);
|
||||
_viewportStack.Clear();
|
||||
|
||||
_matrixStack.Clear();
|
||||
_matrixStack.Push(Matrix4.Identity);
|
||||
}
|
||||
|
||||
private void ConditionalHandler(DrawQueue iterator)
|
||||
{
|
||||
Frame frame = iterator.Dequeue();
|
||||
|
||||
if (
|
||||
frame.IsInteger && (int)frame != 0 ||
|
||||
frame.As<Func<bool>>().Invoke())
|
||||
{
|
||||
// Take this branch.
|
||||
return;
|
||||
}
|
||||
|
||||
// Skip this branch.
|
||||
int depth = 1;
|
||||
while (iterator.TryPeek(out frame))
|
||||
{
|
||||
if (!frame.IsCommand)
|
||||
{
|
||||
iterator.Dequeue();
|
||||
continue;
|
||||
}
|
||||
|
||||
switch ((Command)frame)
|
||||
{
|
||||
case Command.ConditionalBegin:
|
||||
// Increment conditional depth.
|
||||
depth++;
|
||||
break;
|
||||
case Command.ConditionalEnd:
|
||||
// Decrement condional depth, exit if zero.
|
||||
if (--depth == 0)
|
||||
{
|
||||
iterator.Dequeue();
|
||||
return;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
iterator.Dequeue();
|
||||
}
|
||||
}
|
||||
|
||||
private static readonly Dictionary<Type, IDrawListSerializer> s_serializers = new Dictionary<Type, IDrawListSerializer>();
|
||||
|
||||
/// <summary>
|
||||
/// Add a custom serializer to the command engine.
|
||||
/// </summary>
|
||||
/// <typeparam name="T">Type object type.</typeparam>
|
||||
/// <param name="serializer">The serializer.</param>
|
||||
/// <param name="overwrite">True to allow overwriting.</param>
|
||||
public static void AddSerializer<T>(IDrawListSerializer serializer, bool overwrite = false)
|
||||
{
|
||||
if (overwrite)
|
||||
{
|
||||
s_serializers[typeof(T)] = serializer;
|
||||
}
|
||||
else
|
||||
{
|
||||
s_serializers.Add(typeof(T), serializer);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Add a custom serializer to the command engine.
|
||||
/// </summary>
|
||||
/// <typeparam name="T">Type object type.</typeparam>
|
||||
/// <param name="serializer">The serializer.</param>
|
||||
/// <param name="overwrite">True to allow overwriting.</param>
|
||||
public static void AddSerializer<T>(IDrawListSerializer<T> serializer, bool overwrite = false)
|
||||
=> AddSerializer<T>((IDrawListSerializer)serializer, overwrite);
|
||||
|
||||
/// <summary>
|
||||
/// Get a serializer for the given object.
|
||||
/// </summary>
|
||||
/// <typeparam name="T">The object type.</typeparam>
|
||||
/// <param name="value">Required parameter for the C# type inference to work.</param>
|
||||
/// <returns>The serializer.</returns>
|
||||
public static IDrawListSerializer<T> GetSerializer<T>(IDrawListSerializable<T>? value)
|
||||
where T : IDrawListSerializable<T>, new()
|
||||
{
|
||||
if (!s_serializers.TryGetValue(typeof(T), out var serializer))
|
||||
{
|
||||
serializer = new DrawListSerializableSerializer<T>();
|
||||
AddSerializer<T>(serializer);
|
||||
}
|
||||
|
||||
return (IDrawListSerializer<T>)serializer;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get a serializer for the given object.
|
||||
/// </summary>
|
||||
/// <typeparam name="T">The object type.</typeparam>
|
||||
/// <param name="value">Required parameter for the C# type inference to work.</param>
|
||||
/// <returns>The serializer.</returns>
|
||||
public static IDrawListSerializer<T> GetSerializer<T>(T? value)
|
||||
{
|
||||
return (IDrawListSerializer<T>)s_serializers[typeof(T)];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,13 +1,13 @@
|
||||
using Quik.Media;
|
||||
using Dashboard.Media;
|
||||
using OpenTK.Mathematics;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
namespace Quik.CommandMachine
|
||||
namespace Dashboard.ImmediateDraw
|
||||
{
|
||||
public class CommandList : IEnumerable<Frame>
|
||||
public class DrawList : IEnumerable<Frame>
|
||||
{
|
||||
private readonly List<Frame> _frames = new List<Frame>();
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace Quik.CommandMachine
|
||||
_frames.Add(frame);
|
||||
}
|
||||
|
||||
public void Invoke(QuikCommandHandler handler)
|
||||
public void Invoke(CommandHandler handler)
|
||||
{
|
||||
Enqueue(Command.Invoke);
|
||||
Enqueue(new Frame(handler));
|
||||
@@ -49,13 +49,13 @@ namespace Quik.CommandMachine
|
||||
Enqueue(Command.PushViewport);
|
||||
}
|
||||
|
||||
public void IntersectViewport(in QRectangle viewport)
|
||||
public void IntersectViewport(in Rectangle viewport)
|
||||
{
|
||||
Enqueue(Command.IntersectViewport);
|
||||
Enqueue(viewport);
|
||||
}
|
||||
|
||||
public void StoreViewport(in QRectangle viewport)
|
||||
public void StoreViewport(in Rectangle viewport)
|
||||
{
|
||||
Enqueue(Command.StoreViewport);
|
||||
Enqueue(viewport);
|
||||
@@ -109,21 +109,38 @@ namespace Quik.CommandMachine
|
||||
Enqueue(Command.PopZ);
|
||||
}
|
||||
|
||||
public void Line(in QLine line)
|
||||
public void PushStyle(Style style)
|
||||
{
|
||||
Enqueue(Command.PushStyle);
|
||||
Enqueue(new Frame(style));
|
||||
}
|
||||
|
||||
public void StoreStyle(Style style)
|
||||
{
|
||||
Enqueue(Command.StoreStyle);
|
||||
Enqueue(new Frame(style));
|
||||
}
|
||||
|
||||
public void PopStyle()
|
||||
{
|
||||
Enqueue(Command.PopStyle);
|
||||
}
|
||||
|
||||
public void Line(in Line line)
|
||||
{
|
||||
Enqueue(Command.Line);
|
||||
Enqueue(line);
|
||||
}
|
||||
|
||||
public void Line(params QLine[] lines)
|
||||
public void Line(params Line[] lines)
|
||||
{
|
||||
Enqueue(Command.Line);
|
||||
Enqueue((Frame)lines.Length);
|
||||
foreach (QLine line in lines)
|
||||
foreach (Line line in lines)
|
||||
Enqueue(line);
|
||||
}
|
||||
|
||||
public void Bezier(in QBezier bezier)
|
||||
public void Bezier(in Bezier bezier)
|
||||
{
|
||||
Frame a, b;
|
||||
Frame.Create(bezier, out a, out b);
|
||||
@@ -133,14 +150,14 @@ namespace Quik.CommandMachine
|
||||
Enqueue(b);
|
||||
}
|
||||
|
||||
public void Bezier(params QBezier[] beziers)
|
||||
public void Bezier(params Bezier[] beziers)
|
||||
{
|
||||
Frame a, b;
|
||||
|
||||
Enqueue(Command.Bezier);
|
||||
Enqueue((Frame)beziers.Length);
|
||||
|
||||
foreach (QBezier bezier in beziers)
|
||||
foreach (Bezier bezier in beziers)
|
||||
{
|
||||
Frame.Create(bezier, out a, out b);
|
||||
Enqueue(a);
|
||||
@@ -148,21 +165,21 @@ namespace Quik.CommandMachine
|
||||
}
|
||||
}
|
||||
|
||||
public void Rectangle(in QRectangle rectangle)
|
||||
public void Rectangle(in Rectangle rectangle)
|
||||
{
|
||||
Enqueue(Command.Rectangle);
|
||||
Enqueue(rectangle);
|
||||
}
|
||||
|
||||
public void Rectangle(QRectangle[] rectangles)
|
||||
public void Rectangle(Rectangle[] rectangles)
|
||||
{
|
||||
Enqueue(Command.Rectangle);
|
||||
Enqueue((Frame)rectangles.Length);
|
||||
foreach (QRectangle rectangle in rectangles)
|
||||
foreach (Rectangle rectangle in rectangles)
|
||||
Enqueue(rectangle);
|
||||
}
|
||||
|
||||
public void Ellipse(in QEllipse ellipse)
|
||||
public void Ellipse(in Ellipse ellipse)
|
||||
{
|
||||
Frame a, b;
|
||||
Frame.Create(ellipse, out a, out b);
|
||||
@@ -172,12 +189,12 @@ namespace Quik.CommandMachine
|
||||
Enqueue(b);
|
||||
}
|
||||
|
||||
public void Ellipse(params QEllipse[] ellipses)
|
||||
public void Ellipse(params Ellipse[] ellipses)
|
||||
{
|
||||
Frame a, b;
|
||||
Enqueue(Command.Ellipse);
|
||||
Enqueue((Frame)ellipses.Length);
|
||||
foreach (QEllipse ellipse in ellipses)
|
||||
foreach (Ellipse ellipse in ellipses)
|
||||
{
|
||||
Frame.Create(ellipse, out a, out b);
|
||||
Enqueue(a);
|
||||
@@ -185,7 +202,7 @@ namespace Quik.CommandMachine
|
||||
}
|
||||
}
|
||||
|
||||
public void Triangle(in QTriangle triangle)
|
||||
public void Triangle(in Triangle triangle)
|
||||
{
|
||||
Enqueue(Command.Triangle);
|
||||
Enqueue(triangle.A);
|
||||
@@ -193,11 +210,11 @@ namespace Quik.CommandMachine
|
||||
Enqueue(triangle.C);
|
||||
}
|
||||
|
||||
public void Triangle(params QTriangle[] triangles)
|
||||
public void Triangle(params Triangle[] triangles)
|
||||
{
|
||||
Enqueue(Command.Triangle);
|
||||
Enqueue((Frame)triangles.Length);
|
||||
foreach (QTriangle triangle in triangles)
|
||||
foreach (Triangle triangle in triangles)
|
||||
{
|
||||
Enqueue(triangle.A);
|
||||
Enqueue(triangle.B);
|
||||
@@ -205,17 +222,17 @@ namespace Quik.CommandMachine
|
||||
}
|
||||
}
|
||||
|
||||
public void Polygon(params QVec2[] polygon)
|
||||
public void Polygon(params Vector2[] polygon)
|
||||
{
|
||||
Enqueue(Command.Polygon);
|
||||
Enqueue((Frame)polygon.Length);
|
||||
foreach (QVec2 vertex in polygon)
|
||||
foreach (Vector2 vertex in polygon)
|
||||
{
|
||||
Enqueue(vertex);
|
||||
}
|
||||
}
|
||||
|
||||
public void Image(QImage texture, in QRectangle rectangle)
|
||||
public void Image(Image texture, in Rectangle rectangle)
|
||||
{
|
||||
Enqueue(Command.Image);
|
||||
Enqueue((Frame)(int)ImageCommandFlags.Single);
|
||||
@@ -223,7 +240,7 @@ namespace Quik.CommandMachine
|
||||
Enqueue(rectangle);
|
||||
}
|
||||
|
||||
public void Image(QImage texture, in QRectangle rectangle, in QRectangle uv)
|
||||
public void Image(Image texture, in Rectangle rectangle, in Rectangle uv)
|
||||
{
|
||||
Enqueue(Command.Image);
|
||||
Enqueue((Frame)(int)(ImageCommandFlags.Single | ImageCommandFlags.UVs));
|
||||
@@ -232,7 +249,7 @@ namespace Quik.CommandMachine
|
||||
Enqueue(uv);
|
||||
}
|
||||
|
||||
public void Image(QImage texture, ReadOnlySpan<QRectangle> rectangles, bool interleavedUV = false)
|
||||
public void Image(Image texture, ReadOnlySpan<Rectangle> rectangles, bool interleavedUV = false)
|
||||
{
|
||||
int count = rectangles.Length;
|
||||
ImageCommandFlags flags = ImageCommandFlags.None;
|
||||
@@ -247,13 +264,13 @@ namespace Quik.CommandMachine
|
||||
Enqueue(new Frame((int)flags, count));
|
||||
Enqueue(new Frame(texture));
|
||||
|
||||
foreach (QRectangle rectangle in rectangles)
|
||||
foreach (Rectangle rectangle in rectangles)
|
||||
{
|
||||
Enqueue(rectangle);
|
||||
}
|
||||
}
|
||||
|
||||
public void Image(QImage texture, ReadOnlySpan<QRectangle> rectangles, ReadOnlySpan<QRectangle> uvs)
|
||||
public void Image(Image texture, ReadOnlySpan<Rectangle> rectangles, ReadOnlySpan<Rectangle> uvs)
|
||||
{
|
||||
int count = Math.Min(rectangles.Length, uvs.Length);
|
||||
Enqueue(Command.Image);
|
||||
@@ -267,7 +284,7 @@ namespace Quik.CommandMachine
|
||||
}
|
||||
}
|
||||
|
||||
public void Image3D(QImage texture, in Image3DCall call)
|
||||
public void Image3D(Image texture, in Image3DCall call)
|
||||
{
|
||||
Enqueue(Command.Image);
|
||||
Enqueue(new Frame(ImageCommandFlags.Image3d | ImageCommandFlags.Single));
|
||||
@@ -277,7 +294,7 @@ namespace Quik.CommandMachine
|
||||
Enqueue(new Frame(call.Layer));
|
||||
}
|
||||
|
||||
public void Image3D(QImage texture, ReadOnlySpan<Image3DCall> calls)
|
||||
public void Image3D(Image texture, ReadOnlySpan<Image3DCall> calls)
|
||||
{
|
||||
Enqueue(Command.Image);
|
||||
Enqueue(new Frame((int)ImageCommandFlags.Image3d, calls.Length));
|
||||
@@ -291,7 +308,7 @@ namespace Quik.CommandMachine
|
||||
}
|
||||
}
|
||||
|
||||
public void Splice(CommandList list)
|
||||
public void Splice(DrawList list)
|
||||
{
|
||||
foreach (Frame frame in list)
|
||||
{
|
||||
@@ -299,12 +316,33 @@ namespace Quik.CommandMachine
|
||||
}
|
||||
}
|
||||
|
||||
public CommandQueue GetEnumerator() => new CommandQueue(_frames);
|
||||
/// <summary>
|
||||
/// Serialize an object into the command list.
|
||||
/// </summary>
|
||||
/// <typeparam name="T">The type of the value to serialize.</typeparam>
|
||||
/// <param name="value">What to write into the command list.</param>
|
||||
public void Write<T>(T value)
|
||||
{
|
||||
DrawingEngine.GetSerializer(value).Serialize(value, this);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Serialize an object into the command list.
|
||||
/// </summary>
|
||||
/// <typeparam name="T">The type of the value to serialize.</typeparam>
|
||||
/// <param name="value">What to write into the command list.</param>
|
||||
public void Write<T>(IDrawListSerializable<T> value)
|
||||
where T : IDrawListSerializable<T>, new()
|
||||
{
|
||||
DrawingEngine.GetSerializer(value).Serialize((T)value, this);
|
||||
}
|
||||
|
||||
public DrawQueue GetEnumerator() => new DrawQueue(_frames);
|
||||
IEnumerator<Frame> IEnumerable<Frame>.GetEnumerator() => GetEnumerator();
|
||||
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
|
||||
}
|
||||
|
||||
public class CommandQueue : IEnumerator<Frame>
|
||||
public class DrawQueue : IEnumerator<Frame>
|
||||
{
|
||||
private readonly IReadOnlyList<Frame> _frames;
|
||||
private int _current;
|
||||
@@ -313,7 +351,7 @@ namespace Quik.CommandMachine
|
||||
|
||||
object IEnumerator.Current => Current;
|
||||
|
||||
public CommandQueue(IReadOnlyList<Frame> frames)
|
||||
public DrawQueue(IReadOnlyList<Frame> frames)
|
||||
{
|
||||
_current = -1;
|
||||
_frames = frames;
|
||||
@@ -355,6 +393,28 @@ namespace Quik.CommandMachine
|
||||
|
||||
public Frame Peek() => TryPeek(out Frame frame) ? frame : throw new Exception("No more frames left.");
|
||||
|
||||
/// <summary>
|
||||
/// Deserialize an object from the command queue.
|
||||
/// </summary>
|
||||
/// <typeparam name="T">Type of the object to deserialize.</typeparam>
|
||||
/// <param name="value">The deserialized value.</param>
|
||||
public void Read<T>([NotNull] out T? value)
|
||||
{
|
||||
value = DrawingEngine.GetSerializer(default(T)).Deserialize(this);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Deserialize an object from the command queue.
|
||||
/// </summary>
|
||||
/// <typeparam name="T">Type of the object to deserialize.</typeparam>
|
||||
/// <param name="value">The deserialized value.</param>
|
||||
public void Read<T>([NotNull] out IDrawListSerializable<T>? value)
|
||||
where T : IDrawListSerializable<T>, new()
|
||||
{
|
||||
value = DrawingEngine.GetSerializer(value = null).Deserialize(this);
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public bool MoveNext()
|
||||
{
|
||||
if (_current + 1 < _frames.Count)
|
||||
@@ -365,6 +425,7 @@ namespace Quik.CommandMachine
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public void Reset()
|
||||
{
|
||||
_current = -1;
|
||||
@@ -1,7 +1,8 @@
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Quik.CommandMachine
|
||||
namespace Dashboard.ImmediateDraw
|
||||
{
|
||||
[StructLayout(LayoutKind.Explicit)]
|
||||
public struct Frame
|
||||
@@ -28,7 +29,7 @@ namespace Quik.CommandMachine
|
||||
private float _f4;
|
||||
|
||||
[FieldOffset(24)]
|
||||
private object _object;
|
||||
private object? _object = null;
|
||||
|
||||
public bool IsCommand => _type == FrameType.Command;
|
||||
public bool IsInteger =>
|
||||
@@ -200,7 +201,7 @@ namespace Quik.CommandMachine
|
||||
|
||||
public T As<T>()
|
||||
{
|
||||
return (T)_object;
|
||||
return (T)_object!;
|
||||
}
|
||||
|
||||
public float GetF(int i)
|
||||
@@ -281,7 +282,7 @@ namespace Quik.CommandMachine
|
||||
return (Command)frame._i1;
|
||||
}
|
||||
|
||||
public static explicit operator QVec2(in Frame frame)
|
||||
public static explicit operator Vector2(in Frame frame)
|
||||
{
|
||||
switch (frame.Type)
|
||||
{
|
||||
@@ -290,45 +291,50 @@ namespace Quik.CommandMachine
|
||||
case FrameType.IVec2:
|
||||
case FrameType.IVec3:
|
||||
case FrameType.IVec4:
|
||||
return new QVec2(frame._i1, frame._i2);
|
||||
return new Vector2(frame._i1, frame._i2);
|
||||
case FrameType.Vec2:
|
||||
case FrameType.Vec3:
|
||||
case FrameType.Vec4:
|
||||
return new QVec2(frame._f1, frame._f2);
|
||||
return new Vector2(frame._f1, frame._f2);
|
||||
}
|
||||
}
|
||||
|
||||
public static explicit operator QColor(in Frame frame)
|
||||
public static explicit operator Color4(in Frame frame)
|
||||
{
|
||||
if (frame.Type != FrameType.IVec4)
|
||||
switch (frame.Type)
|
||||
{
|
||||
case FrameType.IVec4:
|
||||
return new Color4((byte)frame._i1, (byte)frame._i2, (byte)frame._i3, (byte)frame._i4);
|
||||
case FrameType.Vec4:
|
||||
return new Color4(frame._f1, frame._f2, frame._f3, frame._f4);
|
||||
default:
|
||||
throw new InvalidCastException();
|
||||
|
||||
return new QColor((byte)frame._i1, (byte)frame._i2, (byte)frame._i3, (byte)frame._i4);
|
||||
}
|
||||
}
|
||||
|
||||
public static explicit operator QRectangle(in Frame frame)
|
||||
public static explicit operator Rectangle(in Frame frame)
|
||||
{
|
||||
switch (frame.Type)
|
||||
{
|
||||
default:
|
||||
throw new InvalidCastException();
|
||||
case FrameType.IVec4:
|
||||
return new QRectangle(frame._i1, frame._i2, frame._i3, frame._i4);
|
||||
return new Rectangle(frame._i1, frame._i2, frame._i3, frame._i4);
|
||||
case FrameType.Vec4:
|
||||
return new QRectangle(frame._f1, frame._f2, frame._f3, frame._f4);
|
||||
return new Rectangle(frame._f1, frame._f2, frame._f3, frame._f4);
|
||||
}
|
||||
}
|
||||
|
||||
public static explicit operator QLine(in Frame frame)
|
||||
public static explicit operator Line(in Frame frame)
|
||||
{
|
||||
switch (frame.Type)
|
||||
{
|
||||
default:
|
||||
throw new InvalidCastException();
|
||||
case FrameType.IVec4:
|
||||
return new QLine(frame._i1, frame._i2, frame._i3, frame._i4);
|
||||
return new Line(frame._i1, frame._i2, frame._i3, frame._i4);
|
||||
case FrameType.Vec4:
|
||||
return new QLine(frame._f1, frame._f2, frame._f3, frame._f4);
|
||||
return new Line(frame._f1, frame._f2, frame._f3, frame._f4);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
@@ -336,18 +342,18 @@ namespace Quik.CommandMachine
|
||||
public static explicit operator Frame(int i) => new Frame(i);
|
||||
public static explicit operator Frame(float f) => new Frame(f);
|
||||
public static implicit operator Frame(Command cmd) => new Frame(cmd);
|
||||
public static implicit operator Frame(in QVec2 vector) => new Frame(vector.X, vector.Y);
|
||||
public static implicit operator Frame(in QColor color) => new Frame(color.R, color.G, color.B, color.A);
|
||||
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 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 void Create(in QBezier bezier, out Frame a, out Frame b)
|
||||
public static void Create(in Bezier 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 QEllipse ellipse, out Frame a, out Frame b)
|
||||
public static void Create(in Ellipse 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);
|
||||
68
Dashboard/ImmediateDraw/FrameType.cs
Normal file
68
Dashboard/ImmediateDraw/FrameType.cs
Normal file
@@ -0,0 +1,68 @@
|
||||
namespace Dashboard.ImmediateDraw
|
||||
{
|
||||
/// <summary>
|
||||
/// Enumeration of command types in the Dashboard command lists.
|
||||
/// </summary>
|
||||
public enum FrameType
|
||||
{
|
||||
/// <summary>
|
||||
/// A null value.
|
||||
/// </summary>
|
||||
None,
|
||||
|
||||
/// <summary>
|
||||
/// A command frame.
|
||||
/// </summary>
|
||||
Command,
|
||||
|
||||
/// <summary>
|
||||
/// An integer frame.
|
||||
/// </summary>
|
||||
IVec1,
|
||||
|
||||
/// <summary>
|
||||
/// A two dimensional integer vector frame.
|
||||
/// </summary>
|
||||
IVec2,
|
||||
|
||||
/// <summary>
|
||||
/// A three dimensional integer vector frame.
|
||||
/// </summary>
|
||||
IVec3,
|
||||
|
||||
/// <summary>
|
||||
/// A four dimensional integer vector frame.
|
||||
/// </summary>
|
||||
IVec4,
|
||||
|
||||
/// <summary>
|
||||
/// A floating point frame.
|
||||
/// </summary>
|
||||
Vec1,
|
||||
|
||||
/// <summary>
|
||||
/// A two dimensional floating point vector frame.
|
||||
/// </summary>
|
||||
Vec2,
|
||||
|
||||
/// <summary>
|
||||
/// A three dimensional floating point vector frame.
|
||||
/// </summary>
|
||||
Vec3,
|
||||
|
||||
/// <summary>
|
||||
/// A four dimensional floating point vector frame.
|
||||
/// </summary>
|
||||
Vec4,
|
||||
|
||||
/// <summary>
|
||||
/// A serialized object frame.
|
||||
/// </summary>
|
||||
Serialized,
|
||||
|
||||
/// <summary>
|
||||
/// A .Net object frame.
|
||||
/// </summary>
|
||||
Object,
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace Quik.CommandMachine
|
||||
namespace Dashboard.ImmediateDraw
|
||||
{
|
||||
public enum ImageCommandFlags
|
||||
{
|
||||
@@ -11,8 +11,8 @@ namespace Quik.CommandMachine
|
||||
|
||||
public struct Image3DCall
|
||||
{
|
||||
public QRectangle Rectangle;
|
||||
public QRectangle UVs;
|
||||
public Rectangle Rectangle;
|
||||
public Rectangle UVs;
|
||||
public int Layer;
|
||||
}
|
||||
}
|
||||
68
Dashboard/ImmediateDraw/Serializers.cs
Normal file
68
Dashboard/ImmediateDraw/Serializers.cs
Normal file
@@ -0,0 +1,68 @@
|
||||
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
|
||||
namespace Dashboard.ImmediateDraw
|
||||
{
|
||||
public interface IDrawListSerializable { }
|
||||
|
||||
/// <summary>
|
||||
/// Interface for objects that can be serialized into the Dashboard command stream.
|
||||
/// </summary>
|
||||
public interface IDrawListSerializable<T> : IDrawListSerializable
|
||||
{
|
||||
/// <summary>
|
||||
/// Seralize object.
|
||||
/// </summary>
|
||||
/// <param name="list">The object to serialize into.</param>
|
||||
void Serialize(DrawList list);
|
||||
|
||||
/// <summary>
|
||||
/// Deserialize object.
|
||||
/// </summary>
|
||||
/// <param name="queue">The command queue to deserialize from.</param>
|
||||
void Deserialize(DrawQueue queue);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Base interface for all Command List serializers.
|
||||
/// </summary>
|
||||
public interface IDrawListSerializer { }
|
||||
|
||||
public interface IDrawListSerializer<T> : IDrawListSerializer
|
||||
{
|
||||
/// <summary>
|
||||
/// Serialize an object into the command list.
|
||||
/// </summary>
|
||||
/// <param name="value">The object to serialize.</param>
|
||||
/// <param name="list">The command list to serialize into.</param>
|
||||
void Serialize(T value, DrawList list);
|
||||
|
||||
/// <summary>
|
||||
/// Deserialize an object from the command queue.
|
||||
/// </summary>
|
||||
/// <param name="queue">The command queue.</param>
|
||||
/// <returns>The object deserialized from the command queue.</returns>
|
||||
[return: NotNull]
|
||||
T Deserialize(DrawQueue queue);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Class for automatic serialization of <see cref="IDrawListSerializable"/> objects.
|
||||
/// </summary>
|
||||
/// <typeparam name="T">The object type to convert.</typeparam>
|
||||
internal class DrawListSerializableSerializer<T> : IDrawListSerializer<T>
|
||||
where T : IDrawListSerializable<T>, new()
|
||||
{
|
||||
public T Deserialize(DrawQueue queue)
|
||||
{
|
||||
T value = new T();
|
||||
value.Deserialize(queue);
|
||||
return value;
|
||||
}
|
||||
|
||||
public void Serialize(T value, DrawList list)
|
||||
{
|
||||
value.Serialize(list);
|
||||
}
|
||||
}
|
||||
}
|
||||
116
Dashboard/Layout/GridLayoutAttribute.cs
Normal file
116
Dashboard/Layout/GridLayoutAttribute.cs
Normal file
@@ -0,0 +1,116 @@
|
||||
using OpenTK.Mathematics;
|
||||
using Dashboard.Controls;
|
||||
using System.Reflection.Metadata;
|
||||
|
||||
namespace Dashboard.Layout
|
||||
{
|
||||
/// <summary>
|
||||
/// Control attributes for grid layout.
|
||||
/// </summary>
|
||||
public class GridLayoutAttribute
|
||||
{
|
||||
/// <summary>
|
||||
/// An anchor will keep the relative distance of a control's edges the same during resizes.
|
||||
/// </summary>
|
||||
/// <remarks><see cref="Dock"/> has higher precedence.</remarks>
|
||||
public Anchor Anchor { get; set; } = Anchor.Left | Anchor.Top;
|
||||
|
||||
/// <summary>
|
||||
/// Dock will strongly attach a control to its container or its edges.
|
||||
/// </summary>
|
||||
/// <remarks>Has more precedence than <see cref="Anchor"/></remarks>
|
||||
public Dock Dock { get; set; } = Dock.None;
|
||||
|
||||
public void Evaluate(
|
||||
ResizedEventArgs parentResizeEvent,
|
||||
in Rectangle oldBounds,
|
||||
out Rectangle newBounds
|
||||
)
|
||||
{
|
||||
switch (Dock)
|
||||
{
|
||||
default:
|
||||
case Dock.None:
|
||||
break;
|
||||
case Dock.Top:
|
||||
newBounds = new Rectangle(
|
||||
parentResizeEvent.NewSize.X,
|
||||
oldBounds.Size.Y,
|
||||
0,
|
||||
0
|
||||
);
|
||||
return;
|
||||
case Dock.Bottom:
|
||||
newBounds = new Rectangle(
|
||||
parentResizeEvent.NewSize.X,
|
||||
parentResizeEvent.NewSize.Y,
|
||||
0,
|
||||
oldBounds.Size.Y
|
||||
);
|
||||
return;
|
||||
case Dock.Left:
|
||||
newBounds = new Rectangle(
|
||||
oldBounds.Size.X,
|
||||
parentResizeEvent.NewSize.Y,
|
||||
0,
|
||||
0
|
||||
);
|
||||
return;
|
||||
case Dock.Right:
|
||||
newBounds = new Rectangle(
|
||||
parentResizeEvent.NewSize.X,
|
||||
parentResizeEvent.NewSize.Y,
|
||||
parentResizeEvent.NewSize.Y - oldBounds.Size.Y,
|
||||
0
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
Vector2 scale = parentResizeEvent.NewSize / parentResizeEvent.OldSize;
|
||||
|
||||
newBounds = oldBounds;
|
||||
|
||||
if (Anchor.HasFlag(Anchor.Top))
|
||||
{
|
||||
newBounds.Top = scale.Y * oldBounds.Top;
|
||||
}
|
||||
|
||||
if (Anchor.HasFlag(Anchor.Left))
|
||||
{
|
||||
newBounds.Left = scale.X * oldBounds.Left;
|
||||
}
|
||||
|
||||
if (Anchor.HasFlag(Anchor.Bottom))
|
||||
{
|
||||
float margin = scale.Y * (parentResizeEvent.OldSize.Y - newBounds.Bottom);
|
||||
newBounds.Bottom = parentResizeEvent.NewSize.Y - margin;
|
||||
}
|
||||
|
||||
if (Anchor.HasFlag(Anchor.Right))
|
||||
{
|
||||
float margin = scale.X * (parentResizeEvent.OldSize.X - newBounds.Right);
|
||||
newBounds.Right = parentResizeEvent.NewSize.X - margin;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get the grid layout attribute associated with the given UI-base.
|
||||
/// </summary>
|
||||
/// <param name="uiBase">The UI-base to query.</param>
|
||||
/// <returns>It's grid layout attribute, if any.</returns>
|
||||
public static GridLayoutAttribute GetGridLayout(UIBase uiBase)
|
||||
{
|
||||
const string GRID_LAYOUT_ATTRIBUTE_KEY = "486ddf8c-b75f-4ad4-a51d-5ba20db9bd0e";
|
||||
|
||||
if (
|
||||
!uiBase.Attributes.TryGetValue(GRID_LAYOUT_ATTRIBUTE_KEY, out object? attribute)
|
||||
|| attribute is not GridLayoutAttribute)
|
||||
{
|
||||
attribute = new GridLayoutAttribute();
|
||||
uiBase.Attributes[GRID_LAYOUT_ATTRIBUTE_KEY] = attribute;
|
||||
}
|
||||
|
||||
return (GridLayoutAttribute)attribute;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Quik.Media.Color
|
||||
namespace Dashboard.Media.Color
|
||||
{
|
||||
public static class FormatConvert
|
||||
{
|
||||
@@ -8,12 +9,12 @@ namespace Quik.Media.Color
|
||||
{
|
||||
switch (image.Format)
|
||||
{
|
||||
case QImageFormat.RaF:
|
||||
case QImageFormat.RaU8:
|
||||
case QImageFormat.RgbF:
|
||||
case QImageFormat.RgbU8:
|
||||
case QImageFormat.RgbaF:
|
||||
case QImageFormat.RgbaU8:
|
||||
case ImageFormat.RaF:
|
||||
case ImageFormat.RaU8:
|
||||
case ImageFormat.RgbF:
|
||||
case ImageFormat.RgbU8:
|
||||
case ImageFormat.RgbaF:
|
||||
case ImageFormat.RgbaU8:
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
@@ -27,7 +28,7 @@ namespace Quik.Media.Color
|
||||
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
QColorF color = io[i];
|
||||
Color4 color = io[i];
|
||||
|
||||
color.R *= color.A;
|
||||
color.G *= color.A;
|
||||
@@ -42,8 +43,8 @@ namespace Quik.Media.Color
|
||||
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
QColor color = io[i];
|
||||
float a = color.A/255.0f;
|
||||
Color4 color = io[i];
|
||||
float a = color.A;
|
||||
|
||||
color.R = (byte)(color.R * a);
|
||||
color.G = (byte)(color.G * a);
|
||||
@@ -75,7 +76,7 @@ namespace Quik.Media.Color
|
||||
int count = dst.Width * dst.Height * dst.Depth;
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
dstIO[i] = (QColor)srcIO[i];
|
||||
dstIO[i] = srcIO[i];
|
||||
}
|
||||
}
|
||||
else if (dst.Format.IsFloat() && src.Format.IsU8())
|
||||
@@ -86,7 +87,7 @@ namespace Quik.Media.Color
|
||||
int count = dst.Width * dst.Height * dst.Depth;
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
dstIO[i] = (QColorF)srcIO[i];
|
||||
dstIO[i] = srcIO[i];
|
||||
}
|
||||
}
|
||||
else if (dst.Format.IsFloat() && src.Format.IsFloat())
|
||||
@@ -1,26 +1,28 @@
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace Quik.Media.Color
|
||||
namespace Dashboard.Media.Color
|
||||
{
|
||||
public class QImageBuffer : QImage
|
||||
public class QImageBuffer : Image
|
||||
{
|
||||
private byte[] buffer;
|
||||
GCHandle handle;
|
||||
private bool isSdf = false;
|
||||
|
||||
public override QImageFormat InternalFormat { get; }
|
||||
public override ImageFormat InternalFormat { get; }
|
||||
public override int Width { get; }
|
||||
public override int Height { get; }
|
||||
public override int Depth { get; }
|
||||
public override bool IsSdf => isSdf;
|
||||
|
||||
public QImageBuffer(QImageFormat format, int width, int height, int depth = 1)
|
||||
public QImageBuffer(ImageFormat format, int width, int height, int depth = 1)
|
||||
{
|
||||
InternalFormat = format;
|
||||
Width = width;
|
||||
Height = height;
|
||||
Depth = depth;
|
||||
|
||||
buffer = new byte[width * height * depth];
|
||||
buffer = new byte[(long)width * height * depth * format.BytesPerPixel()];
|
||||
}
|
||||
~QImageBuffer()
|
||||
{
|
||||
@@ -29,7 +31,7 @@ namespace Quik.Media.Color
|
||||
|
||||
private QImageLock Lock()
|
||||
{
|
||||
handle.Free();
|
||||
if (handle.IsAllocated) handle.Free();
|
||||
handle = GCHandle.Alloc(buffer, GCHandleType.Pinned);
|
||||
IntPtr ptr = Marshal.UnsafeAddrOfPinnedArrayElement(buffer, 0);
|
||||
return new QImageLock(InternalFormat, Width, Height, Depth, ptr);
|
||||
@@ -37,8 +39,7 @@ namespace Quik.Media.Color
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
buffer = null;
|
||||
handle.Free();
|
||||
if (handle.IsAllocated) handle.Free();
|
||||
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
@@ -62,5 +63,7 @@ namespace Quik.Media.Color
|
||||
{
|
||||
handle.Free();
|
||||
}
|
||||
|
||||
public void SetSdf(bool value = true) => isSdf = value;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Quik.Media.Color
|
||||
namespace Dashboard.Media.Color
|
||||
{
|
||||
public unsafe struct LockIO
|
||||
{
|
||||
@@ -8,7 +9,7 @@ namespace Quik.Media.Color
|
||||
public int Width => Lock.Width;
|
||||
public int Height => Lock.Height;
|
||||
public int Depth => Depth;
|
||||
public QImageFormat Format => Lock.Format;
|
||||
public ImageFormat Format => Lock.Format;
|
||||
|
||||
public LockIO(QImageLock imageLock)
|
||||
{
|
||||
@@ -18,7 +19,7 @@ namespace Quik.Media.Color
|
||||
Lock = imageLock;
|
||||
}
|
||||
|
||||
public QColor this[int index]
|
||||
public Color4 this[int index]
|
||||
{
|
||||
get
|
||||
{
|
||||
@@ -28,11 +29,11 @@ namespace Quik.Media.Color
|
||||
switch (Format)
|
||||
{
|
||||
default:
|
||||
case QImageFormat.RedU8: return new QColor(ptr[0], 0, 0, 255);
|
||||
case QImageFormat.AlphaU8: return new QColor(0, 0, 0, ptr[0]);
|
||||
case QImageFormat.RaU8: return new QColor(ptr[0], 0, 0, ptr[1]);
|
||||
case QImageFormat.RgbU8: return new QColor(ptr[0], ptr[1], ptr[2], 255);
|
||||
case QImageFormat.RgbaU8: return new QColor(ptr[0], ptr[1], ptr[2], ptr[3]);
|
||||
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]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,31 +45,31 @@ namespace Quik.Media.Color
|
||||
switch (Format)
|
||||
{
|
||||
default:
|
||||
case QImageFormat.RedU8:
|
||||
ptr[0] = value.R;
|
||||
case ImageFormat.RedU8:
|
||||
ptr[0] = (byte)(value.R * 255);
|
||||
break;
|
||||
case QImageFormat.AlphaU8:
|
||||
ptr[0] = value.A;
|
||||
case ImageFormat.AlphaU8:
|
||||
ptr[0] = (byte)(value.A * 255);
|
||||
break;
|
||||
case QImageFormat.RaU8:
|
||||
ptr[0] = value.R;
|
||||
ptr[1] = value.A;
|
||||
case ImageFormat.RaU8:
|
||||
ptr[0] = (byte)(value.R * 255);
|
||||
ptr[1] = (byte)(value.A * 255);
|
||||
break;
|
||||
case QImageFormat.RgbU8:
|
||||
ptr[0] = value.R;
|
||||
ptr[1] = value.G;
|
||||
ptr[2] = value.B;
|
||||
case ImageFormat.RgbU8:
|
||||
ptr[0] = (byte)(value.R * 255);
|
||||
ptr[1] = (byte)(value.G * 255);
|
||||
ptr[2] = (byte)(value.B * 255);
|
||||
break;
|
||||
case QImageFormat.RgbaU8:
|
||||
ptr[0] = value.R;
|
||||
ptr[1] = value.G;
|
||||
ptr[2] = value.B;
|
||||
ptr[3] = value.A;
|
||||
case ImageFormat.RgbaU8:
|
||||
ptr[0] = (byte)(value.R * 255);
|
||||
ptr[1] = (byte)(value.G * 255);
|
||||
ptr[2] = (byte)(value.B * 255);
|
||||
ptr[3] = (byte)(value.A * 255);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
public QColor this[int x, int y, int z = 0]
|
||||
public Color4 this[int x, int y, int z = 0]
|
||||
{
|
||||
get => this[x + y * Width + z * Width * Height];
|
||||
set => this[x + y * Width + z * Width * Height] = value;
|
||||
@@ -81,7 +82,7 @@ namespace Quik.Media.Color
|
||||
public int Width => Lock.Width;
|
||||
public int Height => Lock.Height;
|
||||
public int Depth => Depth;
|
||||
public QImageFormat Format => Lock.Format;
|
||||
public ImageFormat Format => Lock.Format;
|
||||
|
||||
public LockIOF(QImageLock imageLock)
|
||||
{
|
||||
@@ -91,7 +92,7 @@ namespace Quik.Media.Color
|
||||
Lock = imageLock;
|
||||
}
|
||||
|
||||
public QColorF this[int index]
|
||||
public Color4 this[int index]
|
||||
{
|
||||
get
|
||||
{
|
||||
@@ -101,11 +102,11 @@ namespace Quik.Media.Color
|
||||
switch (Format)
|
||||
{
|
||||
default:
|
||||
case QImageFormat.RedU8: return new QColorF(ptr[0], 0, 0, 255);
|
||||
case QImageFormat.AlphaU8: return new QColorF(0, 0, 0, ptr[0]);
|
||||
case QImageFormat.RaU8: return new QColorF(ptr[0], 0, 0, ptr[1]);
|
||||
case QImageFormat.RgbU8: return new QColorF(ptr[0], ptr[1], ptr[2], 255);
|
||||
case QImageFormat.RgbaU8: return new QColorF(ptr[0], ptr[1], ptr[2], ptr[3]);
|
||||
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]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -117,22 +118,22 @@ namespace Quik.Media.Color
|
||||
switch (Format)
|
||||
{
|
||||
default:
|
||||
case QImageFormat.RedU8:
|
||||
case ImageFormat.RedU8:
|
||||
ptr[0] = value.R;
|
||||
break;
|
||||
case QImageFormat.AlphaU8:
|
||||
case ImageFormat.AlphaU8:
|
||||
ptr[0] = value.A;
|
||||
break;
|
||||
case QImageFormat.RaU8:
|
||||
case ImageFormat.RaU8:
|
||||
ptr[0] = value.R;
|
||||
ptr[1] = value.A;
|
||||
break;
|
||||
case QImageFormat.RgbU8:
|
||||
case ImageFormat.RgbU8:
|
||||
ptr[0] = value.R;
|
||||
ptr[1] = value.G;
|
||||
ptr[2] = value.B;
|
||||
break;
|
||||
case QImageFormat.RgbaU8:
|
||||
case ImageFormat.RgbaU8:
|
||||
ptr[0] = value.R;
|
||||
ptr[1] = value.G;
|
||||
ptr[2] = value.B;
|
||||
@@ -141,7 +142,7 @@ namespace Quik.Media.Color
|
||||
}
|
||||
}
|
||||
}
|
||||
public QColorF this[int x, int y, int z = 0]
|
||||
public Color4 this[int x, int y, int z = 0]
|
||||
{
|
||||
get => this[x + y * Width + z * Width * Height];
|
||||
set => this[x + y * Width + z * Width * Height] = value;
|
||||
71
Dashboard/Media/Extensions.cs
Normal file
71
Dashboard/Media/Extensions.cs
Normal file
@@ -0,0 +1,71 @@
|
||||
namespace Dashboard.Media
|
||||
{
|
||||
public static class Extensions
|
||||
{
|
||||
public static bool IsU8(this ImageFormat format)
|
||||
{
|
||||
switch (format)
|
||||
{
|
||||
case ImageFormat.AlphaU8:
|
||||
case ImageFormat.RedU8:
|
||||
case ImageFormat.RaU8:
|
||||
case ImageFormat.RgbU8:
|
||||
case ImageFormat.RgbaU8:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public static bool IsFloat(this ImageFormat format)
|
||||
{
|
||||
switch (format)
|
||||
{
|
||||
case ImageFormat.AlphaF:
|
||||
case ImageFormat.RedF:
|
||||
case ImageFormat.RaF:
|
||||
case ImageFormat.RgbF:
|
||||
case ImageFormat.RgbaF:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public static int BytesPerPixel(this ImageFormat 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);
|
||||
default: return 0;
|
||||
}
|
||||
}
|
||||
|
||||
public static int Channels(this ImageFormat 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;
|
||||
default: return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
129
Dashboard/Media/Font.cs
Normal file
129
Dashboard/Media/Font.cs
Normal file
@@ -0,0 +1,129 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.InteropServices;
|
||||
using Dashboard.Media;
|
||||
using Dashboard.Media.Fonts;
|
||||
|
||||
namespace Dashboard.Media
|
||||
{
|
||||
/// <summary>
|
||||
/// Abstract class that represents a font.
|
||||
/// </summary>
|
||||
public abstract class Font : IDisposable
|
||||
{
|
||||
public abstract FontFace Face { get; }
|
||||
public string Family => Face.Family;
|
||||
public FontSlant Slant => Face.Slant;
|
||||
public FontWeight Weight => Face.Weight;
|
||||
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);
|
||||
|
||||
|
||||
private readonly Dictionary<float, SizedFontCollection> _atlasses = new Dictionary<float, SizedFontCollection>();
|
||||
|
||||
public void Get(int codepoint, float size, out FontGlyph glyph)
|
||||
{
|
||||
SizedFontCollection? collection;
|
||||
|
||||
if (!_atlasses.TryGetValue(size, out collection))
|
||||
{
|
||||
collection = new SizedFontCollection(size);
|
||||
_atlasses.Add(size, collection);
|
||||
}
|
||||
|
||||
collection.Get(codepoint, out glyph, this);
|
||||
}
|
||||
|
||||
// IDisposable
|
||||
private bool isDisposed = false;
|
||||
private void DisposePrivate(bool disposing)
|
||||
{
|
||||
if (isDisposed) return;
|
||||
|
||||
Dispose(disposing);
|
||||
|
||||
isDisposed = true;
|
||||
}
|
||||
protected virtual void Dispose(bool disposing) { }
|
||||
public void Dispose() => DisposePrivate(true);
|
||||
|
||||
private class SizedFontCollection
|
||||
{
|
||||
public float Size { get; }
|
||||
private readonly Dictionary<int, FontGlyph> glyphs = new Dictionary<int, FontGlyph>();
|
||||
private readonly FontAtlas atlas;
|
||||
|
||||
public SizedFontCollection(float size)
|
||||
{
|
||||
Size = size;
|
||||
|
||||
DbApplication.Current.Platform.GetMaximumImage(out int height, out int width);
|
||||
|
||||
// Do no allow to create a texture that is greater than 16 square characters at 200 DPI.
|
||||
width = Math.Min(width, (int)(size * 200 * 16));
|
||||
height = Math.Min(height, (int)(size * 200 * 16));
|
||||
// width = height = 256;
|
||||
|
||||
atlas = new FontAtlas(width, height, DbApplication.Current.FontProvider.RasterizerOptions.Sdf);
|
||||
}
|
||||
|
||||
public void Get(int codepoint, out FontGlyph glyph, Font font)
|
||||
{
|
||||
if (glyphs.TryGetValue(codepoint, out glyph))
|
||||
return;
|
||||
|
||||
Image image = font.Render(
|
||||
out GlyphMetrics metrics,
|
||||
codepoint,
|
||||
Size,
|
||||
DbApplication.Current.FontProvider.RasterizerOptions);
|
||||
|
||||
if (image != null)
|
||||
{
|
||||
image.LockBits2d(out QImageLock l, QImageLockOptions.Default);
|
||||
atlas.PutGlyph(codepoint, l, out FontAtlasGlyphInfo glyphInfo);
|
||||
image.UnlockBits();
|
||||
image.Dispose();
|
||||
|
||||
glyph = new FontGlyph(codepoint, glyphInfo.Image, metrics, glyphInfo.UVs);
|
||||
}
|
||||
else
|
||||
{
|
||||
glyph = new FontGlyph(codepoint, null, metrics, default);
|
||||
}
|
||||
|
||||
glyphs[codepoint] = glyph;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public readonly struct FontGlyph
|
||||
{
|
||||
public readonly int CodePoint;
|
||||
public readonly Image? Image;
|
||||
public readonly GlyphMetrics Metrics;
|
||||
public readonly Rectangle UVs;
|
||||
|
||||
public FontGlyph(int codepoint, Image? image, in GlyphMetrics metrics, in Rectangle uvs)
|
||||
{
|
||||
CodePoint = codepoint;
|
||||
Image = image;
|
||||
Metrics = metrics;
|
||||
UVs = uvs;
|
||||
}
|
||||
}
|
||||
|
||||
public struct FontRasterizerOptions
|
||||
{
|
||||
public float Resolution { get; set; }
|
||||
public bool Sdf { get; set; }
|
||||
|
||||
public static readonly FontRasterizerOptions Default = new FontRasterizerOptions()
|
||||
{
|
||||
Resolution = 96.0f,
|
||||
Sdf = false
|
||||
};
|
||||
}
|
||||
}
|
||||
185
Dashboard/Media/Font/FontAtlas.cs
Normal file
185
Dashboard/Media/Font/FontAtlas.cs
Normal file
@@ -0,0 +1,185 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Dashboard.Media.Color;
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Dashboard.Media.Fonts
|
||||
{
|
||||
public struct FontAtlasGlyphInfo
|
||||
{
|
||||
public int Codepoint;
|
||||
public Image Image;
|
||||
public Rectangle UVs;
|
||||
}
|
||||
|
||||
public class FontAtlas
|
||||
{
|
||||
private readonly int width, height;
|
||||
private readonly List<AtlasPage> atlases = new List<AtlasPage>();
|
||||
private readonly Dictionary<int, FontAtlasGlyphInfo> glyphs = new Dictionary<int, FontAtlasGlyphInfo>();
|
||||
private int index = 0;
|
||||
private AtlasPage? last = null;
|
||||
private bool isSdf = false;
|
||||
private int expansion;
|
||||
|
||||
public bool IsSdf
|
||||
{
|
||||
get => isSdf;
|
||||
set
|
||||
{
|
||||
foreach (AtlasPage page in atlases)
|
||||
{
|
||||
((QImageBuffer)page.Image).SetSdf(value);
|
||||
}
|
||||
isSdf = value;
|
||||
}
|
||||
}
|
||||
|
||||
public FontAtlas(int width, int height, bool isSdf, int expansion = 4)
|
||||
{
|
||||
this.width = width;
|
||||
this.height = height;
|
||||
IsSdf = isSdf;
|
||||
this.expansion = expansion;
|
||||
}
|
||||
|
||||
public bool GetGlyph(int codepoint, out FontAtlasGlyphInfo info)
|
||||
{
|
||||
return glyphs.TryGetValue(codepoint, out info);
|
||||
}
|
||||
|
||||
public void PutGlyph(int codepoint, QImageLock source, out FontAtlasGlyphInfo info)
|
||||
{
|
||||
info = new FontAtlasGlyphInfo() { Codepoint = codepoint };
|
||||
|
||||
if (last == null || !last.WouldFit(source))
|
||||
{
|
||||
AddPage();
|
||||
}
|
||||
|
||||
last!.PutGlyph(source, ref info);
|
||||
}
|
||||
|
||||
private void AddPage()
|
||||
{
|
||||
index++;
|
||||
|
||||
if (index < atlases.Count)
|
||||
{
|
||||
last = atlases[index];
|
||||
}
|
||||
else
|
||||
{
|
||||
last = new AtlasPage(width, height, expansion);
|
||||
((QImageBuffer)last.Image).SetSdf(IsSdf);
|
||||
atlases.Add(last);
|
||||
}
|
||||
}
|
||||
|
||||
public void Clear()
|
||||
{
|
||||
// Trim any pages that were not used yet.
|
||||
for (int i = atlases.Count -1; i >= 0; i--)
|
||||
{
|
||||
if (atlases[i].PointerX != 0 && atlases[i].PointerY != 0)
|
||||
{
|
||||
for (int j = i + 1; j < atlases.Count; j++)
|
||||
{
|
||||
atlases[j].Dispose();
|
||||
}
|
||||
|
||||
if (i != atlases.Count - 1)
|
||||
atlases.RemoveRange(i+1, atlases.Count - i - 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (atlases.Count > 0)
|
||||
{
|
||||
last = atlases[0];
|
||||
}
|
||||
else
|
||||
{
|
||||
last = null;
|
||||
}
|
||||
index = -1;
|
||||
|
||||
glyphs.Clear();
|
||||
}
|
||||
|
||||
private class AtlasPage : IDisposable
|
||||
{
|
||||
public Image Image;
|
||||
public int PointerX, PointerY;
|
||||
public int RowHeight;
|
||||
public int Expansion;
|
||||
|
||||
public bool IsFull => PointerX > Image.Width || PointerY > Image.Height;
|
||||
|
||||
public AtlasPage(int width, int height, int expansion)
|
||||
{
|
||||
Image = new QImageBuffer(ImageFormat.AlphaU8, width, height);
|
||||
Expansion = expansion;
|
||||
Reset();
|
||||
}
|
||||
|
||||
public void PutGlyph(QImageLock src, ref FontAtlasGlyphInfo prototype)
|
||||
{
|
||||
if (IsFull)
|
||||
throw new Exception("Page is full!");
|
||||
|
||||
Image.LockBits2d(out QImageLock dst, QImageLockOptions.Default);
|
||||
src.CopyTo(dst, PointerX, PointerY);
|
||||
Image.UnlockBits();
|
||||
|
||||
Vector2 min = new Vector2((float)PointerX/Image.Width, (float)PointerY/Image.Height);
|
||||
Vector2 size = new Vector2((float)src.Width/Image.Width, (float)src.Height/Image.Height);
|
||||
|
||||
prototype.Image = Image;
|
||||
prototype.UVs = new Rectangle(min + size, min);
|
||||
|
||||
AdvanceColumn(src.Width, src.Height);
|
||||
}
|
||||
|
||||
public void Reset()
|
||||
{
|
||||
RowHeight = PointerX = PointerY = 0;
|
||||
}
|
||||
|
||||
public void AdvanceRow()
|
||||
{
|
||||
PointerX = 0;
|
||||
PointerY += RowHeight + Expansion;
|
||||
|
||||
RowHeight = 0;
|
||||
}
|
||||
|
||||
public void AdvanceColumn(int width, int height)
|
||||
{
|
||||
RowHeight = Math.Max(RowHeight, height);
|
||||
PointerX += width + Expansion;
|
||||
|
||||
if (PointerX > Image.Width)
|
||||
{
|
||||
AdvanceRow();
|
||||
}
|
||||
}
|
||||
|
||||
private bool isDisposed = false;
|
||||
public void Dispose()
|
||||
{
|
||||
if (isDisposed)
|
||||
return;
|
||||
|
||||
Image?.Dispose();
|
||||
|
||||
isDisposed = true;
|
||||
}
|
||||
|
||||
internal bool WouldFit(QImageLock source)
|
||||
{
|
||||
return !IsFull || PointerX + source.Width > Image.Width || PointerY + source.Height > Image.Height;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,7 @@
|
||||
using System;
|
||||
using System.Net.WebSockets;
|
||||
using System.Text;
|
||||
using Quik.Media.Font;
|
||||
|
||||
namespace Quik.Media.Font
|
||||
namespace Dashboard.Media.Fonts
|
||||
{
|
||||
public readonly struct FontFace : IEquatable<FontFace>
|
||||
{
|
||||
@@ -76,9 +74,9 @@ namespace Quik.Media.Font
|
||||
return this == other;
|
||||
}
|
||||
|
||||
public override bool Equals(object obj)
|
||||
public override bool Equals(object? obj)
|
||||
{
|
||||
return (obj.GetType() == typeof(FontFace)) &&
|
||||
return (obj?.GetType() == typeof(FontFace)) &&
|
||||
this == (FontFace)obj;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace Quik.Media.Font
|
||||
namespace Dashboard.Media.Fonts
|
||||
{
|
||||
public enum FontSlant
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace Quik.Media.Font
|
||||
namespace Dashboard.Media.Fonts
|
||||
{
|
||||
/// <summary>
|
||||
/// Enumeration of font stretch values.
|
||||
@@ -1,6 +1,6 @@
|
||||
using System;
|
||||
|
||||
namespace Quik.Media.Font
|
||||
namespace Dashboard.Media.Fonts
|
||||
{
|
||||
public enum FontWeight
|
||||
{
|
||||
26
Dashboard/Media/Font/SystemFontFamily.cs
Normal file
26
Dashboard/Media/Font/SystemFontFamily.cs
Normal file
@@ -0,0 +1,26 @@
|
||||
namespace Dashboard.Media.Fonts
|
||||
{
|
||||
public enum SystemFontFamily
|
||||
{
|
||||
/// <summary>
|
||||
/// A font with serifs, like Times New Roman.
|
||||
/// </summary>
|
||||
Serif,
|
||||
/// <summary>
|
||||
/// A font without serifs, like Helvetica or Arial.
|
||||
/// </summary>
|
||||
Sans,
|
||||
/// <summary>
|
||||
/// A monospace font like Courier New.
|
||||
/// </summary>
|
||||
Monospace,
|
||||
/// <summary>
|
||||
/// A cursive font like Lucida Handwriting.
|
||||
/// </summary>
|
||||
Cursive,
|
||||
/// <summary>
|
||||
/// An immature font like Comic Sans or Papyrus, nghehehehe.
|
||||
/// </summary>
|
||||
Fantasy
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,11 @@
|
||||
namespace Quik.Media
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Dashboard.Media
|
||||
{
|
||||
/// <summary>
|
||||
/// Glyph properties with metrics based on FreeType glyph metrics.
|
||||
/// </summary>
|
||||
public struct QGlyphMetrics
|
||||
public struct GlyphMetrics
|
||||
{
|
||||
/// <summary>
|
||||
/// The code point for the character.
|
||||
@@ -13,29 +15,29 @@ namespace Quik.Media
|
||||
/// <summary>
|
||||
/// Size of the glyph in units.
|
||||
/// </summary>
|
||||
public QVec2 Size { get; }
|
||||
public Vector2 Size { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Bearing vector for horizontal layout.
|
||||
/// </summary>
|
||||
public QVec2 HorizontalBearing { get; }
|
||||
public Vector2 HorizontalBearing { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Bearing vector for vertical layout.
|
||||
/// </summary>
|
||||
public QVec2 VerticalBearing { get; }
|
||||
public Vector2 VerticalBearing { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Advance vector for vertical and horizontal layouts.
|
||||
/// </summary>
|
||||
public QVec2 Advance { get; }
|
||||
public Vector2 Advance { get; }
|
||||
|
||||
public QGlyphMetrics(
|
||||
public GlyphMetrics(
|
||||
int character,
|
||||
QVec2 size,
|
||||
QVec2 horizontalBearing,
|
||||
QVec2 verticalBearing,
|
||||
QVec2 advance)
|
||||
Vector2 size,
|
||||
Vector2 horizontalBearing,
|
||||
Vector2 verticalBearing,
|
||||
Vector2 advance)
|
||||
{
|
||||
Rune = character;
|
||||
Size = size;
|
||||
120
Dashboard/Media/Image.cs
Normal file
120
Dashboard/Media/Image.cs
Normal file
@@ -0,0 +1,120 @@
|
||||
using System;
|
||||
namespace Dashboard.Media
|
||||
{
|
||||
public abstract class Image : IDisposable
|
||||
{
|
||||
public abstract int Width { get; }
|
||||
public abstract int Height { get; }
|
||||
public abstract int Depth { get; }
|
||||
public abstract ImageFormat InternalFormat { get; }
|
||||
public virtual int MipMapLevels => 0;
|
||||
public virtual bool Premultiplied => false;
|
||||
public virtual bool IsSdf => false;
|
||||
|
||||
public abstract void LockBits2d(out QImageLock imageLock, QImageLockOptions options);
|
||||
public abstract void LockBits3d(out QImageLock imageLock, QImageLockOptions options);
|
||||
public abstract void LockBits3d(out QImageLock imageLock, QImageLockOptions options, int depth);
|
||||
public abstract void UnlockBits();
|
||||
|
||||
// IDisposable
|
||||
private bool isDisposed = false;
|
||||
private void DisposePrivate(bool disposing)
|
||||
{
|
||||
if (isDisposed) return;
|
||||
|
||||
Dispose(disposing);
|
||||
|
||||
isDisposed = true;
|
||||
}
|
||||
protected virtual void Dispose(bool disposing) { }
|
||||
public void Dispose() => DisposePrivate(true);
|
||||
}
|
||||
|
||||
public struct QImageLockOptions
|
||||
{
|
||||
public ImageFormat Format { get; }
|
||||
public bool Premultiply { get; }
|
||||
public int MipLevel { get; }
|
||||
public static QImageLockOptions Default { get; } = new QImageLockOptions(ImageFormat.RgbaU8, true, 0);
|
||||
|
||||
public QImageLockOptions(ImageFormat format, bool premultiply, int level)
|
||||
{
|
||||
Format = format;
|
||||
Premultiply = premultiply;
|
||||
MipLevel = level;
|
||||
}
|
||||
}
|
||||
|
||||
public struct QImageLock
|
||||
{
|
||||
public ImageFormat 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)
|
||||
{
|
||||
Format = format;
|
||||
Width = width;
|
||||
Height = height;
|
||||
Depth = depth;
|
||||
ImagePtr = ptr;
|
||||
}
|
||||
|
||||
public unsafe void CopyTo(QImageLock destination, int x, int y)
|
||||
{
|
||||
if (
|
||||
Width + x >= destination.Width ||
|
||||
Height + y >= destination.Height)
|
||||
{
|
||||
throw new Exception("Image falls outside the bounds of the destination.");
|
||||
}
|
||||
else if (Format != destination.Format)
|
||||
{
|
||||
throw new Exception("Image formats must be the same.");
|
||||
}
|
||||
|
||||
int bpp = Format.BytesPerPixel();
|
||||
for (int i = 0; i < Height; i++)
|
||||
{
|
||||
IntPtr srcPtr = (IntPtr)((long)ImagePtr + i * Width * bpp);
|
||||
|
||||
long dstPos = x + i * destination.Width;
|
||||
IntPtr dstPtr = (IntPtr)((long)destination.ImagePtr + dstPos * bpp);
|
||||
|
||||
Buffer.MemoryCopy((void*)srcPtr, (void*)dstPtr, Width * bpp, Width * bpp);
|
||||
}
|
||||
}
|
||||
|
||||
public unsafe void ExtractFrom(QImageLock destination, int x, int y, int width, int height)
|
||||
{
|
||||
if (
|
||||
width != destination.Width ||
|
||||
height != destination.Height)
|
||||
{
|
||||
throw new Exception("Destination is not the same size as the subregion.");
|
||||
}
|
||||
else if (x + width > Width || y + height > Height)
|
||||
{
|
||||
throw new Exception("The subregion is larger than this image.");
|
||||
}
|
||||
else if (Format != destination.Format)
|
||||
{
|
||||
throw new Exception("Image formats must be the same.");
|
||||
}
|
||||
|
||||
int bpp = Format.BytesPerPixel();
|
||||
for (int i = 0; i < height; i++)
|
||||
{
|
||||
long srcPos = x + y * i;
|
||||
IntPtr srcPtr = (IntPtr)((long)ImagePtr + srcPos * bpp);
|
||||
|
||||
long dstPos = i * destination.Width;
|
||||
IntPtr dstPtr = (IntPtr)((long)destination.ImagePtr + dstPos * bpp);
|
||||
|
||||
Buffer.MemoryCopy((void*)srcPtr, (void*)dstPtr, width * bpp, width * bpp);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
using System;
|
||||
|
||||
namespace Quik.Media
|
||||
namespace Dashboard.Media
|
||||
{
|
||||
public enum QImageFormat
|
||||
public enum ImageFormat
|
||||
{
|
||||
Undefined,
|
||||
RedU8,
|
||||
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
|
||||
namespace Quik.Media
|
||||
namespace Dashboard.Media
|
||||
{
|
||||
public enum MediaHint
|
||||
{
|
||||
@@ -1,8 +1,9 @@
|
||||
using OpenTK.Mathematics;
|
||||
using System;
|
||||
|
||||
namespace Quik
|
||||
namespace Dashboard
|
||||
{
|
||||
public enum MouseButton
|
||||
public enum MouseButton : byte
|
||||
{
|
||||
Primary = 1 << 0,
|
||||
Secondary = 1 << 1,
|
||||
@@ -11,15 +12,15 @@ namespace Quik
|
||||
Auxilliary2 = 1 << 4,
|
||||
Auxilliary3 = 1 << 5,
|
||||
Auxilliary4 = 1 << 6,
|
||||
Auxilliary5 = 1 << 8,
|
||||
Auxilliary5 = 1 << 7,
|
||||
}
|
||||
|
||||
public struct MouseState
|
||||
{
|
||||
public readonly QVec2 AbsolutePosition;
|
||||
public readonly Vector2 AbsolutePosition;
|
||||
public readonly MouseButton ButtonsDown;
|
||||
|
||||
public MouseState(QVec2 position, MouseButton down)
|
||||
public MouseState(Vector2 position, MouseButton down)
|
||||
{
|
||||
AbsolutePosition = position;
|
||||
ButtonsDown = down;
|
||||
@@ -28,16 +29,16 @@ namespace Quik
|
||||
|
||||
public class MouseButtonEventArgs : EventArgs
|
||||
{
|
||||
public QVec2 AbsolutePosition { get; }
|
||||
public Vector2 AbsolutePosition { get; }
|
||||
public MouseButton Buttons { get; }
|
||||
|
||||
public MouseButtonEventArgs(QVec2 position, MouseButton buttons)
|
||||
public MouseButtonEventArgs(Vector2 position, MouseButton buttons)
|
||||
{
|
||||
AbsolutePosition = position;
|
||||
Buttons = buttons;
|
||||
}
|
||||
|
||||
public QVec2 RelativePosition(QVec2 origin)
|
||||
public Vector2 RelativePosition(Vector2 origin)
|
||||
{
|
||||
return AbsolutePosition - origin;
|
||||
}
|
||||
@@ -50,18 +51,18 @@ namespace Quik
|
||||
|
||||
public class MouseMoveEventArgs : EventArgs
|
||||
{
|
||||
public QVec2 AbsolutePosition { get; }
|
||||
public QVec2 LastPosition { get; }
|
||||
public QVec2 Motion { get; }
|
||||
public Vector2 AbsolutePosition { get; }
|
||||
public Vector2 LastPosition { get; }
|
||||
public Vector2 Motion { get; }
|
||||
|
||||
public MouseMoveEventArgs(QVec2 position, QVec2 lastPosition)
|
||||
public MouseMoveEventArgs(Vector2 position, Vector2 lastPosition)
|
||||
{
|
||||
AbsolutePosition = position;
|
||||
LastPosition = lastPosition;
|
||||
Motion = position - lastPosition;
|
||||
}
|
||||
|
||||
public QVec2 RelativePosition(QVec2 origin)
|
||||
public Vector2 RelativePosition(Vector2 origin)
|
||||
{
|
||||
return AbsolutePosition - origin;
|
||||
}
|
||||
@@ -1,12 +1,13 @@
|
||||
using Dashboard.VertexGenerator;
|
||||
using Dashboard.Media;
|
||||
using OpenTK.Graphics.OpenGL4;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Collections.Generic;
|
||||
using Quik.VertexGenerator;
|
||||
using static Quik.OpenGL.GLEnum;
|
||||
using Quik.Media;
|
||||
using System.Linq;
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Quik.OpenGL
|
||||
namespace Dashboard.OpenGL
|
||||
{
|
||||
public class GL21Driver : IDisposable
|
||||
{
|
||||
@@ -26,11 +27,11 @@ namespace Quik.OpenGL
|
||||
private int tx2darray;
|
||||
|
||||
private bool isDiposed;
|
||||
private readonly Dictionary<DrawQueue, DrawData> data = new Dictionary<DrawQueue, DrawData>();
|
||||
private readonly Dictionary<DrawCallQueue, DrawData> data = new Dictionary<DrawCallQueue, DrawData>();
|
||||
private readonly TextureManager textures = new TextureManager();
|
||||
|
||||
public bool IsInit { get; private set; } = false;
|
||||
public event Action<GL21Driver> OnGCDispose;
|
||||
public event Action<GL21Driver>? OnGCDispose;
|
||||
|
||||
public GL21Driver()
|
||||
{
|
||||
@@ -45,8 +46,8 @@ namespace Quik.OpenGL
|
||||
{
|
||||
if (IsInit) return;
|
||||
|
||||
int vs = CreateShader(GL_VERTEX_SHADER, "Quik.res.gl21.vert");
|
||||
int fs = CreateShader(GL_FRAGMENT_SHADER, "Quik.res.gl21.frag");
|
||||
int vs = CreateShader(ShaderType.VertexShader, "Dashboard.res.gl21.vert");
|
||||
int fs = CreateShader(ShaderType.FragmentShader, "Dashboard.res.gl21.frag");
|
||||
|
||||
program = GL.CreateProgram();
|
||||
GL.AttachShader(program, vs);
|
||||
@@ -86,11 +87,11 @@ namespace Quik.OpenGL
|
||||
if (!IsInit) throw new InvalidOperationException("Initialize the driver first.");
|
||||
}
|
||||
|
||||
public void Draw(DrawQueue queue, in QRectangle view)
|
||||
public void Draw(DrawCallQueue queue, in Rectangle view)
|
||||
{
|
||||
AssertInit();
|
||||
|
||||
if (!data.TryGetValue(queue, out DrawData draw))
|
||||
if (!data.TryGetValue(queue, out DrawData? draw))
|
||||
{
|
||||
draw = new DrawData(this, queue);
|
||||
data.Add(queue, draw);
|
||||
@@ -99,26 +100,34 @@ namespace Quik.OpenGL
|
||||
// This already binds the vertex array for me.
|
||||
draw.PrepareFrame();
|
||||
|
||||
QVec2 size = view.Size;
|
||||
QMat4.Orthographic(out QMat4 matrix, view);
|
||||
|
||||
Vector2 size = view.Size;
|
||||
Matrix4 viewMatrix = Matrix4.CreateOrthographicOffCenter(view.Left, view.Right, view.Bottom, view.Top, 1, -1);
|
||||
|
||||
GL.Viewport(0, 0, (int)view.Size.X, (int)view.Size.Y);
|
||||
GL.UseProgram(program);
|
||||
GL.Uniform1(fMaxZ, (float)(queue.ZDepth+1));
|
||||
GL.UniformMatrix4(m4Transforms, false, in matrix);
|
||||
GL.Uniform1(fSdfThreshold, 0.0f);
|
||||
GL.Uniform1(fSdfThreshold, 0.5f);
|
||||
GL.Uniform1(tx2d, 0);
|
||||
GL.Enable(GL_BLEND);
|
||||
GL.BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
GL.Enable(EnableCap.Blend);
|
||||
GL.BlendFunc(BlendingFactor.SrcAlpha, BlendingFactor.OneMinusSrcAlpha);
|
||||
GL.Enable(EnableCap.ScissorTest);
|
||||
GL.Enable(EnableCap.DepthTest);
|
||||
GL.DepthFunc(DepthFunction.Less);
|
||||
|
||||
foreach (DrawCall call in queue)
|
||||
{
|
||||
GL.Viewport(
|
||||
(int)call.Bounds.Left,
|
||||
(int)(view.Bottom - call.Bounds.Bottom),
|
||||
(int)call.Bounds.Right,
|
||||
(int)(view.Bottom - call.Bounds.Top));
|
||||
GL.ActiveTexture(GL_TEXTURE0);
|
||||
GL.BindTexture(GL_TEXTURE_2D, 0);
|
||||
GL.Scissor(
|
||||
(int)MathF.Round(call.Bounds.Min.X),
|
||||
(int)MathF.Round(size.Y - call.Bounds.Max.Y),
|
||||
(int)MathF.Round(call.Bounds.Size.X),
|
||||
(int)MathF.Round(call.Bounds.Size.Y));
|
||||
Matrix4 modelMatrix = Matrix4.CreateTranslation(call.Bounds.Min.X, call.Bounds.Min.Y, 0);
|
||||
Matrix4 modelView = viewMatrix * modelMatrix;
|
||||
GL.UniformMatrix4(m4Transforms, false, ref modelView);
|
||||
|
||||
GL.ActiveTexture(TextureUnit.Texture0);
|
||||
GL.BindTexture(TextureTarget.Texture2D, 0);
|
||||
if (call.Texture != null)
|
||||
{
|
||||
GL.Uniform1(iEnableSdf, call.Texture.IsSdf ? 1 : 0);
|
||||
@@ -127,14 +136,14 @@ namespace Quik.OpenGL
|
||||
if (call.Texture.Depth > 1)
|
||||
{
|
||||
GL.Uniform1(iEnableTexture, 3);
|
||||
GL.ActiveTexture(GL_TEXTURE1);
|
||||
GL.BindTexture(GL_TEXTURE_2D_ARRAY, textures.GetTexture(call.Texture));
|
||||
GL.ActiveTexture(TextureUnit.Texture1);
|
||||
GL.BindTexture(TextureTarget.Texture2D, textures.GetTexture(call.Texture));
|
||||
}
|
||||
else
|
||||
{
|
||||
GL.Uniform1(iEnableTexture, 2);
|
||||
GL.ActiveTexture(GL_TEXTURE0);
|
||||
GL.BindTexture(GL_TEXTURE_2D, textures.GetTexture(call.Texture));
|
||||
GL.ActiveTexture(TextureUnit.Texture0);
|
||||
GL.BindTexture(TextureTarget.Texture2D, textures.GetTexture(call.Texture));
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -142,23 +151,27 @@ namespace Quik.OpenGL
|
||||
GL.Uniform1(iEnableTexture, 0);
|
||||
}
|
||||
|
||||
GL.DrawElements(GL_TRIANGLES, call.Count, GL_UNSIGNED_INT, sizeof(int)*call.Start);
|
||||
}
|
||||
GL.DrawElements(PrimitiveType.Triangles, call.Count, DrawElementsType.UnsignedInt, sizeof(int)*call.Start);
|
||||
}
|
||||
|
||||
public void ClearDrawQueue(DrawQueue queue)
|
||||
GL.Disable(EnableCap.ScissorTest);
|
||||
GL.Disable(EnableCap.DepthTest);
|
||||
GL.Disable(EnableCap.Blend);
|
||||
}
|
||||
|
||||
public void ClearDrawQueue(DrawCallQueue queue)
|
||||
{
|
||||
AssertInit();
|
||||
|
||||
if (!data.TryGetValue(queue, out DrawData draw))
|
||||
if (!data.TryGetValue(queue, out DrawData? draw))
|
||||
return;
|
||||
draw.Dispose();
|
||||
data.Remove(queue);
|
||||
}
|
||||
|
||||
private static int CreateShader(GLEnum type, string name)
|
||||
private static int CreateShader(ShaderType type, string name)
|
||||
{
|
||||
StreamReader source = new StreamReader(typeof(GL21Driver).Assembly.GetManifestResourceStream(name));
|
||||
StreamReader source = new StreamReader(typeof(GL21Driver).Assembly.GetManifestResourceStream(name) ?? throw new Exception("Resource not found."));
|
||||
string text = source.ReadToEnd();
|
||||
source.Dispose();
|
||||
|
||||
@@ -182,9 +195,9 @@ namespace Quik.OpenGL
|
||||
{
|
||||
message = string.Empty;
|
||||
|
||||
GL.GetShader(shader, GL_COMPILE_STATUS, out int i);
|
||||
GL.GetShader(shader, ShaderParameter.CompileStatus, out int i);
|
||||
|
||||
if (i != (int)GL_TRUE)
|
||||
if (i == 0)
|
||||
{
|
||||
message = GL.GetShaderInfoLog(shader);
|
||||
return false;
|
||||
@@ -197,9 +210,9 @@ namespace Quik.OpenGL
|
||||
{
|
||||
message = string.Empty;
|
||||
|
||||
GL.GetProgram(program, GL_LINK_STATUS, out int i);
|
||||
GL.GetProgram(program, GetProgramParameterName.LinkStatus, out int i);
|
||||
|
||||
if (i != (int)GL_OK)
|
||||
if (i == 0)
|
||||
{
|
||||
message = GL.GetProgramInfoLog(program);
|
||||
|
||||
@@ -247,14 +260,14 @@ namespace Quik.OpenGL
|
||||
|
||||
private class DrawData : IDisposable
|
||||
{
|
||||
public DrawQueue Queue { get; }
|
||||
public DrawCallQueue Queue { get; }
|
||||
public int VertexArray { get; }
|
||||
|
||||
private readonly GL21Driver driver;
|
||||
private int vbo1, vbo2;
|
||||
private int ebo1, ebo2;
|
||||
|
||||
public DrawData(GL21Driver driver, DrawQueue queue)
|
||||
public DrawData(GL21Driver driver, DrawCallQueue queue)
|
||||
{
|
||||
Queue = queue;
|
||||
this.driver = driver;
|
||||
@@ -276,22 +289,22 @@ namespace Quik.OpenGL
|
||||
return;
|
||||
|
||||
GL.BindVertexArray(VertexArray);
|
||||
GL.BindBuffer(GL_ARRAY_BUFFER, vbo);
|
||||
GL.BufferData(GL_ARRAY_BUFFER, QuikVertex.Stride * Queue.VertexCount, Queue.VertexArray, GL_STREAM_DRAW);
|
||||
GL.BindBuffer(BufferTarget.ArrayBuffer, vbo);
|
||||
GL.BufferData(BufferTarget.ArrayBuffer, DbVertex.Stride * Queue.VertexCount, Queue.VertexArray, BufferUsageHint.StreamDraw);
|
||||
|
||||
GL.VertexAttribPointer(driver.v2Position, 2, GL_FLOAT, false, QuikVertex.Stride, QuikVertex.PositionOffset);
|
||||
GL.VertexAttribPointer(driver.fZIndex, 1, GL_UNSIGNED_INT, false, QuikVertex.Stride, QuikVertex.ZIndexOffset);
|
||||
GL.VertexAttribPointer(driver.v2TexPos, 2, GL_FLOAT, false, QuikVertex.Stride, QuikVertex.TextureCoordinatesOffset);
|
||||
GL.VertexAttribPointer(driver.fTexLayer, 1, GL_FLOAT, false, QuikVertex.Stride, QuikVertex.TextureLayerOffset);
|
||||
GL.VertexAttribPointer(driver.v4Color, 4, GL_UNSIGNED_BYTE, true, QuikVertex.Stride, QuikVertex.ColorOffset);
|
||||
GL.VertexAttribPointer(driver.v2Position, 2, VertexAttribPointerType.Float, false, DbVertex.Stride, DbVertex.PositionOffset);
|
||||
GL.VertexAttribPointer(driver.fZIndex, 1, VertexAttribPointerType.UnsignedInt, false, DbVertex.Stride, DbVertex.ZIndexOffset);
|
||||
GL.VertexAttribPointer(driver.v2TexPos, 2, VertexAttribPointerType.Float, false, DbVertex.Stride, DbVertex.TextureCoordinatesOffset);
|
||||
GL.VertexAttribPointer(driver.fTexLayer, 1, VertexAttribPointerType.Float, false, DbVertex.Stride, DbVertex.TextureLayerOffset);
|
||||
GL.VertexAttribPointer(driver.v4Color, 4, VertexAttribPointerType.Float, true, DbVertex.Stride, DbVertex.ColorOffset);
|
||||
GL.EnableVertexAttribArray(driver.v2Position);
|
||||
GL.EnableVertexAttribArray(driver.fZIndex);
|
||||
GL.EnableVertexAttribArray(driver.v2TexPos);
|
||||
GL.EnableVertexAttribArray(driver.v4Color);
|
||||
GL.EnableVertexAttribArray(driver.fTexLayer);
|
||||
|
||||
GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo);
|
||||
GL.BufferData(GL_ELEMENT_ARRAY_BUFFER, Queue.ElementCount * sizeof(int), Queue.ElementArray, GL_STREAM_DRAW);
|
||||
GL.BindBuffer(BufferTarget.ElementArrayBuffer, ebo);
|
||||
GL.BufferData(BufferTarget.ElementArrayBuffer, Queue.ElementCount * sizeof(int), Queue.ElementArray, BufferUsageHint.StreamDraw);
|
||||
|
||||
int Swap(ref int a, ref int b)
|
||||
{
|
||||
@@ -318,15 +331,15 @@ namespace Quik.OpenGL
|
||||
|
||||
internal class TextureManager : IDisposable
|
||||
{
|
||||
private readonly Dictionary<QImage, int> textures = new Dictionary<QImage, int>();
|
||||
private readonly HashSet<QImage> imagesNotUsed = new HashSet<QImage>();
|
||||
private readonly Dictionary<Image, int> textures = new Dictionary<Image, int>();
|
||||
private readonly HashSet<Image> imagesNotUsed = new HashSet<Image>();
|
||||
private bool isDisposed = false;
|
||||
|
||||
public void BeginFrame()
|
||||
{
|
||||
if (imagesNotUsed.Count > 0)
|
||||
{
|
||||
foreach (QImage image in imagesNotUsed)
|
||||
foreach (Image image in imagesNotUsed)
|
||||
{
|
||||
GL.DeleteTexture(textures[image]);
|
||||
}
|
||||
@@ -334,13 +347,13 @@ namespace Quik.OpenGL
|
||||
imagesNotUsed.Clear();
|
||||
}
|
||||
|
||||
foreach (QImage image in textures.Keys)
|
||||
foreach (Image image in textures.Keys)
|
||||
{
|
||||
imagesNotUsed.Add(image);
|
||||
}
|
||||
}
|
||||
|
||||
public int GetTexture(QImage image)
|
||||
public int GetTexture(Image image)
|
||||
{
|
||||
if (textures.TryGetValue(image, out int texture))
|
||||
{
|
||||
@@ -359,34 +372,52 @@ namespace Quik.OpenGL
|
||||
return textures[image] = texture;
|
||||
}
|
||||
|
||||
public int UploadTexture3d(QImage image3d)
|
||||
public int UploadTexture3d(Image image3d)
|
||||
{
|
||||
int texture = GL.GenTexture();
|
||||
|
||||
GL.BindTexture(GL_TEXTURE_2D_ARRAY, texture);
|
||||
GL.BindTexture(TextureTarget.Texture2DArray, texture);
|
||||
|
||||
image3d.LockBits3d(out QImageLock lck, QImageLockOptions.Default);
|
||||
GL.TexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA, lck.Width, lck.Height, lck.Depth, 0, s_InternalFormat[lck.Format], s_PixelType[lck.Format], lck.ImagePtr);
|
||||
GL.TexImage3D(TextureTarget.Texture2DArray, 0, PixelInternalFormat.Rgba, lck.Width, lck.Height, lck.Depth, 0, s_InternalFormat[lck.Format], s_PixelType[lck.Format], lck.ImagePtr);
|
||||
image3d.UnlockBits();
|
||||
|
||||
GL.TexParameter(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
GL.TexParameter(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
GL.TexParameter(TextureTarget.Texture2DArray, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear);
|
||||
GL.TexParameter(TextureTarget.Texture2DArray, TextureParameterName.TextureMagFilter, (int)TextureMinFilter.Linear);
|
||||
|
||||
return texture;
|
||||
}
|
||||
|
||||
public int UploadTexture2d(QImage image2d)
|
||||
public int UploadTexture2d(Image image2d)
|
||||
{
|
||||
int texture = GL.GenTexture();
|
||||
|
||||
GL.BindTexture(GL_TEXTURE_2D, texture);
|
||||
GL.BindTexture(TextureTarget.Texture2D, texture);
|
||||
|
||||
image2d.LockBits2d(out QImageLock lck, QImageLockOptions.Default);
|
||||
GL.TexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, lck.Width, lck.Height, 0, s_InternalFormat[lck.Format], s_PixelType[lck.Format], lck.ImagePtr);
|
||||
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, lck.Width, lck.Height, 0, s_InternalFormat[lck.Format], s_PixelType[lck.Format], lck.ImagePtr);
|
||||
image2d.UnlockBits();
|
||||
|
||||
GL.TexParameter(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
GL.TexParameter(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear);
|
||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMinFilter.Linear);
|
||||
|
||||
switch (image2d.InternalFormat)
|
||||
{
|
||||
case ImageFormat.RedU8:
|
||||
case ImageFormat.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:
|
||||
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);
|
||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleA, (int)All.Alpha);
|
||||
break;
|
||||
}
|
||||
|
||||
return texture;
|
||||
}
|
||||
@@ -399,31 +430,31 @@ namespace Quik.OpenGL
|
||||
isDisposed = true;
|
||||
|
||||
int[] ids = textures.Values.ToArray();
|
||||
GL.DeleteTextures(ids);
|
||||
GL.DeleteTextures(ids.Length, ref ids[0]);
|
||||
}
|
||||
|
||||
private static readonly Dictionary<QImageFormat, GLEnum> s_InternalFormat = new Dictionary<QImageFormat, GLEnum>()
|
||||
private static readonly Dictionary<ImageFormat, PixelFormat> s_InternalFormat = new Dictionary<ImageFormat, PixelFormat>()
|
||||
{
|
||||
[QImageFormat.AlphaF] = GL_ALPHA,
|
||||
[QImageFormat.AlphaU8] = GL_ALPHA,
|
||||
[QImageFormat.RedF] = GL_RED,
|
||||
[QImageFormat.RedU8] = GL_RED,
|
||||
[QImageFormat.RgbF] = GL_RGB,
|
||||
[QImageFormat.RgbU8] = GL_RGB,
|
||||
[QImageFormat.RgbaU8] = GL_RGBA,
|
||||
[QImageFormat.RgbaF] = GL_RGBA,
|
||||
[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,
|
||||
};
|
||||
|
||||
private static readonly Dictionary<QImageFormat, GLEnum> s_PixelType = new Dictionary<QImageFormat, GLEnum>()
|
||||
private static readonly Dictionary<ImageFormat, PixelType> s_PixelType = new Dictionary<ImageFormat, PixelType>()
|
||||
{
|
||||
[QImageFormat.AlphaF] = GL_FLOAT,
|
||||
[QImageFormat.RedF] = GL_FLOAT,
|
||||
[QImageFormat.RgbF] = GL_FLOAT,
|
||||
[QImageFormat.RgbaF] = GL_FLOAT,
|
||||
[QImageFormat.AlphaU8] = GL_UNSIGNED_BYTE,
|
||||
[QImageFormat.RedU8] = GL_UNSIGNED_BYTE,
|
||||
[QImageFormat.RgbU8] = GL_UNSIGNED_BYTE,
|
||||
[QImageFormat.RgbaU8] = GL_UNSIGNED_BYTE,
|
||||
[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,
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
using System;
|
||||
using static Quik.OpenGL.GLEnum;
|
||||
using OpenTK.Graphics.OpenGL4;
|
||||
|
||||
namespace Quik.OpenGL
|
||||
namespace Dashboard.OpenGL
|
||||
{
|
||||
[System.Serializable]
|
||||
public class GraphicsException : System.Exception
|
||||
public class GraphicsException : Exception
|
||||
{
|
||||
public GraphicsException()
|
||||
{
|
||||
@@ -16,7 +16,7 @@ namespace Quik.OpenGL
|
||||
AddExtraData();
|
||||
}
|
||||
|
||||
public GraphicsException(string message, System.Exception inner) : base(message, inner)
|
||||
public GraphicsException(string message, Exception inner) : base(message, inner)
|
||||
{
|
||||
AddExtraData();
|
||||
}
|
||||
@@ -30,12 +30,12 @@ namespace Quik.OpenGL
|
||||
|
||||
private void AddExtraData()
|
||||
{
|
||||
GL.Get(GL_MAJOR_VERSION, out int major);
|
||||
GL.Get(GL_MINOR_VERSION, out int minor);
|
||||
GL.GetInteger(GetPName.MajorVersion, out int major);
|
||||
GL.GetInteger(GetPName.MinorVersion, out int minor);
|
||||
|
||||
string version = GL.GetString(GL_VERSION);
|
||||
string vendor = GL.GetString(GL_VENDOR);
|
||||
string renderer = GL.GetString(GL_RENDERER);
|
||||
string version = GL.GetString(StringName.Version);
|
||||
string vendor = GL.GetString(StringName.Vendor);
|
||||
string renderer = GL.GetString(StringName.Renderer);
|
||||
|
||||
Data.Add("OpenGL Version", new Version(major, minor));
|
||||
Data.Add("OpenGL Version String", version);
|
||||
@@ -1,20 +1,17 @@
|
||||
using Quik.CommandMachine;
|
||||
using Quik.Controls;
|
||||
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 Quik.PAL
|
||||
namespace Dashboard.PAL
|
||||
{
|
||||
/// <summary>
|
||||
/// An abstraction layer over the UI input and output.
|
||||
/// </summary>
|
||||
public class QuikPort
|
||||
public class Dash
|
||||
{
|
||||
private readonly IQuikPortHandle handle;
|
||||
private readonly IQuikPlatform platform;
|
||||
private readonly IDashHandle handle;
|
||||
private readonly IDbPlatform platform;
|
||||
|
||||
public string Title
|
||||
{
|
||||
@@ -22,19 +19,19 @@ namespace Quik.PAL
|
||||
set => platform.PortSetTitle(handle, value);
|
||||
}
|
||||
|
||||
public QVec2 Size
|
||||
public Vector2 Size
|
||||
{
|
||||
get => platform.PortGetSize(handle);
|
||||
set => platform.PortSetSize(handle, value);
|
||||
}
|
||||
|
||||
public QVec2 Position
|
||||
public Vector2 Position
|
||||
{
|
||||
get => platform.PortGetPosition(handle);
|
||||
set => platform.PortSetPosition(handle, value);
|
||||
}
|
||||
|
||||
public UIBase UIElement { get; set; }
|
||||
public UIBase? UIElement { get; set; }
|
||||
|
||||
public bool IsValid => platform.PortIsValid(handle);
|
||||
|
||||
@@ -50,7 +47,7 @@ namespace Quik.PAL
|
||||
}
|
||||
}
|
||||
|
||||
public QuikPort(IQuikPlatform platform)
|
||||
public Dash(IDbPlatform platform)
|
||||
{
|
||||
this.platform = platform;
|
||||
handle = platform.CreatePort();
|
||||
@@ -70,16 +67,15 @@ namespace Quik.PAL
|
||||
platform.PortFocus(handle);
|
||||
}
|
||||
|
||||
public void Paint(CommandList list = null)
|
||||
public void Paint(DrawList? list = null)
|
||||
{
|
||||
if (UIElement == null)
|
||||
return;
|
||||
|
||||
if(list == null)
|
||||
list = new CommandList();
|
||||
list ??= new DrawList();
|
||||
|
||||
list.Clear();
|
||||
UIElement.Bounds = new QRectangle(Size, new QVec2(0,0));
|
||||
UIElement.Bounds = new Rectangle(Size, new Vector2(0,0));
|
||||
UIElement.Paint(list);
|
||||
platform.PortPaint(handle, list);
|
||||
}
|
||||
62
Dashboard/PAL/IDbPlatform.cs
Normal file
62
Dashboard/PAL/IDbPlatform.cs
Normal file
@@ -0,0 +1,62 @@
|
||||
using Dashboard.ImmediateDraw;
|
||||
using Dashboard.Media;
|
||||
using OpenTK.Mathematics;
|
||||
using System;
|
||||
|
||||
namespace Dashboard.PAL
|
||||
{
|
||||
/// <summary>
|
||||
/// An empty interface to statically type Quik port handles.
|
||||
/// </summary>
|
||||
public interface IDashHandle
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The primary primary platform abstraction interface for dashboard hosts.
|
||||
/// </summary>
|
||||
public interface IDbPlatform : IDisposable
|
||||
{
|
||||
/// <summary>
|
||||
/// The title of the application.
|
||||
/// </summary>
|
||||
string? Title { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The default icon for the application.
|
||||
/// </summary>
|
||||
Image? Icon { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The event raised when an event is received.
|
||||
/// </summary>
|
||||
event EventHandler? EventRaised;
|
||||
|
||||
/// <summary>
|
||||
/// Raise the events that have been enqueued.
|
||||
/// </summary>
|
||||
/// <param name="block">True to block until a new event arrives.</param>
|
||||
void ProcessEvents(bool block);
|
||||
|
||||
/// <summary>
|
||||
/// Create a window.
|
||||
/// </summary>
|
||||
/// <returns>The window instance.</returns>
|
||||
IDashHandle CreatePort();
|
||||
void DestroyPort(IDashHandle port);
|
||||
string PortGetTitle(IDashHandle port);
|
||||
void PortSetTitle(IDashHandle port, string title);
|
||||
Vector2 PortGetSize(IDashHandle port);
|
||||
void PortSetSize(IDashHandle port, Vector2 size);
|
||||
Vector2 PortGetPosition(IDashHandle port);
|
||||
void PortSetPosition(IDashHandle port, Vector2 position);
|
||||
bool PortIsValid(IDashHandle port);
|
||||
void PortSubscribeEvent(IDashHandle port, EventHandler handler);
|
||||
void PortUnsubscribeEvent(IDashHandle port, EventHandler handler);
|
||||
void PortFocus(IDashHandle port);
|
||||
void PortShow(IDashHandle port, bool shown = true);
|
||||
void PortPaint(IDashHandle port, DrawList commands);
|
||||
void GetMaximumImage(out int width, out int height);
|
||||
void GetMaximumImage(out int width, out int height, out int depth);
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using Quik.Media.Font;
|
||||
using Dashboard.Media.Fonts;
|
||||
|
||||
namespace Quik.PAL
|
||||
namespace Dashboard.PAL
|
||||
{
|
||||
/// <summary>
|
||||
/// Flags that effect font search criterea.
|
||||
@@ -29,6 +29,12 @@ namespace Quik.PAL
|
||||
/// </summary>
|
||||
IEnumerable<FontFace> All { get; }
|
||||
|
||||
public FontFace Serif => GetSystemFontFace(SystemFontFamily.Serif);
|
||||
public FontFace Sans => GetSystemFontFace(SystemFontFamily.Sans);
|
||||
public FontFace Monospace => GetSystemFontFace(SystemFontFamily.Monospace);
|
||||
public FontFace Cursive => GetSystemFontFace(SystemFontFamily.Cursive);
|
||||
public FontFace Fantasy => GetSystemFontFace(SystemFontFamily.Fantasy);
|
||||
|
||||
/// <summary>
|
||||
/// Search for the given font face.
|
||||
/// </summary>
|
||||
@@ -50,5 +56,12 @@ namespace Quik.PAL
|
||||
/// <param name="face">The font face to open.</param>
|
||||
/// <returns>The stream to the font face.</returns>
|
||||
Stream Open(FontFace face);
|
||||
|
||||
/// <summary>
|
||||
/// Get a system font family.
|
||||
/// </summary>
|
||||
/// <param name="family">The family type to look up.</param>
|
||||
/// <returns>The name of a font in this family.</returns>
|
||||
FontFace GetSystemFontFace(SystemFontFamily family);
|
||||
}
|
||||
}
|
||||
12
Dashboard/PAL/IFontFactory.cs
Normal file
12
Dashboard/PAL/IFontFactory.cs
Normal file
@@ -0,0 +1,12 @@
|
||||
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.IO;
|
||||
using Dashboard.Media;
|
||||
|
||||
namespace Dashboard.PAL
|
||||
{
|
||||
public interface IFontFactory
|
||||
{
|
||||
bool TryOpen(Stream stream, [NotNullWhen(true)] out Font font);
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,10 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Quik.Media;
|
||||
using Quik.Media.Font;
|
||||
using Dashboard.Media;
|
||||
using Dashboard.Media.Fonts;
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Quik
|
||||
namespace Dashboard
|
||||
{
|
||||
public enum TextAlignment
|
||||
{
|
||||
@@ -53,11 +54,11 @@ namespace Quik
|
||||
|
||||
public abstract class StyleBase
|
||||
{
|
||||
public abstract object this[string key] { get; set; }
|
||||
public abstract object? this[string key] { get; set; }
|
||||
|
||||
public QColor? Color
|
||||
public Color4? Color
|
||||
{
|
||||
get => (QColor?)this["color"];
|
||||
get => (Color4?)this["color"];
|
||||
set => this["color"] = value;
|
||||
}
|
||||
|
||||
@@ -109,9 +110,9 @@ namespace Quik
|
||||
set => this["list-marker-position"] = value;
|
||||
}
|
||||
|
||||
public QImage ListMarkerImage
|
||||
public Image? ListMarkerImage
|
||||
{
|
||||
get => (QImage)this["list-marker-image"];
|
||||
get => (Image?)this["list-marker-image"];
|
||||
set => this["list-marker-image"] = value;
|
||||
}
|
||||
|
||||
@@ -121,15 +122,15 @@ namespace Quik
|
||||
set => this["stroke-width"] = value;
|
||||
}
|
||||
|
||||
public QColor? StrokeColor
|
||||
public OpenTK.Mathematics.Color4? StrokeColor
|
||||
{
|
||||
get => (QColor?)this["stroke-color"];
|
||||
get => (Color4?)this["stroke-color"];
|
||||
set => this["stroke-color"] = value;
|
||||
}
|
||||
|
||||
public FontFace Font
|
||||
public FontFace? Font
|
||||
{
|
||||
get => (FontFace)this["font"];
|
||||
get => (FontFace?)this["font"];
|
||||
set => this["font"] = value;
|
||||
}
|
||||
|
||||
@@ -144,9 +145,9 @@ namespace Quik
|
||||
{
|
||||
private readonly Dictionary<string, object> _keys = new Dictionary<string, object>();
|
||||
|
||||
public override object this[string styleKey]
|
||||
public override object? this[string styleKey]
|
||||
{
|
||||
get => _keys.TryGetValue(styleKey, out object value) ? value : null;
|
||||
get => _keys.TryGetValue(styleKey, out object? value) ? value : null;
|
||||
set
|
||||
{
|
||||
if (value == null)
|
||||
@@ -163,11 +164,11 @@ namespace Quik
|
||||
|
||||
public Style BaseStyle { get; }
|
||||
|
||||
public override object this[string key]
|
||||
public override object? this[string key]
|
||||
{
|
||||
get
|
||||
{
|
||||
object value = null;
|
||||
object? value = null;
|
||||
|
||||
for (int i = _styles.Count; i != 0 && value == null; i--)
|
||||
{
|
||||
@@ -208,7 +209,7 @@ namespace Quik
|
||||
/// <summary>
|
||||
/// A line stipple pattern.
|
||||
/// </summary>
|
||||
public struct QuikStipplePattern
|
||||
public struct StipplePattern
|
||||
{
|
||||
/// <summary>
|
||||
/// The stipple pitch value.
|
||||
@@ -220,24 +221,24 @@ namespace Quik
|
||||
/// </summary>
|
||||
public float DutyCycle;
|
||||
|
||||
public QuikStipplePattern(float pitch, float dutyCycle)
|
||||
public StipplePattern(float pitch, float dutyCycle)
|
||||
{
|
||||
Pitch = pitch;
|
||||
DutyCycle = dutyCycle;
|
||||
}
|
||||
|
||||
public static QuikStipplePattern None => new QuikStipplePattern(0.0f, 1.0f);
|
||||
public static StipplePattern None => new StipplePattern(0.0f, 1.0f);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Stroke style for lines and borders.
|
||||
/// </summary>
|
||||
public class QuikStrokeStyle
|
||||
public class StrokeStyle
|
||||
{
|
||||
/// <summary>
|
||||
/// Stroke color.
|
||||
/// </summary>
|
||||
public QColor Color { get; set; }
|
||||
public Color4 Color { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Stroke width.
|
||||
@@ -249,11 +250,11 @@ namespace Quik
|
||||
// /// </summary>
|
||||
// public QuikStipplePattern StipplePattern { get; set; }
|
||||
|
||||
public QuikStrokeStyle()
|
||||
public StrokeStyle()
|
||||
{
|
||||
}
|
||||
|
||||
public QuikStrokeStyle(QColor color, float width /*, QuikStipplePattern pattern*/)
|
||||
public StrokeStyle(Color4 color, float width /*, QuikStipplePattern pattern*/)
|
||||
{
|
||||
Color = color;
|
||||
Width = width;
|
||||
@@ -268,8 +269,8 @@ namespace Quik
|
||||
/// <summary>
|
||||
/// Fill style for rectangles and the like.
|
||||
/// </summary>
|
||||
public class QuikFillStyle
|
||||
public class FillStyle
|
||||
{
|
||||
public QColor Color { get; set; }
|
||||
public Color4 Color { get; set; }
|
||||
}
|
||||
}
|
||||
108
Dashboard/Typography/FontProvider.cs
Normal file
108
Dashboard/Typography/FontProvider.cs
Normal file
@@ -0,0 +1,108 @@
|
||||
using Dashboard.Media;
|
||||
using Dashboard.Media.Fonts;
|
||||
using Dashboard.PAL;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
|
||||
namespace Dashboard.Typography
|
||||
{
|
||||
/// <summary>
|
||||
/// The font provider is a caching object that provides fonts for typesetting classes.
|
||||
/// </summary>
|
||||
public class FontProvider : IDisposable
|
||||
{
|
||||
private Dictionary<FontFace, Font> Fonts { get; } = new Dictionary<FontFace, Font>();
|
||||
private HashSet<Font> UsedFonts { get; } = new HashSet<Font>();
|
||||
public readonly FontRasterizerOptions RasterizerOptions;
|
||||
public IFontDataBase? Database { get; set; }
|
||||
public IFontFactory? FontFactory { get; set; }
|
||||
private readonly DbApplication App;
|
||||
|
||||
public Font this[FontFace info]
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!Fonts.TryGetValue(info, out Font? font))
|
||||
{
|
||||
using Stream str = Database?.Open(info) ?? throw new Exception("Font could not be found.");
|
||||
|
||||
if (FontFactory?.TryOpen(str, out font) ?? false)
|
||||
{
|
||||
Fonts.Add(info, font);
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Exception("Font not found.");
|
||||
}
|
||||
}
|
||||
|
||||
UsedFonts.Add(font);
|
||||
return font;
|
||||
}
|
||||
}
|
||||
|
||||
public Font this[SystemFontFamily family]
|
||||
{
|
||||
get
|
||||
{
|
||||
return this[Database?.GetSystemFontFace(family) ?? throw new Exception("No font database.")];
|
||||
}
|
||||
}
|
||||
|
||||
public FontProvider(DbApplication app, in FontRasterizerOptions options)
|
||||
{
|
||||
RasterizerOptions = options;
|
||||
App = app;
|
||||
|
||||
Type? fdb = Type.GetType("Quik.Media.Defaults.FontDataBaseProvider, Quik.Media.Defaults");
|
||||
if (fdb != null)
|
||||
{
|
||||
PropertyInfo? instanceProperty = fdb.GetProperty("Instance", BindingFlags.Static | BindingFlags.Public | BindingFlags.GetProperty);
|
||||
if (instanceProperty != null)
|
||||
{
|
||||
Database = (IFontDataBase)instanceProperty.GetValue(null)!;
|
||||
}
|
||||
}
|
||||
|
||||
Type? ffact = Type.GetType("Quik.Media.Defaults.FreeTypeFontFactory, Quik.Media.Defaults");
|
||||
if (ffact != null)
|
||||
{
|
||||
ConstructorInfo? ctor = ffact.GetConstructor(Array.Empty<Type>());
|
||||
FontFactory = (IFontFactory?)ctor?.Invoke(null);
|
||||
}
|
||||
}
|
||||
public FontProvider(DbApplication app)
|
||||
: this(app, FontRasterizerOptions.Default)
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Tracks the use of fonts used by this typesetter and removes any that haven't been referenced since the last cycle.
|
||||
/// </summary>
|
||||
public void Collect()
|
||||
{
|
||||
// foreach (FontJar jar in Fonts.Values.ToArray())
|
||||
// {
|
||||
// if (!UsedFonts.Contains(jar))
|
||||
// {
|
||||
// Fonts.Remove(jar.Info);
|
||||
// }
|
||||
// }
|
||||
// UsedFonts.Clear();
|
||||
}
|
||||
|
||||
private bool isDisposed = false;
|
||||
public void Dispose()
|
||||
{
|
||||
if (isDisposed) return;
|
||||
|
||||
isDisposed = true;
|
||||
foreach (Font font in Fonts.Values)
|
||||
{
|
||||
font.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,12 @@
|
||||
using OpenTK.Mathematics;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Text;
|
||||
using Quik.Media;
|
||||
using Dashboard.Media;
|
||||
|
||||
namespace Quik.Typography
|
||||
namespace Dashboard.Typography
|
||||
{
|
||||
/// <summary>
|
||||
/// An atomic horizontal block of text which cannot be further divided.
|
||||
@@ -182,7 +183,7 @@ namespace Quik.Typography
|
||||
int index = 0;
|
||||
bool firstLine = true;
|
||||
|
||||
QVec2 pen = new QVec2(0, -PreSpace);
|
||||
Vector2 pen = new Vector2(0, -PreSpace);
|
||||
|
||||
while (index < Blocks.Count)
|
||||
{
|
||||
@@ -226,7 +227,7 @@ namespace Quik.Typography
|
||||
|
||||
pen.Y -= PostSpace;
|
||||
|
||||
group.BoundingBox = new QRectangle(width, 0, 0, pen.Y);
|
||||
group.BoundingBox = new Rectangle(width, pen.Y, 0, 0);
|
||||
group.Translate(-pen);
|
||||
}
|
||||
|
||||
@@ -264,9 +265,9 @@ namespace Quik.Typography
|
||||
TypesetGroup group,
|
||||
Queue<HorizontalTextBlock> line,
|
||||
float interblockWs,
|
||||
ref QVec2 pen)
|
||||
ref Vector2 pen)
|
||||
{
|
||||
QVec2 penpal = pen;
|
||||
Vector2 penpal = pen;
|
||||
|
||||
while (line.TryDequeue(out HorizontalTextBlock block))
|
||||
{
|
||||
@@ -353,15 +354,15 @@ namespace Quik.Typography
|
||||
public struct TypesetCharacter
|
||||
{
|
||||
public int Character;
|
||||
public QuikTexture Texture;
|
||||
public QRectangle Position;
|
||||
public QRectangle UV;
|
||||
public Image Texture;
|
||||
public Rectangle Position;
|
||||
public Rectangle UV;
|
||||
|
||||
public TypesetCharacter(
|
||||
int chr,
|
||||
QuikTexture texture,
|
||||
in QRectangle position,
|
||||
in QRectangle uv)
|
||||
Image texture,
|
||||
in Rectangle position,
|
||||
in Rectangle uv)
|
||||
{
|
||||
Character = chr;
|
||||
Texture = texture;
|
||||
@@ -375,7 +376,7 @@ namespace Quik.Typography
|
||||
private int _count = 0;
|
||||
private TypesetCharacter[] _array = Array.Empty<TypesetCharacter>();
|
||||
|
||||
public QRectangle BoundingBox;
|
||||
public Rectangle BoundingBox;
|
||||
|
||||
public int Count => _count;
|
||||
|
||||
@@ -396,7 +397,7 @@ namespace Quik.Typography
|
||||
_count = 0;
|
||||
}
|
||||
|
||||
public void Translate(QVec2 offset)
|
||||
public void Translate(Vector2 offset)
|
||||
{
|
||||
BoundingBox.Translate(offset);
|
||||
|
||||
182
Dashboard/Typography/Typesetter.cs
Normal file
182
Dashboard/Typography/Typesetter.cs
Normal file
@@ -0,0 +1,182 @@
|
||||
using OpenTK.Mathematics;
|
||||
using Dashboard.ImmediateDraw;
|
||||
using Dashboard.Media;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace Dashboard.Typography
|
||||
{
|
||||
public static class Typesetter
|
||||
{
|
||||
private ref struct LineEnumerator
|
||||
{
|
||||
private ReadOnlySpan<char> Entire, Segment;
|
||||
private bool Final;
|
||||
|
||||
public ReadOnlySpan<char> Current => Segment;
|
||||
|
||||
public LineEnumerator(ReadOnlySpan<char> value)
|
||||
{
|
||||
Entire = value;
|
||||
Segment = ReadOnlySpan<char>.Empty;
|
||||
Final = false;
|
||||
}
|
||||
|
||||
public void Reset()
|
||||
{
|
||||
Segment = ReadOnlySpan<char>.Empty;
|
||||
Final = false;
|
||||
}
|
||||
|
||||
public bool MoveNext()
|
||||
{
|
||||
if (Final)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else if (Segment == ReadOnlySpan<char>.Empty)
|
||||
{
|
||||
int index = Entire.IndexOf('\n');
|
||||
if (index == -1)
|
||||
{
|
||||
Segment = Entire;
|
||||
}
|
||||
else
|
||||
{
|
||||
Segment = Entire.Slice(0, index);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
Entire.Overlaps(Segment, out int offset);
|
||||
|
||||
if (offset + Segment.Length >= Entire.Length)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
ReadOnlySpan<char> rest = Entire.Slice(offset + Segment.Length + 1);
|
||||
|
||||
int index = rest.IndexOf('\n');
|
||||
if (index == -1)
|
||||
{
|
||||
Segment = rest;
|
||||
Final = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
Segment = rest.Slice(0, index);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static Vector2 MeasureHorizontal(ReadOnlySpan<char> str, float size, Font font)
|
||||
{
|
||||
var enumerator = new LineEnumerator(str);
|
||||
|
||||
float width = 0.0f;
|
||||
float height = 0.0f;
|
||||
|
||||
while (enumerator.MoveNext())
|
||||
{
|
||||
ReadOnlySpan<char> line = enumerator.Current;
|
||||
|
||||
float lineHeight = 0.0f;
|
||||
|
||||
foreach (Rune r in line.EnumerateRunes())
|
||||
{
|
||||
int codepoint = r.Value;
|
||||
font.Get(codepoint, size, out FontGlyph glyph);
|
||||
|
||||
width += glyph.Metrics.Advance.X;
|
||||
lineHeight = Math.Max(lineHeight, glyph.Metrics.Size.Y);
|
||||
}
|
||||
|
||||
height += lineHeight;
|
||||
}
|
||||
|
||||
return new Vector2(width, height);
|
||||
}
|
||||
|
||||
public static void TypesetHorizontalDirect(this DrawList list, ReadOnlySpan<char> str, Vector2 origin, float size, Font font)
|
||||
{
|
||||
Dictionary<Image, FontDrawInfo> drawInfo = new Dictionary<Image, FontDrawInfo>();
|
||||
var enumerator = new LineEnumerator(str);
|
||||
|
||||
Vector2 pen = origin;
|
||||
while (enumerator.MoveNext())
|
||||
{
|
||||
ReadOnlySpan<char> line = enumerator.Current;
|
||||
float rise = 0.0f;
|
||||
float fall = 0.0f;
|
||||
|
||||
// Find out all the code pages required, and the line height.
|
||||
foreach (Rune r in line.EnumerateRunes())
|
||||
{
|
||||
int codepoint = r.Value;
|
||||
font.Get(codepoint, size, out FontGlyph glyph);
|
||||
float crise = glyph.Metrics.HorizontalBearing.Y;
|
||||
float cfall = glyph.Metrics.Size.Y - crise;
|
||||
|
||||
rise = Math.Max(crise, rise);
|
||||
fall = Math.Max(cfall, fall);
|
||||
}
|
||||
|
||||
pen += new Vector2(0, rise);
|
||||
|
||||
foreach (Rune r in line.EnumerateRunes())
|
||||
{
|
||||
FontDrawInfo info;
|
||||
int codepoint = r.Value;
|
||||
|
||||
font.Get(codepoint, size, out FontGlyph glyph);
|
||||
ref readonly GlyphMetrics metrics = ref glyph.Metrics;
|
||||
Image? image = glyph.Image;
|
||||
|
||||
if (image == null)
|
||||
{
|
||||
pen += new Vector2(metrics.Advance.X, 0);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!drawInfo.TryGetValue(image, out info))
|
||||
{
|
||||
info = new FontDrawInfo();
|
||||
info.Image = image;
|
||||
info.rectangles = new List<Rectangle>();
|
||||
drawInfo[image] = info;
|
||||
}
|
||||
|
||||
Rectangle dest = new Rectangle(
|
||||
pen + new Vector2(metrics.HorizontalBearing.X + metrics.Size.X, metrics.Size.Y - metrics.HorizontalBearing.Y),
|
||||
pen + new Vector2(metrics.HorizontalBearing.X, -metrics.HorizontalBearing.Y));
|
||||
|
||||
info.rectangles.Add(dest);
|
||||
info.rectangles.Add(glyph.UVs);
|
||||
|
||||
pen.X += metrics.Advance.X;
|
||||
}
|
||||
|
||||
pen.X = origin.X;
|
||||
pen.Y += fall;
|
||||
}
|
||||
|
||||
// Now for each rectangle we can dispatch draw calls.
|
||||
foreach (FontDrawInfo info in drawInfo.Values)
|
||||
{
|
||||
list.Image(info.Image, info.rectangles.ToArray(), true);
|
||||
}
|
||||
}
|
||||
|
||||
private struct FontDrawInfo
|
||||
{
|
||||
public Image Image;
|
||||
public List<Rectangle> rectangles;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Text;
|
||||
|
||||
namespace Quik.Typography
|
||||
namespace Dashboard.Typography
|
||||
{
|
||||
public static class UnicodeUtil
|
||||
{
|
||||
@@ -1,27 +1,28 @@
|
||||
using OpenTK.Mathematics;
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace Quik.VertexGenerator
|
||||
namespace Dashboard.VertexGenerator
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents a GPU vertex.
|
||||
/// </summary>
|
||||
[DebuggerDisplay("XY={Position} RGBA={Color}, UV={TextureCoordinates}")]
|
||||
public struct QuikVertex
|
||||
public struct DbVertex
|
||||
{
|
||||
/// <summary>
|
||||
/// Position value.
|
||||
/// </summary>
|
||||
public QVec2 Position;
|
||||
public Vector2 Position;
|
||||
|
||||
/// <summary>
|
||||
/// Texture Coordinates.
|
||||
/// </summary>
|
||||
public QVec2 TextureCoordinates;
|
||||
public Vector2 TextureCoordinates;
|
||||
|
||||
/// <summary>
|
||||
/// Per vertex color value.
|
||||
/// </summary>
|
||||
public QColor Color;
|
||||
public Color4 Color;
|
||||
|
||||
/// <summary>
|
||||
/// Per vertex depth index value.
|
||||
@@ -34,10 +35,10 @@ namespace Quik.VertexGenerator
|
||||
public float TextureLayer;
|
||||
|
||||
public static int PositionOffset => 0;
|
||||
public static unsafe int TextureCoordinatesOffset => sizeof(QVec2);
|
||||
public static unsafe int ColorOffset => 2 * sizeof(QVec2);
|
||||
public static unsafe int ZIndexOffset => ColorOffset + sizeof(QColor);
|
||||
public static unsafe int TextureCoordinatesOffset => sizeof(Vector2);
|
||||
public static unsafe int ColorOffset => 2 * sizeof(Vector2);
|
||||
public static unsafe int ZIndexOffset => ColorOffset + sizeof(Color4);
|
||||
public static unsafe int TextureLayerOffset => ZIndexOffset + sizeof(int);
|
||||
public static unsafe int Stride => sizeof(QuikVertex);
|
||||
public static unsafe int Stride => sizeof(DbVertex);
|
||||
}
|
||||
}
|
||||
@@ -1,23 +1,23 @@
|
||||
using Quik.Media;
|
||||
using Dashboard.Media;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
namespace Quik.VertexGenerator
|
||||
namespace Dashboard.VertexGenerator
|
||||
{
|
||||
public class DrawQueue : IEnumerable<DrawCall>
|
||||
public class DrawCallQueue : IEnumerable<DrawCall>
|
||||
{
|
||||
private readonly RefList<QuikVertex> _vertices = new RefList<QuikVertex>();
|
||||
private readonly RefList<DbVertex> _vertices = new RefList<DbVertex>();
|
||||
private readonly RefList<int> _elements = new RefList<int>();
|
||||
private readonly List<DrawCall> _drawCalls = new List<DrawCall>();
|
||||
private int _start;
|
||||
private int _baseOffset;
|
||||
private QRectangle _bounds;
|
||||
private QImage _texture;
|
||||
private Rectangle _bounds;
|
||||
private Image? _texture;
|
||||
|
||||
public int ZDepth { get; private set; }
|
||||
public QuikVertex[] VertexArray => _vertices.InternalArray;
|
||||
public DbVertex[] VertexArray => _vertices.InternalArray;
|
||||
public int VertexCount => _vertices.Count;
|
||||
public int[] ElementArray => _elements.InternalArray;
|
||||
public int ElementCount => _elements.Count;
|
||||
@@ -33,7 +33,7 @@ namespace Quik.VertexGenerator
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void StartDrawCall(in QRectangle bounds, QImage texture, int baseOffset)
|
||||
public void StartDrawCall(in Rectangle bounds, Image? texture, int baseOffset)
|
||||
{
|
||||
_start = ElementCount;
|
||||
_texture = texture;
|
||||
@@ -42,16 +42,16 @@ namespace Quik.VertexGenerator
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void StartDrawCall(in QRectangle bounds) => StartDrawCall(bounds, null, _vertices.Count);
|
||||
public void StartDrawCall(in Rectangle bounds) => StartDrawCall(bounds, null, _vertices.Count);
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void StartDrawCall(in QRectangle bounds, int baseOffset) => StartDrawCall(bounds, null, baseOffset);
|
||||
public void StartDrawCall(in Rectangle bounds, int baseOffset) => StartDrawCall(bounds, null, baseOffset);
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void StartDrawCall(in QRectangle bounds, QImage texture) => StartDrawCall(bounds, texture, _vertices.Count);
|
||||
public void StartDrawCall(in Rectangle bounds, Image texture) => StartDrawCall(bounds, texture, _vertices.Count);
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void AddVertex(in QuikVertex vertex)
|
||||
public void AddVertex(in DbVertex vertex)
|
||||
{
|
||||
_vertices.Add(in vertex);
|
||||
}
|
||||
@@ -99,10 +99,10 @@ namespace Quik.VertexGenerator
|
||||
{
|
||||
public int Start { get; }
|
||||
public int Count { get; }
|
||||
public QRectangle Bounds { get; }
|
||||
public QImage Texture { get; }
|
||||
public Rectangle Bounds { get; }
|
||||
public Image? Texture { get; }
|
||||
|
||||
public DrawCall(int start, int count, in QRectangle bounds, QImage texture)
|
||||
public DrawCall(int start, int count, in Rectangle bounds, Image? texture)
|
||||
{
|
||||
Start = start;
|
||||
Count = count;
|
||||
@@ -1,12 +1,12 @@
|
||||
using System;
|
||||
|
||||
namespace Quik.VertexGenerator
|
||||
namespace Dashboard.VertexGenerator
|
||||
{
|
||||
/// <summary>
|
||||
/// A small list which whose items can be used by reference.
|
||||
/// </summary>
|
||||
/// <typeparam name="T">Container type.</typeparam>
|
||||
public class RefList<T>
|
||||
internal class RefList<T>
|
||||
{
|
||||
private T[] _array = Array.Empty<T>();
|
||||
private int _count = 0;
|
||||
@@ -1,14 +1,14 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Quik.CommandMachine;
|
||||
using Quik.Media;
|
||||
using Quik.Typography;
|
||||
using Dashboard.ImmediateDraw;
|
||||
using Dashboard.Media;
|
||||
using OpenTK.Mathematics;
|
||||
|
||||
namespace Quik.VertexGenerator
|
||||
namespace Dashboard.VertexGenerator
|
||||
{
|
||||
public class VertexGeneratorEngine : CommandEngine
|
||||
public class VertexDrawingEngine : DrawingEngine
|
||||
{
|
||||
public DrawQueue DrawQueue { get; } = new DrawQueue();
|
||||
public DrawCallQueue DrawQueue { get; } = new DrawCallQueue();
|
||||
|
||||
/// <summary>
|
||||
/// Granularity for rounded geometry.
|
||||
@@ -18,21 +18,21 @@ namespace Quik.VertexGenerator
|
||||
protected bool BlendTextures =>
|
||||
(Style["-vertex-blend-textures"] is bool value) ? value : false;
|
||||
|
||||
protected QuikVertex StrokeVertex => new QuikVertex()
|
||||
protected DbVertex StrokeVertex => new DbVertex()
|
||||
{
|
||||
ZIndex = Style.ZIndex ?? this.ZIndex,
|
||||
Color = Style.StrokeColor ?? QColor.Black,
|
||||
Color = Style.StrokeColor ?? Color4.Black,
|
||||
};
|
||||
protected QuikVertex FillVertex => new QuikVertex()
|
||||
protected DbVertex FillVertex => new DbVertex()
|
||||
{
|
||||
ZIndex = Style.ZIndex ?? this.ZIndex,
|
||||
Color = Style.Color ?? QColor.White,
|
||||
Color = Style.Color ?? Color4.White,
|
||||
};
|
||||
|
||||
protected QuikVertex ImageVertex => new QuikVertex()
|
||||
protected DbVertex ImageVertex => new DbVertex()
|
||||
{
|
||||
ZIndex = Style.ZIndex ?? this.ZIndex,
|
||||
Color = BlendTextures ? (Style.Color ?? QColor.White) : QColor.White,
|
||||
Color = BlendTextures ? (Style.Color ?? Color4.White) : Color4.White,
|
||||
};
|
||||
|
||||
public override void Reset()
|
||||
@@ -41,7 +41,7 @@ namespace Quik.VertexGenerator
|
||||
DrawQueue.Clear();
|
||||
}
|
||||
|
||||
protected override void ChildProcessCommand(Command name, CommandQueue queue)
|
||||
protected override void ChildProcessCommand(Command name, DrawQueue queue)
|
||||
{
|
||||
base.ChildProcessCommand(name, queue);
|
||||
|
||||
@@ -66,8 +66,8 @@ namespace Quik.VertexGenerator
|
||||
return (int) Math.Ceiling(arc * radius * CurveGranularity);
|
||||
}
|
||||
|
||||
private readonly List<QLine> LineList = new List<QLine>();
|
||||
private void LineProc(CommandQueue queue)
|
||||
private readonly List<Line> LineList = new List<Line>();
|
||||
private void LineProc(DrawQueue queue)
|
||||
{
|
||||
Frame frame = queue.Dequeue();
|
||||
|
||||
@@ -79,12 +79,12 @@ namespace Quik.VertexGenerator
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
frame = queue.Dequeue();
|
||||
LineList.Add((QLine)frame);
|
||||
LineList.Add((Line)frame);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
LineList.Add((QLine)frame);
|
||||
LineList.Add((Line)frame);
|
||||
}
|
||||
|
||||
float width = Style.StrokeWidth ?? 1;
|
||||
@@ -93,7 +93,7 @@ namespace Quik.VertexGenerator
|
||||
LineInfo prevBase, nextBase = default;
|
||||
for (int i = 0; i < LineList.Count; i++)
|
||||
{
|
||||
QLine line = LineList[i];
|
||||
Line 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,11 +124,11 @@ namespace Quik.VertexGenerator
|
||||
DrawQueue.EndDrawCall();
|
||||
}
|
||||
|
||||
private LineInfo GenerateLineSegment(in QLine line)
|
||||
private LineInfo GenerateLineSegment(in Line line)
|
||||
{
|
||||
QuikVertex vertex = StrokeVertex;
|
||||
QuikVertex a, b, c, d;
|
||||
QVec2 normal = line.Normal();
|
||||
DbVertex vertex = StrokeVertex;
|
||||
DbVertex a, b, c, d;
|
||||
Vector2 normal = line.Normal();
|
||||
float width = Style.StrokeWidth ?? 1;
|
||||
|
||||
a = b = c = d = vertex;
|
||||
@@ -148,20 +148,20 @@ namespace Quik.VertexGenerator
|
||||
}
|
||||
|
||||
private void GenerateJoint(
|
||||
in QVec2 center,
|
||||
in QVec2 prevNormal,
|
||||
in QVec2 nextNormal,
|
||||
in Vector2 center,
|
||||
in Vector2 prevNormal,
|
||||
in Vector2 nextNormal,
|
||||
in LineInfo prevInfo,
|
||||
in LineInfo nextInfo)
|
||||
{
|
||||
// Figure out which side needs the joint.
|
||||
QVec2 meanNormal = 0.5f * (prevNormal + nextNormal);
|
||||
QVec2 meanTangent = new QVec2(meanNormal.Y, -meanNormal.X);
|
||||
QVec2 positiveEdge = ((center + nextNormal) - (center + prevNormal)).Normalize();
|
||||
QVec2 negativeEdge = ((center - nextNormal) - (center - prevNormal)).Normalize();
|
||||
Vector2 meanNormal = 0.5f * (prevNormal + nextNormal);
|
||||
Vector2 meanTangent = new Vector2(meanNormal.Y, -meanNormal.X);
|
||||
Vector2 positiveEdge = ((center + nextNormal) - (center + prevNormal)).Normalized();
|
||||
Vector2 negativeEdge = ((center - nextNormal) - (center - prevNormal)).Normalized();
|
||||
float positive, negative;
|
||||
positive = QVec2.Dot(meanTangent, positiveEdge);
|
||||
negative = QVec2.Dot(meanNormal, negativeEdge);
|
||||
positive = Vector2.Dot(meanTangent, positiveEdge);
|
||||
negative = Vector2.Dot(meanNormal, negativeEdge);
|
||||
|
||||
if (positive == negative)
|
||||
{
|
||||
@@ -171,9 +171,9 @@ namespace Quik.VertexGenerator
|
||||
return;
|
||||
}
|
||||
|
||||
QuikVertex vertex = StrokeVertex;
|
||||
DbVertex vertex = StrokeVertex;
|
||||
float radius = Style.StrokeWidth/2 ?? 0.5f;
|
||||
float arc = MathF.Acos(QVec2.Dot(prevNormal, nextNormal));
|
||||
float arc = MathF.Acos(Vector2.Dot(prevNormal, nextNormal));
|
||||
int resolution = GetRoundingResolution(radius, arc);
|
||||
bool isNegative = positive < negative;
|
||||
|
||||
@@ -199,10 +199,10 @@ namespace Quik.VertexGenerator
|
||||
float cos = MathF.Cos(angle);
|
||||
float sin = MathF.Sin(angle);
|
||||
|
||||
QVec2 displacement;
|
||||
Vector2 displacement;
|
||||
if (isNegative)
|
||||
{
|
||||
displacement = new QVec2()
|
||||
displacement = new Vector2()
|
||||
{
|
||||
X = -prevNormal.X * cos + prevNormal.Y * sin,
|
||||
Y = -prevNormal.X * sin - prevNormal.Y * cos
|
||||
@@ -210,7 +210,7 @@ namespace Quik.VertexGenerator
|
||||
}
|
||||
else
|
||||
{
|
||||
displacement = new QVec2()
|
||||
displacement = new Vector2()
|
||||
{
|
||||
X = nextNormal.X * cos - nextNormal.Y * sin,
|
||||
Y = nextNormal.X * sin + nextNormal.Y * cos
|
||||
@@ -234,13 +234,13 @@ namespace Quik.VertexGenerator
|
||||
}
|
||||
|
||||
private void GenerateCap(
|
||||
in QVec2 center,
|
||||
in QVec2 normal,
|
||||
in Vector2 center,
|
||||
in Vector2 normal,
|
||||
in LineInfo info,
|
||||
bool endCap)
|
||||
{
|
||||
int lastIndex, startIndex;
|
||||
QuikVertex vertex = StrokeVertex;
|
||||
DbVertex vertex = StrokeVertex;
|
||||
float radius = Style.StrokeWidth ?? 1.0f;
|
||||
int resolution = GetRoundingResolution(radius, MathF.PI);
|
||||
|
||||
@@ -262,10 +262,10 @@ namespace Quik.VertexGenerator
|
||||
float cos = MathF.Cos(angle);
|
||||
float sin = MathF.Sin(angle);
|
||||
|
||||
QVec2 displacement;
|
||||
Vector2 displacement;
|
||||
if (endCap)
|
||||
{
|
||||
displacement = new QVec2()
|
||||
displacement = new Vector2()
|
||||
{
|
||||
X = normal.X * cos + normal.Y * sin,
|
||||
Y = -normal.X * sin + normal.Y * cos
|
||||
@@ -273,7 +273,7 @@ namespace Quik.VertexGenerator
|
||||
}
|
||||
else
|
||||
{
|
||||
displacement = new QVec2()
|
||||
displacement = new Vector2()
|
||||
{
|
||||
X = normal.X * cos - normal.Y * sin,
|
||||
Y = normal.X * sin + normal.Y * cos
|
||||
@@ -291,8 +291,8 @@ namespace Quik.VertexGenerator
|
||||
}
|
||||
}
|
||||
|
||||
private readonly List<QBezier> BezierList = new List<QBezier>();
|
||||
private void BezierProc(CommandQueue queue)
|
||||
private readonly List<Bezier> BezierList = new List<Bezier>();
|
||||
private void BezierProc(DrawQueue queue)
|
||||
{
|
||||
Frame a = queue.Dequeue();
|
||||
Frame b;
|
||||
@@ -308,11 +308,11 @@ namespace Quik.VertexGenerator
|
||||
b = queue.Dequeue();
|
||||
|
||||
BezierList.Add(
|
||||
new QBezier(
|
||||
new QVec2(a.GetF(0), a.GetF(1)),
|
||||
new QVec2(b.GetF(0), b.GetF(1)),
|
||||
new QVec2(b.GetF(2), b.GetF(3)),
|
||||
new QVec2(a.GetF(2), a.GetF(3))
|
||||
new Bezier(
|
||||
new Vector2(a.GetF(0), a.GetF(1)),
|
||||
new Vector2(b.GetF(0), b.GetF(1)),
|
||||
new Vector2(b.GetF(2), b.GetF(3)),
|
||||
new Vector2(a.GetF(2), a.GetF(3))
|
||||
)
|
||||
);
|
||||
}
|
||||
@@ -322,11 +322,11 @@ namespace Quik.VertexGenerator
|
||||
b = queue.Dequeue();
|
||||
|
||||
BezierList.Add(
|
||||
new QBezier(
|
||||
new QVec2(a.GetF(0), a.GetF(1)),
|
||||
new QVec2(b.GetF(0), b.GetF(1)),
|
||||
new QVec2(b.GetF(2), b.GetF(3)),
|
||||
new QVec2(a.GetF(2), a.GetF(3))
|
||||
new Bezier(
|
||||
new Vector2(a.GetF(0), a.GetF(1)),
|
||||
new Vector2(b.GetF(0), b.GetF(1)),
|
||||
new Vector2(b.GetF(2), b.GetF(3)),
|
||||
new Vector2(a.GetF(2), a.GetF(3))
|
||||
)
|
||||
);
|
||||
}
|
||||
@@ -337,7 +337,7 @@ namespace Quik.VertexGenerator
|
||||
LineInfo prevBase, nextBase = default;
|
||||
for (int i = 0; i < LineList.Count; i++)
|
||||
{
|
||||
QBezier bezier = BezierList[i];
|
||||
Bezier 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,19 +368,19 @@ namespace Quik.VertexGenerator
|
||||
DrawQueue.EndDrawCall();
|
||||
}
|
||||
|
||||
private LineInfo GenerateBezierSegment(in QBezier bezier)
|
||||
private LineInfo GenerateBezierSegment(in Bezier bezier)
|
||||
{
|
||||
QVec2 startTangent = bezier.GetBezierTangent(0);
|
||||
QVec2 endTangent = bezier.GetBezierTangent(1);
|
||||
QVec2 startNormal = new QVec2(-startTangent.Y, startTangent.X).Normalize();
|
||||
QVec2 endNormal = new QVec2(-endTangent.Y, endTangent.X).Normalize();
|
||||
Vector2 startTangent = bezier.GetBezierTangent(0);
|
||||
Vector2 endTangent = bezier.GetBezierTangent(1);
|
||||
Vector2 startNormal = new Vector2(-startTangent.Y, startTangent.X).Normalized();
|
||||
Vector2 endNormal = new Vector2(-endTangent.Y, endTangent.X).Normalized();
|
||||
|
||||
float width = Style.StrokeWidth ?? 1;
|
||||
float radius = 0.5f * width;
|
||||
int resolution = GetRoundingResolution(radius, bezier.RasterizationArc);
|
||||
|
||||
DrawQueue.RestoreOffset();
|
||||
QuikVertex v = StrokeVertex;
|
||||
DbVertex v = StrokeVertex;
|
||||
int vbase = DrawQueue.BaseOffset;
|
||||
int index = 2;
|
||||
|
||||
@@ -392,9 +392,9 @@ namespace Quik.VertexGenerator
|
||||
for (int i = 0; i < resolution; i++, index += 2)
|
||||
{
|
||||
float t = (i + 1.0f) / resolution;
|
||||
QVec2 at = bezier.GetBezierTangent(t).Normalize();
|
||||
QVec2 a = bezier.GetBezierPoint(t);
|
||||
QVec2 an = radius * new QVec2(-at.Y, at.X);
|
||||
Vector2 at = bezier.GetBezierTangent(t).Normalized();
|
||||
Vector2 a = bezier.GetBezierPoint(t);
|
||||
Vector2 an = radius * new Vector2(-at.Y, at.X);
|
||||
|
||||
v.Position = a + an;
|
||||
DrawQueue.AddVertex(v);
|
||||
@@ -408,8 +408,8 @@ namespace Quik.VertexGenerator
|
||||
return new LineInfo(vbase, 0, 1, index - 2, index - 1);
|
||||
}
|
||||
|
||||
private readonly List<QRectangle> RectangleList = new List<QRectangle>();
|
||||
private void RectangleProc(CommandQueue queue)
|
||||
private readonly List<Rectangle> RectangleList = new List<Rectangle>();
|
||||
private void RectangleProc(DrawQueue queue)
|
||||
{
|
||||
Frame frame = queue.Dequeue();
|
||||
RectangleList.Clear();
|
||||
@@ -419,12 +419,12 @@ namespace Quik.VertexGenerator
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
frame = queue.Dequeue();
|
||||
RectangleList.Add((QRectangle)frame);
|
||||
RectangleList.Add((Rectangle)frame);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
RectangleList.Add((QRectangle)frame);
|
||||
RectangleList.Add((Rectangle)frame);
|
||||
}
|
||||
|
||||
float stroke = Style.StrokeWidth ?? 1.0f;
|
||||
@@ -432,8 +432,8 @@ namespace Quik.VertexGenerator
|
||||
DrawQueue.StartDrawCall(Viewport);
|
||||
for (int i = 0; i < RectangleList.Count; i++)
|
||||
{
|
||||
QRectangle outer = RectangleList[i];
|
||||
QRectangle inner = new QRectangle(
|
||||
Rectangle outer = RectangleList[i];
|
||||
Rectangle inner = new Rectangle(
|
||||
outer.Right - stroke, outer.Bottom - stroke,
|
||||
outer.Left + stroke, outer.Top + stroke);
|
||||
|
||||
@@ -457,7 +457,7 @@ namespace Quik.VertexGenerator
|
||||
DrawQueue.EndDrawCall();
|
||||
}
|
||||
|
||||
private void GenerateRectangleBase(in QRectangle rectangle, float radius)
|
||||
private void GenerateRectangleBase(in Rectangle rectangle, float radius)
|
||||
{
|
||||
/*
|
||||
+--j-------i--+
|
||||
@@ -478,16 +478,16 @@ namespace Quik.VertexGenerator
|
||||
|
||||
// Draw center rectangle.
|
||||
|
||||
QVec2 aPos, bPos, cPos, dPos;
|
||||
Vector2 aPos, bPos, cPos, dPos;
|
||||
|
||||
QuikVertex v = FillVertex;
|
||||
aPos = v.Position = new QVec2(rectangle.Left + radius, rectangle.Bottom - radius);
|
||||
DbVertex v = FillVertex;
|
||||
aPos = v.Position = new Vector2(rectangle.Left + radius, rectangle.Bottom - radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
bPos = v.Position = new QVec2(rectangle.Right - radius, rectangle.Bottom - radius);
|
||||
bPos = v.Position = new Vector2(rectangle.Right - radius, rectangle.Bottom - radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
cPos = v.Position = new QVec2(rectangle.Right - radius, rectangle.Top + radius);
|
||||
cPos = v.Position = new Vector2(rectangle.Right - radius, rectangle.Top + radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
dPos = v.Position = new QVec2(rectangle.Left + radius, rectangle.Top + radius);
|
||||
dPos = v.Position = new Vector2(rectangle.Left + radius, rectangle.Top + radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
DrawQueue.AddElement(0); DrawQueue.AddElement(1); DrawQueue.AddElement(2);
|
||||
@@ -498,9 +498,9 @@ namespace Quik.VertexGenerator
|
||||
|
||||
// Draw south rectangle.
|
||||
|
||||
v.Position = new QVec2(rectangle.Left + radius, rectangle.Bottom);
|
||||
v.Position = new Vector2(rectangle.Left + radius, rectangle.Bottom);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right - radius, rectangle.Bottom);
|
||||
v.Position = new Vector2(rectangle.Right - radius, rectangle.Bottom);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
DrawQueue.AddElement(4); DrawQueue.AddElement(5); DrawQueue.AddElement(1);
|
||||
@@ -508,9 +508,9 @@ namespace Quik.VertexGenerator
|
||||
|
||||
// Draw east rectangle.
|
||||
|
||||
v.Position = new QVec2(rectangle.Right, rectangle.Bottom - radius);
|
||||
v.Position = new Vector2(rectangle.Right, rectangle.Bottom - radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right, rectangle.Top + radius);
|
||||
v.Position = new Vector2(rectangle.Right, rectangle.Top + radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
DrawQueue.AddElement(1); DrawQueue.AddElement(6); DrawQueue.AddElement(7);
|
||||
@@ -518,9 +518,9 @@ namespace Quik.VertexGenerator
|
||||
|
||||
// Draw north rectangle.
|
||||
|
||||
v.Position = new QVec2(rectangle.Right - radius, rectangle.Top);
|
||||
v.Position = new Vector2(rectangle.Right - radius, rectangle.Top);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Left + radius, rectangle.Top);
|
||||
v.Position = new Vector2(rectangle.Left + radius, rectangle.Top);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
DrawQueue.AddElement(3); DrawQueue.AddElement(2); DrawQueue.AddElement(8);
|
||||
@@ -528,9 +528,9 @@ namespace Quik.VertexGenerator
|
||||
|
||||
// Draw west rectangle.
|
||||
|
||||
v.Position = new QVec2(rectangle.Left, rectangle.Top + radius);
|
||||
v.Position = new Vector2(rectangle.Left, rectangle.Top + radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Left, rectangle.Bottom - radius);
|
||||
v.Position = new Vector2(rectangle.Left, rectangle.Bottom - radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
DrawQueue.AddElement(11); DrawQueue.AddElement(0); DrawQueue.AddElement(3);
|
||||
@@ -547,7 +547,7 @@ namespace Quik.VertexGenerator
|
||||
float xoff = MathF.Cos(theta) * radius;
|
||||
float yoff = MathF.Sin(theta) * radius;
|
||||
|
||||
v.Position = cPos + new QVec2(xoff, yoff);
|
||||
v.Position = cPos + new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
DrawQueue.AddElement(2); DrawQueue.AddElement(previous); DrawQueue.AddElement((previous = current++));
|
||||
}
|
||||
@@ -562,7 +562,7 @@ namespace Quik.VertexGenerator
|
||||
float xoff = -MathF.Sin(theta) * radius;
|
||||
float yoff = MathF.Cos(theta) * radius;
|
||||
|
||||
v.Position = dPos + new QVec2(xoff, yoff);
|
||||
v.Position = dPos + new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
DrawQueue.AddElement(3); DrawQueue.AddElement(previous); DrawQueue.AddElement((previous = current++));
|
||||
}
|
||||
@@ -577,7 +577,7 @@ namespace Quik.VertexGenerator
|
||||
float xoff = -MathF.Cos(theta) * radius;
|
||||
float yoff = -MathF.Sin(theta) * radius;
|
||||
|
||||
v.Position = aPos + new QVec2(xoff, yoff);
|
||||
v.Position = aPos + new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
DrawQueue.AddElement(0); DrawQueue.AddElement(previous); DrawQueue.AddElement((previous = current++));
|
||||
}
|
||||
@@ -592,14 +592,14 @@ namespace Quik.VertexGenerator
|
||||
float xoff = -MathF.Sin(theta) * radius;
|
||||
float yoff = MathF.Cos(theta) * radius;
|
||||
|
||||
v.Position = bPos + new QVec2(xoff, yoff);
|
||||
v.Position = bPos + new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
DrawQueue.AddElement(1); DrawQueue.AddElement(previous); DrawQueue.AddElement((previous = current++));
|
||||
}
|
||||
DrawQueue.AddElement(1); DrawQueue.AddElement(previous); DrawQueue.AddElement(6);
|
||||
}
|
||||
|
||||
private void GenerateRectangleStripStraight(in QRectangle rectangle)
|
||||
private void GenerateRectangleStripStraight(in Rectangle rectangle)
|
||||
{
|
||||
/*
|
||||
h---------g
|
||||
@@ -616,27 +616,27 @@ namespace Quik.VertexGenerator
|
||||
0 1 2 3 4 5 6 7
|
||||
*/
|
||||
|
||||
QuikVertex v = StrokeVertex;
|
||||
DbVertex v = StrokeVertex;
|
||||
float stroke = Style.StrokeWidth ?? 1.0f;
|
||||
|
||||
DrawQueue.RestoreOffset();
|
||||
|
||||
v.Position = new QVec2(rectangle.Left + stroke, rectangle.Bottom - stroke);
|
||||
v.Position = new Vector2(rectangle.Left + stroke, rectangle.Bottom - stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right - stroke, rectangle.Bottom - stroke);
|
||||
v.Position = new Vector2(rectangle.Right - stroke, rectangle.Bottom - stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right - stroke, rectangle.Top + stroke);
|
||||
v.Position = new Vector2(rectangle.Right - stroke, rectangle.Top + stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Left + stroke, rectangle.Top + stroke);
|
||||
v.Position = new Vector2(rectangle.Left + stroke, rectangle.Top + stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
v.Position = new QVec2(rectangle.Left, rectangle.Bottom);
|
||||
v.Position = new Vector2(rectangle.Left, rectangle.Bottom);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right, rectangle.Bottom);
|
||||
v.Position = new Vector2(rectangle.Right, rectangle.Bottom);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right, rectangle.Top);
|
||||
v.Position = new Vector2(rectangle.Right, rectangle.Top);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Left, rectangle.Top);
|
||||
v.Position = new Vector2(rectangle.Left, rectangle.Top);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
DrawQueue.AddElement(4); DrawQueue.AddElement(5); DrawQueue.AddElement(1); // SSW
|
||||
@@ -649,7 +649,7 @@ namespace Quik.VertexGenerator
|
||||
DrawQueue.AddElement(4); DrawQueue.AddElement(3); DrawQueue.AddElement(7); // SWW
|
||||
}
|
||||
|
||||
private void GenerateRectangleStripNarrow(in QRectangle rectangle, float radius)
|
||||
private void GenerateRectangleStripNarrow(in Rectangle rectangle, float radius)
|
||||
{
|
||||
/*
|
||||
v-j---i-u
|
||||
@@ -673,74 +673,74 @@ namespace Quik.VertexGenerator
|
||||
u v w x
|
||||
20: 0 1 2 3
|
||||
*/
|
||||
QuikVertex v = StrokeVertex;
|
||||
QVec2 nPos, qPos, tPos, wPos;
|
||||
DbVertex v = StrokeVertex;
|
||||
Vector2 nPos, qPos, tPos, wPos;
|
||||
float stroke = Style.StrokeWidth ?? 1.0f;
|
||||
|
||||
DrawQueue.RestoreOffset();
|
||||
|
||||
// a-b-c-d
|
||||
|
||||
v.Position = new QVec2(rectangle.Left + stroke, rectangle.Bottom - stroke);
|
||||
v.Position = new Vector2(rectangle.Left + stroke, rectangle.Bottom - stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right - stroke, rectangle.Bottom - stroke);
|
||||
v.Position = new Vector2(rectangle.Right - stroke, rectangle.Bottom - stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right - stroke, rectangle.Top + stroke);
|
||||
v.Position = new Vector2(rectangle.Right - stroke, rectangle.Top + stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Left + stroke, rectangle.Top + stroke);
|
||||
v.Position = new Vector2(rectangle.Left + stroke, rectangle.Top + stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
// ef-gh-ij-kl
|
||||
|
||||
v.Position = new QVec2(rectangle.Left + stroke, rectangle.Bottom);
|
||||
v.Position = new Vector2(rectangle.Left + stroke, rectangle.Bottom);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Left + stroke, rectangle.Bottom);
|
||||
v.Position = new Vector2(rectangle.Left + stroke, rectangle.Bottom);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right, rectangle.Bottom - stroke);
|
||||
v.Position = new Vector2(rectangle.Right, rectangle.Bottom - stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right, rectangle.Top + stroke);
|
||||
v.Position = new Vector2(rectangle.Right, rectangle.Top + stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right - stroke, rectangle.Top);
|
||||
v.Position = new Vector2(rectangle.Right - stroke, rectangle.Top);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right - stroke, rectangle.Top);
|
||||
v.Position = new Vector2(rectangle.Right - stroke, rectangle.Top);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Left, rectangle.Top + stroke);
|
||||
v.Position = new Vector2(rectangle.Left, rectangle.Top + stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Left, rectangle.Bottom - stroke);
|
||||
v.Position = new Vector2(rectangle.Left, rectangle.Bottom - stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
// mno
|
||||
|
||||
v.Position = new QVec2(rectangle.Left, rectangle.Bottom - radius);
|
||||
v.Position = new Vector2(rectangle.Left, rectangle.Bottom - radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
nPos = v.Position = new QVec2(rectangle.Left + radius, rectangle.Bottom - radius);
|
||||
nPos = v.Position = new Vector2(rectangle.Left + radius, rectangle.Bottom - radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Left + radius, rectangle.Bottom);
|
||||
v.Position = new Vector2(rectangle.Left + radius, rectangle.Bottom);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
// pqr
|
||||
v.Position = new QVec2(rectangle.Right - radius, rectangle.Bottom);
|
||||
v.Position = new Vector2(rectangle.Right - radius, rectangle.Bottom);
|
||||
DrawQueue.AddVertex(v);
|
||||
qPos = v.Position = new QVec2(rectangle.Right - radius, rectangle.Bottom - radius);
|
||||
qPos = v.Position = new Vector2(rectangle.Right - radius, rectangle.Bottom - radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right, rectangle.Bottom - radius);
|
||||
v.Position = new Vector2(rectangle.Right, rectangle.Bottom - radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
// stu
|
||||
v.Position = new QVec2(rectangle.Right, rectangle.Top + radius);
|
||||
v.Position = new Vector2(rectangle.Right, rectangle.Top + radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
tPos = v.Position = new QVec2(rectangle.Right - radius, rectangle.Top + radius);
|
||||
tPos = v.Position = new Vector2(rectangle.Right - radius, rectangle.Top + radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right - radius, rectangle.Top);
|
||||
v.Position = new Vector2(rectangle.Right - radius, rectangle.Top);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
// vwx
|
||||
|
||||
v.Position = new QVec2(rectangle.Left + radius, rectangle.Top);
|
||||
v.Position = new Vector2(rectangle.Left + radius, rectangle.Top);
|
||||
DrawQueue.AddVertex(v);
|
||||
wPos = v.Position = new QVec2(rectangle.Left + radius, rectangle.Top + radius);
|
||||
wPos = v.Position = new Vector2(rectangle.Left + radius, rectangle.Top + radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Left, rectangle.Top + radius);
|
||||
v.Position = new Vector2(rectangle.Left, rectangle.Top + radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
// E
|
||||
@@ -791,7 +791,7 @@ namespace Quik.VertexGenerator
|
||||
float xoff = MathF.Cos(theta) * radius;
|
||||
float yoff = MathF.Sin(theta) * radius;
|
||||
|
||||
v.Position = tPos + new QVec2(xoff, yoff);
|
||||
v.Position = tPos + new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
DrawQueue.AddElement(19); DrawQueue.AddElement(previous); DrawQueue.AddElement((previous = current++));
|
||||
}
|
||||
@@ -806,7 +806,7 @@ namespace Quik.VertexGenerator
|
||||
float xoff = -MathF.Sin(theta) * radius;
|
||||
float yoff = MathF.Cos(theta) * radius;
|
||||
|
||||
v.Position = wPos + new QVec2(xoff, yoff);
|
||||
v.Position = wPos + new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
DrawQueue.AddElement(22); DrawQueue.AddElement(previous); DrawQueue.AddElement((previous = current++));
|
||||
}
|
||||
@@ -821,7 +821,7 @@ namespace Quik.VertexGenerator
|
||||
float xoff = -MathF.Cos(theta) * radius;
|
||||
float yoff = -MathF.Sin(theta) * radius;
|
||||
|
||||
v.Position = nPos + new QVec2(xoff, yoff);
|
||||
v.Position = nPos + new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
DrawQueue.AddElement(23); DrawQueue.AddElement(previous); DrawQueue.AddElement((previous = current++));
|
||||
}
|
||||
@@ -836,14 +836,14 @@ namespace Quik.VertexGenerator
|
||||
float xoff = -MathF.Sin(theta) * radius;
|
||||
float yoff = MathF.Cos(theta) * radius;
|
||||
|
||||
v.Position = qPos + new QVec2(xoff, yoff);
|
||||
v.Position = qPos + new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
DrawQueue.AddElement(16); DrawQueue.AddElement(previous); DrawQueue.AddElement((previous = current++));
|
||||
}
|
||||
DrawQueue.AddElement(16); DrawQueue.AddElement(previous); DrawQueue.AddElement(17);
|
||||
}
|
||||
|
||||
private void GenerateRectangleStripWide(in QRectangle rectangle, float radius)
|
||||
private void GenerateRectangleStripWide(in Rectangle rectangle, float radius)
|
||||
{
|
||||
/*
|
||||
l---k
|
||||
@@ -862,45 +862,45 @@ namespace Quik.VertexGenerator
|
||||
10: 0 1 2 3 4 5
|
||||
*/
|
||||
|
||||
QuikVertex v = StrokeVertex;
|
||||
DbVertex v = StrokeVertex;
|
||||
float stroke = Style.StrokeWidth ?? 1.0f;
|
||||
float innerRadius = radius - stroke;
|
||||
DrawQueue.RestoreOffset();
|
||||
|
||||
v.Position = new QVec2(rectangle.Left + radius, rectangle.Bottom);
|
||||
v.Position = new Vector2(rectangle.Left + radius, rectangle.Bottom);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right - radius, rectangle.Bottom);
|
||||
v.Position = new Vector2(rectangle.Right - radius, rectangle.Bottom);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right - radius, rectangle.Bottom - stroke);
|
||||
v.Position = new Vector2(rectangle.Right - radius, rectangle.Bottom - stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Left + radius, rectangle.Bottom - stroke);
|
||||
v.Position = new Vector2(rectangle.Left + radius, rectangle.Bottom - stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
v.Position = new QVec2(rectangle.Right - stroke, rectangle.Bottom - radius);
|
||||
v.Position = new Vector2(rectangle.Right - stroke, rectangle.Bottom - radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right, rectangle.Top + radius);
|
||||
v.Position = new Vector2(rectangle.Right, rectangle.Top + radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right, rectangle.Top + radius);
|
||||
v.Position = new Vector2(rectangle.Right, rectangle.Top + radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right - stroke, rectangle.Bottom - radius);
|
||||
v.Position = new Vector2(rectangle.Right - stroke, rectangle.Bottom - radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
v.Position = new QVec2(rectangle.Left + radius, rectangle.Top + stroke);
|
||||
v.Position = new Vector2(rectangle.Left + radius, rectangle.Top + stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right - radius, rectangle.Top + stroke);
|
||||
v.Position = new Vector2(rectangle.Right - radius, rectangle.Top + stroke);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Right - radius, rectangle.Top);
|
||||
v.Position = new Vector2(rectangle.Right - radius, rectangle.Top);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Left + radius, rectangle.Top);
|
||||
v.Position = new Vector2(rectangle.Left + radius, rectangle.Top);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
v.Position = new QVec2(rectangle.Left, rectangle.Bottom + radius);
|
||||
v.Position = new Vector2(rectangle.Left, rectangle.Bottom + radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Left + stroke, rectangle.Top + radius);
|
||||
v.Position = new Vector2(rectangle.Left + stroke, rectangle.Top + radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Left + stroke, rectangle.Top + radius);
|
||||
v.Position = new Vector2(rectangle.Left + stroke, rectangle.Top + radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = new QVec2(rectangle.Left, rectangle.Bottom + radius);
|
||||
v.Position = new Vector2(rectangle.Left, rectangle.Bottom + radius);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
// S
|
||||
@@ -920,7 +920,7 @@ namespace Quik.VertexGenerator
|
||||
int resolution = GetRoundingResolution(radius, 0.5f * MathF.PI);
|
||||
int current = 16;
|
||||
|
||||
QVec2 center = new QVec2(rectangle.Right - radius, rectangle.Top - radius);
|
||||
Vector2 center = new Vector2(rectangle.Right - radius, rectangle.Top - radius);
|
||||
int s1 = 7, s2 = 6;
|
||||
for (int i = 0; i < resolution - 1; i++)
|
||||
{
|
||||
@@ -928,9 +928,9 @@ namespace Quik.VertexGenerator
|
||||
float xoff = MathF.Cos(theta);
|
||||
float yoff = MathF.Sin(theta);
|
||||
|
||||
v.Position = center + radius * new QVec2(xoff, yoff);
|
||||
v.Position = center + radius * new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = center + innerRadius * new QVec2(xoff, yoff);
|
||||
v.Position = center + innerRadius * new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
DrawQueue.AddElement(s1); DrawQueue.AddElement(s2); DrawQueue.AddElement(current + 0);
|
||||
@@ -943,7 +943,7 @@ namespace Quik.VertexGenerator
|
||||
DrawQueue.AddElement(s1); DrawQueue.AddElement(s2); DrawQueue.AddElement(9);
|
||||
|
||||
// Draw NW arc
|
||||
center = new QVec2(rectangle.Left + radius, rectangle.Top - radius);
|
||||
center = new Vector2(rectangle.Left + radius, rectangle.Top - radius);
|
||||
s1 = 8; s2 = 11;
|
||||
for (int i = 0; i < resolution - 1; i++)
|
||||
{
|
||||
@@ -951,9 +951,9 @@ namespace Quik.VertexGenerator
|
||||
float xoff = -MathF.Sin(theta);
|
||||
float yoff = MathF.Cos(theta);
|
||||
|
||||
v.Position = center + radius * new QVec2(xoff, yoff);
|
||||
v.Position = center + radius * new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = center + innerRadius * new QVec2(xoff, yoff);
|
||||
v.Position = center + innerRadius * new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
DrawQueue.AddElement(s1); DrawQueue.AddElement(s2); DrawQueue.AddElement(current + 0);
|
||||
@@ -966,7 +966,7 @@ namespace Quik.VertexGenerator
|
||||
DrawQueue.AddElement(s1); DrawQueue.AddElement(s2); DrawQueue.AddElement(14);
|
||||
|
||||
// Draw SW arc
|
||||
center = new QVec2(rectangle.Left + radius, rectangle.Bottom + radius);
|
||||
center = new Vector2(rectangle.Left + radius, rectangle.Bottom + radius);
|
||||
s1 = 13; s2 = 12;
|
||||
for (int i = 0; i < resolution - 1; i++)
|
||||
{
|
||||
@@ -974,9 +974,9 @@ namespace Quik.VertexGenerator
|
||||
float xoff = -MathF.Cos(theta);
|
||||
float yoff = -MathF.Sin(theta);
|
||||
|
||||
v.Position = center + radius * new QVec2(xoff, yoff);
|
||||
v.Position = center + radius * new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = center + innerRadius * new QVec2(xoff, yoff);
|
||||
v.Position = center + innerRadius * new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
DrawQueue.AddElement(s1); DrawQueue.AddElement(s2); DrawQueue.AddElement(current + 0);
|
||||
@@ -989,7 +989,7 @@ namespace Quik.VertexGenerator
|
||||
DrawQueue.AddElement(s1); DrawQueue.AddElement(s2); DrawQueue.AddElement(3);
|
||||
|
||||
// Draw SW arc
|
||||
center = new QVec2(rectangle.Right - radius, rectangle.Bottom + radius);
|
||||
center = new Vector2(rectangle.Right - radius, rectangle.Bottom + radius);
|
||||
s1 = 2; s2 = 1;
|
||||
for (int i = 0; i < resolution - 1; i++)
|
||||
{
|
||||
@@ -997,9 +997,9 @@ namespace Quik.VertexGenerator
|
||||
float xoff = MathF.Sin(theta);
|
||||
float yoff = -MathF.Cos(theta);
|
||||
|
||||
v.Position = center + radius * new QVec2(xoff, yoff);
|
||||
v.Position = center + radius * new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
v.Position = center + innerRadius * new QVec2(xoff, yoff);
|
||||
v.Position = center + innerRadius * new Vector2(xoff, yoff);
|
||||
DrawQueue.AddVertex(v);
|
||||
|
||||
DrawQueue.AddElement(s1); DrawQueue.AddElement(s2); DrawQueue.AddElement(current + 0);
|
||||
@@ -1012,11 +1012,11 @@ namespace Quik.VertexGenerator
|
||||
DrawQueue.AddElement(s1); DrawQueue.AddElement(s2); DrawQueue.AddElement(4);
|
||||
}
|
||||
|
||||
private void ImageProc(CommandQueue queue)
|
||||
private void ImageProc(DrawQueue queue)
|
||||
{
|
||||
Frame frame = queue.Dequeue();
|
||||
ImageCommandFlags flags = (ImageCommandFlags)frame.I1;
|
||||
QImage image = queue.Dequeue().As<QImage>();
|
||||
Image image = queue.Dequeue().As<Image>();
|
||||
|
||||
int count = flags.HasFlag(ImageCommandFlags.Single) ? 1 : frame.I2;
|
||||
if (flags.HasFlag(ImageCommandFlags.Image3d))
|
||||
@@ -1029,41 +1029,41 @@ namespace Quik.VertexGenerator
|
||||
}
|
||||
}
|
||||
|
||||
private void Image2d(CommandQueue queue, QImage image, int count, bool uv)
|
||||
private void Image2d(DrawQueue queue, Image image, int count, bool uv)
|
||||
{
|
||||
DrawQueue.StartDrawCall(Viewport, image);
|
||||
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
QRectangle rect = (QRectangle)queue.Dequeue();
|
||||
QRectangle uvs;
|
||||
Rectangle rect = (Rectangle)queue.Dequeue();
|
||||
Rectangle uvs;
|
||||
|
||||
if (uv)
|
||||
{
|
||||
uvs = (QRectangle)queue.Dequeue();
|
||||
uvs = (Rectangle)queue.Dequeue();
|
||||
}
|
||||
else
|
||||
{
|
||||
uvs = new QRectangle(1, 1, 0, 0);
|
||||
uvs = new Rectangle(1, 1, 0, 0);
|
||||
}
|
||||
|
||||
DrawQueue.RestoreOffset();
|
||||
QuikVertex vertex = ImageVertex;
|
||||
DbVertex vertex = ImageVertex;
|
||||
|
||||
vertex.Position = new QVec2(rect.Top, rect.Left);
|
||||
vertex.TextureCoordinates = new QVec2(uvs.Top, uvs.Left);
|
||||
vertex.Position = new Vector2(rect.Left, rect.Top);
|
||||
vertex.TextureCoordinates = new Vector2(uvs.Left, uvs.Top);
|
||||
DrawQueue.AddVertex(vertex);
|
||||
|
||||
vertex.Position = new QVec2(rect.Bottom, rect.Left);
|
||||
vertex.TextureCoordinates = new QVec2(uvs.Bottom, uvs.Left);
|
||||
vertex.Position = new Vector2(rect.Left, rect.Bottom);
|
||||
vertex.TextureCoordinates = new Vector2(uvs.Left, uvs.Bottom);
|
||||
DrawQueue.AddVertex(vertex);
|
||||
|
||||
vertex.Position = new QVec2(rect.Bottom, rect.Right);
|
||||
vertex.TextureCoordinates = new QVec2(uvs.Bottom, uvs.Right);
|
||||
vertex.Position = new Vector2(rect.Right, rect.Bottom);
|
||||
vertex.TextureCoordinates = new Vector2(uvs.Right, uvs.Bottom);
|
||||
DrawQueue.AddVertex(vertex);
|
||||
|
||||
vertex.Position = new QVec2(rect.Top, rect.Right);
|
||||
vertex.TextureCoordinates = new QVec2(uvs.Top, uvs.Right);
|
||||
vertex.Position = new Vector2(rect.Right, rect.Top);
|
||||
vertex.TextureCoordinates = new Vector2(uvs.Right, uvs.Top);
|
||||
DrawQueue.AddVertex(vertex);
|
||||
|
||||
DrawQueue.AddElement(0); DrawQueue.AddElement(2); DrawQueue.AddElement(3);
|
||||
@@ -1073,34 +1073,34 @@ namespace Quik.VertexGenerator
|
||||
DrawQueue.EndDrawCall();
|
||||
}
|
||||
|
||||
private void Image3d(CommandQueue queue, QImage image, int count)
|
||||
private void Image3d(DrawQueue queue, Image image, int count)
|
||||
{
|
||||
DrawQueue.StartDrawCall(Viewport, image);
|
||||
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
QRectangle rect = (QRectangle)queue.Dequeue();
|
||||
QRectangle uvs = (QRectangle)queue.Dequeue();
|
||||
Rectangle rect = (Rectangle)queue.Dequeue();
|
||||
Rectangle uvs = (Rectangle)queue.Dequeue();
|
||||
int layer = (int)queue.Dequeue();
|
||||
|
||||
DrawQueue.RestoreOffset();
|
||||
QuikVertex vertex = ImageVertex;
|
||||
DbVertex vertex = ImageVertex;
|
||||
vertex.TextureLayer = layer;
|
||||
|
||||
vertex.Position = new QVec2(rect.Top, rect.Left);
|
||||
vertex.TextureCoordinates = new QVec2(uvs.Top, uvs.Left);
|
||||
vertex.Position = new Vector2(rect.Top, rect.Left);
|
||||
vertex.TextureCoordinates = new Vector2(uvs.Top, uvs.Left);
|
||||
DrawQueue.AddVertex(vertex);
|
||||
|
||||
vertex.Position = new QVec2(rect.Bottom, rect.Left);
|
||||
vertex.TextureCoordinates = new QVec2(uvs.Bottom, uvs.Left);
|
||||
vertex.Position = new Vector2(rect.Bottom, rect.Left);
|
||||
vertex.TextureCoordinates = new Vector2(uvs.Bottom, uvs.Left);
|
||||
DrawQueue.AddVertex(vertex);
|
||||
|
||||
vertex.Position = new QVec2(rect.Bottom, rect.Right);
|
||||
vertex.TextureCoordinates = new QVec2(uvs.Bottom, uvs.Right);
|
||||
vertex.Position = new Vector2(rect.Bottom, rect.Right);
|
||||
vertex.TextureCoordinates = new Vector2(uvs.Bottom, uvs.Right);
|
||||
DrawQueue.AddVertex(vertex);
|
||||
|
||||
vertex.Position = new QVec2(rect.Top, rect.Right);
|
||||
vertex.TextureCoordinates = new QVec2(uvs.Top, uvs.Right);
|
||||
vertex.Position = new Vector2(rect.Top, rect.Right);
|
||||
vertex.TextureCoordinates = new Vector2(uvs.Top, uvs.Right);
|
||||
DrawQueue.AddVertex(vertex);
|
||||
|
||||
DrawQueue.AddElement(0); DrawQueue.AddElement(2); DrawQueue.AddElement(3);
|
||||
@@ -13,9 +13,8 @@ out vec4 fragColor;
|
||||
uniform int iEnableSdf;
|
||||
uniform int iEnableTexture;
|
||||
uniform int iAlphaDiscard;
|
||||
uniform float fSdfThreshold;
|
||||
uniform float fSdfThreshold = 0.5;
|
||||
uniform sampler2D tx2d;
|
||||
uniform sampler2DArray tx2dArray;
|
||||
|
||||
const float fAlphaThreshold = 0.01;
|
||||
|
||||
@@ -23,7 +22,13 @@ vec4 getTexture()
|
||||
{
|
||||
if (iEnableTexture == 3)
|
||||
{
|
||||
return texture(tx2dArray, vec3(fv2TexPos, ffTexLayer));
|
||||
// return texture(tx2dArray, vec3(fv2TexPos, ffTexLayer));
|
||||
}
|
||||
else if (iEnableSdf == 1)
|
||||
{
|
||||
vec2 texelSz = 1.0/vec2(textureSize(tx2d, 0));
|
||||
vec2 txCoord2 = fv2TexPos + texelSz * (1 - mod(fv2TexPos, texelSz));
|
||||
return texture(tx2d, txCoord2);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -41,12 +46,7 @@ void main(void)
|
||||
|
||||
if (iEnableSdf != 0)
|
||||
{
|
||||
float a = max(value.r, value.a);
|
||||
|
||||
value =
|
||||
(a >= fSdfThreshold) ?
|
||||
vec4(1.0,1.0,1.0,1.0) :
|
||||
vec4(0.0,0.0,0.0,0.0);
|
||||
value = vec4(vec3(1.0), smoothstep(fSdfThreshold-0.1, fSdfThreshold+0.1, value.r));
|
||||
}
|
||||
|
||||
if (iAlphaDiscard != 0 && value.a <= fAlphaThreshold)
|
||||
@@ -1,108 +0,0 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using Quik.FreeType;
|
||||
using Quik.Media;
|
||||
using Quik.Media.Color;
|
||||
|
||||
namespace Quik.Media.Defaults
|
||||
{
|
||||
public class QFontFreeType : QFont
|
||||
{
|
||||
private MemoryStream ms;
|
||||
private FTFace face;
|
||||
|
||||
public override FontInfo Info => throw new NotImplementedException();
|
||||
|
||||
public QFontFreeType(Stream stream)
|
||||
{
|
||||
ms = new MemoryStream();
|
||||
stream.CopyTo(ms);
|
||||
|
||||
FTError e = FT.NewMemoryFace(Ft, ms.GetBuffer(), ms.Length, 0, out face);
|
||||
if (e != FTError.None)
|
||||
{
|
||||
throw new Exception("Could not load font face from stream.");
|
||||
}
|
||||
}
|
||||
|
||||
public override bool HasRune(int rune)
|
||||
{
|
||||
return FT.GetCharIndex(face, (ulong)rune) != 0;
|
||||
}
|
||||
|
||||
public override QFontPage RasterizePage(int codepage, float size, in FontRasterizerOptions options)
|
||||
{
|
||||
FT.SetCharSize(face, 0, (long)Math.Round(64*size), 0, (uint)Math.Round(options.Resolution));
|
||||
QGlyphMetrics[] allMetrics = new QGlyphMetrics[256];
|
||||
|
||||
// Figure out the map size needed.
|
||||
int pixels = 0;
|
||||
for (int i = 0; i < 256; i++)
|
||||
{
|
||||
uint index = FT.GetCharIndex(face, (ulong)(codepage + i));
|
||||
FT.LoadGlyph(face, index, FTLoadFlags.Default);
|
||||
|
||||
ref readonly FTGlyphMetrics metrics = ref face.Glyph.Metrics;
|
||||
allMetrics[i] = new QGlyphMetrics(
|
||||
codepage + i,
|
||||
new QVec2(metrics.Width, metrics.Height),
|
||||
new QVec2(metrics.HorizontalBearingX/64f, metrics.HorizontalBearingY/64f),
|
||||
new QVec2(metrics.VerticalBearingX/64f, metrics.VerticalBearingY/64f),
|
||||
new QVec2(metrics.HorizontalAdvance/64f, metrics.VerticalAdvance/64f)
|
||||
);
|
||||
pixels = (int)Math.Max(pixels, Math.Max(face.Glyph.Metrics.Width/64f, face.Glyph.Metrics.Height/64f));
|
||||
}
|
||||
|
||||
int bits = Math.ILogB(pixels);
|
||||
if (1 << bits != pixels)
|
||||
{
|
||||
pixels = 1 << bits + 1;
|
||||
}
|
||||
|
||||
// Now we can create a bitmap and render our glyphs.
|
||||
|
||||
QImageBuffer buffer = new QImageBuffer(QImageFormat.RedU8, (int)pixels, (int)pixels, 256);
|
||||
|
||||
for (int i = 0; i < 256; i++)
|
||||
{
|
||||
uint index = FT.GetCharIndex(face, (ulong)(codepage + i));
|
||||
FT.LoadGlyph(face, index, FTLoadFlags.Default);
|
||||
FT.RenderGlyph(face.Glyph, options.Sdf ? FTRenderMode.Sdf : FTRenderMode.Mono);
|
||||
|
||||
ref readonly FTBitmap bitmap = ref face.Glyph.Bitmap;
|
||||
|
||||
buffer.LockBits3d(out QImageLock dst, QImageLockOptions.Default, i);
|
||||
|
||||
if (bitmap.Buffer != IntPtr.Zero) unsafe
|
||||
{
|
||||
for (int j = 0; j < bitmap.Rows; j++)
|
||||
{
|
||||
Buffer.MemoryCopy(
|
||||
(byte*)bitmap.Buffer + (j * bitmap.Pitch),
|
||||
(byte*)dst.ImagePtr + (j * dst.Width),
|
||||
dst.Width,
|
||||
bitmap.Width);
|
||||
}
|
||||
}
|
||||
|
||||
buffer.UnlockBits();
|
||||
}
|
||||
|
||||
return new QFontPage(this, codepage, size, options, buffer, allMetrics);
|
||||
}
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
base.Dispose(disposing);
|
||||
|
||||
if (disposing)
|
||||
{
|
||||
ms.Dispose();
|
||||
}
|
||||
|
||||
FT.DoneFace(face);
|
||||
}
|
||||
|
||||
private static FTLibrary Ft => FTProvider.Ft;
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<LanguageVersion>7.3</LanguageVersion>
|
||||
<Nullable>disable</Nullable>
|
||||
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Quik\Quik.csproj" />
|
||||
<ProjectReference Include="..\Quik.StbImage\Quik.StbImage.csproj" />
|
||||
<ProjectReference Include="..\Quik.FreeType\Quik.FreeType.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -1,91 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using OpenTK.Windowing.Desktop;
|
||||
using OpenTK.Windowing.GraphicsLibraryFramework;
|
||||
using Quik.CommandMachine;
|
||||
using Quik.Media;
|
||||
using Quik.OpenGL;
|
||||
using Quik.PAL;
|
||||
|
||||
namespace Quik.OpenTK
|
||||
{
|
||||
public class OpenTKPlatform : IQuikPlatform
|
||||
{
|
||||
private readonly List<OpenTKPort> _ports = new List<OpenTKPort>();
|
||||
|
||||
// These shall remain a sad nop for now.
|
||||
public string Title { get; set; }
|
||||
public QImage Icon { get; set; }
|
||||
|
||||
public event EventHandler EventRaised;
|
||||
|
||||
public NativeWindowSettings DefaultSettings { get; set; } = NativeWindowSettings.Default;
|
||||
|
||||
public IReadOnlyList<OpenTKPort> Ports => _ports;
|
||||
|
||||
private bool IsGLInitialized = false;
|
||||
|
||||
public IQuikPortHandle CreatePort()
|
||||
{
|
||||
NativeWindow window = new NativeWindow(DefaultSettings);
|
||||
OpenTKPort port = new OpenTKPort(window);
|
||||
_ports.Add(port);
|
||||
|
||||
if (!IsGLInitialized)
|
||||
{
|
||||
window.Context.MakeCurrent();
|
||||
GL.LoadBindings(GLFW.GetProcAddress);
|
||||
IsGLInitialized = true;
|
||||
}
|
||||
|
||||
window.Closing += (ea) =>
|
||||
{
|
||||
Environment.Exit(0);
|
||||
};
|
||||
|
||||
return port;
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
// FIXME: dispose pattern here!
|
||||
|
||||
// Copy the array to prevent collection modification exceptions.
|
||||
foreach (OpenTKPort port in _ports.ToArray())
|
||||
{
|
||||
port.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
public void ProcessEvents(bool block)
|
||||
{
|
||||
NativeWindow.ProcessWindowEvents(block);
|
||||
}
|
||||
|
||||
public void DestroyPort(IQuikPortHandle port) => ((OpenTKPort)port).Dispose();
|
||||
|
||||
public string PortGetTitle(IQuikPortHandle port) => ((OpenTKPort)port).Title;
|
||||
|
||||
public void PortSetTitle(IQuikPortHandle port, string title) => ((OpenTKPort)port).Title = title;
|
||||
|
||||
public QVec2 PortGetSize(IQuikPortHandle port) => ((OpenTKPort)port).Size;
|
||||
|
||||
public void PortSetSize(IQuikPortHandle port, QVec2 size) => ((OpenTKPort)port).Size = size;
|
||||
|
||||
public QVec2 PortGetPosition(IQuikPortHandle port) => ((OpenTKPort)port).Position;
|
||||
|
||||
public void PortSetPosition(IQuikPortHandle port, QVec2 position) => ((OpenTKPort)port).Position = position;
|
||||
|
||||
public bool PortIsValid(IQuikPortHandle port) => ((OpenTKPort)port).IsValid;
|
||||
|
||||
public void PortSubscribeEvent(IQuikPortHandle port, EventHandler handler) => ((OpenTKPort)port).EventRaised += handler;
|
||||
|
||||
public void PortUnsubscribeEvent(IQuikPortHandle port, EventHandler handler) => ((OpenTKPort)port).EventRaised -= handler;
|
||||
|
||||
public void PortFocus(IQuikPortHandle port) => ((OpenTKPort)port).Focus();
|
||||
|
||||
public void PortShow(IQuikPortHandle port, bool shown = true) => ((OpenTKPort)port).Show(shown);
|
||||
|
||||
public void PortPaint(IQuikPortHandle port, CommandList commands) => ((OpenTKPort)port).Paint(commands);
|
||||
}
|
||||
}
|
||||
84
Quik.sln
84
Quik.sln
@@ -1,84 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.9.34701.34
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Quik", "Quik\Quik.csproj", "{B86B2B99-DAE4-43CE-A040-1D8E143B94A7}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Quik.OpenTK", "Quik.OpenTK\Quik.OpenTK.csproj", "{586E5E28-1D07-4CC2-B04F-0BC420564F57}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AE05ADE5-A809-479F-97D5-BEAFE7604285}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuikDemo", "tests\QuikDemo\QuikDemo.csproj", "{79CBF97F-4884-4692-94FB-75DDEB61E26F}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Quik.Media.Defaults", "Quik.Media.Defaults\Quik.Media.Defaults.csproj", "{B517D2BF-CB9D-4448-BE50-EA85E100EB47}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{B86B2B99-DAE4-43CE-A040-1D8E143B94A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B86B2B99-DAE4-43CE-A040-1D8E143B94A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B86B2B99-DAE4-43CE-A040-1D8E143B94A7}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{B86B2B99-DAE4-43CE-A040-1D8E143B94A7}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{B86B2B99-DAE4-43CE-A040-1D8E143B94A7}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{B86B2B99-DAE4-43CE-A040-1D8E143B94A7}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{B86B2B99-DAE4-43CE-A040-1D8E143B94A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B86B2B99-DAE4-43CE-A040-1D8E143B94A7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B86B2B99-DAE4-43CE-A040-1D8E143B94A7}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{B86B2B99-DAE4-43CE-A040-1D8E143B94A7}.Release|x64.Build.0 = Release|Any CPU
|
||||
{B86B2B99-DAE4-43CE-A040-1D8E143B94A7}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{B86B2B99-DAE4-43CE-A040-1D8E143B94A7}.Release|x86.Build.0 = Release|Any CPU
|
||||
{586E5E28-1D07-4CC2-B04F-0BC420564F57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{586E5E28-1D07-4CC2-B04F-0BC420564F57}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{586E5E28-1D07-4CC2-B04F-0BC420564F57}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{586E5E28-1D07-4CC2-B04F-0BC420564F57}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{586E5E28-1D07-4CC2-B04F-0BC420564F57}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{586E5E28-1D07-4CC2-B04F-0BC420564F57}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{586E5E28-1D07-4CC2-B04F-0BC420564F57}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{586E5E28-1D07-4CC2-B04F-0BC420564F57}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{586E5E28-1D07-4CC2-B04F-0BC420564F57}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{586E5E28-1D07-4CC2-B04F-0BC420564F57}.Release|x64.Build.0 = Release|Any CPU
|
||||
{586E5E28-1D07-4CC2-B04F-0BC420564F57}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{586E5E28-1D07-4CC2-B04F-0BC420564F57}.Release|x86.Build.0 = Release|Any CPU
|
||||
{79CBF97F-4884-4692-94FB-75DDEB61E26F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{79CBF97F-4884-4692-94FB-75DDEB61E26F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{79CBF97F-4884-4692-94FB-75DDEB61E26F}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{79CBF97F-4884-4692-94FB-75DDEB61E26F}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{79CBF97F-4884-4692-94FB-75DDEB61E26F}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{79CBF97F-4884-4692-94FB-75DDEB61E26F}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{79CBF97F-4884-4692-94FB-75DDEB61E26F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{79CBF97F-4884-4692-94FB-75DDEB61E26F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{79CBF97F-4884-4692-94FB-75DDEB61E26F}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{79CBF97F-4884-4692-94FB-75DDEB61E26F}.Release|x64.Build.0 = Release|Any CPU
|
||||
{79CBF97F-4884-4692-94FB-75DDEB61E26F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{79CBF97F-4884-4692-94FB-75DDEB61E26F}.Release|x86.Build.0 = Release|Any CPU
|
||||
{B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Release|x64.Build.0 = Release|Any CPU
|
||||
{B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{79CBF97F-4884-4692-94FB-75DDEB61E26F} = {AE05ADE5-A809-479F-97D5-BEAFE7604285}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {EF011093-DA56-4E14-B2AB-D565B64F73E1}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@@ -1,164 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Quik.CommandMachine
|
||||
{
|
||||
public class CommandEngine
|
||||
{
|
||||
private int _zIndex = 0;
|
||||
private readonly Stack<int> _zStack = new Stack<int>();
|
||||
public int ZIndex => _zIndex;
|
||||
|
||||
private QRectangle _viewport;
|
||||
private readonly Stack<QRectangle> _viewportStack = new Stack<QRectangle>();
|
||||
private readonly Stack<QMat4> _matrixStack = new Stack<QMat4>();
|
||||
|
||||
private Command _customCommandBase = Command.CustomCommandBase;
|
||||
private readonly List<QuikCommandHandler> _customCommands = new List<QuikCommandHandler>();
|
||||
|
||||
public QRectangle Viewport => _viewport;
|
||||
|
||||
public QMat4 ActiveTransforms { get; }
|
||||
|
||||
public StyleStack Style { get; } = new StyleStack(new Quik.Style());
|
||||
|
||||
protected CommandEngine()
|
||||
{
|
||||
Reset();
|
||||
}
|
||||
|
||||
public Command RegisterCustomCommand(QuikCommandHandler handler)
|
||||
{
|
||||
Command id = _customCommandBase++;
|
||||
_customCommands.Insert(id - Command.CustomCommandBase, handler);
|
||||
return id;
|
||||
}
|
||||
|
||||
public void ProcessCommands(QRectangle bounds, CommandList queue)
|
||||
{
|
||||
CommandQueue iterator = queue.GetEnumerator();
|
||||
|
||||
if (!iterator.Peek().IsCommand)
|
||||
throw new ArgumentException("The first element in the iterator must be a command frame.");
|
||||
|
||||
Reset();
|
||||
|
||||
_viewport = bounds;
|
||||
_viewportStack.Push(_viewport);
|
||||
|
||||
Frame frame;
|
||||
while (iterator.TryDequeue(out frame))
|
||||
{
|
||||
Command cmd = (Command)frame;
|
||||
switch (cmd)
|
||||
{
|
||||
default:
|
||||
if (cmd > Command.CustomCommandBase)
|
||||
{
|
||||
_customCommands[cmd - Command.CustomCommandBase].Invoke(this, iterator);
|
||||
}
|
||||
else
|
||||
{
|
||||
ChildProcessCommand(cmd, iterator);
|
||||
}
|
||||
break;
|
||||
|
||||
case Command.ConditionalBegin: ConditionalHandler(iterator); break;
|
||||
case Command.ConditionalEnd: /* nop */ break;
|
||||
|
||||
case Command.Invoke:
|
||||
iterator.Dequeue().As<QuikCommandHandler>().Invoke(this, iterator);
|
||||
break;
|
||||
case Command.PushViewport:
|
||||
_viewportStack.Push(_viewport);
|
||||
break;
|
||||
case Command.IntersectViewport:
|
||||
_viewport = QRectangle.Intersect((QRectangle)iterator.Dequeue(), _viewport);
|
||||
break;
|
||||
case Command.StoreViewport:
|
||||
_viewport = (QRectangle)iterator.Dequeue();
|
||||
break;
|
||||
case Command.PopViewport:
|
||||
_viewport = _viewportStack.TryPop(out QRectangle viewport) ? viewport : bounds;
|
||||
break;
|
||||
case Command.PushZ:
|
||||
_zStack.Push(_zIndex);
|
||||
break;
|
||||
case Command.IncrementZ:
|
||||
_zIndex++;
|
||||
break;
|
||||
case Command.AddZ:
|
||||
_zIndex += (int)iterator.Dequeue();
|
||||
break;
|
||||
case Command.StoreZ:
|
||||
_zIndex = (int)iterator.Dequeue();
|
||||
break;
|
||||
case Command.DecrementZ:
|
||||
_zIndex--;
|
||||
break;
|
||||
case Command.PopZ:
|
||||
_zIndex = _zStack.TryPop(out int zindex) ? zindex : 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void ChildProcessCommand(Command name, CommandQueue queue)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Reset()
|
||||
{
|
||||
_zIndex = 0;
|
||||
_zStack.Clear();
|
||||
|
||||
_viewport = new QRectangle(float.MaxValue, float.MinValue, float.MinValue, float.MaxValue);
|
||||
_viewportStack.Clear();
|
||||
|
||||
_matrixStack.Clear();
|
||||
_matrixStack.Push(QMat4.Identity);
|
||||
}
|
||||
|
||||
private void ConditionalHandler(CommandQueue iterator)
|
||||
{
|
||||
Frame frame = iterator.Dequeue();
|
||||
|
||||
if (
|
||||
frame.IsInteger && (int)frame != 0 ||
|
||||
frame.As<Func<bool>>().Invoke())
|
||||
{
|
||||
// Take this branch.
|
||||
return;
|
||||
}
|
||||
|
||||
// Skip this branch.
|
||||
int depth = 1;
|
||||
while (iterator.TryPeek(out frame))
|
||||
{
|
||||
if (!frame.IsCommand)
|
||||
{
|
||||
iterator.Dequeue();
|
||||
continue;
|
||||
}
|
||||
|
||||
switch ((Command)frame)
|
||||
{
|
||||
case Command.ConditionalBegin:
|
||||
// Increment conditional depth.
|
||||
depth++;
|
||||
break;
|
||||
case Command.ConditionalEnd:
|
||||
// Decrement condional depth, exit if zero.
|
||||
if (--depth == 0)
|
||||
{
|
||||
iterator.Dequeue();
|
||||
return;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
iterator.Dequeue();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
namespace Quik.CommandMachine
|
||||
{
|
||||
/// <summary>
|
||||
/// A delegate for a QUIK command.
|
||||
/// </summary>
|
||||
/// <param name="stack">The current stack.</param>
|
||||
public delegate void QuikCommandHandler(CommandEngine state, CommandQueue queue);
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
namespace Quik.CommandMachine
|
||||
{
|
||||
public enum FrameType
|
||||
{
|
||||
None,
|
||||
Command,
|
||||
IVec1,
|
||||
IVec2,
|
||||
IVec3,
|
||||
IVec4,
|
||||
Vec1,
|
||||
Vec2,
|
||||
Vec3,
|
||||
Vec4,
|
||||
Object,
|
||||
}
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
|
||||
using System;
|
||||
using Quik.CommandMachine;
|
||||
|
||||
namespace Quik.Controls
|
||||
{
|
||||
/// <summary>
|
||||
/// Bases for all UI elements.
|
||||
/// </summary>
|
||||
public abstract class UIBase
|
||||
{
|
||||
public UIBase Parent { get; protected set; }
|
||||
public string Id { get; set; }
|
||||
public QRectangle Bounds { get; set; }
|
||||
|
||||
public QVec2 Position
|
||||
{
|
||||
get => Bounds.Min;
|
||||
set => Bounds = new QRectangle(Bounds.Max - Bounds.Min + value, value);
|
||||
}
|
||||
|
||||
public QVec2 Size
|
||||
{
|
||||
get => Bounds.Max - Bounds.Min;
|
||||
set => Bounds = new QRectangle(value + Bounds.Min, Bounds.Min);
|
||||
}
|
||||
|
||||
public QRectangle AbsoluteBounds
|
||||
{
|
||||
get
|
||||
{
|
||||
if (Parent == null)
|
||||
{
|
||||
return Bounds;
|
||||
}
|
||||
else
|
||||
{
|
||||
return new QRectangle(Bounds.Max + Parent.Position, Bounds.Min + Parent.Position);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void NotifyEvent(object sender, EventArgs args)
|
||||
{
|
||||
}
|
||||
|
||||
protected virtual void PaintBegin(CommandList cmd)
|
||||
{
|
||||
cmd.PushViewport();
|
||||
cmd.StoreViewport(AbsoluteBounds);
|
||||
cmd.PushZ();
|
||||
}
|
||||
|
||||
protected virtual void PaintEnd(CommandList cmd)
|
||||
{
|
||||
cmd.PopZ();
|
||||
cmd.PopViewport();
|
||||
}
|
||||
|
||||
public void Paint(CommandList cmd)
|
||||
{
|
||||
PaintBegin(cmd);
|
||||
PaintEnd(cmd);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,92 +0,0 @@
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace Quik.Media
|
||||
{
|
||||
public class QImageBuffer : QImage
|
||||
{
|
||||
private byte[] buffer;
|
||||
GCHandle handle;
|
||||
|
||||
public override QImageFormat InternalFormat { get; }
|
||||
public override int Width { get; }
|
||||
public override int Height { get; }
|
||||
public override int Depth { get; }
|
||||
|
||||
public QImageBuffer(QImageFormat format, int width, int height, int depth = 1)
|
||||
{
|
||||
InternalFormat = format;
|
||||
Width = width;
|
||||
Height = height;
|
||||
Depth = depth;
|
||||
|
||||
buffer = new byte[width * height * depth * format.BytesPerPixel()];
|
||||
}
|
||||
~QImageBuffer()
|
||||
{
|
||||
Dispose(false);
|
||||
}
|
||||
|
||||
private QImageLock Lock()
|
||||
{
|
||||
handle.Free();
|
||||
handle = GCHandle.Alloc(buffer, GCHandleType.Pinned);
|
||||
IntPtr ptr = Marshal.UnsafeAddrOfPinnedArrayElement(buffer, 0);
|
||||
return new QImageLock(InternalFormat, Width, Height, Depth, ptr);
|
||||
}
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (handle.IsAllocated) handle.Free();
|
||||
buffer = null;
|
||||
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
|
||||
public override void LockBits2d(out QImageLock imageLock, QImageLockOptions options)
|
||||
{
|
||||
if (options.Format != options.Format) throw new InvalidOperationException("This image type cannot be converted.");
|
||||
if (Depth > 1) throw new InvalidOperationException("This texture has a depth component.");
|
||||
|
||||
UnlockBits();
|
||||
|
||||
handle = GCHandle.Alloc(buffer, GCHandleType.Pinned);
|
||||
IntPtr ptr = Marshal.UnsafeAddrOfPinnedArrayElement(buffer, 0);
|
||||
imageLock = new QImageLock(InternalFormat, Width, Height, Depth, ptr);
|
||||
}
|
||||
|
||||
public override void LockBits3d(out QImageLock imageLock, QImageLockOptions options)
|
||||
{
|
||||
if (options.Format != options.Format) throw new InvalidOperationException("This image type cannot be converted.");
|
||||
UnlockBits();
|
||||
|
||||
handle = GCHandle.Alloc(buffer, GCHandleType.Pinned);
|
||||
IntPtr ptr = Marshal.UnsafeAddrOfPinnedArrayElement(buffer, 0);
|
||||
imageLock = new QImageLock(InternalFormat, Width, Height, Depth, ptr);
|
||||
}
|
||||
|
||||
public override void LockBits3d(out QImageLock imageLock, QImageLockOptions options, int depth)
|
||||
{
|
||||
if (options.Format != options.Format) throw new InvalidOperationException("This image type cannot be converted.");
|
||||
if (depth < 0 || depth > Depth)
|
||||
throw new ArgumentOutOfRangeException(nameof(depth), "Depth must be in range.");
|
||||
|
||||
UnlockBits();
|
||||
|
||||
handle = GCHandle.Alloc(buffer, GCHandleType.Pinned);
|
||||
IntPtr ptr = Marshal.UnsafeAddrOfPinnedArrayElement(buffer, 0);
|
||||
imageLock = new QImageLock(
|
||||
InternalFormat,
|
||||
Width,
|
||||
Height,
|
||||
1,
|
||||
ptr + (depth * Width * Height * InternalFormat.BytesPerPixel()));
|
||||
}
|
||||
|
||||
public override void UnlockBits()
|
||||
{
|
||||
if (handle.IsAllocated)
|
||||
handle.Free();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,71 +0,0 @@
|
||||
namespace Quik.Media
|
||||
{
|
||||
public static class Extensions
|
||||
{
|
||||
public static bool IsU8(this QImageFormat format)
|
||||
{
|
||||
switch (format)
|
||||
{
|
||||
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 QImageFormat format)
|
||||
{
|
||||
switch (format)
|
||||
{
|
||||
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 QImageFormat format)
|
||||
{
|
||||
switch (format)
|
||||
{
|
||||
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 QImageFormat format)
|
||||
{
|
||||
switch (format)
|
||||
{
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,94 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Quik.Media;
|
||||
using Quik.Media.Font;
|
||||
|
||||
namespace Quik.Media
|
||||
{
|
||||
/// <summary>
|
||||
/// Abstract class that represents a font.
|
||||
/// </summary>
|
||||
public abstract class QFont : IDisposable
|
||||
{
|
||||
public abstract FontFace Face { get; }
|
||||
public string Family => Face.Family;
|
||||
public FontSlant Slant => Face.Slant;
|
||||
public FontWeight Weight => Face.Weight;
|
||||
public FontStretch Stretch => Face.Stretch;
|
||||
|
||||
public abstract bool HasRune(int rune);
|
||||
public abstract QFontPage RasterizePage(int codepage, float size, in FontRasterizerOptions options);
|
||||
public QFontPage RasterizePage(int codepage, float size) => RasterizePage(codepage, size, FontRasterizerOptions.Default);
|
||||
|
||||
// IDisposable
|
||||
private bool isDisposed = false;
|
||||
private void DisposePrivate(bool disposing)
|
||||
{
|
||||
if (isDisposed) return;
|
||||
|
||||
Dispose(disposing);
|
||||
|
||||
isDisposed = true;
|
||||
}
|
||||
protected virtual void Dispose(bool disposing) { }
|
||||
public void Dispose() => DisposePrivate(true);
|
||||
}
|
||||
|
||||
public struct FontRasterizerOptions
|
||||
{
|
||||
public float Resolution { get; set; }
|
||||
public bool Sdf { get; set; }
|
||||
|
||||
public static readonly FontRasterizerOptions Default = new FontRasterizerOptions()
|
||||
{
|
||||
Resolution = 96.0f,
|
||||
Sdf = true
|
||||
};
|
||||
}
|
||||
|
||||
public class QFontPage : IDisposable
|
||||
{
|
||||
public QFont Font { get; }
|
||||
public int CodePage { get; }
|
||||
public float Size { get; }
|
||||
public virtual QImage Image { get; } = null;
|
||||
public virtual QGlyphMetrics[] Metrics { get; } = Array.Empty<QGlyphMetrics>();
|
||||
|
||||
public FontRasterizerOptions Options { get; }
|
||||
public float Resolution => Options.Resolution;
|
||||
public bool Sdf => Options.Sdf;
|
||||
|
||||
public void Dispose() => DisposeInternal(false);
|
||||
|
||||
protected QFontPage(QFont font, int codepage, float size, in FontRasterizerOptions options)
|
||||
{
|
||||
Font = font;
|
||||
CodePage = codepage;
|
||||
Size = size;
|
||||
Options = options;
|
||||
}
|
||||
public QFontPage(QFont font, int codepage, float size, in FontRasterizerOptions options, QImage image, QGlyphMetrics[] metrics)
|
||||
: this(font, codepage, size, options)
|
||||
{
|
||||
Image = image;
|
||||
Metrics = metrics;
|
||||
}
|
||||
|
||||
private bool isDisposed = false;
|
||||
private void DisposeInternal(bool disposing)
|
||||
{
|
||||
if (isDisposed) return;
|
||||
|
||||
Dispose(disposing);
|
||||
isDisposed = true;
|
||||
}
|
||||
|
||||
protected virtual void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing)
|
||||
{
|
||||
Image?.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
using System;
|
||||
|
||||
namespace Quik.Media
|
||||
{
|
||||
public abstract class QImage : IDisposable
|
||||
{
|
||||
public abstract int Width { get; }
|
||||
public abstract int Height { get; }
|
||||
public abstract int Depth { get; }
|
||||
public abstract QImageFormat InternalFormat { get; }
|
||||
public virtual int MipMapLevels => 0;
|
||||
public virtual bool Premultiplied => false;
|
||||
public virtual bool IsSdf => false;
|
||||
|
||||
public abstract void LockBits2d(out QImageLock imageLock, QImageLockOptions options);
|
||||
public abstract void LockBits3d(out QImageLock imageLock, QImageLockOptions options);
|
||||
public abstract void LockBits3d(out QImageLock imageLock, QImageLockOptions options, int depth);
|
||||
public abstract void UnlockBits();
|
||||
|
||||
// IDisposable
|
||||
private bool isDisposed = false;
|
||||
private void DisposePrivate(bool disposing)
|
||||
{
|
||||
if (isDisposed) return;
|
||||
|
||||
Dispose(disposing);
|
||||
|
||||
isDisposed = true;
|
||||
}
|
||||
protected virtual void Dispose(bool disposing) { }
|
||||
public void Dispose() => DisposePrivate(true);
|
||||
}
|
||||
|
||||
public struct QImageLockOptions
|
||||
{
|
||||
public QImageFormat Format { get; }
|
||||
public bool Premultiply { get; }
|
||||
public int MipLevel { get; }
|
||||
public static QImageLockOptions Default { get; } = new QImageLockOptions(QImageFormat.RgbaU8, true, 0);
|
||||
|
||||
public QImageLockOptions(QImageFormat format, bool premultiply, int level)
|
||||
{
|
||||
Format = format;
|
||||
Premultiply = premultiply;
|
||||
MipLevel = level;
|
||||
}
|
||||
}
|
||||
|
||||
public struct QImageLock
|
||||
{
|
||||
public QImageFormat Format { get; }
|
||||
public int Width { get; }
|
||||
public int Height { get; }
|
||||
public int Depth { get; }
|
||||
public IntPtr ImagePtr { get; }
|
||||
|
||||
public QImageLock(QImageFormat format, int width, int height, int depth, IntPtr ptr)
|
||||
{
|
||||
Format = format;
|
||||
Width = width;
|
||||
Height = height;
|
||||
Depth = depth;
|
||||
ImagePtr = ptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
using System;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
namespace Quik.OpenGL
|
||||
{
|
||||
public unsafe static partial class GL
|
||||
{
|
||||
private delegate void BufferDataProc(GLEnum target, int size, void* data, GLEnum usageHint);
|
||||
|
||||
private static GenObjectsProc _genBuffers;
|
||||
private static GenObjectsProc _deleteBuffers;
|
||||
private static BindSlottedProc _bindBuffer;
|
||||
private static BufferDataProc _bufferData;
|
||||
|
||||
private static void LoadBuffer()
|
||||
{
|
||||
_genBuffers = GetProcAddress<GenObjectsProc>("glGenBuffers");
|
||||
_deleteBuffers = GetProcAddress<GenObjectsProc>("glDeleteBuffers");
|
||||
_bindBuffer = GetProcAddress<BindSlottedProc>("glBindBuffer");
|
||||
_bufferData = GetProcAddress<BufferDataProc>("glBufferData");
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void GenBuffers(int count, out int buffers)
|
||||
{
|
||||
fixed (int *ptr = &buffers)
|
||||
_genBuffers(count, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void GenBuffers(int[] buffers) => GenBuffers(buffers.Length, out buffers[0]);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static int GenBuffer()
|
||||
{
|
||||
GenBuffers(1, out int i);
|
||||
return i;
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DeleteBuffers(int count, ref int buffers)
|
||||
{
|
||||
fixed (int *ptr = &buffers)
|
||||
_deleteBuffers(count, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DeleteBuffers(int[] buffers) => DeleteBuffers(buffers.Length, ref buffers[0]);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DeleteBuffer(int buffer) => DeleteBuffers(1, ref buffer);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void BindBuffer(GLEnum target, int buffer)
|
||||
{
|
||||
_bindBuffer(target, buffer);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void BufferData(GLEnum target, int size, IntPtr data, GLEnum usageHint) =>
|
||||
_bufferData(target, size, (void*)data, usageHint);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void BufferData<T>(GLEnum target, int size, ref T data, GLEnum usageHint)
|
||||
where T : unmanaged
|
||||
{
|
||||
fixed (T* ptr = &data)
|
||||
_bufferData(target, size, ptr, usageHint);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void BufferData<T>(GLEnum target, int size, T[] data, GLEnum usageHint)
|
||||
where T : unmanaged =>
|
||||
BufferData(target, size, ref data[0], usageHint);
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,96 +0,0 @@
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Text;
|
||||
using static Quik.OpenGL.GLEnum;
|
||||
|
||||
namespace Quik.OpenGL
|
||||
{
|
||||
public unsafe static partial class GL
|
||||
{
|
||||
private delegate int CreateProgramProc();
|
||||
private delegate void UseProgramProc(int program);
|
||||
private delegate void AttachShaderProc(int program, int shader);
|
||||
private delegate void DetachShaderProc(int program, int shader);
|
||||
private delegate void LinkProgramProc(int program);
|
||||
private delegate void GetProgramProc(int program, GLEnum pname, int *value);
|
||||
private delegate void GetProgramInfoLogProc(int program, int maxLength, int * length, byte *infoLog);
|
||||
private delegate void DeleteProgramProc(int program);
|
||||
private delegate int GetShaderLocationProc(int program, byte *name);
|
||||
|
||||
private static CreateProgramProc _createProgram;
|
||||
private static UseProgramProc _useProgram;
|
||||
private static AttachShaderProc _attachShader;
|
||||
private static DetachShaderProc _detachShader;
|
||||
private static LinkProgramProc _linkProgram;
|
||||
private static GetProgramProc _getProgram;
|
||||
private static GetProgramInfoLogProc _getProgramInfoLog;
|
||||
private static DeleteProgramProc _deleteProgram;
|
||||
private static GetShaderLocationProc _getUniformLocation;
|
||||
private static GetShaderLocationProc _getAttribLocation;
|
||||
|
||||
private static void LoadProgram()
|
||||
{
|
||||
_createProgram = GetProcAddress<CreateProgramProc>("glCreateProgram");
|
||||
_useProgram = GetProcAddress<UseProgramProc>("glUseProgram");
|
||||
_attachShader = GetProcAddress<AttachShaderProc>("glAttachShader");
|
||||
_detachShader = GetProcAddress<DetachShaderProc>("glDetachShader");
|
||||
_linkProgram = GetProcAddress<LinkProgramProc>("glLinkProgram");
|
||||
_getProgram = GetProcAddress<GetProgramProc>("glGetProgramiv");
|
||||
_getProgramInfoLog = GetProcAddress<GetProgramInfoLogProc>("glGetProgramInfoLog");
|
||||
_deleteProgram = GetProcAddress<DeleteProgramProc>("glDeleteProgram");
|
||||
_getUniformLocation = GetProcAddress<GetShaderLocationProc>("glGetUniformLocation");
|
||||
_getAttribLocation = GetProcAddress<GetShaderLocationProc>("glGetAttribLocation");
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static int CreateProgram() => _createProgram();
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void UseProgram(int program) => _useProgram(program);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void AttachShader(int program, int shader) => _attachShader(program, shader);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DetachShader(int program, int shader) => _detachShader(program, shader);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void LinkProgram(int program) => _linkProgram(program);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void GetProgram(int program, GLEnum pname, out int value)
|
||||
{
|
||||
value = default;
|
||||
fixed (int* ptr = &value)
|
||||
_getProgram(program, pname, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static string GetProgramInfoLog(int program)
|
||||
{
|
||||
GetProgram(program, GL_INFO_LOG_LENGTH, out int length);
|
||||
byte[] infoLog = new byte[length];
|
||||
|
||||
fixed (byte *ptr = infoLog)
|
||||
_getProgramInfoLog(program, length, &length, ptr);
|
||||
|
||||
return Encoding.UTF8.GetString(infoLog);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DeleteProgram(int program) => _deleteProgram(program);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static int GetUniformLocation(int program, string name)
|
||||
{
|
||||
fixed(byte* ptr = Encoding.UTF8.GetBytes(name))
|
||||
return _getUniformLocation(program, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static int GetAttribLocation(int program, string name)
|
||||
{
|
||||
fixed(byte* ptr = Encoding.UTF8.GetBytes(name))
|
||||
return _getAttribLocation(program, ptr);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,110 +0,0 @@
|
||||
using System;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using static Quik.OpenGL.GLEnum;
|
||||
|
||||
namespace Quik.OpenGL
|
||||
{
|
||||
public unsafe static partial class GL
|
||||
{
|
||||
private delegate int CreateShaderProc(GLEnum type);
|
||||
private delegate void ShaderSourceProc(int shader, int count, byte** strings, int* length);
|
||||
private delegate void CompileShaderProc(int shader);
|
||||
private delegate void GetShaderProc(int shader, GLEnum pname, int* value);
|
||||
private delegate void GetShaderInfoLogProc(int shader, int maxLength, int* length, byte* infoLog);
|
||||
private delegate void DeleteShaderProc(int id);
|
||||
|
||||
private static CreateShaderProc _createShader;
|
||||
private static ShaderSourceProc _shaderSource;
|
||||
private static CompileShaderProc _compileShader;
|
||||
private static GetShaderProc _getShader;
|
||||
private static GetShaderInfoLogProc _getShaderInfoLog;
|
||||
private static DeleteShaderProc _deleteShader;
|
||||
|
||||
private static void LoadShader()
|
||||
{
|
||||
_createShader = GetProcAddress<CreateShaderProc>("glCreateShader");
|
||||
_shaderSource = GetProcAddress<ShaderSourceProc>("glShaderSource");
|
||||
_compileShader = GetProcAddress<CompileShaderProc>("glCompileShader");
|
||||
_getShader = GetProcAddress<GetShaderProc>("glGetShaderiv");
|
||||
_getShaderInfoLog = GetProcAddress<GetShaderInfoLogProc>("glGetShaderInfoLog");
|
||||
_deleteShader = GetProcAddress<DeleteShaderProc>("glDeleteShader");
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static int CreateShader(GLEnum type) => _createShader(type);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void ShaderSource(int shader, string source)
|
||||
{
|
||||
byte[] sourceUTF8 = Encoding.UTF8.GetBytes(source);
|
||||
int length = sourceUTF8.Length;
|
||||
|
||||
fixed (byte* ptr = &sourceUTF8[0])
|
||||
{
|
||||
_shaderSource(shader, 1, &ptr, &length);
|
||||
}
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void ShaderSource(int shader, string[] sources)
|
||||
{
|
||||
int count = sources.Length;
|
||||
byte*[] pointers = new byte*[count];
|
||||
int[] lengths = new int[count];
|
||||
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
byte[] decoded = Encoding.UTF8.GetBytes(sources[i]);
|
||||
int length = lengths[i] = decoded.Length;
|
||||
IntPtr memory = Marshal.AllocHGlobal(decoded.Length);
|
||||
|
||||
Marshal.Copy(decoded, 0, memory, length);
|
||||
pointers[i] = (byte*)memory;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
fixed (byte** ptr = &pointers[0])
|
||||
fixed (int * len = &lengths[0])
|
||||
{
|
||||
_shaderSource(shader, count, ptr, len);
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
Marshal.FreeHGlobal((IntPtr)pointers[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void CompileShader(int shader) => _compileShader(shader);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void GetShader(int shader, GLEnum pname, out int value)
|
||||
{
|
||||
value = default;
|
||||
fixed (int *ptr = &value)
|
||||
_getShader(shader, pname, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static string GetShaderInfoLog(int shader)
|
||||
{
|
||||
GetShader(shader, GL_INFO_LOG_LENGTH, out int length);
|
||||
byte[] infoLog = new byte[length];
|
||||
|
||||
fixed (byte *ptr = infoLog)
|
||||
_getShaderInfoLog(shader, length, &length, ptr);
|
||||
|
||||
return Encoding.UTF8.GetString(infoLog);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DeleteShader(int shader) => _deleteShader(shader);
|
||||
}
|
||||
}
|
||||
@@ -1,187 +0,0 @@
|
||||
using System;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
namespace Quik.OpenGL
|
||||
{
|
||||
public unsafe static partial class GL
|
||||
{
|
||||
private delegate void ActiveTextureProc(GLEnum unit);
|
||||
private delegate void PixelStoreiProc(GLEnum pname, int param);
|
||||
private delegate void PixelStorefProc(GLEnum pname, float param);
|
||||
private delegate void TexImage2DProc(GLEnum target, int level, GLEnum internalFormat, int width, int height, int border, GLEnum format, GLEnum pixelType, void *data);
|
||||
private delegate void TexImage3DProc(GLEnum target, int level, GLEnum internalFormat, int width, int height, int depth, int border, GLEnum format, GLEnum pixelType, void* data);
|
||||
private delegate void TexSubImage2DProc(GLEnum target, int level, int x, int y, int width, int height, GLEnum format, GLEnum pixelType, void *data);
|
||||
private delegate void TexSubImage3DProc(GLEnum target, int level, int x, int y, int z, int width, int height, int depth, int border, GLEnum format, GLEnum pixelType, void* data);
|
||||
private delegate void TexParameteriProc(GLEnum target, GLEnum pname, int value);
|
||||
private delegate void TexParameterfProc(GLEnum target, GLEnum pname, float value);
|
||||
private delegate void TexParameterivProc(GLEnum target, GLEnum pname, int* value);
|
||||
private delegate void TexParameterfvProc(GLEnum target, GLEnum pname, float* value);
|
||||
private delegate void GenerateMipmapProc(GLEnum target);
|
||||
|
||||
private static GenObjectsProc _genTextures;
|
||||
private static GenObjectsProc _deleteTextures;
|
||||
private static BindSlottedProc _bindTexture;
|
||||
private static ActiveTextureProc _activeTexture;
|
||||
private static PixelStoreiProc _pixelStorei;
|
||||
private static PixelStorefProc _pixelStoref;
|
||||
private static TexImage2DProc _texImage2D;
|
||||
private static TexImage3DProc _texImage3D;
|
||||
private static TexSubImage2DProc _texSubImage2D;
|
||||
private static TexSubImage3DProc _texSubImage3D;
|
||||
private static TexParameteriProc _texParameteri;
|
||||
private static TexParameterfProc _texParameterf;
|
||||
private static TexParameterivProc _texParameteriv;
|
||||
private static TexParameterfvProc _texParameterfv;
|
||||
private static GenerateMipmapProc _generateMipmap;
|
||||
|
||||
private static void LoadTexture()
|
||||
{
|
||||
_genTextures = GetProcAddress<GenObjectsProc>("glGenTextures");
|
||||
_deleteTextures = GetProcAddress<GenObjectsProc>("glDeleteTextures");
|
||||
_bindTexture = GetProcAddress<BindSlottedProc>("glBindTexture");
|
||||
_activeTexture = GetProcAddress<ActiveTextureProc>("glActiveTexture");
|
||||
_pixelStorei = GetProcAddress<PixelStoreiProc>("glPixelStorei");
|
||||
_pixelStoref = GetProcAddress<PixelStorefProc>("glPixelStoref");
|
||||
_texImage2D = GetProcAddress<TexImage2DProc>("glTexImage2D");
|
||||
_texImage3D = GetProcAddress<TexImage3DProc>("glTexImage3D");
|
||||
_texSubImage2D = GetProcAddress<TexSubImage2DProc>("glTexSubImage2D");
|
||||
_texSubImage3D = GetProcAddress<TexSubImage3DProc>("glTexSubImage3D");
|
||||
_texParameteri = GetProcAddress<TexParameteriProc>("glTexParameteri");
|
||||
_texParameterf = GetProcAddress<TexParameterfProc>("glTexParameterf");
|
||||
_texParameteriv = GetProcAddress<TexParameterivProc>("glTexParameteriv");
|
||||
_texParameterfv = GetProcAddress<TexParameterfvProc>("glTexParameterfv");
|
||||
_generateMipmap = GetProcAddress<GenerateMipmapProc>("glGenerateMipmap");
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void GenTextures(int count, out int textures)
|
||||
{
|
||||
fixed (int *ptr = &textures)
|
||||
_genTextures(count, ptr);
|
||||
}
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static int GenTexture()
|
||||
{
|
||||
GenTextures(1, out int i);
|
||||
return i;
|
||||
}
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void GenTextures(int[] textures) => GenTextures(textures.Length, out textures[0]);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DeleteTextures(int count, in int textures)
|
||||
{
|
||||
fixed (int* ptr = &textures)
|
||||
_deleteTextures(count, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DeleteTexture(int i) => DeleteTextures(1, i);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DeleteTextures(int[] textures) => DeleteTextures(textures.Length, in textures[0]);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void BindTexture(GLEnum target, int texture) => _bindTexture(target, texture);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void ActiveTexture(GLEnum unit) => _activeTexture(unit);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void PixelStore(GLEnum pname, int value) => _pixelStorei(pname, value);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void PixelStore(GLEnum pname, float value) => _pixelStoref(pname, value);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexImage2D(GLEnum target, int level, GLEnum internalFormat, int width, int height, int border, GLEnum format, GLEnum pixelType, IntPtr data) =>
|
||||
_texImage2D(target, level, internalFormat, width, height, border, format, pixelType, (void*)data);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexImage2D<T>(GLEnum target, int level, GLEnum internalFormat, int width, int height, int border, GLEnum format, GLEnum pixelType, in T data) where T : unmanaged
|
||||
{
|
||||
fixed(T *ptr = &data)
|
||||
_texImage2D(target, level, internalFormat, width, height, border, format, pixelType, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexImage2D<T>(GLEnum target, int level, GLEnum internalFormat, int width, int height, int border, GLEnum format, GLEnum pixelType, T[] data) where T : unmanaged =>
|
||||
TexImage2D(target, level, internalFormat, width, height, border, format, pixelType, in data[0]);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexImage3D(GLEnum target, int level, GLEnum internalFormat, int width, int height, int depth, int border, GLEnum format, GLEnum pixelType, void* data) =>
|
||||
_texImage3D(target, level, internalFormat, width, height, depth, border, format, pixelType, data);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexImage3D<T>(GLEnum target, int level, GLEnum internalFormat, int width, int height, int depth, int border, GLEnum format, GLEnum pixelType, in T data)
|
||||
where T : unmanaged
|
||||
{
|
||||
fixed (T* ptr = &data)
|
||||
_texImage3D(target, level, internalFormat, width, height, depth, border, format, pixelType, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexImage3D<T>(GLEnum target, int level, GLEnum internalFormat, int width, int height, int depth, int border, GLEnum format, GLEnum pixelType, T[] data)
|
||||
where T : unmanaged =>
|
||||
TexImage3D(target, level, internalFormat, width, height, depth, border, format, pixelType, in data[0]);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexSubImage2D(GLEnum target, int level, int x, int y, int width, int height, GLEnum format, GLEnum pixelType, IntPtr data) =>
|
||||
_texSubImage2D(target, level, x, y, width, height,format, pixelType, (void*)data);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexSubImage2d<T>(GLEnum target, int level, int x, int y, int width, int height, GLEnum format, GLEnum pixelType, in T data) where T : unmanaged
|
||||
{
|
||||
fixed(T *ptr = &data)
|
||||
_texSubImage2D(target, level, x, y, width, height, format, pixelType, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexSubImage2D<T>(GLEnum target, int level, int x, int y, int width, int height, GLEnum format, GLEnum pixelType, T[] data) where T : unmanaged =>
|
||||
TexSubImage2d<T>(target, level, x, y, width, height, format, pixelType, in data[0]);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexSubImage3D(GLEnum target, int level, int x, int y, int z, int width, int height, int depth, int border, GLEnum format, GLEnum pixelType, void* data) =>
|
||||
_texSubImage3D(target, level, x, y, z, width, height, depth, border, format, pixelType, data);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexSubImage3D<T>(GLEnum target, int level, int x, int y, int z, int width, int height, int depth, int border, GLEnum format, GLEnum pixelType, in T data)
|
||||
where T : unmanaged
|
||||
{
|
||||
fixed (T* ptr = &data)
|
||||
_texSubImage3D(target, level, x, y, z, width, height, depth, border, format, pixelType, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexSubImage3D<T>(GLEnum target, int level, int x, int y, int z, int width, int height, int depth, int border, GLEnum format, GLEnum pixelType, T[] data)
|
||||
where T : unmanaged =>
|
||||
TexSubImage3D(target, level, x, y, z, width, height, depth, border, format, pixelType, in data[0]);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexParameter(GLEnum target, GLEnum pname, int value) => _texParameteri(target, pname, value);
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexParameter(GLEnum target, GLEnum pname, GLEnum value) => _texParameteri(target, pname, (int)value);
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexParameter(GLEnum target, GLEnum pname, float value) => _texParameterf(target, pname, value);
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexParameter(GLEnum target, GLEnum pname, ref int values)
|
||||
{
|
||||
fixed (int *ptr = &values)
|
||||
_texParameteriv(target, pname, ptr);
|
||||
}
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexParameter(GLEnum target, GLEnum pname, int[] values) => TexParameter(target, pname, ref values[0]);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexParameter(GLEnum target, GLEnum pname, ref float values)
|
||||
{
|
||||
fixed (float *ptr = &values)
|
||||
_texParameterfv(target, pname, ptr);
|
||||
}
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void TexParameter(GLEnum target, GLEnum pname, float[] values) => TexParameter(target, pname, ref values[0]);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void GenerateMipmap(GLEnum target) => _generateMipmap(target);
|
||||
}
|
||||
}
|
||||
@@ -1,222 +0,0 @@
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
namespace Quik.OpenGL
|
||||
{
|
||||
public unsafe static partial class GL
|
||||
{
|
||||
private delegate void Uniform1fProc(int location, float x);
|
||||
private delegate void Uniform2fProc(int location, float x, float y);
|
||||
private delegate void Uniform3fProc(int location, float x, float y, float z);
|
||||
private delegate void Uniform4fProc(int location, float x, float y, float z, float w);
|
||||
private delegate void Uniform1iProc(int location, int x);
|
||||
private delegate void Uniform2iProc(int location, int x, int y);
|
||||
private delegate void Uniform3iProc(int location, int x, int y, int z);
|
||||
private delegate void Uniform4iProc(int location, int x, int y, int z, int w);
|
||||
private delegate void UniformNfvProc(int location, int count, float* value);
|
||||
private delegate void UniformNivProc(int location, int count, int* value);
|
||||
private delegate void UniformMatrixNxNfvProc(int location, int count, bool transpose, float *value);
|
||||
|
||||
private static Uniform1fProc _uniform1f;
|
||||
private static Uniform2fProc _uniform2f;
|
||||
private static Uniform3fProc _uniform3f;
|
||||
private static Uniform4fProc _uniform4f;
|
||||
private static Uniform1iProc _uniform1i;
|
||||
private static Uniform2iProc _uniform2i;
|
||||
private static Uniform3iProc _uniform3i;
|
||||
private static Uniform4iProc _uniform4i;
|
||||
private static UniformNfvProc _uniform1fv;
|
||||
private static UniformNfvProc _uniform2fv;
|
||||
private static UniformNfvProc _uniform3fv;
|
||||
private static UniformNfvProc _uniform4fv;
|
||||
private static UniformNivProc _uniform1iv;
|
||||
private static UniformNivProc _uniform2iv;
|
||||
private static UniformNivProc _uniform3iv;
|
||||
private static UniformNivProc _uniform4iv;
|
||||
private static UniformMatrixNxNfvProc _uniformMatrix2fv;
|
||||
private static UniformMatrixNxNfvProc _uniformMatrix3fv;
|
||||
private static UniformMatrixNxNfvProc _uniformMatrix4fv;
|
||||
|
||||
public static void LoadUniform()
|
||||
{
|
||||
_uniform1f = GetProcAddress<Uniform1fProc>("glUniform1f");
|
||||
_uniform2f = GetProcAddress<Uniform2fProc>("glUniform2f");
|
||||
_uniform3f = GetProcAddress<Uniform3fProc>("glUniform3f");
|
||||
_uniform4f = GetProcAddress<Uniform4fProc>("glUniform4f");
|
||||
_uniform1i = GetProcAddress<Uniform1iProc>("glUniform1i");
|
||||
_uniform2i = GetProcAddress<Uniform2iProc>("glUniform2i");
|
||||
_uniform3i = GetProcAddress<Uniform3iProc>("glUniform3i");
|
||||
_uniform4i = GetProcAddress<Uniform4iProc>("glUniform4i");
|
||||
_uniform1fv = GetProcAddress<UniformNfvProc>("glUniform1fv");
|
||||
_uniform2fv = GetProcAddress<UniformNfvProc>("glUniform2fv");
|
||||
_uniform3fv = GetProcAddress<UniformNfvProc>("glUniform3fv");
|
||||
_uniform4fv = GetProcAddress<UniformNfvProc>("glUniform4fv");
|
||||
_uniform1iv = GetProcAddress<UniformNivProc>("glUniform1iv");
|
||||
_uniform2iv = GetProcAddress<UniformNivProc>("glUniform2iv");
|
||||
_uniform3iv = GetProcAddress<UniformNivProc>("glUniform3iv");
|
||||
_uniform4iv = GetProcAddress<UniformNivProc>("glUniform4iv");
|
||||
_uniformMatrix2fv = GetProcAddress<UniformMatrixNxNfvProc>("glUniformMatrix2fv");
|
||||
_uniformMatrix3fv = GetProcAddress<UniformMatrixNxNfvProc>("glUniformMatrix3fv");
|
||||
_uniformMatrix4fv = GetProcAddress<UniformMatrixNxNfvProc>("glUniformMatrix4fv");
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform1(int location, float x)
|
||||
{
|
||||
_uniform1f(location, x);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform2(int location, float x, float y)
|
||||
{
|
||||
_uniform2f(location, x, y);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform3(int location, float x, float y, float z)
|
||||
{
|
||||
_uniform3f(location, x, y, z);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform4(int location, float x, float y, float z, float w)
|
||||
{
|
||||
_uniform4f(location, x, y, z, w);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform1(int location, int x)
|
||||
{
|
||||
_uniform1i(location, x);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform2(int location, int x, int y)
|
||||
{
|
||||
_uniform2i(location, x, y);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform3(int location, int x, int y, int z)
|
||||
{
|
||||
_uniform3i(location, x, y, z);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform4(int location, int x, int y, int z, int w)
|
||||
{
|
||||
_uniform4i(location, x, y, z, w);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform1(int location, int count, ref float first)
|
||||
{
|
||||
fixed(float *ptr = &first)
|
||||
_uniform1fv(location, count, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform2(int location, int count, ref float first)
|
||||
{
|
||||
fixed(float *ptr = &first)
|
||||
_uniform2fv(location, count, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform3(int location, int count, ref float first)
|
||||
{
|
||||
fixed(float *ptr = &first)
|
||||
_uniform3fv(location, count, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform4(int location, int count, ref float first)
|
||||
{
|
||||
fixed(float *ptr = &first)
|
||||
_uniform4fv(location, count, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform1(int location, int count, ref int first)
|
||||
{
|
||||
fixed(int *ptr = &first)
|
||||
_uniform1iv(location, count, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform2(int location, int count, ref int first)
|
||||
{
|
||||
fixed(int *ptr = &first)
|
||||
_uniform2iv(location, count, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform3(int location, int count, ref int first)
|
||||
{
|
||||
fixed(int *ptr = &first)
|
||||
_uniform3iv(location, count, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Uniform4(int location, int count, ref int first)
|
||||
{
|
||||
fixed(int *ptr = &first)
|
||||
_uniform4iv(location, count, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void UniformMatrix2(int location, bool transpose, ref float m11)
|
||||
{
|
||||
fixed (float* ptr = &m11)
|
||||
_uniformMatrix2fv(location, 1, transpose, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void UniformMatrix3(int location, bool transpose, ref float m11)
|
||||
{
|
||||
fixed (float* ptr = &m11)
|
||||
_uniformMatrix3fv(location, 1, transpose, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void UniformMatrix4(int location, bool transpose, ref float m11)
|
||||
{
|
||||
fixed (float* ptr = &m11)
|
||||
_uniformMatrix4fv(location, 1, transpose, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void UniformMatrix2(int location, int count, bool transpose, ref float m11)
|
||||
{
|
||||
fixed (float* ptr = &m11)
|
||||
_uniformMatrix2fv(location, count, transpose, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void UniformMatrix3(int location, int count, bool transpose, ref float m11)
|
||||
{
|
||||
fixed (float* ptr = &m11)
|
||||
_uniformMatrix3fv(location, count, transpose, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void UniformMatrix4(int location, int count, bool transpose, ref float m11)
|
||||
{
|
||||
fixed (float* ptr = &m11)
|
||||
_uniformMatrix4fv(location, count, transpose, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void UniformMatrix4(int location, bool transpose, in QMat4 m4)
|
||||
{
|
||||
fixed (float* ptr = &m4.M11)
|
||||
_uniformMatrix4fv(location, 1, transpose, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void UniformMatrix4(int location, int count, bool transpose, ref QMat4 m4)
|
||||
{
|
||||
fixed (float* ptr = &m4.M11)
|
||||
_uniformMatrix4fv(location, count, transpose, ptr);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,78 +0,0 @@
|
||||
using System;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
namespace Quik.OpenGL
|
||||
{
|
||||
public unsafe static partial class GL
|
||||
{
|
||||
private delegate void EnableVertexAttribArrayProc(int location);
|
||||
private delegate void VertexAttribPointerProc(int location, int size, GLEnum type, bool normalized, int stride, IntPtr offset);
|
||||
private delegate void VertexAttribIPointerProc(int location, int size, GLEnum type, int stride, IntPtr offset);
|
||||
|
||||
private static GenObjectsProc _genVertexArrays;
|
||||
private static GenObjectsProc _deleteVertexArrays;
|
||||
private static BindObjectProc _bindVertexArray;
|
||||
private static EnableVertexAttribArrayProc _enableVertexAttribArray;
|
||||
private static EnableVertexAttribArrayProc _disableVertexAttribArray;
|
||||
private static VertexAttribPointerProc _vertexAttribPointer;
|
||||
private static VertexAttribIPointerProc _vertexAttribIPointer;
|
||||
|
||||
private static void LoadVertexArrays()
|
||||
{
|
||||
_genVertexArrays = GetProcAddress<GenObjectsProc>("glGenVertexArrays");
|
||||
_deleteVertexArrays = GetProcAddress<GenObjectsProc>("glDeleteVertexArrays");
|
||||
_bindVertexArray = GetProcAddress<BindObjectProc>("glBindVertexArray");
|
||||
_enableVertexAttribArray = GetProcAddress<EnableVertexAttribArrayProc>("glEnableVertexAttribArray");
|
||||
_disableVertexAttribArray = GetProcAddress<EnableVertexAttribArrayProc>("glDisableVertexAttribArray");
|
||||
_vertexAttribPointer = GetProcAddress<VertexAttribPointerProc>("glVertexAttribPointer");
|
||||
_vertexAttribIPointer = GetProcAddress<VertexAttribIPointerProc>("glVertexAttribIPointer");
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void GenVertexArrays(int count, out int vertexArrays)
|
||||
{
|
||||
fixed (int *ptr = &vertexArrays)
|
||||
_genVertexArrays(count, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static int GenVertexArray()
|
||||
{
|
||||
GenVertexArrays(1, out int i);
|
||||
return i;
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void GenVertexArrays(int[] vertexArrays) => GenVertexArrays(vertexArrays.Length, out vertexArrays[0]);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DeleteVertexArrays(int count, ref int vertexArrays)
|
||||
{
|
||||
fixed (int *ptr = &vertexArrays)
|
||||
_deleteVertexArrays(count, ptr);
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DeleteVertexArrays(int[] vertexArrays) => DeleteVertexArrays(vertexArrays.Length, ref vertexArrays[0]);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DeleteVertexArray(int vertexArray) => DeleteVertexArrays(1, ref vertexArray);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void BindVertexArray(int vertexArray) => _bindVertexArray(vertexArray);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void EnableVertexAttribArray(int location) => _enableVertexAttribArray(location);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DisableVertexAttribArray(int location) => _disableVertexAttribArray(location);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void VertexAttribPointer(int location, int size, GLEnum type, bool normalized, int stride, int offset) =>
|
||||
_vertexAttribPointer(location, size, type, normalized, stride, (IntPtr)offset);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void VertexAttribIPointer(int location, int size, GLEnum type, int stride, int offset) =>
|
||||
_vertexAttribIPointer(location, size, type, stride, (IntPtr)offset);
|
||||
}
|
||||
}
|
||||
@@ -1,124 +0,0 @@
|
||||
using System;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace Quik.OpenGL
|
||||
{
|
||||
public delegate IntPtr GetProcAddressProc(string procName);
|
||||
|
||||
public unsafe static partial class GL
|
||||
{
|
||||
private delegate void GenObjectsProc(int count, int *ids);
|
||||
private delegate void BindObjectProc(int id);
|
||||
private delegate void BindSlottedProc(GLEnum target, int id);
|
||||
private delegate void GLEnum1Proc(GLEnum x);
|
||||
private delegate void GLEnum2Proc(GLEnum x, GLEnum y);
|
||||
private delegate void GLI4Proc(int x, int y, int z, int w);
|
||||
private delegate void GLF4Proc(float x, float y, float z, float w);
|
||||
private delegate void DrawElementsProc(GLEnum primitive, int size, GLEnum type, void *offset);
|
||||
private delegate void DrawArraysProc(GLEnum primitive, int first, int offset);
|
||||
private delegate void GetIntegervProc(GLEnum pname, int *data);
|
||||
private delegate void GetFloatvProc(GLEnum pname, float *data);
|
||||
private delegate byte* GetStringProc(GLEnum pname);
|
||||
|
||||
private const short AggressiveInlining = (short)MethodImplOptions.AggressiveInlining;
|
||||
|
||||
private static GetProcAddressProc _getProcAddress;
|
||||
private static GLEnum1Proc _enable;
|
||||
private static GLEnum1Proc _disable;
|
||||
private static GLEnum2Proc _blendFunc;
|
||||
private static GLEnum1Proc _depthFunc;
|
||||
private static GLEnum1Proc _clear;
|
||||
private static GLI4Proc _viewport;
|
||||
private static GLF4Proc _clearColor;
|
||||
private static DrawElementsProc _drawElements;
|
||||
private static DrawArraysProc _drawArrays;
|
||||
private static GetIntegervProc _getIntegerv;
|
||||
private static GetFloatvProc _getFloatv;
|
||||
private static GetStringProc _getString;
|
||||
|
||||
private static T GetProcAddress<T>(string procName)
|
||||
where T : Delegate
|
||||
{
|
||||
IntPtr funcptr = _getProcAddress(procName);
|
||||
return Marshal.GetDelegateForFunctionPointer<T>(funcptr);
|
||||
}
|
||||
|
||||
public static void LoadBindings(GetProcAddressProc getProcAddress)
|
||||
{
|
||||
_getProcAddress = getProcAddress;
|
||||
|
||||
_enable = GetProcAddress<GLEnum1Proc>("glEnable");
|
||||
_disable = GetProcAddress<GLEnum1Proc>("glDisable");
|
||||
_blendFunc = GetProcAddress<GLEnum2Proc>("glBlendFunc");
|
||||
_depthFunc = GetProcAddress<GLEnum1Proc>("glDepthFunc");
|
||||
_clear = GetProcAddress<GLEnum1Proc>("glClear");
|
||||
_viewport = GetProcAddress<GLI4Proc>("glViewport");
|
||||
_clearColor = GetProcAddress<GLF4Proc>("glClearColor");
|
||||
_drawElements = GetProcAddress<DrawElementsProc>("glDrawElements");
|
||||
_drawArrays = GetProcAddress<DrawArraysProc>("glDrawArrays");
|
||||
_getIntegerv = GetProcAddress<GetIntegervProc>("glGetIntegerv");
|
||||
_getFloatv = GetProcAddress<GetFloatvProc>("glGetFloatv");
|
||||
_getString = GetProcAddress<GetStringProc>("glGetString");
|
||||
|
||||
LoadBuffer();
|
||||
LoadProgram();
|
||||
LoadShader();
|
||||
LoadTexture();
|
||||
LoadUniform();
|
||||
LoadVertexArrays();
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Enable(GLEnum cap) => _enable(cap);
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Disable(GLEnum cap) => _disable(cap);
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void BlendFunc(GLEnum src, GLEnum dst) => _blendFunc(src, dst);
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DepthFunc(GLEnum func) => _depthFunc(func);
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Clear(GLEnum buffer_bits) => _clear(buffer_bits);
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Viewport(int x, int y, int w, int h) => _viewport(x, y, w, h);
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void ClearColor(float r, float g, float b, float a) => _clearColor(r, g, b, a);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DrawElements(GLEnum primitive, int count, GLEnum type, int offset) => _drawElements(primitive, count, type, (void*)offset);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void DrawArrays(GLEnum primitive, int offset, int count) => _drawArrays(primitive, offset, count);
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Get(GLEnum pname, out int value)
|
||||
{
|
||||
value = default;
|
||||
fixed(int* ptr = &value)
|
||||
{
|
||||
_getIntegerv(pname, ptr);
|
||||
}
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static void Get(GLEnum pname, out float value)
|
||||
{
|
||||
value = default;
|
||||
fixed (float* ptr = &value)
|
||||
{
|
||||
_getFloatv(pname, ptr);
|
||||
}
|
||||
}
|
||||
|
||||
[MethodImpl(AggressiveInlining)]
|
||||
public static string GetString(GLEnum pname)
|
||||
{
|
||||
int length;
|
||||
byte* str = _getString(pname);
|
||||
|
||||
for (length = 0; str[length] == 0 || length < 256; length++);
|
||||
|
||||
return System.Text.Encoding.UTF8.GetString(str, length);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,76 +0,0 @@
|
||||
namespace Quik.OpenGL
|
||||
{
|
||||
public enum GLEnum : int
|
||||
{
|
||||
GL_OK = 0,
|
||||
GL_TRUE = 1,
|
||||
GL_FALSE = 0,
|
||||
GL_MAJOR_VERSION = 0x821B,
|
||||
GL_MINOR_VERSION = 0x821C,
|
||||
GL_VENDOR = 0x1F00,
|
||||
GL_RENDERER = 0x1F01,
|
||||
GL_VERSION = 0x1F02,
|
||||
GL_EXTENSIONS = 0x1F03,
|
||||
|
||||
GL_MULTISAMPLE = 0x809D,
|
||||
GL_BLEND = 0x0BE2,
|
||||
|
||||
GL_COLOR_BUFFER_BIT = 0x00004000,
|
||||
|
||||
GL_SRC_ALPHA = 0x0302,
|
||||
GL_ONE_MINUS_SRC_ALPHA = 0x0303,
|
||||
|
||||
GL_VERTEX_SHADER = 0x8B31,
|
||||
GL_FRAGMENT_SHADER = 0x8B30,
|
||||
GL_INFO_LOG_LENGTH = 0x8B84,
|
||||
GL_COMPILE_STATUS = 0x8B81,
|
||||
GL_LINK_STATUS = 0x8B82,
|
||||
|
||||
GL_UNSIGNED_BYTE = 0x1401,
|
||||
GL_UNSIGNED_SHORT = 0x1403,
|
||||
GL_UNSIGNED_INT = 0x1405,
|
||||
GL_FLOAT = 0x1406,
|
||||
|
||||
GL_RED = 0x1903,
|
||||
GL_ALPHA = 0x1906,
|
||||
GL_RGB = 0x1907,
|
||||
GL_RGBA = 0x1908,
|
||||
|
||||
GL_ARRAY_BUFFER = 0x8892,
|
||||
GL_ELEMENT_ARRAY_BUFFER = 0x8893,
|
||||
|
||||
GL_STREAM_DRAW = 0x88E0,
|
||||
|
||||
GL_TEXTURE0 = 0x84C0,
|
||||
GL_TEXTURE1 = GL_TEXTURE0 + 1,
|
||||
GL_TEXTURE2 = GL_TEXTURE0 + 2,
|
||||
GL_TEXTURE3 = GL_TEXTURE0 + 3,
|
||||
GL_TEXTURE4 = GL_TEXTURE0 + 4,
|
||||
GL_TEXTURE5 = GL_TEXTURE0 + 5,
|
||||
GL_TEXTURE6 = GL_TEXTURE0 + 6,
|
||||
|
||||
GL_TEXTURE_2D = 0x0DE1,
|
||||
GL_TEXTURE_2D_ARRAY = 0x8C1A,
|
||||
GL_UNPACK_ALIGNMENT = 0x0CF5,
|
||||
|
||||
GL_TEXTURE_MAG_FILTER = 0x2800,
|
||||
GL_TEXTURE_MIN_FILTER = 0x2801,
|
||||
GL_NEAREST = 0x2600,
|
||||
GL_LINEAR = 0x2601,
|
||||
GL_NEAREST_MIPMAP_NEAREST = 0x2700,
|
||||
GL_LINEAR_MIPMAP_NEAREST = 0x2701,
|
||||
GL_NEAREST_MIPMAP_LINEAR = 0x2702,
|
||||
GL_LINEAR_MIPMAP_LINEAR = 0x2703,
|
||||
|
||||
GL_TEXTURE_WRAP_S = 0x2802,
|
||||
GL_TEXTURE_WRAP_T = 0x2803,
|
||||
GL_CLAMP_TO_EDGE = 0x812F,
|
||||
GL_CLAMP_TO_BORDER = 0x812D,
|
||||
GL_MIRRORED_REPEAT = 0x8370,
|
||||
GL_MIRROR_CLAMP_TO_EDGE = 0x8743,
|
||||
GL_CLAMP = 0x2900,
|
||||
GL_REPEAT = 0x2901,
|
||||
|
||||
GL_TRIANGLES = 0x0004,
|
||||
}
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
using System;
|
||||
using Quik.CommandMachine;
|
||||
using Quik.Media;
|
||||
|
||||
namespace Quik.PAL
|
||||
{
|
||||
/// <summary>
|
||||
/// An empty interface to statically type Quik port handles.
|
||||
/// </summary>
|
||||
public interface IQuikPortHandle
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The primary primary platform abstraction interface for Quik hosts.
|
||||
/// </summary>
|
||||
public interface IQuikPlatform : IDisposable
|
||||
{
|
||||
/// <summary>
|
||||
/// The title of the application.
|
||||
/// </summary>
|
||||
string Title { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The default icon for the application.
|
||||
/// </summary>
|
||||
QImage Icon { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The event raised when an event is received.
|
||||
/// </summary>
|
||||
event EventHandler EventRaised;
|
||||
|
||||
/// <summary>
|
||||
/// Raise the events that have been enqueued.
|
||||
/// </summary>
|
||||
/// <param name="block">True to block until a new event arrives.</param>
|
||||
void ProcessEvents(bool block);
|
||||
|
||||
/// <summary>
|
||||
/// Create a window.
|
||||
/// </summary>
|
||||
/// <returns>The window instance.</returns>
|
||||
IQuikPortHandle CreatePort();
|
||||
void DestroyPort(IQuikPortHandle port);
|
||||
string PortGetTitle(IQuikPortHandle port);
|
||||
void PortSetTitle(IQuikPortHandle port, string title);
|
||||
QVec2 PortGetSize(IQuikPortHandle port);
|
||||
void PortSetSize(IQuikPortHandle port, QVec2 size);
|
||||
QVec2 PortGetPosition(IQuikPortHandle port);
|
||||
void PortSetPosition(IQuikPortHandle port, QVec2 position);
|
||||
bool PortIsValid(IQuikPortHandle port);
|
||||
void PortSubscribeEvent(IQuikPortHandle port, EventHandler handler);
|
||||
void PortUnsubscribeEvent(IQuikPortHandle port, EventHandler handler);
|
||||
void PortFocus(IQuikPortHandle port);
|
||||
void PortShow(IQuikPortHandle port, bool shown = true);
|
||||
void PortPaint(IQuikPortHandle port, CommandList commands);
|
||||
}
|
||||
}
|
||||
@@ -1,521 +0,0 @@
|
||||
using System;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace Quik
|
||||
{
|
||||
/// <summary>
|
||||
/// A 2 dimensional Vector.
|
||||
/// </summary>
|
||||
[DebuggerDisplay("({X}, {Y})")]
|
||||
public struct QVec2
|
||||
{
|
||||
public float X;
|
||||
public float Y;
|
||||
|
||||
public float Magnitude => MathF.Sqrt(X * X + Y * Y);
|
||||
|
||||
public QVec2(float x, float y)
|
||||
{
|
||||
X = x;
|
||||
Y = y;
|
||||
}
|
||||
|
||||
public QVec2 Normalize() => this * (1.0f / Magnitude);
|
||||
|
||||
public float Atan2() => MathF.Atan2(Y, X);
|
||||
public static QVec2 operator +(QVec2 a, QVec2 b)
|
||||
{
|
||||
return new QVec2()
|
||||
{
|
||||
X = a.X + b.X,
|
||||
Y = a.Y + b.Y
|
||||
};
|
||||
}
|
||||
|
||||
public static QVec2 operator -(QVec2 a)
|
||||
{
|
||||
return new QVec2()
|
||||
{
|
||||
X = -a.X,
|
||||
Y = -a.Y
|
||||
};
|
||||
}
|
||||
|
||||
public static QVec2 operator -(QVec2 a, QVec2 b)
|
||||
{
|
||||
return new QVec2()
|
||||
{
|
||||
X = a.X - b.X,
|
||||
Y = a.Y - b.Y
|
||||
};
|
||||
}
|
||||
|
||||
public static QVec2 operator *(float a, QVec2 b)
|
||||
{
|
||||
return new QVec2()
|
||||
{
|
||||
X = a * b.X,
|
||||
Y = a * b.Y
|
||||
};
|
||||
}
|
||||
|
||||
public static QVec2 operator *(QVec2 a, float b) => b * a;
|
||||
|
||||
public static bool operator ==(QVec2 a, QVec2 b) => a.X == b.X && a.Y == b.Y;
|
||||
|
||||
public static bool operator !=(QVec2 a, QVec2 b) => a.X != b.X || a.Y != b.Y;
|
||||
|
||||
public override bool Equals(object obj)
|
||||
{
|
||||
if (obj is QVec2)
|
||||
{
|
||||
return (QVec2) obj == this;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public override int GetHashCode()
|
||||
{
|
||||
return 63671 * X.GetHashCode() ^ 81083 * Y.GetHashCode();
|
||||
}
|
||||
|
||||
public static float Dot(QVec2 a, QVec2 b)
|
||||
{
|
||||
return a.X * b.X + a.Y * b.Y;
|
||||
}
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return $"({X}; {Y})";
|
||||
}
|
||||
|
||||
public static readonly QVec2 Zero = new QVec2(0, 0);
|
||||
public static readonly QVec2 UnitX = new QVec2(1, 0);
|
||||
public static readonly QVec2 UnitY = new QVec2(0, 1);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A RGBA color value.
|
||||
/// </summary>
|
||||
[DebuggerDisplay("({R}, {G}, {B}, {A})")]
|
||||
public struct QColor
|
||||
{
|
||||
/// <summary>
|
||||
/// Red channel.
|
||||
/// </summary>
|
||||
public byte R;
|
||||
/// <summary>
|
||||
/// Green channel.
|
||||
/// </summary>
|
||||
public byte G;
|
||||
/// <summary>
|
||||
/// Blue channel.
|
||||
/// </summary>
|
||||
public byte B;
|
||||
/// <summary>
|
||||
/// Alpha channel.
|
||||
/// </summary>
|
||||
public byte A;
|
||||
|
||||
public QColor(byte r, byte g, byte b, byte a)
|
||||
{
|
||||
R = r;
|
||||
G = g;
|
||||
B = b;
|
||||
A = a;
|
||||
}
|
||||
|
||||
public QColor(byte r, byte g, byte b) : this(r, g, b, 1) { }
|
||||
|
||||
public QColor(uint hexCode)
|
||||
{
|
||||
R = (byte)((hexCode >> 24) & 0xFF);
|
||||
G = (byte)((hexCode >> 16) & 0xFF);
|
||||
B = (byte)((hexCode >> 8 ) & 0xFF);
|
||||
A = (byte)((hexCode >> 0 ) & 0xFF);
|
||||
}
|
||||
public QColor(int hexCode) : this((uint)hexCode) { }
|
||||
|
||||
public static readonly QColor Black = new QColor(0, 0, 0, 255);
|
||||
public static readonly QColor Red = new QColor(255, 0, 0, 255);
|
||||
public static readonly QColor Green = new QColor(0, 255, 0, 255);
|
||||
public static readonly QColor Blue = new QColor(0, 0, 255, 255);
|
||||
public static readonly QColor Yellow = new QColor(255, 255, 0, 255);
|
||||
public static readonly QColor Cyan = new QColor(0, 255, 255, 255);
|
||||
public static readonly QColor Magenta = new QColor(255, 0, 255, 255);
|
||||
public static readonly QColor White = new QColor(255, 255, 255, 255);
|
||||
|
||||
public static explicit operator QColorF(QColor a)
|
||||
{
|
||||
return new QColorF(a.R/255.0f, a.G/255.0f, a.B/255.0f, a.A/255.0f);
|
||||
}
|
||||
}
|
||||
|
||||
public struct QColorF
|
||||
{
|
||||
/// <summary>
|
||||
/// Red channel.
|
||||
/// </summary>
|
||||
public float R;
|
||||
/// <summary>
|
||||
/// Green channel.
|
||||
/// </summary>
|
||||
public float G;
|
||||
/// <summary>
|
||||
/// Blue channel.
|
||||
/// </summary>
|
||||
public float B;
|
||||
/// <summary>
|
||||
/// Alpha channel.
|
||||
/// </summary>
|
||||
public float A;
|
||||
|
||||
public QColorF(float r, float g, float b, float a)
|
||||
{
|
||||
R = r; G = g; B = b; A = a;
|
||||
}
|
||||
public QColorF(float r, float g, float b) : this(r, g, b, 1.0f) { }
|
||||
public QColorF(uint hexCode)
|
||||
{
|
||||
R = ((hexCode >> 24) & 0xFF)/255.0f;
|
||||
G = ((hexCode >> 16) & 0xFF)/255.0f;
|
||||
B = ((hexCode >> 8 ) & 0xFF)/255.0f;
|
||||
A = ((hexCode >> 0 ) & 0xFF)/255.0f;
|
||||
}
|
||||
public QColorF(int hexCode) : this((uint)hexCode) { }
|
||||
|
||||
public static readonly QColorF Black = new QColorF(0, 0, 0, 1.0f);
|
||||
public static readonly QColorF Red = new QColorF(1.0f, 0, 0, 1.0f);
|
||||
public static readonly QColorF Green = new QColorF(0, 1, 0, 1);
|
||||
public static readonly QColorF Blue = new QColorF(0, 0, 1, 1);
|
||||
public static readonly QColorF Yellow = new QColorF(1, 1, 0, 1);
|
||||
public static readonly QColorF Cyan = new QColorF(0, 1, 1, 1);
|
||||
public static readonly QColorF Magenta = new QColorF(1, 0, 1, 1);
|
||||
public static readonly QColorF White = new QColorF(1, 1, 1, 1);
|
||||
|
||||
public static explicit operator QColor(QColorF a)
|
||||
{
|
||||
return new QColor((byte)(a.R * 255), (byte)(a.G * 255), (byte)(a.B * 255), (byte)(a.A * 255));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// A bezier curve segment.
|
||||
/// </summary>
|
||||
[DebuggerDisplay("{Start} -- {ControlA} -- {ControlB} -- {End}")]
|
||||
public struct QBezier
|
||||
{
|
||||
/// <summary>
|
||||
/// Segment start point.
|
||||
/// </summary>
|
||||
public QVec2 Start;
|
||||
|
||||
/// <summary>
|
||||
/// Start point control point.
|
||||
/// </summary>
|
||||
public QVec2 ControlA;
|
||||
|
||||
/// <summary>
|
||||
/// End point control point.
|
||||
/// </summary>
|
||||
public QVec2 ControlB;
|
||||
|
||||
/// <summary>
|
||||
/// Segment end point.
|
||||
/// </summary>
|
||||
public QVec2 End;
|
||||
|
||||
/// <summary>
|
||||
/// An approximation of the arc length of the bezier curve, for calculating rasterization resolution.
|
||||
/// </summary>
|
||||
public float RasterizationArc =>
|
||||
0.5f * (End - Start).Magnitude +
|
||||
0.5f * ((ControlA - Start).Magnitude + (ControlB - ControlA).Magnitude + (End - ControlB).Magnitude);
|
||||
|
||||
public QBezier(QVec2 start, QVec2 controlA, QVec2 controlB, QVec2 end)
|
||||
{
|
||||
Start = start;
|
||||
ControlA = controlA;
|
||||
ControlB = controlB;
|
||||
End = end;
|
||||
}
|
||||
|
||||
public QBezier(
|
||||
float startX,
|
||||
float startY,
|
||||
float controlAx,
|
||||
float controlAy,
|
||||
float controlBx,
|
||||
float controlBy,
|
||||
float endX,
|
||||
float endY)
|
||||
: this(
|
||||
new QVec2(startX, startY),
|
||||
new QVec2(controlAx, controlAy),
|
||||
new QVec2(controlBx, controlBy),
|
||||
new QVec2(endX, endY))
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get a point in the curve segment.
|
||||
/// </summary>
|
||||
/// <param name="t">Control parameter (between 0 and 1)</param>
|
||||
/// <returns>The point on the curve.</returns>
|
||||
public QVec2 GetBezierPoint(float t)
|
||||
{
|
||||
float T = 1 - t;
|
||||
return
|
||||
T * T * T * Start +
|
||||
3 * T * T * t * ControlA +
|
||||
3 * T * t * t * ControlB +
|
||||
t * t * t * End;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get the tangent on the curve.
|
||||
/// </summary>
|
||||
/// <param name="t">Control parameter (between 0 and 1)</param>
|
||||
/// <returns>The tangent curve.</returns>
|
||||
public QVec2 GetBezierTangent(float t)
|
||||
{
|
||||
float T = 1 - t;
|
||||
return
|
||||
(
|
||||
3 * T * T * (ControlA - Start) +
|
||||
6 * T * t * (ControlB - ControlA) +
|
||||
3 * t * t * (End - ControlB)
|
||||
).Normalize();
|
||||
}
|
||||
|
||||
internal QVec2 GetBezierNormal(float t)
|
||||
{
|
||||
QVec2 tangent = GetBezierTangent(t);
|
||||
return new QVec2(-tangent.Y, tangent.X);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A line segment.
|
||||
/// </summary>
|
||||
[DebuggerDisplay("{Start} -- {End}")]
|
||||
public struct QLine
|
||||
{
|
||||
/// <summary>
|
||||
/// Start point.
|
||||
/// </summary>
|
||||
public QVec2 Start;
|
||||
|
||||
/// <summary>
|
||||
/// End point.
|
||||
/// </summary>
|
||||
public QVec2 End;
|
||||
|
||||
public QLine(QVec2 start, QVec2 end)
|
||||
{
|
||||
Start = start;
|
||||
End = end;
|
||||
}
|
||||
|
||||
public QLine(float startX, float startY, float endX, float endY)
|
||||
{
|
||||
Start.X = startX;
|
||||
Start.Y = startY;
|
||||
End.X = endX;
|
||||
End.Y = endY;
|
||||
}
|
||||
|
||||
public QVec2 Normal()
|
||||
{
|
||||
QVec2 tangent = Tangent();
|
||||
return new QVec2(-tangent.Y, tangent.X);
|
||||
}
|
||||
public QVec2 Tangent()
|
||||
{
|
||||
return (End - Start).Normalize();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A rectangle.
|
||||
/// </summary>
|
||||
[DebuggerDisplay("({Left}, {Top}, {Right}, {Bottom})")]
|
||||
public struct QRectangle
|
||||
{
|
||||
/// <summary>
|
||||
/// Position maximum point.
|
||||
/// </summary>
|
||||
public QVec2 Max;
|
||||
|
||||
/// <summary>
|
||||
/// Position minimum point.
|
||||
/// </summary>
|
||||
public QVec2 Min;
|
||||
|
||||
public float Left
|
||||
{
|
||||
get => Min.X;
|
||||
set => Min.X = value;
|
||||
}
|
||||
|
||||
public float Right
|
||||
{
|
||||
get => Max.X;
|
||||
set => Max.X = value;
|
||||
}
|
||||
|
||||
public float Top
|
||||
{
|
||||
get => Min.Y;
|
||||
set => Min.Y = value;
|
||||
}
|
||||
|
||||
public float Bottom
|
||||
{
|
||||
get => Max.Y;
|
||||
set => Max.Y = value;
|
||||
}
|
||||
|
||||
public QVec2 Size
|
||||
{
|
||||
get => Max - Min;
|
||||
set => Max = Min + value;
|
||||
}
|
||||
|
||||
public QRectangle(QVec2 max, QVec2 min)
|
||||
{
|
||||
Max = max;
|
||||
Min = min;
|
||||
}
|
||||
|
||||
public QRectangle(float r, float b, float l, float t)
|
||||
{
|
||||
Max = new QVec2() {X = r, Y = b};
|
||||
Min = new QVec2() {X = l, Y = t};
|
||||
}
|
||||
|
||||
public bool Contains(QVec2 point)
|
||||
{
|
||||
return
|
||||
point.X > Left && point.X < Right &&
|
||||
point.Y > Bottom && point.Y < Top;
|
||||
}
|
||||
|
||||
internal void Translate(in QVec2 offset)
|
||||
{
|
||||
Min += offset;
|
||||
Max += offset;
|
||||
}
|
||||
|
||||
public static QRectangle Intersect(in QRectangle a, in QRectangle b) =>
|
||||
new QRectangle(
|
||||
Math.Max(a.Right, b.Right),
|
||||
Math.Max(a.Bottom, b.Bottom)
|
||||
,
|
||||
Math.Min(a.Left, b.Left),
|
||||
Math.Min(a.Top, b.Top));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// An ellipse.
|
||||
/// </summary>
|
||||
/// <remarks>It is undefined to have an ellipse with non-orthogonal axes.</remarks>
|
||||
[DebuggerDisplay("{Center} ellipse {AxisA}; {AxisB}")]
|
||||
public struct QEllipse
|
||||
{
|
||||
/// <summary>
|
||||
/// Ellipse center point.
|
||||
/// </summary>
|
||||
public QVec2 Center;
|
||||
|
||||
/// <summary>
|
||||
/// First ellipse axis.
|
||||
/// </summary>
|
||||
public QVec2 AxisA;
|
||||
|
||||
/// <summary>
|
||||
/// Second ellipse axis.
|
||||
/// </summary>
|
||||
public QVec2 AxisB;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A triangle.
|
||||
/// </summary>
|
||||
[DebuggerDisplay("{A} -- {B} -- {C}")]
|
||||
public struct QTriangle
|
||||
{
|
||||
/// <summary>
|
||||
/// First vertex.
|
||||
/// </summary>
|
||||
public QVec2 A;
|
||||
|
||||
/// <summary>
|
||||
/// Second vertex.
|
||||
/// </summary>
|
||||
public QVec2 B;
|
||||
|
||||
/// <summary>
|
||||
/// Third vertex.
|
||||
/// </summary>
|
||||
public QVec2 C;
|
||||
}
|
||||
|
||||
[DebuggerDisplay("[{M11} {M12} {M13} {M14}; {M21} {M22} {M23} {M24}; {M31} {M32} {M33} {M34}; {M41} {M42} {M43} {M44}]")]
|
||||
public struct QMat4
|
||||
{
|
||||
public float M11, M21, M31, M41;
|
||||
public float M12, M22, M32, M42;
|
||||
public float M13, M23, M33, M43;
|
||||
public float M14, M24, M34, M44;
|
||||
|
||||
public static QMat4 Identity { get; } = new QMat4()
|
||||
{
|
||||
M11 = 1.0f,
|
||||
M22 = 1.0f,
|
||||
M33 = 1.0f,
|
||||
M44 = 1.0f
|
||||
};
|
||||
|
||||
public static void Translation(out QMat4 mat, float x, float y, float z)
|
||||
{
|
||||
mat = Identity;
|
||||
mat.M41 = x;
|
||||
mat.M42 = y;
|
||||
mat.M43 = z;
|
||||
}
|
||||
|
||||
public static void Scale(out QMat4 mat, float x, float y, float z)
|
||||
{
|
||||
mat = default;
|
||||
mat.M11 = x;
|
||||
mat.M22 = y;
|
||||
mat.M33 = z;
|
||||
mat.M44 = 1.0f;
|
||||
}
|
||||
|
||||
public static void Orthographic(out QMat4 mat, QRectangle bounds, float near = 1, float far = -1)
|
||||
{
|
||||
float a, b, c;
|
||||
mat = Identity;
|
||||
|
||||
a = 1.0f/(bounds.Right - bounds.Left);
|
||||
b = 1.0f/(bounds.Top - bounds.Bottom);
|
||||
c = 1.0f/(far - near);
|
||||
|
||||
mat.M11 = 2 * a;
|
||||
mat.M22 = 2 * b;
|
||||
mat.M33 = -2 * c;
|
||||
|
||||
mat.M14 = -a * (bounds.Left + bounds.Right);
|
||||
mat.M24 = -b * (bounds.Top + bounds.Bottom);
|
||||
mat.M34 = -c * (far + near);
|
||||
mat.M44 = 1.0f;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
Quik/lib
|
||||
========
|
||||
This is where the git submodules of 3rd party native dependencies are supposed
|
||||
to end up at. Also note `lib/quik` is where all common headers go for building
|
||||
these libraries and their distributions.
|
||||
Submodule lib/freetype deleted from 86bc8a9505
1
lib/stb
1
lib/stb
Submodule lib/stb deleted from 5736b15f7e
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user