Mercurial > games > semicongine
annotate tests/test_vulkan_wrapper.nim @ 788:2d8a92171c9e
add: make same attribute for different shaders work correctly, yipie!
author | Sam <sam@basx.dev> |
---|---|
date | Fri, 25 Aug 2023 01:09:23 +0700 |
parents | 670ca93a358b |
children | 8d0ffcacc7e3 |
rev | line source |
---|---|
733
07c755e65a4a
add: final font-rendering, API changes fixed
Sam <sam@basx.dev>
parents:
714
diff
changeset
|
1 import std/tables |
07c755e65a4a
add: final font-rendering, API changes fixed
Sam <sam@basx.dev>
parents:
714
diff
changeset
|
2 |
578 | 3 import semicongine |
560
8de8a2102071
add: vertex and (initial) shader types and methods
Sam <sam@basx.dev>
parents:
559
diff
changeset
|
4 |
783
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
5 |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
6 let |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
7 sampler = Sampler( |
783
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
8 magnification: VK_FILTER_NEAREST, |
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
9 minification: VK_FILTER_NEAREST, |
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
10 wrapModeS: VK_SAMPLER_ADDRESS_MODE_REPEAT, |
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
11 wrapModeT: VK_SAMPLER_ADDRESS_MODE_REPEAT, |
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
12 ) |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
13 (R, W) = ([255'u8, 0'u8, 0'u8, 255'u8], [255'u8, 255'u8, 255'u8, 255'u8]) |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
14 mat = Material( |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
15 name: "mat", |
783
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
16 materialType: "my_material", |
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
17 textures: { |
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
18 "my_little_texture": Texture(image: Image(width: 5, height: 5, imagedata: @[ |
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
19 R, R, R, R, R, |
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
20 R, R, W, R, R, |
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
21 R, W, W, W, R, |
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
22 R, R, W, R, R, |
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
23 R, R, R, R, R, |
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
24 ]), sampler: sampler) |
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
25 }.toTable |
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
26 ) |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
27 mat2 = Material( |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
28 name: "mat2", |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
29 materialType: "my_material", |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
30 textures: { |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
31 "my_little_texture": Texture(image: Image(width: 5, height: 5, imagedata: @[ |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
32 R, W, R, W, R, |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
33 W, R, W, R, W, |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
34 R, W, R, W, R, |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
35 W, R, W, R, W, |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
36 R, W, R, W, R, |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
37 ]), sampler: sampler) |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
38 }.toTable |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
39 ) |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
40 mat3 = Material( |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
41 name: "mat3", |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
42 materialType: "my_special_material", |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
43 constants: { |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
44 "color": toGPUValue(newVec4f(0, 1, 0, 1)) |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
45 }.toTable |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
46 ) |
783
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
47 |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
48 proc scene_different_mesh_types(): seq[Mesh] = |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
49 @[ |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
50 newMesh( |
589
b434feaf2b67
did: finish refactoring of render pipeline, yipi! :)
Sam <sam@basx.dev>
parents:
588
diff
changeset
|
51 positions=[newVec3f(0.0, -0.5), newVec3f(0.5, 0.5), newVec3f(-0.5, 0.5)], |
672 | 52 colors=[newVec4f(1.0, 0.0, 0.0, 1), newVec4f(0.0, 1.0, 0.0, 1), newVec4f(0.0, 0.0, 1.0, 1)], |
783
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
53 material=mat, |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
54 transform=translate(-0.7, -0.5), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
55 ), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
56 newMesh( |
589
b434feaf2b67
did: finish refactoring of render pipeline, yipi! :)
Sam <sam@basx.dev>
parents:
588
diff
changeset
|
57 positions=[newVec3f(0.0, -0.4), newVec3f(0.4, 0.4), newVec3f(-0.4, 0.5)], |
672 | 58 colors=[newVec4f(1.0, 0.0, 0.0, 1), newVec4f(0.0, 1.0, 0.0, 1), newVec4f(0.0, 0.0, 1.0, 1)], |
783
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
59 material=mat, |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
60 transform=translate(0, -0.5), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
61 ), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
62 newMesh( |
589
b434feaf2b67
did: finish refactoring of render pipeline, yipi! :)
Sam <sam@basx.dev>
parents:
588
diff
changeset
|
63 positions=[newVec3f(0.0, 0.5), newVec3f(0.5, -0.5), newVec3f(-0.5, -0.5)], |
672 | 64 colors=[newVec4f(1.0, 0.0, 0.0, 1), newVec4f(0.0, 1.0, 0.0, 1), newVec4f(0.0, 0.0, 1.0, 1)], |
783
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
65 indices=[[0'u16, 2'u16, 1'u16]], |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
66 material=mat2, |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
67 transform=translate(0.7, -0.5), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
68 ), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
69 newMesh( |
589
b434feaf2b67
did: finish refactoring of render pipeline, yipi! :)
Sam <sam@basx.dev>
parents:
588
diff
changeset
|
70 positions=[newVec3f(0.0, 0.4), newVec3f(0.4, -0.4), newVec3f(-0.4, -0.4)], |
672 | 71 colors=[newVec4f(1.0, 0.0, 0.0, 1), newVec4f(0.0, 1.0, 0.0, 1), newVec4f(0.0, 0.0, 1.0, 1)], |
783
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
72 indices=[[0'u16, 2'u16, 1'u16]], |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
73 material=mat2, |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
74 transform=translate(-0.7, 0.5), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
75 ), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
76 newMesh( |
589
b434feaf2b67
did: finish refactoring of render pipeline, yipi! :)
Sam <sam@basx.dev>
parents:
588
diff
changeset
|
77 positions=[newVec3f(0.4, 0.5), newVec3f(0.9, -0.3), newVec3f(0.0, -0.3)], |
672 | 78 colors=[newVec4f(1.0, 1.0, 0.0, 1), newVec4f(1.0, 1.0, 0.0, 1), newVec4f(1.0, 1.0, 0.0, 1)], |
589
b434feaf2b67
did: finish refactoring of render pipeline, yipi! :)
Sam <sam@basx.dev>
parents:
588
diff
changeset
|
79 indices=[[0'u32, 2'u32, 1'u32]], |
783
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
80 autoResize=false, |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
81 material=mat2, |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
82 transform=translate(0, 0.5), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
83 ), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
84 newMesh( |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
85 positions=[newVec3f(0.4, 0.5), newVec3f(0.9, -0.3), newVec3f(0.0, -0.3)], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
86 colors=[newVec4f(1.0, 1.0, 0.0, 1), newVec4f(1.0, 1.0, 0.0, 1), newVec4f(1.0, 1.0, 0.0, 1)], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
87 indices=[[0'u32, 2'u32, 1'u32]], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
88 autoResize=false, |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
89 material=mat2, |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
90 transform=translate(0.7, 0.5), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
91 ), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
92 ] |
585
2df00e84757d
fix: completely overhole buffer handling for drawing, fix shit
Sam <sam@basx.dev>
parents:
584
diff
changeset
|
93 |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
94 proc scene_simple(): seq[Mesh] = |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
95 @[ |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
96 newMesh( |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
97 positions=[newVec3f(0.0, -0.3), newVec3f(0.3, 0.3), newVec3f(-0.3, 0.3)], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
98 colors=[newVec4f(1.0, 0.0, 0.0, 1), newVec4f(0.0, 1.0, 0.0, 1), newVec4f(0.0, 0.0, 1.0, 1)], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
99 material=mat, |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
100 transform=translate(0.4, 0.4), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
101 ), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
102 newMesh( |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
103 positions=[newVec3f(0.0, -0.5), newVec3f(0.5, 0.5), newVec3f(-0.5, 0.5)], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
104 colors=[newVec4f(1.0, 0.0, 0.0, 1), newVec4f(0.0, 1.0, 0.0, 1), newVec4f(0.0, 0.0, 1.0, 1)], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
105 material=mat, |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
106 transform=translate(0.4, -0.4), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
107 ), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
108 newMesh( |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
109 positions=[newVec3f(0.0, -0.6), newVec3f(0.6, 0.6), newVec3f(-0.6, 0.6)], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
110 colors=[newVec4f(1.0, 1.0, 0.0, 1), newVec4f(1.0, 1.0, 0.0, 1), newVec4f(1.0, 1.0, 0.0, 1)], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
111 indices=[[0'u32, 1'u32, 2'u32]], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
112 autoResize=false, |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
113 material=mat, |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
114 transform=translate(-0.4, 0.4), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
115 ), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
116 newMesh( |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
117 positions=[newVec3f(0.0, -0.8), newVec3f(0.8, 0.8), newVec3f(-0.8, 0.8)], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
118 colors=[newVec4f(0.0, 0.0, 1.0, 1), newVec4f(0.0, 0.0, 1.0, 1), newVec4f(0.0, 0.0, 1.0, 1)], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
119 indices=[[0'u16, 1'u16, 2'u16]], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
120 instanceTransforms=[Unit4F32, Unit4F32], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
121 material=mat, |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
122 transform=translate(-0.4, -0.4), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
123 ) |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
124 ] |
585
2df00e84757d
fix: completely overhole buffer handling for drawing, fix shit
Sam <sam@basx.dev>
parents:
584
diff
changeset
|
125 |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
126 proc scene_primitives(): seq[Mesh] = |
586 | 127 var r = rect(color="ff0000") |
128 var t = tri(color="0000ff") | |
129 var c = circle(color="00ff00") | |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
130 r.material = mat |
783
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
131 t.material = mat |
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
132 c.material = mat |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
133 r.transform = translate(newVec3f(0.5, -0.3)) |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
134 t.transform = translate(newVec3f(0.3, 0.3)) |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
135 c.transform = translate(newVec3f(-0.3, 0.1)) |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
136 result = @[r, c, t] |
585
2df00e84757d
fix: completely overhole buffer handling for drawing, fix shit
Sam <sam@basx.dev>
parents:
584
diff
changeset
|
137 |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
138 proc scene_flag(): seq[Mesh] = |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
139 @[ |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
140 newMesh( |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
141 positions=[newVec3f(-1.0, -1.0), newVec3f(1.0, -1.0), newVec3f(1.0, 1.0), newVec3f(-1.0, 1.0)], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
142 colors=[newVec4f(-1, -1, 1, 1), newVec4f(1, -1, 1, 1), newVec4f(1, 1, 1, 1), newVec4f(-1, 1, 1, 1)], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
143 indices=[[0'u16, 1'u16, 2'u16], [2'u16, 3'u16, 0'u16]], |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
144 material=mat, |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
145 transform=scale(0.5, 0.5) |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
146 ) |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
147 ] |
653
ac7dfbd56cc6
add: textures now support in shader via scene data, also: improved config handling a bit, more to come
Sam <sam@basx.dev>
parents:
652
diff
changeset
|
148 |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
149 proc scene_multi_material(): seq[Mesh] = |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
150 var |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
151 r1 = rect(color="ffffff") |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
152 r2 = rect(color="000000") |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
153 r1.material = mat |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
154 r2.material = mat3 |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
155 r1.transform = translate(newVec3f(-0.5)) |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
156 r2.transform = translate(newVec3f(+0.5)) |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
157 result = @[r1, r2] |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
158 |
590
1edf3e16144e
add: input handling, small refactoring for renderer
Sam <sam@basx.dev>
parents:
589
diff
changeset
|
159 proc main() = |
588 | 160 var engine = initEngine("Test") |
585
2df00e84757d
fix: completely overhole buffer handling for drawing, fix shit
Sam <sam@basx.dev>
parents:
584
diff
changeset
|
161 |
2df00e84757d
fix: completely overhole buffer handling for drawing, fix shit
Sam <sam@basx.dev>
parents:
584
diff
changeset
|
162 # INIT RENDERER: |
2df00e84757d
fix: completely overhole buffer handling for drawing, fix shit
Sam <sam@basx.dev>
parents:
584
diff
changeset
|
163 const |
785
1880ab140165
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
784
diff
changeset
|
164 shaderConfiguration1 = createShaderConfiguration( |
782
b6950ea89b37
did next step in renderpipeline-refactoring, using shaderconfiguration objects instead for less ambigious shader-pipeline configuration
Sam <sam@basx.dev>
parents:
777
diff
changeset
|
165 inputs=[ |
b6950ea89b37
did next step in renderpipeline-refactoring, using shaderconfiguration objects instead for less ambigious shader-pipeline configuration
Sam <sam@basx.dev>
parents:
777
diff
changeset
|
166 attr[Vec3f]("position", memoryPerformanceHint=PreferFastRead), |
b6950ea89b37
did next step in renderpipeline-refactoring, using shaderconfiguration objects instead for less ambigious shader-pipeline configuration
Sam <sam@basx.dev>
parents:
777
diff
changeset
|
167 attr[Vec4f]("color", memoryPerformanceHint=PreferFastWrite), |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
168 attr[Mat4]("transform", perInstance=true), |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
169 attr[uint16]("materialIndex", perInstance=true), |
782
b6950ea89b37
did next step in renderpipeline-refactoring, using shaderconfiguration objects instead for less ambigious shader-pipeline configuration
Sam <sam@basx.dev>
parents:
777
diff
changeset
|
170 ], |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
171 intermediates=[ |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
172 attr[Vec4f]("outcolor"), |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
173 attr[uint16]("materialIndexOut", noInterpolation=true), |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
174 ], |
782
b6950ea89b37
did next step in renderpipeline-refactoring, using shaderconfiguration objects instead for less ambigious shader-pipeline configuration
Sam <sam@basx.dev>
parents:
777
diff
changeset
|
175 outputs=[attr[Vec4f]("color")], |
b6950ea89b37
did next step in renderpipeline-refactoring, using shaderconfiguration objects instead for less ambigious shader-pipeline configuration
Sam <sam@basx.dev>
parents:
777
diff
changeset
|
176 uniforms=[attr[float32]("time")], |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
177 samplers=[ |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
178 attr[Sampler2DType]("my_little_texture", arrayCount=2) |
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
179 ], |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
180 vertexCode="""gl_Position = vec4(position, 1.0) * transform; outcolor = color; materialIndexOut = materialIndex;""", |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
181 fragmentCode="color = texture(my_little_texture[materialIndexOut], outcolor.xy) * 0.5 + outcolor * 0.5;", |
585
2df00e84757d
fix: completely overhole buffer handling for drawing, fix shit
Sam <sam@basx.dev>
parents:
584
diff
changeset
|
182 ) |
785
1880ab140165
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
784
diff
changeset
|
183 shaderConfiguration2 = createShaderConfiguration( |
1880ab140165
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
784
diff
changeset
|
184 inputs=[ |
1880ab140165
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
784
diff
changeset
|
185 attr[Vec3f]("position", memoryPerformanceHint=PreferFastRead), |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
186 attr[Mat4]("transform", perInstance=true), |
785
1880ab140165
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
784
diff
changeset
|
187 ], |
1880ab140165
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
784
diff
changeset
|
188 intermediates=[attr[Vec4f]("outcolor")], |
1880ab140165
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
784
diff
changeset
|
189 outputs=[attr[Vec4f]("color")], |
1880ab140165
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
784
diff
changeset
|
190 uniforms=[attr[Vec4f]("color")], |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
191 vertexCode="""gl_Position = vec4(position, 1.0) * transform; outcolor = Uniforms.color;""", |
788
2d8a92171c9e
add: make same attribute for different shaders work correctly, yipie!
Sam <sam@basx.dev>
parents:
787
diff
changeset
|
192 fragmentCode="color = outcolor;", |
785
1880ab140165
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
784
diff
changeset
|
193 ) |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
194 engine.initRenderer({ |
785
1880ab140165
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
784
diff
changeset
|
195 "my_material": shaderConfiguration1, |
1880ab140165
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
784
diff
changeset
|
196 "my_special_material": shaderConfiguration2, |
784
fa39e67dded7
add: first complete working version of multiple materials and shaders per scene, yipie :)
Sam <sam@basx.dev>
parents:
783
diff
changeset
|
197 }.toTable) |
585
2df00e84757d
fix: completely overhole buffer handling for drawing, fix shit
Sam <sam@basx.dev>
parents:
584
diff
changeset
|
198 |
590
1edf3e16144e
add: input handling, small refactoring for renderer
Sam <sam@basx.dev>
parents:
589
diff
changeset
|
199 # INIT SCENES |
650
be6e0f89645a
add: initial code for texture support, not finished, had to completely refactor how to handle material-data (ie scene-wide data, sorry if you ever read this
Sam <sam@basx.dev>
parents:
649
diff
changeset
|
200 var scenes = [ |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
201 # Scene(name: "simple", meshes: scene_simple()), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
202 # Scene(name: "different mesh types", meshes: scene_different_mesh_types()), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
203 # Scene(name: "primitives", meshes: scene_primitives()), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
204 # Scene(name: "flag", meshes: scene_flag()), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
205 # Scene(name: "multimaterial", meshes: scene_multi_material(), materialIndexAttribute: ""), |
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
206 Scene(name: "multimaterial", meshes: scene_multi_material()), |
650
be6e0f89645a
add: initial code for texture support, not finished, had to completely refactor how to handle material-data (ie scene-wide data, sorry if you ever read this
Sam <sam@basx.dev>
parents:
649
diff
changeset
|
207 ] |
783
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
208 |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
209 scenes[0].addShaderGlobal("color", newVec4f(1, 0, 0, 1)) |
589
b434feaf2b67
did: finish refactoring of render pipeline, yipi! :)
Sam <sam@basx.dev>
parents:
588
diff
changeset
|
210 for scene in scenes.mitems: |
650
be6e0f89645a
add: initial code for texture support, not finished, had to completely refactor how to handle material-data (ie scene-wide data, sorry if you ever read this
Sam <sam@basx.dev>
parents:
649
diff
changeset
|
211 scene.addShaderGlobal("time", 0.0'f32) |
783
893ec0fbfd44
add: first, incomplete version of material use
Sam <sam@basx.dev>
parents:
782
diff
changeset
|
212 engine.addScene(scene) |
570 | 213 |
576 | 214 # MAINLOOP |
572
9f1de117aaca
did: allow runtime shader-input definitions
Sam <sam@basx.dev>
parents:
570
diff
changeset
|
215 echo "Setup successfull, start rendering" |
589
b434feaf2b67
did: finish refactoring of render pipeline, yipi! :)
Sam <sam@basx.dev>
parents:
588
diff
changeset
|
216 for i in 0 ..< 3: |
650
be6e0f89645a
add: initial code for texture support, not finished, had to completely refactor how to handle material-data (ie scene-wide data, sorry if you ever read this
Sam <sam@basx.dev>
parents:
649
diff
changeset
|
217 for scene in scenes.mitems: |
787
670ca93a358b
fix: many issues, better mesh-handling, still need to cope with different binding numbers when using different pipelines...
Sam <sam@basx.dev>
parents:
786
diff
changeset
|
218 echo "rendering scene ", scene.name |
589
b434feaf2b67
did: finish refactoring of render pipeline, yipi! :)
Sam <sam@basx.dev>
parents:
588
diff
changeset
|
219 for i in 0 ..< 1000: |
607 | 220 if engine.updateInputs() != Running or engine.keyIsDown(Escape): |
590
1edf3e16144e
add: input handling, small refactoring for renderer
Sam <sam@basx.dev>
parents:
589
diff
changeset
|
221 engine.destroy() |
1edf3e16144e
add: input handling, small refactoring for renderer
Sam <sam@basx.dev>
parents:
589
diff
changeset
|
222 return |
651
164bf40c664f
add: uncomment some of the prepared texture code, nice interface for scene-global shader values (aka uniforms
Sam <sam@basx.dev>
parents:
650
diff
changeset
|
223 setShaderGlobal(scene, "time", getShaderGlobal[float32](scene, "time") + 0.0005'f) |
592
cda5874a8454
add: recreation of swapchain (at least on linux, windows will likely fail, needs testing
Sam <sam@basx.dev>
parents:
590
diff
changeset
|
224 engine.renderScene(scene) |
590
1edf3e16144e
add: input handling, small refactoring for renderer
Sam <sam@basx.dev>
parents:
589
diff
changeset
|
225 echo "Rendered ", engine.framesRendered, " frames" |
1edf3e16144e
add: input handling, small refactoring for renderer
Sam <sam@basx.dev>
parents:
589
diff
changeset
|
226 echo "Processed ", engine.eventsProcessed, " events" |
575
eaedc0369c38
yay: first triangle rendering with new engine implmentation
Sam <sam@basx.dev>
parents:
574
diff
changeset
|
227 |
eaedc0369c38
yay: first triangle rendering with new engine implmentation
Sam <sam@basx.dev>
parents:
574
diff
changeset
|
228 # cleanup |
557 | 229 echo "Start cleanup" |
588 | 230 engine.destroy() |
590
1edf3e16144e
add: input handling, small refactoring for renderer
Sam <sam@basx.dev>
parents:
589
diff
changeset
|
231 |
1edf3e16144e
add: input handling, small refactoring for renderer
Sam <sam@basx.dev>
parents:
589
diff
changeset
|
232 when isMainModule: |
1edf3e16144e
add: input handling, small refactoring for renderer
Sam <sam@basx.dev>
parents:
589
diff
changeset
|
233 main() |