annotate tests/test_text.nim @ 1403:02d302c868d5

fix: font-rendering alignment, still something off with positioning
author sam <sam@basx.dev>
date Wed, 18 Dec 2024 23:39:54 +0700
parents caf441eebc23
children 80cfa19d1e2c
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
1381
c8d1b87cf6c8 did: make progress on new glyph-rendering system
sam <sam@basx.dev>
parents: 1380
diff changeset
7 import std/tables
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
8 import std/options
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
9 import std/random
1381
c8d1b87cf6c8 did: make progress on new glyph-rendering system
sam <sam@basx.dev>
parents: 1380
diff changeset
10 import std/unicode
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
11
1267
4cf9872f7bb6 did: rename back to old name (no v2)
sam <sam@basx.dev>
parents: 1241
diff changeset
12 import ../semicongine
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
13
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
14 type FontDS = object
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
15 fontAtlas: Image[Gray]
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
16
1379
9ca552dad5fc did: continue working on new glyph-renderer
sam <sam@basx.dev>
parents: 1374
diff changeset
17 type EMPTY = object
9ca552dad5fc did: continue working on new glyph-renderer
sam <sam@basx.dev>
parents: 1374
diff changeset
18
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
19 const MAX_GLYPHS = 200
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
20 proc test_01_static_label_new(time: float32) =
1403
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
21 # var font = loadFont[MAX_GLYPHS]("Overhaul.ttf", lineHeightPixels = 200)
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
22 var font = loadFont[MAX_GLYPHS]("DejaVuSans.ttf", lineHeightPixels = 200)
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
23 var renderdata = initRenderData()
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
24 var pipeline =
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
25 createPipeline[GlyphShader[MAX_GLYPHS]](renderPass = vulkan.swapchain.renderPass)
1401
4ecb004ee7f8 did: add horizontal advancment for glyph rendering
sam <sam@basx.dev>
parents: 1400
diff changeset
26 var glyphs = font.initGlyphs(1000, baseScale = 0.1)
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
27
1379
9ca552dad5fc did: continue working on new glyph-renderer
sam <sam@basx.dev>
parents: 1374
diff changeset
28 assignBuffers(renderdata, glyphs)
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
29 assignBuffers(renderdata, font.descriptorSet)
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
30 uploadImages(renderdata, font.descriptorSet)
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
31 initDescriptorSet(renderdata, pipeline.layout(0), font.descriptorSet)
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
32
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
33 var start = getMonoTime()
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
34 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
1400
20602878744e did: finished basic implementation of new glyph-rendering system
sam <sam@basx.dev>
parents: 1399
diff changeset
35 let t = getMonoTime()
20602878744e did: finished basic implementation of new glyph-rendering system
sam <sam@basx.dev>
parents: 1399
diff changeset
36 glyphs.reset()
1403
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
37 glyphs.add("+", vec3(0.0, 0.0), anchor = vec2(0.5, 0.5), color = vec4(0, 0, 0, 1))
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
38 glyphs.add(
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
39 "Hello world\nHow are you today?\nWell, I am fine".toRunes(),
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
40 vec3(0.5, 0.5),
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
41 alignment = Right,
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
42 anchor = vec2(1, 0.5),
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
43 color = vec4(0, 0, 0, 1),
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
44 )
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
45 glyphs.add(
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
46 "Hello world\nHow are you today?\nWell, I am fine".toRunes(),
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
47 vec3(0.5, 0.5),
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
48 alignment = Left,
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
49 anchor = vec2(0, 0.5),
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
50 color = vec4(0, 0, 0, 1),
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
51 )
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
52 glyphs.add("semi-\ncon-\ngine".toRunes(), vec3(0.5, -0.5), color = vec4(0, 0, 0, 1))
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
53 glyphs.add("semi-\ncon-\ngine".toRunes(), vec3(-0.5, 0.5), color = vec4(0, 0, 0, 1))
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
54 # glyphs.add("11111111111111111", vec3(0.5, 0.5), vec2(1, 0))
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
55 # glyphs.add("22222222222222222", vec3(0.5, 0.5))
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
56 # glyphs.add("33333333333333333", vec3(0.5, 0.5), vec2(0, 1))
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
57 glyphs.add("semi-\ncon-\ngineb".toRunes(), vec3(0.1, 0.9), color = vec4(0, 0, 0, 1))
1400
20602878744e did: finished basic implementation of new glyph-rendering system
sam <sam@basx.dev>
parents: 1399
diff changeset
58 glyphs.updateAllGPUBuffers(flush = true)
20602878744e did: finished basic implementation of new glyph-rendering system
sam <sam@basx.dev>
parents: 1399
diff changeset
59
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
60 withNextFrame(framebuffer, commandbuffer):
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
61 bindDescriptorSet(commandbuffer, font.descriptorSet, 0, pipeline)
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
62 withRenderPass(
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
63 vulkan.swapchain.renderPass,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
64 framebuffer,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
65 commandbuffer,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
66 vulkan.swapchain.width,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
67 vulkan.swapchain.height,
1403
02d302c868d5 fix: font-rendering alignment, still something off with positioning
sam <sam@basx.dev>
parents: 1402
diff changeset
68 vec4(1, 1, 1, 1),
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
69 ):
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
70 withPipeline(commandbuffer, pipeline):
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
71 renderGlyphs(commandbuffer, pipeline, glyphs)
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
72
1400
20602878744e did: finished basic implementation of new glyph-rendering system
sam <sam@basx.dev>
parents: 1399
diff changeset
73 # cleanup
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
74 checkVkResult vkDeviceWaitIdle(vulkan.device)
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
75 destroyPipeline(pipeline)
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
76 destroyRenderData(renderdata)
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
77
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
78 #[
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
79 proc test_01_static_label(time: float32) =
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
80 var font = loadFont[MAX_GLYPHS]("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
81 var renderdata = initRenderData()
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
82 var pipeline =
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
83 createPipeline[GlyphShader[MAX_GLYPHS]](renderPass = vulkan.swapchain.renderPass)
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
84
1335
f2ff6f624932 fix: image copies of font atlas
sam <sam@basx.dev>
parents: 1332
diff changeset
85 var ds = asDescriptorSetData(FontDS(fontAtlas: font.fontAtlas.copy()))
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
86 uploadImages(renderdata, ds)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
87 initDescriptorSet(renderdata, pipeline.layout(0), ds)
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
88
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
89 var label1 =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
90 initTextbox(renderdata, pipeline.layout(0), font, 0.0005, "Hello semicongine!")
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
91
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
92 var start = getMonoTime()
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
93 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
94 label1.refresh()
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
95 withNextFrame(framebuffer, commandbuffer):
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
96 bindDescriptorSet(commandbuffer, ds, 0, pipeline)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
97 withRenderPass(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
98 vulkan.swapchain.renderPass,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
99 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
100 commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
101 vulkan.swapchain.width,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
102 vulkan.swapchain.height,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
103 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
104 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
105 withPipeline(commandbuffer, pipeline):
1379
9ca552dad5fc did: continue working on new glyph-renderer
sam <sam@basx.dev>
parents: 1374
diff changeset
106 render(commandbuffer, pipeline, label1, vec3(), vec4(1, 1, 1, 1))
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
107 # cleanup
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
108 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
109 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
110 destroyRenderData(renderdata)
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
111
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
112 proc test_02_multiple_animated(time: float32) =
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
113 var font1 = loadFont[MAX_GLYPHS]("Overhaul.ttf", lineHeightPixels = 40)
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
114 var font2 = loadFont[MAX_GLYPHS]("Overhaul.ttf", lineHeightPixels = 160)
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
115 var font3 = loadFont[MAX_GLYPHS]("DejaVuSans.ttf", lineHeightPixels = 160)
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
116 var renderdata = initRenderData()
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
117
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
118 var pipeline =
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
119 createPipeline[GlyphShader[MAX_GLYPHS]](renderPass = vulkan.swapchain.renderPass)
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
120
1335
f2ff6f624932 fix: image copies of font atlas
sam <sam@basx.dev>
parents: 1332
diff changeset
121 var ds1 = asDescriptorSetData(FontDS(fontAtlas: font1.fontAtlas.copy()))
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
122 uploadImages(renderdata, ds1)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
123 initDescriptorSet(renderdata, pipeline.layout(0), ds1)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
124
1335
f2ff6f624932 fix: image copies of font atlas
sam <sam@basx.dev>
parents: 1332
diff changeset
125 var ds2 = asDescriptorSetData(FontDS(fontAtlas: font2.fontAtlas.copy()))
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
126 uploadImages(renderdata, ds2)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
127 initDescriptorSet(renderdata, pipeline.layout(0), ds2)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
128
1335
f2ff6f624932 fix: image copies of font atlas
sam <sam@basx.dev>
parents: 1332
diff changeset
129 var ds3 = asDescriptorSetData(FontDS(fontAtlas: font3.fontAtlas.copy()))
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
130 uploadImages(renderdata, ds3)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
131 initDescriptorSet(renderdata, pipeline.layout(0), ds3)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
132
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
133 var labels = [
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
134 initTextbox(renderdata, pipeline.layout(0), font1, 0.004, " 0"),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
135 initTextbox(renderdata, pipeline.layout(0), font2, 0.001, " 1"),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
136 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
137 ]
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
138
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
139 var start = getMonoTime()
1238
03634915bbdb add: tests for updating texts, does not pass validation atm
sam <sam@basx.dev>
parents: 1237
diff changeset
140 var p = 0
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
141 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
142 let progress = ((getMonoTime() - start).inMilliseconds().int / 1000) / time
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
143 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
144 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
145 labels[i].refresh()
1238
03634915bbdb add: tests for updating texts, does not pass validation atm
sam <sam@basx.dev>
parents: 1237
diff changeset
146 inc p
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
147 withNextFrame(framebuffer, commandbuffer):
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
148 withRenderPass(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
149 vulkan.swapchain.renderPass,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
150 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
151 commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
152 vulkan.swapchain.width,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
153 vulkan.swapchain.height,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
154 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
155 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
156 withPipeline(commandbuffer, pipeline):
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
157 bindDescriptorSet(commandbuffer, ds1, 0, pipeline)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
158 render(
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
159 commandbuffer,
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
160 pipeline,
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
161 labels[0],
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
162 position = vec3(0 / labels.len, 0.1 + progress * 0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
163 color = vec4(1, 1, 1, 1),
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
164 )
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
165 bindDescriptorSet(commandbuffer, ds2, 0, pipeline)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
166 render(
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
167 commandbuffer,
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
168 pipeline,
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
169 labels[1],
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
170 position = vec3(1 / labels.len, 0.1 + progress * 0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
171 color = vec4(1, 1, 1, 1),
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
172 )
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
173 bindDescriptorSet(commandbuffer, ds3, 0, pipeline)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
174 render(
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
175 commandbuffer,
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
176 pipeline,
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
177 labels[2],
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
178 position = vec3(2 / labels.len, 0.1 + progress * 0.5),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
179 color = vec4(1, 1, 1, 1),
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
180 )
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
181
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
182 # cleanup
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
183 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
184 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
185 destroyRenderData(renderdata)
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
186
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
187 proc test_03_layouting(time: float32) =
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
188 var font = loadFont[MAX_GLYPHS]("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
189 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
190
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
191 var pipeline =
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
192 createPipeline[GlyphShader[MAX_GLYPHS]](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
193
1335
f2ff6f624932 fix: image copies of font atlas
sam <sam@basx.dev>
parents: 1332
diff changeset
194 var ds = asDescriptorSetData(FontDS(fontAtlas: font.fontAtlas.copy()))
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
195 uploadImages(renderdata, ds)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
196 initDescriptorSet(renderdata, pipeline.layout(0), ds)
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
197
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
198 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
199
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
200 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
201 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
202 renderdata,
1292
5de466f5f087 add: color utils and textbox refactoring
sam <sam@basx.dev>
parents: 1283
diff changeset
203 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
204 font,
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
205 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
206 $horizontal & " aligned",
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
207 horizontalAlignment = horizontal,
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
208 )
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
209 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
210 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
211 renderdata,
1292
5de466f5f087 add: color utils and textbox refactoring
sam <sam@basx.dev>
parents: 1283
diff changeset
212 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
213 font,
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
214 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
215 $vertical & " aligned",
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
216 verticalAlignment = vertical,
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
217 )
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
218 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
219 renderdata,
1292
5de466f5f087 add: color utils and textbox refactoring
sam <sam@basx.dev>
parents: 1283
diff changeset
220 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
221 font,
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
222 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
223 """Paragraph
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
224 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
225
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
226 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
227 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
228 verticalAlignment = Top,
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
229 horizontalAlignment = Left,
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
230 )
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
231
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
232 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
233 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
234 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
235 withNextFrame(framebuffer, commandbuffer):
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
236 bindDescriptorSet(commandbuffer, ds, 0, pipeline)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
237 withRenderPass(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
238 vulkan.swapchain.renderPass,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
239 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
240 commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
241 vulkan.swapchain.width,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
242 vulkan.swapchain.height,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
243 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
244 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
245 withPipeline(commandbuffer, pipeline):
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
246 for i in 0 ..< labels.len:
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
247 render(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
248 commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
249 pipeline,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
250 labels[i],
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
251 vec3(0.5 - i.float32 * 0.1, 0.5 - i.float32 * 0.1),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
252 vec4(1, 1, 1, 1),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
253 )
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
254
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
255 # cleanup
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
256 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
257 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
258 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
259
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
260 proc test_04_lots_of_texts(time: float32) =
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
261 var font = loadFont[MAX_GLYPHS]("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
262 var renderdata = initRenderData()
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
263
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
264 var pipeline =
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
265 createPipeline[GlyphShader[MAX_GLYPHS]](renderPass = vulkan.swapchain.renderPass)
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
266
1335
f2ff6f624932 fix: image copies of font atlas
sam <sam@basx.dev>
parents: 1332
diff changeset
267 var ds = asDescriptorSetData(FontDS(fontAtlas: font.fontAtlas.copy()))
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
268 uploadImages(renderdata, ds)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
269 initDescriptorSet(renderdata, pipeline.layout(0), ds)
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
270
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
271 var labels: seq[Textbox]
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
272 var positions = newSeq[Vec3f](100)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
273 var colors = newSeq[Vec4f](100)
1329
ad09d41abd1e add: 2d-scaling for text
sam <sam@basx.dev>
parents: 1327
diff changeset
274 var scales = newSeq[Vec2f](100)
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
275 for i in 0 ..< 100:
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
276 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
277 colors[i] =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
278 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
279 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
280 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
281
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
282 var start = getMonoTime()
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
283 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
284 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
285 l.refresh()
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
286 withNextFrame(framebuffer, commandbuffer):
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
287 bindDescriptorSet(commandbuffer, ds, 0, pipeline)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
288 withRenderPass(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
289 vulkan.swapchain.renderPass,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
290 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
291 commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
292 vulkan.swapchain.width,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
293 vulkan.swapchain.height,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
294 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
295 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
296 withPipeline(commandbuffer, pipeline):
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
297 for i in 0 ..< labels.len:
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
298 render(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
299 commandbuffer, pipeline, labels[i], positions[i], colors[i], scales[i]
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
300 )
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
301
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
302 # cleanup
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
303 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
304 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
305 destroyRenderData(renderdata)
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
306 ]#
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
307
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
308 when isMainModule:
1381
c8d1b87cf6c8 did: make progress on new glyph-rendering system
sam <sam@basx.dev>
parents: 1380
diff changeset
309 var time = 1000'f32
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
310 initVulkan()
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
311
1241
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
312 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
313 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
314 setupSwapchain(renderpass = renderpass)
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
315
1241
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
316 # tests a simple triangle with minimalistic shader and vertex format
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
317 test_01_static_label_new(time)
1379
9ca552dad5fc did: continue working on new glyph-renderer
sam <sam@basx.dev>
parents: 1374
diff changeset
318 # test_01_static_label(time)
9ca552dad5fc did: continue working on new glyph-renderer
sam <sam@basx.dev>
parents: 1374
diff changeset
319 # test_02_multiple_animated(time)
9ca552dad5fc did: continue working on new glyph-renderer
sam <sam@basx.dev>
parents: 1374
diff changeset
320 # test_03_layouting(time)
9ca552dad5fc did: continue working on new glyph-renderer
sam <sam@basx.dev>
parents: 1374
diff changeset
321 # 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
322
1241
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
323 checkVkResult vkDeviceWaitIdle(vulkan.device)
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
324 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
325 clearSwapchain()
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
326
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
327 destroyVulkan()