Frox/Vektor
1
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: parameterize stroke color and thickness

Browse Source
This commit is contained in:
Froxwin
2026-03-07 14:49:12 +05:30
parent d620caf02b
commit 3a292ea351
10 changed files with 112 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/primitives.c
View File

@@ -46,12 +46,12 @@ void vektor_polygon_free(VektorPolygon* pg) {
free(pg);
}
void vektor_primitivebuffer_add_primitive(VektorPrimitiveBuffer* buffer,
VektorPrimitive prim) {
void vektor_shapebuffer_add_shape(VektorShapeBuffer* buffer,
VektorShape shape) {
if (buffer->count >= buffer->capacity) {
buffer->capacity = buffer->capacity ? buffer->capacity * 2 : 4;
buffer->primitives = realloc(
buffer->primitives, sizeof(VektorPrimitive) * buffer->capacity);
buffer->shapes =
realloc(buffer->shapes, sizeof(VektorShape) * buffer->capacity);
}
buffer->primitives[buffer->count++] = prim;
buffer->shapes[buffer->count++] = shape;
}

26
src/core/primitives.h
View File

@@ -1,15 +1,11 @@
#ifndef PRIMITIVES_H_
#define PRIMITIVES_H_
#include "src/util/color.h"
#include "stddef.h"
#include "stdlib.h"
#include "vector.h"
typedef struct {
V2 p1;
V2 p2;
} VektorLine;
typedef struct {
V2* points;
size_t count;
@@ -28,7 +24,6 @@ typedef struct {
} VektorCircle;
typedef enum {
VEKTOR_LINE,
VEKTOR_POLYLINE,
VEKTOR_POLYGON,
VEKTOR_CIRCLE
@@ -37,7 +32,6 @@ typedef enum {
typedef struct {
VektorPrimitiveKind kind;
union {
VektorLine line;
VektorPolyline* polyline;
VektorPolygon* polygon;
VektorCircle circle;
@@ -53,12 +47,22 @@ void vektor_polygon_add_point(VektorPolygon* pl, V2 point);
void vektor_polygon_free(VektorPolygon* pl);
typedef struct {
VektorPrimitive* primitives;
VektorColor stroke_color;
float stroke_width;
} VektorStyle;
typedef struct {
VektorStyle style;
int z_index;
VektorPrimitive primitive;
} VektorShape;
typedef struct {
VektorShape* shapes;
size_t count;
size_t capacity;
} VektorPrimitiveBuffer;
} VektorShapeBuffer;
void vektor_primitivebuffer_add_primitive(VektorPrimitiveBuffer* edges,
VektorPrimitive edge);
void vektor_shapebuffer_add_shape(VektorShapeBuffer* buffer, VektorShape shape);
#endif // PRIMITIVES_H_

153
src/core/raster.c
View File

@@ -2,6 +2,7 @@
#include "epoxy/gl.h"
#include "primitives.h"
#include "stddef.h"
#include <stddef.h>
void vektor_edgebuffer_add_edge(EdgeBuffer* buffer, Edge edge) {
if (buffer->count >= buffer->capacity) {
@@ -11,18 +12,15 @@ void vektor_edgebuffer_add_edge(EdgeBuffer* buffer, Edge edge) {
buffer->edges[buffer->count++] = edge;
}
void vektor_line_flatten(EdgeBuffer* buffer, VektorLine line) {
vektor_edgebuffer_add_edge(buffer, (Edge){line.p1, line.p2, 0});
}
void vektor_polyline_flatten(EdgeBuffer* buffer, VektorPolyline* line) {
void vektor_polyline_flatten(EdgeBuffer* buffer, VektorPolyline* line,
size_t j) {
for (size_t i = 0; i + 1 < line->count; i++) {
vektor_edgebuffer_add_edge(
buffer, (Edge){line->points[i], line->points[i + 1], 0});
buffer, (Edge){line->points[i], line->points[i + 1], 0, j});
}
}
void vektor_polygon_flatten(EdgeBuffer* buffer, VektorPolygon* pg) {
void vektor_polygon_flatten(EdgeBuffer* buffer, VektorPolygon* pg, size_t j) {
size_t n = pg->count;
if (n < 3)
return;
@@ -31,86 +29,22 @@ void vektor_polygon_flatten(EdgeBuffer* buffer, VektorPolygon* pg) {
V2 p1 = pg->points[i];
V2 p2 = pg->points[(i + 1) % n];
int winding = (p1.y < p2.y) ? +1 : -1;
vektor_edgebuffer_add_edge(buffer, (Edge){p1, p2, winding});
vektor_edgebuffer_add_edge(buffer, (Edge){p1, p2, winding, j});
}
}
inline VektorFramebuffer vektor_framebuffer_new(unsigned int W,
unsigned int H) {
VektorFramebuffer fb = {
.width = W, .height = H, .pixels = calloc(W * H * 4, 1)};
return fb;
}
inline void vektor_framebuffer_putpixel(VektorFramebuffer* fb, int x, int y,
VektorColor color) {
if ((unsigned)x >= fb->width || (unsigned)y >= fb->height)
return;
int i = (y * fb->width + x) * 4;
fb->pixels[i + 0] = color.r;
fb->pixels[i + 1] = color.g;
fb->pixels[i + 2] = color.b;
fb->pixels[i + 3] = color.a;
}
void draw_filled_circle(VektorFramebuffer* fb, int cx, int cy, int r,
VektorColor color) {
for (int y = -r; y <= r; y++) {
int dx = (int)sqrt(r * r - y * y);
for (int x = -dx; x <= dx; x++) {
vektor_framebuffer_putpixel(fb, cx + x, cy + y, color);
}
}
}
void vektor_framebuffer_drawline(VektorFramebuffer* fb, V2 a, V2 b,
VektorColor color, double thickness) {
int x0 = (int)a.x;
int y0 = (int)a.y;
int x1 = (int)b.x;
int y1 = (int)b.y;
int dx = abs(x1 - x0);
int sx = x0 < x1 ? 1 : -1;
int dy = -abs(y1 - y0);
int sy = y0 < y1 ? 1 : -1;
int err = dx + dy;
for (;;) {
draw_filled_circle(fb, x0, y0, thickness / 2, color);
if (x0 == x1 && y0 == y1)
break;
int e2 = 2 * err;
if (e2 >= dy) {
err += dy;
x0 += sx;
}
if (e2 <= dx) {
err += dx;
y0 += sy;
}
}
}
void vektor_framebuffer_rasterize(VektorFramebuffer* fb,
VektorPrimitiveBuffer* prims) {
void vektor_rasterize(VertexBuffer* vb, VektorShapeBuffer* shapes) {
EdgeBuffer edges = {0};
for (size_t i = 0; i < prims->count; i++) {
VektorPrimitive* p = &prims->primitives[i];
for (size_t i = 0; i < shapes->count; i++) {
VektorPrimitive* p = &shapes->shapes[i].primitive;
switch (p->kind) {
case VEKTOR_LINE:
vektor_line_flatten(&edges, p->line);
break;
case VEKTOR_POLYLINE:
vektor_polyline_flatten(&edges, p->polyline);
vektor_polyline_flatten(&edges, p->polyline, i);
break;
case VEKTOR_POLYGON:
vektor_polygon_flatten(&edges, p->polygon);
vektor_polygon_flatten(&edges, p->polygon, i);
break;
default:
@@ -119,73 +53,46 @@ void vektor_framebuffer_rasterize(VektorFramebuffer* fb,
}
}
for (size_t i = 0; i < edges.count; i++) {
vektor_framebuffer_drawline(fb, edges.edges[i].p1, edges.edges[i].p2,
vektor_color_solid(255, 0, 255), 4);
}
vektor_edges_to_triangles(vb, &edges, shapes);
}
VertexBuffer vektor_rasterize(VektorPrimitiveBuffer* prims) {
EdgeBuffer edges = {0};
for (size_t i = 0; i < prims->count; i++) {
VektorPrimitive* p = &prims->primitives[i];
switch (p->kind) {
case VEKTOR_LINE:
vektor_line_flatten(&edges, p->line);
break;
case VEKTOR_POLYLINE:
vektor_polyline_flatten(&edges, p->polyline);
break;
case VEKTOR_POLYGON:
vektor_polygon_flatten(&edges, p->polygon);
break;
default:
// TODO: fill in all primitives
break;
}
}
VertexBuffer vb = vektor_edges_to_triangles(&edges, 0.1f);
return vb;
}
void vb_add_triangle(VertexBuffer* vb, V2 v0, V2 v1, V2 v2) {
void vb_add_triangle(VertexBuffer* vb, V2 v0, V2 v1, V2 v2, VektorColor color) {
if (vb->count + 3 >= vb->capacity) {
vb->capacity = vb->capacity ? vb->capacity * 2 : 8;
vb->vertices = realloc(vb->vertices, sizeof(V2) * vb->capacity);
vb->vertices = realloc(vb->vertices, sizeof(Vertex) * vb->capacity);
}
vb->vertices[vb->count++] = v0;
vb->vertices[vb->count++] = v1;
vb->vertices[vb->count++] = v2;
vb->vertices[vb->count++] = (Vertex){v0, color};
vb->vertices[vb->count++] = (Vertex){v1, color};
vb->vertices[vb->count++] = (Vertex){v2, color};
}
void vektor_edge_to_triangles(VertexBuffer* vb, Edge e, float thickness) {
void vektor_edge_to_triangles(VertexBuffer* vb, Edge e,
VektorShapeBuffer* shape_buffer) {
float dx = e.p2.x - e.p1.x;
float dy = e.p2.y - e.p1.y;
float len = sqrtf(dx * dx + dy * dy);
if (len == 0)
return;
float px = -dy / len * (thickness / 2);
float py = dx / len * (thickness / 2);
float px =
-dy / len * (shape_buffer->shapes[e.shape_id].style.stroke_width / 2);
float py =
dx / len * (shape_buffer->shapes[e.shape_id].style.stroke_width / 2);
V2 v0 = {e.p1.x + px, e.p1.y + py};
V2 v1 = {e.p1.x - px, e.p1.y - py};
V2 v2 = {e.p2.x + px, e.p2.y + py};
V2 v3 = {e.p2.x - px, e.p2.y - py};
vb_add_triangle(vb, v0, v1, v2);
vb_add_triangle(vb, v2, v1, v3);
vb_add_triangle(vb, v0, v1, v2,
shape_buffer->shapes[e.shape_id].style.stroke_color);
vb_add_triangle(vb, v2, v1, v3,
shape_buffer->shapes[e.shape_id].style.stroke_color);
}
VertexBuffer vektor_edges_to_triangles(EdgeBuffer* edges, float thickness) {
VertexBuffer vb = {0};
void vektor_edges_to_triangles(VertexBuffer* vb, EdgeBuffer* edges,
VektorShapeBuffer* shape_buffer) {
for (size_t i = 0; i < edges->count; i++) {
vektor_edge_to_triangles(&vb, edges->edges[i], thickness);
vektor_edge_to_triangles(vb, edges->edges[i], shape_buffer);
}
return vb;
}

40
src/core/raster.h
View File

@@ -3,14 +3,16 @@
#include "primitives.h"
#include "src/util/color.h"
#include "../util/color.h"
#include "stddef.h"
#include "vector.h"
#include <stddef.h>
typedef struct {
V2 p1;
V2 p2;
int winding;
size_t shape_id;
} Edge;
typedef struct {
@@ -21,37 +23,25 @@ typedef struct {
void vektor_edgebuffer_add_edge(EdgeBuffer* edges, Edge edge);
void vektor_line_flatten(EdgeBuffer* edges, VektorLine line);
void vektor_polyline_flatten(EdgeBuffer* edges, VektorPolyline* line);
void vektor_polygon_flatten(EdgeBuffer* buffer, VektorPolygon* line);
void vektor_polyline_flatten(EdgeBuffer* edges, VektorPolyline* line, size_t i);
void vektor_polygon_flatten(EdgeBuffer* buffer, VektorPolygon* line, size_t i);
typedef struct {
unsigned int width;
unsigned int height;
unsigned char* pixels; // Flat RGBA8 array
} VektorFramebuffer;
VektorFramebuffer vektor_framebuffer_new(unsigned int width,
unsigned int height);
void vektor_framebuffer_putpixel(VektorFramebuffer* fb, int x, int y,
VektorColor color);
void vektor_framebuffer_drawline(VektorFramebuffer* fb, V2 a, V2 b,
VektorColor color, double thickness);
void vektor_framebuffer_rasterize(VektorFramebuffer* fb,
VektorPrimitiveBuffer* primitives);
V2 coords;
VektorColor color;
} Vertex;
typedef struct {
V2* vertices;
Vertex* vertices;
size_t count;
size_t capacity;
} VertexBuffer;
void vb_add_triangle(VertexBuffer* vb, V2 v0, V2 v1, V2 v2);
void vektor_edge_to_triangles(VertexBuffer* vb, Edge e, float thickness);
VertexBuffer vektor_edges_to_triangles(EdgeBuffer* edges, float thickness);
VertexBuffer vektor_rasterize(VektorPrimitiveBuffer* prims);
void vb_add_triangle(VertexBuffer* vb, V2 v0, V2 v1, V2 v2, VektorColor color);
void vektor_edge_to_triangles(VertexBuffer* vb, Edge e,
VektorShapeBuffer* shape_buffer);
void vektor_edges_to_triangles(VertexBuffer* vb, EdgeBuffer* edges,
VektorShapeBuffer* shape_buffer);
void vektor_rasterize(VertexBuffer* vb, VektorShapeBuffer* shapes);
#endif // RASTER_H_