src/2d.c

Sat, 26 Jul 2025 21:13:05 +0200

author
Mike Becker <universe@uap-core.de>
date
Sat, 26 Jul 2025 21:13:05 +0200
changeset 227
a5775e8dbc13
parent 226
18327d2df79d
child 228
ecda73508be6
permissions
-rw-r--r--

simplify build and copy assets to build dir

demo programs can then be run directly from the build dir

143
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1 /*
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
3 * Copyright 2025 Mike Becker. All rights reserved.
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
4 *
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
5 * Redistribution and use in source and binary forms, with or without
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
6 * modification, are permitted provided that the following conditions are met:
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
7 *
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
8 * 1. Redistributions of source code must retain the above copyright
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
9 * notice, this list of conditions and the following disclaimer.
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
10 *
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
11 * 2. Redistributions in binary form must reproduce the above copyright
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
12 * notice, this list of conditions and the following disclaimer in the
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
13 * documentation and/or other materials provided with the distribution.
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
14 *
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
15 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
16 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
18 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
19 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
20 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
21 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
22 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
23 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
24 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
25 * POSSIBILITY OF SUCH DAMAGE.
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
26 */
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
27
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
28 #include "ascension/2d.h"
4db4f00493ad prepare implementation of primitives
Mike Becker <universe@uap-core.de>
parents:
diff changeset
29
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
30 #include "ascension/constants.h"
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
31 #include "ascension/error.h"
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
32 #include "ascension/shader.h"
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
33
160
80700db530ff improve the combination of shader preprocessor flags
Mike Becker <universe@uap-core.de>
parents: 159
diff changeset
34 #include <assert.h>
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
35
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
36 typedef struct asc_rectangle_shader_s {
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
37 AscShaderProgram program;
168
f70569c49c24 add abstractions that allow removing dependencies to glew.h
Mike Becker <universe@uap-core.de>
parents: 167
diff changeset
38 asc_uniform_loc color;
f70569c49c24 add abstractions that allow removing dependencies to glew.h
Mike Becker <universe@uap-core.de>
parents: 167
diff changeset
39 asc_uniform_loc border_color;
f70569c49c24 add abstractions that allow removing dependencies to glew.h
Mike Becker <universe@uap-core.de>
parents: 167
diff changeset
40 asc_uniform_loc size;
f70569c49c24 add abstractions that allow removing dependencies to glew.h
Mike Becker <universe@uap-core.de>
parents: 167
diff changeset
41 asc_uniform_loc thickness;
f70569c49c24 add abstractions that allow removing dependencies to glew.h
Mike Becker <universe@uap-core.de>
parents: 167
diff changeset
42 asc_uniform_loc radius;
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
43 } AscRectangleShader;
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
44
159
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
45 #define ASC_RECTANGLE_SHADER_FLAG_FILL 1
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
46 #define ASC_RECTANGLE_SHADER_FLAG_ROUND 2
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
47 #define ASC_RECTANGLE_SHADER_FLAG_BORDER 4
158
f650994ec543 implement rounded corners
Mike Becker <universe@uap-core.de>
parents: 151
diff changeset
48
222
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
49 static void asc_rectangle_shader_init(AscShaderProgram *shader, int flags) {
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
50 asc_shader_init_uniform_loc_nice(shader, AscRectangleShader, size);
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
51 if (asc_test_flag(flags, ASC_RECTANGLE_SHADER_FLAG_FILL)) {
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
52 asc_shader_init_uniform_loc_nice(shader, AscRectangleShader, color);
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
53 }
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
54 if (asc_test_flag(flags, ASC_RECTANGLE_SHADER_FLAG_BORDER)) {
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
55 asc_shader_init_uniform_loc_nice(shader, AscRectangleShader, border_color);
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
56 asc_shader_init_uniform_loc_nice(shader, AscRectangleShader, thickness);
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
57 }
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
58 if (asc_test_flag(flags, ASC_RECTANGLE_SHADER_FLAG_ROUND)) {
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
59 asc_shader_init_uniform_loc_nice(shader, AscRectangleShader, radius);
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
60 }
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
61 }
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
62
158
f650994ec543 implement rounded corners
Mike Becker <universe@uap-core.de>
parents: 151
diff changeset
63 static AscShaderProgram *asc_rectangle_shader_create(int flags) {
223
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
64 return asc_shader_create((AscShaderCodes){
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
65 .vtx = {.source_file = "sprite_vtx.glsl"},
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
66 .frag = {
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
67 .source_file = "rectangle_frag.glsl",
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
68 .preamble_code = (const char *[]) {
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
69 "#define FILL",
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
70 "#define ROUNDED_CORNERS",
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
71 "#define BORDER"
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
72 },
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
73 .preamble_code_flags = flags,
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
74 },
222
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
75 }, sizeof(AscRectangleShader), asc_rectangle_shader_init, flags);
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
76 }
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
77
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
78 static void asc_rectangle_destroy(AscSceneNode *node) {
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
79 asc_ptr_cast(AscRectangle, rectangle, node);
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
80 asc_mesh_destroy(&rectangle->mesh);
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
81 }
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
82
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
83 static void asc_rectangle_update(AscSceneNode *node) {
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
84 asc_ptr_cast(AscRectangle, rectangle, node);
167
8e6a661c87db add functions to upload common uniforms
Mike Becker <universe@uap-core.de>
parents: 163
diff changeset
85 asc_mesh_plane_2d(&rectangle->mesh, .size = rectangle->size, .uv_scale = rectangle->size);
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
86 }
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
87
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
88 static void asc_rectangle_draw(const AscCamera *camera, const AscSceneNode *node) {
169
6e6717d9c776 improve "polymorphic" typing of shaders
Mike Becker <universe@uap-core.de>
parents: 168
diff changeset
89 asc_cptr_cast(AscRectangle, rectangle, node);
159
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
90 const bool filled = rectangle->filled;
158
f650994ec543 implement rounded corners
Mike Becker <universe@uap-core.de>
parents: 151
diff changeset
91 const bool round = rectangle->radius > 0;
159
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
92 const bool border = rectangle->thickness > 0;
158
f650994ec543 implement rounded corners
Mike Becker <universe@uap-core.de>
parents: 151
diff changeset
93
f650994ec543 implement rounded corners
Mike Becker <universe@uap-core.de>
parents: 151
diff changeset
94 // Compute shader flags
f650994ec543 implement rounded corners
Mike Becker <universe@uap-core.de>
parents: 151
diff changeset
95 int shader_flags = 0;
226
18327d2df79d simplify how pre-defined shader IDs work
Mike Becker <universe@uap-core.de>
parents: 223
diff changeset
96 // TODO: think about a bool-array to int utility function
158
f650994ec543 implement rounded corners
Mike Becker <universe@uap-core.de>
parents: 151
diff changeset
97 if (filled) shader_flags |= ASC_RECTANGLE_SHADER_FLAG_FILL;
159
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
98 if (border) shader_flags |= ASC_RECTANGLE_SHADER_FLAG_BORDER;
158
f650994ec543 implement rounded corners
Mike Becker <universe@uap-core.de>
parents: 151
diff changeset
99 if (round) shader_flags |= ASC_RECTANGLE_SHADER_FLAG_ROUND;
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
100
226
18327d2df79d simplify how pre-defined shader IDs work
Mike Becker <universe@uap-core.de>
parents: 223
diff changeset
101 // Look up and activate the shader
169
6e6717d9c776 improve "polymorphic" typing of shaders
Mike Becker <universe@uap-core.de>
parents: 168
diff changeset
102 const AscShaderProgram *shader = asc_shader_lookup_or_create(
226
18327d2df79d simplify how pre-defined shader IDs work
Mike Becker <universe@uap-core.de>
parents: 223
diff changeset
103 ASC_SHADER_RECTANGLE(shader_flags),
18327d2df79d simplify how pre-defined shader IDs work
Mike Becker <universe@uap-core.de>
parents: 223
diff changeset
104 asc_rectangle_shader_create, shader_flags
18327d2df79d simplify how pre-defined shader IDs work
Mike Becker <universe@uap-core.de>
parents: 223
diff changeset
105 );
169
6e6717d9c776 improve "polymorphic" typing of shaders
Mike Becker <universe@uap-core.de>
parents: 168
diff changeset
106 if (asc_shader_use(shader, camera)) return;
6e6717d9c776 improve "polymorphic" typing of shaders
Mike Becker <universe@uap-core.de>
parents: 168
diff changeset
107 asc_cptr_cast(AscRectangleShader, rect_shader, shader);
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
108
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
109 // Upload uniforms
169
6e6717d9c776 improve "polymorphic" typing of shaders
Mike Becker <universe@uap-core.de>
parents: 168
diff changeset
110 asc_shader_upload_model_matrix(shader, node);
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
111
159
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
112 if (filled) {
169
6e6717d9c776 improve "polymorphic" typing of shaders
Mike Becker <universe@uap-core.de>
parents: 168
diff changeset
113 asc_shader_upload_col4f(rect_shader->color, rectangle->color);
159
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
114 }
169
6e6717d9c776 improve "polymorphic" typing of shaders
Mike Becker <universe@uap-core.de>
parents: 168
diff changeset
115 asc_shader_upload_vec2f(rect_shader->size, rectangle->size);
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
116
159
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
117 if (border) {
169
6e6717d9c776 improve "polymorphic" typing of shaders
Mike Becker <universe@uap-core.de>
parents: 168
diff changeset
118 asc_shader_upload_float(rect_shader->thickness, rectangle->thickness);
6e6717d9c776 improve "polymorphic" typing of shaders
Mike Becker <universe@uap-core.de>
parents: 168
diff changeset
119 asc_shader_upload_col4f(rect_shader->border_color, rectangle->border_color);
158
f650994ec543 implement rounded corners
Mike Becker <universe@uap-core.de>
parents: 151
diff changeset
120 }
f650994ec543 implement rounded corners
Mike Becker <universe@uap-core.de>
parents: 151
diff changeset
121 if (round) {
169
6e6717d9c776 improve "polymorphic" typing of shaders
Mike Becker <universe@uap-core.de>
parents: 168
diff changeset
122 asc_shader_upload_float(rect_shader->radius, rectangle->radius);
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
123 }
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
124
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
125 // Draw mesh
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
126 asc_mesh_draw_triangle_strip(&rectangle->mesh);
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
127 }
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
128
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
129 AscSceneNode *asc_rectangle_create(struct asc_rectangle_create_args args) {
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
130 AscRectangle *rectangle = cxZallocDefault(sizeof(AscRectangle));
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
131
189
2c063b225183 remove separate vectors for position, rotation, scale from scene node
Mike Becker <universe@uap-core.de>
parents: 175
diff changeset
132 float pos_x, pos_y;
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
133 if (args.bounds.size.width + args.bounds.size.height > 0) {
189
2c063b225183 remove separate vectors for position, rotation, scale from scene node
Mike Becker <universe@uap-core.de>
parents: 175
diff changeset
134 pos_x = (float) args.bounds.pos.x;
2c063b225183 remove separate vectors for position, rotation, scale from scene node
Mike Becker <universe@uap-core.de>
parents: 175
diff changeset
135 pos_y = (float) args.bounds.pos.y;
167
8e6a661c87db add functions to upload common uniforms
Mike Becker <universe@uap-core.de>
parents: 163
diff changeset
136 rectangle->size.width = (float) args.bounds.size.width;
8e6a661c87db add functions to upload common uniforms
Mike Becker <universe@uap-core.de>
parents: 163
diff changeset
137 rectangle->size.height = (float) args.bounds.size.height;
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
138 } else {
189
2c063b225183 remove separate vectors for position, rotation, scale from scene node
Mike Becker <universe@uap-core.de>
parents: 175
diff changeset
139 pos_x = (float) args.x;
2c063b225183 remove separate vectors for position, rotation, scale from scene node
Mike Becker <universe@uap-core.de>
parents: 175
diff changeset
140 pos_y = (float) args.y;
167
8e6a661c87db add functions to upload common uniforms
Mike Becker <universe@uap-core.de>
parents: 163
diff changeset
141 rectangle->size.width = (float) args.width;
8e6a661c87db add functions to upload common uniforms
Mike Becker <universe@uap-core.de>
parents: 163
diff changeset
142 rectangle->size.height = (float) args.height;
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
143 }
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
144
158
f650994ec543 implement rounded corners
Mike Becker <universe@uap-core.de>
parents: 151
diff changeset
145 rectangle->radius = (float)args.radius;
159
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
146 rectangle->filled = args.filled;
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
147 if (!args.filled && args.thickness == 0) {
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
148 // when we do not fill the rectangle, we need a border
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
149 rectangle->thickness = 1;
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
150 } else {
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
151 rectangle->thickness = args.thickness;
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
152 }
214
9d460888a83e remove global active font and color (also fixes #693)
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
153
175
e5544920377e improve macros in datatypes.h - fixes #692
Mike Becker <universe@uap-core.de>
parents: 173
diff changeset
154 if (!args.filled && asc_memcmpz(&args.border_color, sizeof(args.border_color))) {
159
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
155 // convenience fallback:
da7ebfcdd159 add combination of filled rectangle with a border
Mike Becker <universe@uap-core.de>
parents: 158
diff changeset
156 // when we are drawing an outline but have no explicit border color,
214
9d460888a83e remove global active font and color (also fixes #693)
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
157 // use the main color
9d460888a83e remove global active font and color (also fixes #693)
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
158 args.border_color = args.color;
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
159 }
214
9d460888a83e remove global active font and color (also fixes #693)
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
160 rectangle->color = asc_col_itof(args.color);
9d460888a83e remove global active font and color (also fixes #693)
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
161 rectangle->border_color = asc_col_itof(args.border_color);
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
162
207
4d184a8706b1 add asc_scene_node_init() - fixes #695
Mike Becker <universe@uap-core.de>
parents: 206
diff changeset
163 asc_ptr_cast(AscSceneNode, node, rectangle);
4d184a8706b1 add asc_scene_node_init() - fixes #695
Mike Becker <universe@uap-core.de>
parents: 206
diff changeset
164 asc_scene_node_init(node,
4d184a8706b1 add asc_scene_node_init() - fixes #695
Mike Becker <universe@uap-core.de>
parents: 206
diff changeset
165 ASC_SCENE_NODE_FUNCS(asc_rectangle),
4d184a8706b1 add asc_scene_node_init() - fixes #695
Mike Becker <universe@uap-core.de>
parents: 206
diff changeset
166 .pos2d = ASC_VEC2I(pos_x, pos_y),
215
a7c8e1727971 use new point-of-origin for 2d primitives
Mike Becker <universe@uap-core.de>
parents: 214
diff changeset
167 .origin2d = ASC_VEC2I(args.origin_x, args.origin_y),
214
9d460888a83e remove global active font and color (also fixes #693)
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
168 .render_group = (args.filled && args.color.alpha < 255) || args.border_color.alpha < 255
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
169 ? ASC_RENDER_GROUP_2D_BLEND
207
4d184a8706b1 add asc_scene_node_init() - fixes #695
Mike Becker <universe@uap-core.de>
parents: 206
diff changeset
170 : ASC_RENDER_GROUP_2D_OPAQUE
4d184a8706b1 add asc_scene_node_init() - fixes #695
Mike Becker <universe@uap-core.de>
parents: 206
diff changeset
171 );
151
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
172 return node;
42960d0c879b adds first basic rectangle shader
Mike Becker <universe@uap-core.de>
parents: 143
diff changeset
173 }
173
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
174
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
175 static void asc_ellipsis_destroy(AscSceneNode *node) {
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
176 asc_ptr_cast(AscEllipsis, ellipsis, node);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
177 asc_mesh_destroy(&ellipsis->mesh);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
178 }
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
179
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
180 static void asc_ellipsis_update(AscSceneNode *node) {
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
181 asc_ptr_cast(AscEllipsis, ellipsis, node);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
182 asc_vec2f size = asc_vec2f_scale(ellipsis->radii, 2);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
183 asc_mesh_plane_2d(&ellipsis->mesh, .size = size, .uv_scale = size);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
184 }
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
185
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
186
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
187 typedef struct asc_ellipsis_shader_s {
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
188 AscShaderProgram program;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
189 asc_uniform_loc color;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
190 asc_uniform_loc border_color;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
191 asc_uniform_loc radii;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
192 asc_uniform_loc thickness;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
193 } AscEllipsisShader;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
194
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
195 #define ASC_ELLIPSIS_SHADER_FLAG_FILL 1
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
196 #define ASC_ELLIPSIS_SHADER_FLAG_BORDER 2
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
197
222
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
198 static void asc_ellipsis_shader_init(AscShaderProgram *shader, int flags) {
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
199 asc_shader_init_uniform_loc_nice(shader, AscEllipsisShader, radii);
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
200 if (asc_test_flag(flags, ASC_ELLIPSIS_SHADER_FLAG_FILL)) {
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
201 asc_shader_init_uniform_loc_nice(shader, AscEllipsisShader, color);
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
202 }
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
203 if (asc_test_flag(flags, ASC_ELLIPSIS_SHADER_FLAG_BORDER)) {
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
204 asc_shader_init_uniform_loc_nice(shader, AscEllipsisShader, thickness);
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
205 asc_shader_init_uniform_loc_nice(shader, AscEllipsisShader, border_color);
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
206 }
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
207 }
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
208
173
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
209 static AscShaderProgram *asc_ellipsis_shader_create(int flags) {
223
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
210 return asc_shader_create((AscShaderCodes){
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
211 .vtx = {.source_file = "sprite_vtx.glsl"},
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
212 .frag = {
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
213 .source_file = "ellipsis_frag.glsl",
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
214 .preamble_code = (const char *[]) {
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
215 "#define FILL",
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
216 "#define BORDER"
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
217 },
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
218 .preamble_code_flags = flags,
4f32c7755138 clean up the messy shader code specification
Mike Becker <universe@uap-core.de>
parents: 222
diff changeset
219 },
222
2cb9a71df7a6 vastly deduplicate shader creation code
Mike Becker <universe@uap-core.de>
parents: 221
diff changeset
220 }, sizeof(AscEllipsisShader), asc_ellipsis_shader_init, flags);
173
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
221 }
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
222
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
223 static void asc_ellipsis_draw(const AscCamera *camera, const AscSceneNode *node) {
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
224 asc_cptr_cast(AscEllipsis, ellipsis, node);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
225
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
226 const bool filled = ellipsis->filled;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
227 const bool border = ellipsis->thickness > 0;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
228
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
229 // Compute shader flags
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
230 int shader_flags = 0;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
231 if (filled) shader_flags |= ASC_ELLIPSIS_SHADER_FLAG_FILL;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
232 if (border) shader_flags |= ASC_ELLIPSIS_SHADER_FLAG_BORDER;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
233
226
18327d2df79d simplify how pre-defined shader IDs work
Mike Becker <universe@uap-core.de>
parents: 223
diff changeset
234 // Look up and activate the shader
173
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
235 const AscShaderProgram *shader = asc_shader_lookup_or_create(
226
18327d2df79d simplify how pre-defined shader IDs work
Mike Becker <universe@uap-core.de>
parents: 223
diff changeset
236 ASC_SHADER_ELLIPSIS(shader_flags),
18327d2df79d simplify how pre-defined shader IDs work
Mike Becker <universe@uap-core.de>
parents: 223
diff changeset
237 asc_ellipsis_shader_create, shader_flags
18327d2df79d simplify how pre-defined shader IDs work
Mike Becker <universe@uap-core.de>
parents: 223
diff changeset
238 );
173
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
239 if (asc_shader_use(shader, camera)) return;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
240 asc_cptr_cast(AscEllipsisShader, ellipsis_shader, shader);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
241
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
242 // Upload uniforms
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
243 asc_shader_upload_model_matrix(shader, node);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
244
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
245 if (filled) {
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
246 asc_shader_upload_col4f(ellipsis_shader->color, ellipsis->color);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
247 }
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
248 asc_shader_upload_vec2f(ellipsis_shader->radii, ellipsis->radii);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
249
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
250 if (border) {
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
251 asc_shader_upload_float(ellipsis_shader->thickness, ellipsis->thickness);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
252 asc_shader_upload_col4f(ellipsis_shader->border_color, ellipsis->border_color);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
253 }
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
254
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
255 // Draw mesh
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
256 asc_mesh_draw_triangle_strip(&ellipsis->mesh);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
257 }
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
258
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
259 AscSceneNode *asc_ellipsis_create(struct asc_ellipsis_create_args args) {
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
260 AscEllipsis *ellipsis = cxZallocDefault(sizeof(AscEllipsis));
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
261
189
2c063b225183 remove separate vectors for position, rotation, scale from scene node
Mike Becker <universe@uap-core.de>
parents: 175
diff changeset
262 float pos_x, pos_y;
173
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
263 if (args.bounds.size.width + args.bounds.size.height > 0) {
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
264 ellipsis->radii.x = (float) args.bounds.size.width / 2.f;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
265 ellipsis->radii.y = (float) args.bounds.size.height / 2.f;
215
a7c8e1727971 use new point-of-origin for 2d primitives
Mike Becker <universe@uap-core.de>
parents: 214
diff changeset
266 pos_x = (float) args.bounds.pos.x + ellipsis->radii.x;
a7c8e1727971 use new point-of-origin for 2d primitives
Mike Becker <universe@uap-core.de>
parents: 214
diff changeset
267 pos_y = (float) args.bounds.pos.y + ellipsis->radii.y;
173
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
268 } else {
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
269 const unsigned cx = ASC_NONZERO_OR(args.x, args.center.x);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
270 const unsigned cy = ASC_NONZERO_OR(args.y, args.center.y);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
271 const unsigned rx = ASC_NONZERO_OR(args.radius, args.radius_x);
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
272 const unsigned ry = ASC_NONZERO_OR(args.radius, args.radius_y);
215
a7c8e1727971 use new point-of-origin for 2d primitives
Mike Becker <universe@uap-core.de>
parents: 214
diff changeset
273 pos_x = (float) cx;
a7c8e1727971 use new point-of-origin for 2d primitives
Mike Becker <universe@uap-core.de>
parents: 214
diff changeset
274 pos_y = (float) cy;
173
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
275 ellipsis->radii.x = (float) rx;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
276 ellipsis->radii.y = (float) ry;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
277 }
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
278
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
279 ellipsis->filled = args.filled;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
280 if (!args.filled && args.thickness == 0) {
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
281 // when we do not fill the ellipsis, we need a border
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
282 ellipsis->thickness = 1;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
283 } else {
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
284 ellipsis->thickness = args.thickness;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
285 }
214
9d460888a83e remove global active font and color (also fixes #693)
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
286
175
e5544920377e improve macros in datatypes.h - fixes #692
Mike Becker <universe@uap-core.de>
parents: 173
diff changeset
287 if (!args.filled && asc_memcmpz(&args.border_color, sizeof(args.border_color))) {
173
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
288 // convenience fallback:
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
289 // when we are drawing an outline but have no explicit border color,
214
9d460888a83e remove global active font and color (also fixes #693)
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
290 // use the main color
9d460888a83e remove global active font and color (also fixes #693)
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
291 args.border_color = args.color;
173
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
292 }
214
9d460888a83e remove global active font and color (also fixes #693)
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
293 ellipsis->color = asc_col_itof(args.color);
9d460888a83e remove global active font and color (also fixes #693)
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
294 ellipsis->border_color = asc_col_itof(args.border_color);
173
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
295
207
4d184a8706b1 add asc_scene_node_init() - fixes #695
Mike Becker <universe@uap-core.de>
parents: 206
diff changeset
296 asc_ptr_cast(AscSceneNode, node, ellipsis);
4d184a8706b1 add asc_scene_node_init() - fixes #695
Mike Becker <universe@uap-core.de>
parents: 206
diff changeset
297 asc_scene_node_init(node,
4d184a8706b1 add asc_scene_node_init() - fixes #695
Mike Becker <universe@uap-core.de>
parents: 206
diff changeset
298 ASC_SCENE_NODE_FUNCS(asc_ellipsis),
4d184a8706b1 add asc_scene_node_init() - fixes #695
Mike Becker <universe@uap-core.de>
parents: 206
diff changeset
299 .pos2d = ASC_VEC2I(pos_x, pos_y),
215
a7c8e1727971 use new point-of-origin for 2d primitives
Mike Becker <universe@uap-core.de>
parents: 214
diff changeset
300 .origin3d = ASC_VEC3F(ellipsis->radii.x, ellipsis->radii.y, 0), // use float to avoid cast
214
9d460888a83e remove global active font and color (also fixes #693)
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
301 .render_group = (args.filled && args.color.alpha < 255) || args.border_color.alpha < 255
173
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
302 ? ASC_RENDER_GROUP_2D_BLEND
207
4d184a8706b1 add asc_scene_node_init() - fixes #695
Mike Becker <universe@uap-core.de>
parents: 206
diff changeset
303 : ASC_RENDER_GROUP_2D_OPAQUE
4d184a8706b1 add asc_scene_node_init() - fixes #695
Mike Becker <universe@uap-core.de>
parents: 206
diff changeset
304 );
173
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
305 return node;
bd57fe3f6360 add ellipsis shader - resolves #385
Mike Becker <universe@uap-core.de>
parents: 169
diff changeset
306 }

mercurial