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

chore: refactor to use shape nodes

Browse Source
This commit is contained in:
Beriff
2026-03-14 18:25:02 +07:00
parent e054fc4fe7
commit 43b6d284dd
9 changed files with 151 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ui/vektorcanvas.c
View File

@@ -139,17 +139,17 @@ static void init_geometry(void) {
void vektor_canvas_geometry_changed(VektorCanvasRenderInfo* renderInfo) {
vb.count = 0;
vektor_rasterize(&vb, renderInfo->shapes, renderInfo->zoom);
vektor_vb_rasterize(&vb, renderInfo->shapes, renderInfo->zoom);
shape_vertex_count = vb.count;
if (renderInfo->selectedShape != NULL &&
*(renderInfo->selectedShape) != NULL) {
VektorShape* selectedShape = *renderInfo->selectedShape;
VektorShapeNode* selectedShape = *renderInfo->selectedShape;
// create handle quads if a shape is selected
for (size_t i = 0; i < selectedShape->handleCount; i++) {
V2 handle = selectedShape->handles[i];
for (size_t i = 0; i < selectedShape->base.handleCount; i++) {
V2 handle = selectedShape->base.handles[i];
VektorBBox handleBbox = vektor_shape_get_handle_bbox(handle);
vektor_vb_add_quad(&vb, handleBbox.min, handleBbox.max,
vektor_color_new(255, 255, 255, 255));
@@ -158,7 +158,7 @@ void vektor_canvas_geometry_changed(VektorCanvasRenderInfo* renderInfo) {
shape_vertex_count = vb.count;
// create selection quad if a shape is selected
VektorBBox bbox = vektor_primitive_get_bbox(selectedShape->primitive);
VektorBBox bbox = vektor_primitive_get_bbox(selectedShape->base.primitive);
// expand it a little so it is not inset
bbox = vektor_bbox_expand(bbox, 0.03f);
@@ -199,7 +199,7 @@ static gboolean render(GtkGLArea* a, GdkGLContext* ctx,
// re-fetch bbox (we know a shape is selected)
VektorBBox bbox = vektor_primitive_get_bbox(
(*(renderInfo->selectedShape))->primitive);
(*(renderInfo->selectedShape))->base.primitive);
bbox = vektor_bbox_expand(bbox, 0.03f);
glUseProgram(selection_shader_program);

5
src/ui/vektorcanvas.h
View File

@@ -5,6 +5,7 @@
#include "../util/color.h"
#include "gtk/gtk.h"
#include "src/core/matrix.h"
#include "src/core/modifier.h"
#include "src/core/primitives.h"
#include "uicontroller.h"
@@ -22,10 +23,10 @@ typedef struct VektorCanvas {
typedef struct VektorCanvasRenderInfo {
gint64 startupTime;
VektorShapeBuffer* shapes;
VektorShapeNodeBuffer* shapes;
// a pointer to appstate->selectedShape
VektorShape** selectedShape;
VektorShapeNode** selectedShape;
float zoom;
float panX;
float panY;