annotate tests/test_text.nim @ 1378:31f57a969ffd

fix: make text-tests buildable again
author sam <sam@basx.dev>
date Sun, 08 Dec 2024 22:00:31 +0700
parents 92c089136a05
children 4aa9e703af48
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
1 import std/os
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
2 import std/algorithm
1238
03634915bbdb add: tests for updating texts, does not pass validation atm
sam <sam@basx.dev>
parents: 1237
diff changeset
3 import std/strutils
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
4 import std/sequtils
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
5 import std/monotimes
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
6 import std/times
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
7 import std/options
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
8 import std/random
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
9
1267
4cf9872f7bb6 did: rename back to old name (no v2)
sam <sam@basx.dev>
parents: 1241
diff changeset
10 import ../semicongine
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
11
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
12 type FontDS = object
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
13 fontAtlas: Image[Gray]
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
14
1378
31f57a969ffd fix: make text-tests buildable again
sam <sam@basx.dev>
parents: 1374
diff changeset
15 proc test_01_static_label(time: float32) =
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
16 var font = loadFont("Overhaul.ttf", lineHeightPixels = 160)
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
17 var renderdata = initRenderData()
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
18 var pipeline =
1378
31f57a969ffd fix: make text-tests buildable again
sam <sam@basx.dev>
parents: 1374
diff changeset
19 createPipeline[DefaultFontShader[FontDS]](renderPass = vulkan.swapchain.renderPass)
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
20
1378
31f57a969ffd fix: make text-tests buildable again
sam <sam@basx.dev>
parents: 1374
diff changeset
21 var ds = asDescriptorSetData(FontDS(fontAtlas: font.fontAtlas.copy()))
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
22 uploadImages(renderdata, ds)
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
23 initDescriptorSet(renderdata, pipeline.layout(0), ds)
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
24
1378
31f57a969ffd fix: make text-tests buildable again
sam <sam@basx.dev>
parents: 1374
diff changeset
25 var label1 =
31f57a969ffd fix: make text-tests buildable again
sam <sam@basx.dev>
parents: 1374
diff changeset
26 initTextbox(renderdata, pipeline.layout(0), font, 0.0005, "Hello semicongine!")
31f57a969ffd fix: make text-tests buildable again
sam <sam@basx.dev>
parents: 1374
diff changeset
27
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
28 var start = getMonoTime()
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
29 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1378
31f57a969ffd fix: make text-tests buildable again
sam <sam@basx.dev>
parents: 1374
diff changeset
30 label1.refresh()
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
31 withNextFrame(framebuffer, commandbuffer):
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
32 bindDescriptorSet(commandbuffer, ds, 0, pipeline)
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
33 withRenderPass(
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
34 vulkan.swapchain.renderPass,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
35 framebuffer,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
36 commandbuffer,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
37 vulkan.swapchain.width,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
38 vulkan.swapchain.height,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
39 vec4(0, 0, 0, 0),
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
40 ):
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
41 withPipeline(commandbuffer, pipeline):
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
42 render(commandbuffer, pipeline, label1, vec3(), vec4(1, 1, 1, 1))
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
43
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
44 # cleanup
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
45 checkVkResult vkDeviceWaitIdle(vulkan.device)
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
46 destroyPipeline(pipeline)
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
47 destroyRenderData(renderdata)
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
48
1378
31f57a969ffd fix: make text-tests buildable again
sam <sam@basx.dev>
parents: 1374
diff changeset
49 #[
31f57a969ffd fix: make text-tests buildable again
sam <sam@basx.dev>
parents: 1374
diff changeset
50 proc test_01_static_label_new(time: float32) =
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
51 var font = loadFont("Overhaul.ttf", lineHeightPixels = 160)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
52 var renderdata = initRenderData()
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
53 var pipeline =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
54 createPipeline[DefaultFontShader[FontDS]](renderPass = vulkan.swapchain.renderPass)
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
55
1335
f2ff6f624932 fix: image copies of font atlas
sam <sam@basx.dev>
parents: 1332
diff changeset
56 var ds = asDescriptorSetData(FontDS(fontAtlas: font.fontAtlas.copy()))
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
57 uploadImages(renderdata, ds)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
58 initDescriptorSet(renderdata, pipeline.layout(0), ds)
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
59
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
60 var label1 =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
61 initTextbox(renderdata, pipeline.layout(0), font, 0.0005, "Hello semicongine!")
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
62
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
63 var start = getMonoTime()
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
64 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
65 label1.refresh()
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
66 withNextFrame(framebuffer, commandbuffer):
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
67 bindDescriptorSet(commandbuffer, ds, 0, pipeline)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
68 withRenderPass(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
69 vulkan.swapchain.renderPass,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
70 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
71 commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
72 vulkan.swapchain.width,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
73 vulkan.swapchain.height,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
74 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
75 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
76 withPipeline(commandbuffer, pipeline):
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
77 proc render(
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
78 commandBuffer = commandbuffer,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
79 pipeline = pipeline,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
80 mesh: TMesh,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
81 instances: TInstance,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
82 fixedVertexCount = -1,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
83 fixedInstanceCount = -1,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
84 )
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
85
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
86 # cleanup
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
87 checkVkResult vkDeviceWaitIdle(vulkan.device)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
88 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
89 destroyRenderData(renderdata)
1378
31f57a969ffd fix: make text-tests buildable again
sam <sam@basx.dev>
parents: 1374
diff changeset
90 ]#
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
91
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
92 proc test_02_multiple_animated(time: float32) =
1282
3308b88e53a6 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
93 var font1 = loadFont("Overhaul.ttf", lineHeightPixels = 40)
3308b88e53a6 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
94 var font2 = loadFont("Overhaul.ttf", lineHeightPixels = 160)
3308b88e53a6 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
95 var font3 = loadFont("DejaVuSans.ttf", lineHeightPixels = 160)
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
96 var renderdata = initRenderData()
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
97
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
98 var pipeline =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
99 createPipeline[DefaultFontShader[FontDS]](renderPass = vulkan.swapchain.renderPass)
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
100
1335
f2ff6f624932 fix: image copies of font atlas
sam <sam@basx.dev>
parents: 1332
diff changeset
101 var ds1 = asDescriptorSetData(FontDS(fontAtlas: font1.fontAtlas.copy()))
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
102 uploadImages(renderdata, ds1)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
103 initDescriptorSet(renderdata, pipeline.layout(0), ds1)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
104
1335
f2ff6f624932 fix: image copies of font atlas
sam <sam@basx.dev>
parents: 1332
diff changeset
105 var ds2 = asDescriptorSetData(FontDS(fontAtlas: font2.fontAtlas.copy()))
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
106 uploadImages(renderdata, ds2)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
107 initDescriptorSet(renderdata, pipeline.layout(0), ds2)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
108
1335
f2ff6f624932 fix: image copies of font atlas
sam <sam@basx.dev>
parents: 1332
diff changeset
109 var ds3 = asDescriptorSetData(FontDS(fontAtlas: font3.fontAtlas.copy()))
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
110 uploadImages(renderdata, ds3)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
111 initDescriptorSet(renderdata, pipeline.layout(0), ds3)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
112
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
113 var labels = [
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
114 initTextbox(renderdata, pipeline.layout(0), font1, 0.004, " 0"),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
115 initTextbox(renderdata, pipeline.layout(0), font2, 0.001, " 1"),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
116 initTextbox(renderdata, pipeline.layout(0), font3, 0.001, " 2"),
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
117 ]
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
118
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
119 var start = getMonoTime()
1238
03634915bbdb add: tests for updating texts, does not pass validation atm
sam <sam@basx.dev>
parents: 1237
diff changeset
120 var p = 0
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
121 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
122 let progress = ((getMonoTime() - start).inMilliseconds().int / 1000) / time
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
123 for i in 0 ..< labels.len:
1238
03634915bbdb add: tests for updating texts, does not pass validation atm
sam <sam@basx.dev>
parents: 1237
diff changeset
124 labels[i].text = $(p + i)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
125 labels[i].refresh()
1238
03634915bbdb add: tests for updating texts, does not pass validation atm
sam <sam@basx.dev>
parents: 1237
diff changeset
126 inc p
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
127 withNextFrame(framebuffer, commandbuffer):
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
128 withRenderPass(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
129 vulkan.swapchain.renderPass,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
130 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
131 commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
132 vulkan.swapchain.width,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
133 vulkan.swapchain.height,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
134 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
135 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
136 withPipeline(commandbuffer, pipeline):
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
137 bindDescriptorSet(commandbuffer, ds1, 0, pipeline)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
138 render(
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
139 commandbuffer,
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
140 pipeline,
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
141 labels[0],
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
142 position = vec3(0 / labels.len, 0.1 + progress * 0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
143 color = vec4(1, 1, 1, 1),
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
144 )
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
145 bindDescriptorSet(commandbuffer, ds2, 0, pipeline)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
146 render(
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
147 commandbuffer,
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
148 pipeline,
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
149 labels[1],
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
150 position = vec3(1 / labels.len, 0.1 + progress * 0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
151 color = vec4(1, 1, 1, 1),
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
152 )
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
153 bindDescriptorSet(commandbuffer, ds3, 0, pipeline)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
154 render(
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
155 commandbuffer,
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
156 pipeline,
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
157 labels[2],
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
158 position = vec3(2 / labels.len, 0.1 + progress * 0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
159 color = vec4(1, 1, 1, 1),
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
160 )
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
161
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
162 # cleanup
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
163 checkVkResult vkDeviceWaitIdle(vulkan.device)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
164 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
165 destroyRenderData(renderdata)
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
166
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
167 proc test_03_layouting(time: float32) =
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
168 var font = loadFont("DejaVuSans.ttf", lineHeightPixels = 40)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
169 var renderdata = initRenderData()
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
170
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
171 var pipeline =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
172 createPipeline[DefaultFontShader[FontDS]](renderPass = vulkan.swapchain.renderPass)
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
173
1335
f2ff6f624932 fix: image copies of font atlas
sam <sam@basx.dev>
parents: 1332
diff changeset
174 var ds = asDescriptorSetData(FontDS(fontAtlas: font.fontAtlas.copy()))
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
175 uploadImages(renderdata, ds)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
176 initDescriptorSet(renderdata, pipeline.layout(0), ds)
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
177
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
178 var labels: seq[Textbox]
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
179
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
180 for horizontal in HorizontalAlignment:
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
181 labels.add initTextbox(
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
182 renderdata,
1292
5de466f5f087 add: color utils and textbox refactoring
sam <sam@basx.dev>
parents: 1283
diff changeset
183 pipeline.layout(0),
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
184 font,
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
185 0.001,
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
186 $horizontal & " aligned",
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
187 horizontalAlignment = horizontal,
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
188 )
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
189 for vertical in VerticalAlignment:
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
190 labels.add initTextbox(
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
191 renderdata,
1292
5de466f5f087 add: color utils and textbox refactoring
sam <sam@basx.dev>
parents: 1283
diff changeset
192 pipeline.layout(0),
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
193 font,
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
194 0.001,
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
195 $vertical & " aligned",
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
196 verticalAlignment = vertical,
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
197 )
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
198 labels.add initTextbox(
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
199 renderdata,
1292
5de466f5f087 add: color utils and textbox refactoring
sam <sam@basx.dev>
parents: 1283
diff changeset
200 pipeline.layout(0),
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
201 font,
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
202 0.001,
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
203 """Paragraph
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
204 This is a somewhat longer paragraph with a few newlines and a maximum width of 0.2.
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
205
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
206 It should display with some space above and have a pleasing appearance overall! :)""",
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
207 maxWidth = 0.6,
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
208 verticalAlignment = Top,
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
209 horizontalAlignment = Left,
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
210 )
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
211
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
212 var start = getMonoTime()
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
213 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
214 let progress = ((getMonoTime() - start).inMilliseconds().int / 1000) / time
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
215 withNextFrame(framebuffer, commandbuffer):
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
216 bindDescriptorSet(commandbuffer, ds, 0, pipeline)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
217 withRenderPass(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
218 vulkan.swapchain.renderPass,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
219 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
220 commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
221 vulkan.swapchain.width,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
222 vulkan.swapchain.height,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
223 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
224 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
225 withPipeline(commandbuffer, pipeline):
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
226 for i in 0 ..< labels.len:
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
227 render(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
228 commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
229 pipeline,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
230 labels[i],
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
231 vec3(0.5 - i.float32 * 0.1, 0.5 - i.float32 * 0.1),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
232 vec4(1, 1, 1, 1),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
233 )
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
234
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
235 # cleanup
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
236 checkVkResult vkDeviceWaitIdle(vulkan.device)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
237 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
238 destroyRenderData(renderdata)
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
240 proc test_04_lots_of_texts(time: float32) =
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
241 var font = loadFont("DejaVuSans.ttf", lineHeightPixels = 160)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
242 var renderdata = initRenderData()
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
243
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
244 var pipeline =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
245 createPipeline[DefaultFontShader[FontDS]](renderPass = vulkan.swapchain.renderPass)
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
246
1335
f2ff6f624932 fix: image copies of font atlas
sam <sam@basx.dev>
parents: 1332
diff changeset
247 var ds = asDescriptorSetData(FontDS(fontAtlas: font.fontAtlas.copy()))
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
248 uploadImages(renderdata, ds)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
249 initDescriptorSet(renderdata, pipeline.layout(0), ds)
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
250
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
251 var labels: seq[Textbox]
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
252 var positions = newSeq[Vec3f](100)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
253 var colors = newSeq[Vec4f](100)
1329
ad09d41abd1e add: 2d-scaling for text
sam <sam@basx.dev>
parents: 1327
diff changeset
254 var scales = newSeq[Vec2f](100)
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
255 for i in 0 ..< 100:
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
256 positions[i] = vec3(rand(-0.5 .. 0.5), rand(-0.5 .. 0.5), rand(-0.1 .. 0.1))
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
257 colors[i] =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
258 vec4(rand(0.5 .. 1.0), rand(0.5 .. 1.0), rand(0.5 .. 1.0), rand(0.5 .. 1.0))
1329
ad09d41abd1e add: 2d-scaling for text
sam <sam@basx.dev>
parents: 1327
diff changeset
259 scales[i] = vec2(rand(0.5'f32 .. 1.5'f32), rand(0.5'f32 .. 1.5'f32))
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
260 labels.add initTextbox(renderdata, pipeline.layout(0), font, 0.001, $i)
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
261
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
262 var start = getMonoTime()
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
263 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
264 for l in labels.mitems:
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
265 l.refresh()
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
266 withNextFrame(framebuffer, commandbuffer):
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
267 bindDescriptorSet(commandbuffer, ds, 0, pipeline)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
268 withRenderPass(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
269 vulkan.swapchain.renderPass,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
270 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
271 commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
272 vulkan.swapchain.width,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
273 vulkan.swapchain.height,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
274 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
275 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
276 withPipeline(commandbuffer, pipeline):
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
277 for i in 0 ..< labels.len:
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
278 render(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
279 commandbuffer, pipeline, labels[i], positions[i], colors[i], scales[i]
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
280 )
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
281
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
282 # cleanup
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
283 checkVkResult vkDeviceWaitIdle(vulkan.device)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
284 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
285 destroyRenderData(renderdata)
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
286
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
287 when isMainModule:
1241
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
288 var time = 1'f32
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
289 initVulkan()
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
290
1241
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
291 for depthBuffer in [true, false]:
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
292 var renderpass = createDirectPresentationRenderPass(depthBuffer = depthBuffer)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
293 setupSwapchain(renderpass = renderpass)
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
294
1241
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
295 # tests a simple triangle with minimalistic shader and vertex format
1378
31f57a969ffd fix: make text-tests buildable again
sam <sam@basx.dev>
parents: 1374
diff changeset
296 # test_01_static_label_new(time)
1241
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
297 test_01_static_label(time)
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
298 test_02_multiple_animated(time)
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
299 test_03_layouting(time)
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
300 test_04_lots_of_texts(time)
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
301
1241
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
302 checkVkResult vkDeviceWaitIdle(vulkan.device)
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
303 vkDestroyRenderPass(vulkan.device, renderpass.vk, nil)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
304 clearSwapchain()
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
305
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
306 destroyVulkan()