Mercurial > games > semicongine

annotate tests/test_text.nim @ 1406:aeb15aa9768c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
did: continue text layout, improve vector api
author sam <sam@basx.dev>
date Sat, 21 Dec 2024 19:32:59 +0700
parents 46bac138ad6c
children 56f927b89716
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
1404
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
14 const MAX_CODEPOINTS = 200
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
15 const FONTNAME = "Overhaul.ttf"
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
16 # const FONTNAME = "DejaVuSans.ttf"
1379
9ca552dad5fc did: continue working on new glyph-renderer
sam <sam@basx.dev>
parents: 1374
diff changeset
17
1404
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
18 proc test_01_static_label(time: float32) =
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
19 var font = loadFont[MAX_CODEPOINTS](FONTNAME, lineHeightPixels = 200)
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
20 var renderdata = initRenderData()
1404
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
21 var pipeline = createPipeline[GlyphShader[MAX_CODEPOINTS]](
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
22 renderPass = vulkan.swapchain.renderPass
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
23 )
1401
4ecb004ee7f8 did: add horizontal advancment for glyph rendering
sam <sam@basx.dev>
parents: 1400
diff changeset
24 var glyphs = font.initGlyphs(1000, baseScale = 0.1)
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
25
1379
9ca552dad5fc did: continue working on new glyph-renderer
sam <sam@basx.dev>
parents: 1374
diff changeset
26 assignBuffers(renderdata, glyphs)
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
27 assignBuffers(renderdata, font.descriptorSet)
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
28 uploadImages(renderdata, font.descriptorSet)
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
29 initDescriptorSet(renderdata, pipeline.layout(0), font.descriptorSet)
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
30
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
31 var start = getMonoTime()
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
32 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
33 let t = getMonoTime()
20602878744e did: finished basic implementation of new glyph-rendering system
sam <sam@basx.dev>
parents: 1399
diff changeset
34 glyphs.reset()
1404
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
35 glyphs.add("Hello semicongine!", vec3(0.5, 0.5), anchor = vec2(0.5, 0.5))
1400
20602878744e did: finished basic implementation of new glyph-rendering system
sam <sam@basx.dev>
parents: 1399
diff changeset
36 glyphs.updateAllGPUBuffers(flush = true)
20602878744e did: finished basic implementation of new glyph-rendering system
sam <sam@basx.dev>
parents: 1399
diff changeset
37
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
38 withNextFrame(framebuffer, commandbuffer):
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
39 bindDescriptorSet(commandbuffer, font.descriptorSet, 0, pipeline)
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
40 withRenderPass(
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
41 vulkan.swapchain.renderPass,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
42 framebuffer,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
43 commandbuffer,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
44 vulkan.swapchain.width,
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
45 vulkan.swapchain.height,
1404
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
46 vec4(0, 0, 0, 0),
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
47 ):
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
48 withPipeline(commandbuffer, pipeline):
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
49 renderGlyphs(commandbuffer, pipeline, glyphs)
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
50
1400
20602878744e did: finished basic implementation of new glyph-rendering system
sam <sam@basx.dev>
parents: 1399
diff changeset
51 # cleanup
1374
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
52 checkVkResult vkDeviceWaitIdle(vulkan.device)
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
53 destroyPipeline(pipeline)
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
54 destroyRenderData(renderdata)
92c089136a05 did: start with new glyph-renderer
sam <sam@basx.dev>
parents: 1335
diff changeset
55
1404
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
56 proc test_02_multi_counter(time: float32) =
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
57 var font1 = loadFont[MAX_CODEPOINTS]("Overhaul.ttf", lineHeightPixels = 40)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
58 var font2 = loadFont[MAX_CODEPOINTS]("Overhaul.ttf", lineHeightPixels = 160)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
59 var font3 = loadFont[MAX_CODEPOINTS]("DejaVuSans.ttf", lineHeightPixels = 160)
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
60 var renderdata = initRenderData()
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
61
1404
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
62 var pipeline = createPipeline[GlyphShader[MAX_CODEPOINTS]](
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
63 renderPass = vulkan.swapchain.renderPass
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
64 )
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
65
1404
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
66 assignBuffers(renderdata, font1.descriptorSet)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
67 assignBuffers(renderdata, font2.descriptorSet)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
68 assignBuffers(renderdata, font3.descriptorSet)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
69 uploadImages(renderdata, font1.descriptorSet)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
70 uploadImages(renderdata, font2.descriptorSet)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
71 uploadImages(renderdata, font3.descriptorSet)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
72 initDescriptorSet(renderdata, pipeline.layout(0), font1.descriptorSet)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
73 initDescriptorSet(renderdata, pipeline.layout(0), font2.descriptorSet)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
74 initDescriptorSet(renderdata, pipeline.layout(0), font3.descriptorSet)
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
75
1404
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
76 var glyphs1 = font1.initGlyphs(10, baseScale = 0.1)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
77 var glyphs2 = font2.initGlyphs(10, baseScale = 0.1)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
78 var glyphs3 = font3.initGlyphs(10, baseScale = 0.1)
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
79
1404
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
80 assignBuffers(renderdata, glyphs1)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
81 assignBuffers(renderdata, glyphs2)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
82 assignBuffers(renderdata, glyphs3)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
83
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
84 var labels = [" 0", " 1", " 2"]
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
85
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
86 var start = getMonoTime()
1238
03634915bbdb add: tests for updating texts, does not pass validation atm
sam <sam@basx.dev>
parents: 1237
diff changeset
87 var p = 0
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
88 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
89 let progress = ((getMonoTime() - start).inMilliseconds().int / 1000) / time
1404
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
90 glyphs1.reset()
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
91 glyphs2.reset()
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
92 glyphs3.reset()
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
93
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
94 glyphs1.add($(p + 0), vec3(0.3, 0.5))
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
95 glyphs2.add($(p + 1), vec3(0.5, 0.5))
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
96 glyphs3.add($(p + 2), vec3(0.7, 0.5))
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
97
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
98 glyphs1.updateAllGPUBuffers(flush = true)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
99 glyphs2.updateAllGPUBuffers(flush = true)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
100 glyphs3.updateAllGPUBuffers(flush = true)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
101
1238
03634915bbdb add: tests for updating texts, does not pass validation atm
sam <sam@basx.dev>
parents: 1237
diff changeset
102 inc p
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
103 withNextFrame(framebuffer, commandbuffer):
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
104 withRenderPass(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
105 vulkan.swapchain.renderPass,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
106 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
107 commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
108 vulkan.swapchain.width,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
109 vulkan.swapchain.height,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
110 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
111 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
112 withPipeline(commandbuffer, pipeline):
1404
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
113 bindDescriptorSet(commandbuffer, font1.descriptorSet, 0, pipeline)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
114 renderGlyphs(commandbuffer, pipeline, glyphs1)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
115 bindDescriptorSet(commandbuffer, font2.descriptorSet, 0, pipeline)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
116 renderGlyphs(commandbuffer, pipeline, glyphs2)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
117 bindDescriptorSet(commandbuffer, font3.descriptorSet, 0, pipeline)
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
118 renderGlyphs(commandbuffer, pipeline, glyphs3)
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
119
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
120 # cleanup
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
121 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
122 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
123 destroyRenderData(renderdata)
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
124
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
125 proc test_03_layouting(time: float32) =
1406
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
126 var font = loadFont[MAX_CODEPOINTS]("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
127 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
128
1404
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
129 var pipeline = createPipeline[GlyphShader[MAX_CODEPOINTS]](
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
130 renderPass = vulkan.swapchain.renderPass
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
131 )
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
132
1405
46bac138ad6c did: minimal work on next test
sam <sam@basx.dev>
parents: 1404
diff changeset
133 assignBuffers(renderdata, font.descriptorSet)
46bac138ad6c did: minimal work on next test
sam <sam@basx.dev>
parents: 1404
diff changeset
134 uploadImages(renderdata, font.descriptorSet)
46bac138ad6c did: minimal work on next test
sam <sam@basx.dev>
parents: 1404
diff changeset
135 initDescriptorSet(renderdata, pipeline.layout(0), font.descriptorSet)
46bac138ad6c did: minimal work on next test
sam <sam@basx.dev>
parents: 1404
diff changeset
136
46bac138ad6c did: minimal work on next test
sam <sam@basx.dev>
parents: 1404
diff changeset
137 var glyphs = font.initGlyphs(1000, baseScale = 0.1)
46bac138ad6c did: minimal work on next test
sam <sam@basx.dev>
parents: 1404
diff changeset
138 assignBuffers(renderdata, glyphs)
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
139
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
140 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
141 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
142 let progress = ((getMonoTime() - start).inMilliseconds().int / 1000) / time
1406
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
143
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
144 glyphs.reset()
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
145 glyphs.add("Anchor Center", vec3(0, 0), anchor = vec2(0, 0))
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
146 glyphs.add("Anchor top left", vec3(0, 0), anchor = vec2(-1, 1))
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
147 glyphs.add("Anchor top right", vec3(0, 0), anchor = vec2(1, 1))
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
148 glyphs.add("Anchor bottom left", vec3(0, 0), anchor = vec2(-1, -1))
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
149 glyphs.add("Anchor bottom right", vec3(0, 0), anchor = vec2(1, -1))
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
150
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
151 glyphs.add(
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
152 """Paragraph
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
153 This is a somewhat longer paragraph with a few newlines and a maximum width of 0.2.
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
154
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
155 It should display with some space above and have a pleasing appearance overall! :)""",
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
156 vec3(0.5, 0.5),
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
157 anchor = vec2(0, 0),
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
158 alignment = Center,
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
159 )
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
160 glyphs.updateAllGPUBuffers(flush = true)
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
161
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
162 withNextFrame(framebuffer, commandbuffer):
1405
46bac138ad6c did: minimal work on next test
sam <sam@basx.dev>
parents: 1404
diff changeset
163 bindDescriptorSet(commandbuffer, font.descriptorSet, 0, pipeline)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
164 withRenderPass(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
165 vulkan.swapchain.renderPass,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
166 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
167 commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
168 vulkan.swapchain.width,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
169 vulkan.swapchain.height,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
170 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
171 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
172 withPipeline(commandbuffer, pipeline):
1405
46bac138ad6c did: minimal work on next test
sam <sam@basx.dev>
parents: 1404
diff changeset
173 renderGlyphs(commandbuffer, pipeline, glyphs)
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
174
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
175 # cleanup
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
176 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
177 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
178 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
179
1405
46bac138ad6c did: minimal work on next test
sam <sam@basx.dev>
parents: 1404
diff changeset
180 #[
1239
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests
sam <sam@basx.dev>
parents: 1238
diff changeset
181 proc test_04_lots_of_texts(time: float32) =
1404
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
182 var font = loadFont[MAX_CODEPOINTS]("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
183 var renderdata = initRenderData()
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
184
1404
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
185 var pipeline = createPipeline[GlyphShader[MAX_CODEPOINTS]](
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
186 renderPass = vulkan.swapchain.renderPass
80cfa19d1e2c did: finally get text/glyph layouting correct again, 2/4 test adapted to new glyph API
sam <sam@basx.dev>
parents: 1403
diff changeset
187 )
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
188
1335
f2ff6f624932 fix: image copies of font atlas
sam <sam@basx.dev>
parents: 1332
diff changeset
189 var ds = asDescriptorSetData(FontDS(fontAtlas: font.fontAtlas.copy()))
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
190 uploadImages(renderdata, ds)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
191 initDescriptorSet(renderdata, pipeline.layout(0), ds)
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
192
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
193 var labels: seq[Textbox]
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
194 var positions = newSeq[Vec3f](100)
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
195 var colors = newSeq[Vec4f](100)
1329
ad09d41abd1e add: 2d-scaling for text
sam <sam@basx.dev>
parents: 1327
diff changeset
196 var scales = newSeq[Vec2f](100)
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
197 for i in 0 ..< 100:
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
198 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
199 colors[i] =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
200 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
201 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
202 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
203
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
204 var start = getMonoTime()
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
205 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time:
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
206 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
207 l.refresh()
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
208 withNextFrame(framebuffer, commandbuffer):
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
209 bindDescriptorSet(commandbuffer, ds, 0, pipeline)
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
210 withRenderPass(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
211 vulkan.swapchain.renderPass,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
212 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
213 commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
214 vulkan.swapchain.width,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
215 vulkan.swapchain.height,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
216 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
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 withPipeline(commandbuffer, pipeline):
1327
373a4888f6ac did: rework font-rendering
sam <sam@basx.dev>
parents: 1321
diff changeset
219 for i in 0 ..< labels.len:
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
220 render(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
221 commandbuffer, pipeline, labels[i], positions[i], colors[i], scales[i]
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1329
diff changeset
222 )
1240
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
223
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
224 # cleanup
42eeb59f3a43 add: more tests, line and point rendering
sam <sam@basx.dev>
parents: 1239
diff changeset
225 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
226 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
227 destroyRenderData(renderdata)
1399
dde74be11b49 did: continue a lot on glyph renderer
sam <sam@basx.dev>
parents: 1398
diff changeset
228 ]#
1237
97813ac43cfb add: multi-text with all properties animated
sam <sam@basx.dev>
parents: 1236
diff changeset
229
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
230 when isMainModule:
1406
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
231 var time = 100'f32
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
232 initVulkan()
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
233
1241
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
234 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
235 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
236 setupSwapchain(renderpass = renderpass)
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
237
1241
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
238 # tests a simple triangle with minimalistic shader and vertex format
1406
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
239 # test_01_static_label(time)
aeb15aa9768c did: continue text layout, improve vector api
sam <sam@basx.dev>
parents: 1405
diff changeset
240 # test_02_multi_counter(time)
1405
46bac138ad6c did: minimal work on next test
sam <sam@basx.dev>
parents: 1404
diff changeset
241 test_03_layouting(time)
1379
9ca552dad5fc did: continue working on new glyph-renderer
sam <sam@basx.dev>
parents: 1374
diff changeset
242 # 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
243
1241
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
244 checkVkResult vkDeviceWaitIdle(vulkan.device)
a0ed1a918fda fix: letters sometimes overlapping other letters quad
sam <sam@basx.dev>
parents: 1240
diff changeset
245 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
246 clearSwapchain()
1236
176383220123 add: first font-rendering test
sam <sam@basx.dev>
parents:
diff changeset
247
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1282
diff changeset
248 destroyVulkan()