sleepy-day/editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update dependencies, now using xlib via dlib

Browse Source
This commit is contained in:
Matthew 2025-11-30 17:11:32 +11:00
parent 82cb3cb357
commit ea8bc59753
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dub.json
View File

@ -11,7 +11,7 @@
"sourceFiles-windows": [], "sourceFiles-windows": [],
"importPaths": ["src/editor", "src/dlib", "src/dlib/external/xxhash", "src/VulkanRenderer"], "importPaths": ["src/editor", "src/dlib", "src/dlib/external/xxhash", "src/VulkanRenderer"],
"sourcePaths": ["src/editor", "src/dlib", "src/dlib/external/xxhash", "src/VulkanRenderer"], "sourcePaths": ["src/editor", "src/dlib", "src/dlib/external/xxhash", "src/VulkanRenderer"],
"libs-linux": ["xcb", "X11", "X11-xcb", "vulkan", "stdc++", "xcb-xfixes", "freetype"], "libs-linux": ["X11", "vulkan", "stdc++", "xfixes", "freetype"],
"libs-windows": [], "libs-windows": [],
"versions": ["VULKAN_DEBUG"], "versions": ["VULKAN_DEBUG"],
"preGenerateCommands-linux": ["./build.sh"], "preGenerateCommands-linux": ["./build.sh"],

2
src/VulkanRenderer

@ -1 +1 @@
Subproject commit c42238a456f5048c7d1b2d5ebd71ecf13bb10ece Subproject commit 6bd47180639496b491fba904d382f3f9c47cd627

2
src/dlib

@ -1 +1 @@
Subproject commit 10b5c0a127ef5fd5a18b956d2d112cae75017150 Subproject commit a9607ec0cdd179f45165ffe56393578c85379615

8
src/editor/main.d
View File

@ -18,7 +18,13 @@ void main(string[] argv)
f.close(); f.close();
} }
PlatformWindow window = CreateWindow("Editor", 1920, 1080); PlatformWindow window;
if(!CreateWindow(&window, "Editor", 1920, 1080))
{
Errf("Unable to create window: %s", WindowError());
return;
}
StartPlatformThread(&window); StartPlatformThread(&window);
EditorCtx ctx = InitEditorCtx(&window); EditorCtx ctx = InitEditorCtx(&window);

7
src/editor/ui.d
View File

@ -728,8 +728,8 @@ InitUICtx(PlatformWindow* window)
version(linux) version(linux)
{ {
PlatformHandles handles = { PlatformHandles handles = {
display: window.display,
window: window.window, window: window.window,
conn: window.conn,
}; };
} }
@ -814,10 +814,9 @@ InitUICtx(PlatformWindow* window)
CreateGraphicsPipeline(&ctx.rd, &ctx.pipeline, &ui_info); CreateGraphicsPipeline(&ctx.rd, &ctx.pipeline, &ui_info);
CreateImageView(&ctx.rd, &ctx.font_atlas, ctx.atlas_buf.atlas.width, ctx.atlas_buf.atlas.height, 4, ctx.atlas_buf.data); CreateImageView(&ctx.rd, &ctx.font_atlas, ctx.atlas_buf.atlas.width, ctx.atlas_buf.atlas.height, 4, ctx.atlas_buf.data, DT.Image, 0);
ctx.sampler = CreateSampler(&ctx.rd, MipmapMode.Nearest); ctx.sampler = CreateSampler(&ctx.rd, MipmapMode.Nearest, 1);
ctx.sampler.binding = 1;
Write(&ctx.rd, ctx.desc_set, [ctx.font_atlas, ctx.sampler]); Write(&ctx.rd, ctx.desc_set, [ctx.font_atlas, ctx.sampler]);