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

update libraries and fix for new compiler version

Browse Source
This commit is contained in:
Matthew 2026-04-17 16:48:47 +10:00
parent fc67f2512d
commit 61422a21b5
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -26,6 +26,6 @@ for shader in src/shaders/*.glsl; do
$shader_compiler $shader_flags $shader_stage $shader "${shader_out}${base_name}.spv" $shader_compiler $shader_flags $shader_stage $shader "${shader_out}${base_name}.spv"
done done
/bin/bash src/VulkanRenderer/build.sh build #/bin/bash src/VulkanRenderer/build.sh build
/bin/bash src/dlib/build.sh build /bin/bash src/dlib/build.sh build

4
dub.json
View File

@ -13,10 +13,10 @@
"sourcePaths": ["src/editor", "src/dlib", "src/dlib/external/xxhash", "src/VulkanRenderer"], "sourcePaths": ["src/editor", "src/dlib", "src/dlib/external/xxhash", "src/VulkanRenderer"],
"libs-linux": ["X11", "vulkan", "stdc++", "xfixes", "freetype"], "libs-linux": ["X11", "vulkan", "stdc++", "xfixes", "freetype"],
"libs-windows": [], "libs-windows": [],
"versions": ["VULKAN_DEBUG", "ENABLE_RENDERER", "NO_STBI"], "versions": ["VULKAN_DEBUG", "ENABLE_RENDERER", "DLIB"],
"preGenerateCommands-linux": ["./build.sh"], "preGenerateCommands-linux": ["./build.sh"],
"preGenerateCommands-windows": [], "preGenerateCommands-windows": [],
"dflags": ["-P-I/usr/include/freetype2", "-Jbuild", "-Jassets", "-Xcc=-DNO_STBI"], "dflags": ["-P-I/usr/include/freetype2", "-Jbuild", "-Jassets", "-P-DDLIB_INCLUDE_VULKAN"],
"dflags-ldc2": ["-link-debuglib"], "dflags-ldc2": ["-link-debuglib"],
"dflags-dmd": [] "dflags-dmd": []
}, },

2
src/VulkanRenderer

@ -1 +1 @@
Subproject commit 0c5521153f63001273170b09b15a5eaabb289885 Subproject commit b7674e43bde4661dac2a11092826079c57a4d66c

2
src/dlib

@ -1 +1 @@
Subproject commit 53dbb8bf3492f99418f129d54184d8eddc895338 Subproject commit 8690e93b41ffe7bba528b76dfa749ee4bb6f28d5

15
src/editor/ui.d
View File

@ -409,6 +409,8 @@ InitUI(Ctx* ctx)
alpha_op: BO.Add, alpha_op: BO.Add,
}; };
CreateGraphicsPipeline(&ctx.pipeline, &ui_info);
for(u32 i = 0; i < ctx.font_descs.length; i += 1) for(u32 i = 0; i < ctx.font_descs.length; i += 1)
{ {
CreateDescriptor(&ctx.font_descs[i], DescInfo( CreateDescriptor(&ctx.font_descs[i], DescInfo(
@ -425,7 +427,6 @@ InitUI(Ctx* ctx)
ctx.font_sets[i].index = i; ctx.font_sets[i].index = i;
} }
CreateGraphicsPipeline(&ctx.pipeline, &ui_info);
CreateDescriptor(&ctx.sampler, DescInfo( CreateDescriptor(&ctx.sampler, DescInfo(
type: DT.Sampler, type: DT.Sampler,
mipmap_mode: MipmapMode.Nearest, mipmap_mode: MipmapMode.Nearest,
@ -1740,8 +1741,8 @@ SetNil(Args...)(Args args)
void void
Clamp(Ctx* ctx, Vertex* v) Clamp(Ctx* ctx, Vertex* v)
{ {
v.dst_start = Clamp(v.dst_start, Vec2(0.0), Vec2(ctx.res)); v.dst_start = Clamp(v.dst_start, Vec2(0.0), cast(Vec2)ctx.res);
v.dst_end = Clamp(v.dst_end, Vec2(0.0), Vec2(ctx.res)); v.dst_end = Clamp(v.dst_end, Vec2(0.0), cast(Vec2)ctx.res);
} }
bool bool
@ -1756,11 +1757,11 @@ UpdateState(f32* v, bool cond)
{ {
*v += g_ctx.animation_rate * (cast(f32)(cond) - *v); *v += g_ctx.animation_rate * (cast(f32)(cond) - *v);
f32 diff = fabsf((*v)-1.0); f32 diff = fabsf((*v)-1.0);
if(diff < 0.00009) if(cond && diff < 0.00009)
{ {
*v = 1.0; *v = 1.0;
} }
else if(diff > 0.99998) else if(!cond && diff > 0.99998)
{ {
*v = 0.0; *v = 0.0;
} }
@ -2193,7 +2194,7 @@ SetReady(UIItem* item, bool ready)
{ {
item.ready_t = 1.0; item.ready_t = 1.0;
} }
else if(item.ready_t < 0.0009) else if(!ready && item.ready_t < 0.0009)
{ {
item.ready_t = 0.0; item.ready_t = 0.0;
} }
@ -2208,7 +2209,7 @@ SetHot(UIItem* item, bool hot)
{ {
item.hot_t = 1.0; item.hot_t = 1.0;
} }
else if(item.hot_t < 0.0009) else if(!hot && item.hot_t < 0.0009)
{ {
item.hot_t = 0.0; item.hot_t = 0.0;
} }