fix: update canvas real-time

This commit is contained in:
Beriff
2026-03-10 17:19:50 +07:00
parent 1d168f7be4
commit 64dd2d6e40
7 changed files with 29 additions and 10 deletions

View File

@@ -29,7 +29,9 @@ static void appstate_set_tool(GtkButton* button, gpointer user_data) {
);
// setting tool also resets selected shape
data->state->selectedShape = NULL;
// NOTE: isn't needed anymore, as you would
// want to be able to select & edit existing shapes
//data->state->selectedShape = NULL;
}
static void appstate_reveal_subtools(GtkButton* button, gpointer user_data) {
@@ -60,8 +62,8 @@ static void appstate_on_color_change(VektorColorWheel* wheel,
gtk_editable_set_text(GTK_EDITABLE(appstate->widgetState->sidepanelEntryB),
str_b);
gtk_gl_area_queue_render(
GTK_GL_AREA(appstate->widgetState->workspaceCanvas));
/*gtk_gl_area_queue_render(
GTK_GL_AREA(appstate->widgetState->workspaceCanvas));*/
}
static void appstate_on_entry_update(GtkEntry* entry, gpointer user_data) {
@@ -97,7 +99,8 @@ static void canvas_onclick(GtkGestureClick* gesture, int n_press, double x,
vektor_appstate_canvas_click(state, normalized_coords.x,
normalized_coords.y);
gtk_gl_area_queue_render(GTK_GL_AREA(widget));
//gtk_gl_area_queue_render(GTK_GL_AREA(widget));
}
void vektor_appstate_canvas_click(VektorAppState* state, double x, double y) {
@@ -174,18 +177,18 @@ begin_click_dispatch:
vektor_rectangle_set_start(&state->selectedShape->primitive.rectangle, pos);
vektor_rectangle_set_end(
&state->selectedShape->primitive.rectangle,
vec2_add(pos, (V2){0.1f,-0.1f})
vec2_add(pos, (V2){0.1f,0.1f})
);
//state->selectedShape = NULL;
vektor_shapes_update_bbox(state->shapeBuffer);
}
else if (state->selectedTool == VektorSelectionTool) {
g_print("as select");
for(size_t i = 0; i < state->shapeBuffer->count; i++) {
VektorBBox bbox =
vektor_primitive_get_bbox(state->shapeBuffer->shapes[i].primitive);
if(vektor_bbox_isinside(bbox, pos)) {
state->selectedShape = &(state->shapeBuffer->shapes[i]);
g_print("%d", state->selectedShape == NULL);
return;
}
}
@@ -215,6 +218,8 @@ void vektor_appstate_new(VektorWidgetState* wstate, VektorAppState* stateOut) {
data_selecttool->tool = VektorSelectionTool;
// populate appstate
stateOut->startupTime = g_get_monotonic_time();
stateOut->shapeBuffer = malloc(sizeof(VektorShapeBuffer));
*stateOut->shapeBuffer = (VektorShapeBuffer){0};
stateOut->canvas = malloc(sizeof(VektorCanvas));
@@ -224,6 +229,7 @@ void vektor_appstate_new(VektorWidgetState* wstate, VektorAppState* stateOut) {
VektorCanvasRenderInfo* renderInfo = malloc(sizeof(VektorCanvasRenderInfo));
renderInfo->selectedShape = &(stateOut->selectedShape);
renderInfo->shapes = stateOut->shapeBuffer;
renderInfo->startupTime = stateOut->startupTime;
vektor_canvas_init(wstate, stateOut->canvas, renderInfo);
// link all the buttons

View File

@@ -14,6 +14,8 @@ typedef enum VektorAppTool {
} VektorAppTool;
typedef struct VektorAppState {
gint64 startupTime;
VektorWidgetState* widgetState;
VektorAppTool selectedTool;

View File

@@ -112,7 +112,7 @@ VektorBBox vektor_polygon_get_bbox(VektorPrimitive prim) {
}
VektorBBox vektor_rectangle_get_bbox(VektorPrimitive prim) {
return *(VektorBBox*)&prim.rectangle;
return (VektorBBox){prim.rectangle.start, prim.rectangle.end};
}
VektorBBox vektor_primitive_get_bbox(VektorPrimitive prim) {

View File

@@ -1,3 +1,4 @@
#include "glib.h"
#include "gtk/gtk.h"
#include "src/application/applicationstate.h"
#include "src/core/primitives.h"
@@ -14,6 +15,13 @@ static void on_map(GtkWidget* window, gpointer user_data) {
vektor_uictrl_map((VektorWidgetState*)user_data);
}
static int update_callback(gpointer data) {
VektorAppState* appstate = (VektorAppState*)data;
gtk_gl_area_queue_render(
GTK_GL_AREA(appstate->widgetState->workspaceCanvas));
return G_SOURCE_CONTINUE;
}
static void activate(GtkApplication* app, gpointer user_data) {
VektorWidgetState* widget_state =
@@ -25,6 +33,8 @@ static void activate(GtkApplication* app, gpointer user_data) {
g_signal_connect(widget_state->window, "map", G_CALLBACK(on_map),
widget_state);
g_timeout_add(1, update_callback, app_state);
gtk_window_present(widget_state->window);
}

View File

@@ -168,7 +168,7 @@ static gboolean render(GtkGLArea* a, GdkGLContext* ctx, VektorCanvasRenderInfo*
// PASS 2 - draw selection quads
if (vb.count > shape_vertex_count) {
float time = g_get_monotonic_time() / 1000000.0f;
float time = (g_get_monotonic_time() - renderInfo->startupTime) / 10000000.0f;
// re-fetch bbox (we know a shape is selected)
VektorBBox bbox = vektor_primitive_get_bbox(

View File

@@ -21,6 +21,7 @@ typedef struct VektorCanvas {
} VektorCanvas;
typedef struct VektorCanvasRenderInfo {
gint64 startupTime;
VektorShapeBuffer* shapes;
// a pointer to appstate->selectedShape