fix: update canvas real-time
This commit is contained in:
@@ -26,11 +26,11 @@ void main()
|
|||||||
float gap_length = 0.015;
|
float gap_length = 0.015;
|
||||||
float total = dash_length + gap_length;
|
float total = dash_length + gap_length;
|
||||||
|
|
||||||
float speed = 1.8;
|
float speed = 0.3;
|
||||||
|
|
||||||
float distance_along = (vPos.x + vPos.y) * 20.0;
|
float distance_along = (vPos.x + vPos.y) * 20.0;
|
||||||
|
|
||||||
float t = mod(distance_along * total, total);
|
float t = mod( distance_along * total + uTime * speed, total);
|
||||||
|
|
||||||
if (t < dash_length)
|
if (t < dash_length)
|
||||||
FragColor = uColor2;
|
FragColor = uColor2;
|
||||||
|
|||||||
@@ -29,7 +29,9 @@ static void appstate_set_tool(GtkButton* button, gpointer user_data) {
|
|||||||
);
|
);
|
||||||
|
|
||||||
// setting tool also resets selected shape
|
// 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) {
|
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),
|
gtk_editable_set_text(GTK_EDITABLE(appstate->widgetState->sidepanelEntryB),
|
||||||
str_b);
|
str_b);
|
||||||
|
|
||||||
gtk_gl_area_queue_render(
|
/*gtk_gl_area_queue_render(
|
||||||
GTK_GL_AREA(appstate->widgetState->workspaceCanvas));
|
GTK_GL_AREA(appstate->widgetState->workspaceCanvas));*/
|
||||||
}
|
}
|
||||||
|
|
||||||
static void appstate_on_entry_update(GtkEntry* entry, gpointer user_data) {
|
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,
|
vektor_appstate_canvas_click(state, normalized_coords.x,
|
||||||
normalized_coords.y);
|
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) {
|
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_start(&state->selectedShape->primitive.rectangle, pos);
|
||||||
vektor_rectangle_set_end(
|
vektor_rectangle_set_end(
|
||||||
&state->selectedShape->primitive.rectangle,
|
&state->selectedShape->primitive.rectangle,
|
||||||
vec2_add(pos, (V2){0.1f,-0.1f})
|
vec2_add(pos, (V2){0.1f,0.1f})
|
||||||
);
|
);
|
||||||
//state->selectedShape = NULL;
|
//state->selectedShape = NULL;
|
||||||
vektor_shapes_update_bbox(state->shapeBuffer);
|
vektor_shapes_update_bbox(state->shapeBuffer);
|
||||||
}
|
}
|
||||||
else if (state->selectedTool == VektorSelectionTool) {
|
else if (state->selectedTool == VektorSelectionTool) {
|
||||||
g_print("as select");
|
|
||||||
for(size_t i = 0; i < state->shapeBuffer->count; i++) {
|
for(size_t i = 0; i < state->shapeBuffer->count; i++) {
|
||||||
VektorBBox bbox =
|
VektorBBox bbox =
|
||||||
vektor_primitive_get_bbox(state->shapeBuffer->shapes[i].primitive);
|
vektor_primitive_get_bbox(state->shapeBuffer->shapes[i].primitive);
|
||||||
if(vektor_bbox_isinside(bbox, pos)) {
|
if(vektor_bbox_isinside(bbox, pos)) {
|
||||||
state->selectedShape = &(state->shapeBuffer->shapes[i]);
|
state->selectedShape = &(state->shapeBuffer->shapes[i]);
|
||||||
|
g_print("%d", state->selectedShape == NULL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -215,6 +218,8 @@ void vektor_appstate_new(VektorWidgetState* wstate, VektorAppState* stateOut) {
|
|||||||
data_selecttool->tool = VektorSelectionTool;
|
data_selecttool->tool = VektorSelectionTool;
|
||||||
|
|
||||||
// populate appstate
|
// populate appstate
|
||||||
|
stateOut->startupTime = g_get_monotonic_time();
|
||||||
|
|
||||||
stateOut->shapeBuffer = malloc(sizeof(VektorShapeBuffer));
|
stateOut->shapeBuffer = malloc(sizeof(VektorShapeBuffer));
|
||||||
*stateOut->shapeBuffer = (VektorShapeBuffer){0};
|
*stateOut->shapeBuffer = (VektorShapeBuffer){0};
|
||||||
stateOut->canvas = malloc(sizeof(VektorCanvas));
|
stateOut->canvas = malloc(sizeof(VektorCanvas));
|
||||||
@@ -224,6 +229,7 @@ void vektor_appstate_new(VektorWidgetState* wstate, VektorAppState* stateOut) {
|
|||||||
VektorCanvasRenderInfo* renderInfo = malloc(sizeof(VektorCanvasRenderInfo));
|
VektorCanvasRenderInfo* renderInfo = malloc(sizeof(VektorCanvasRenderInfo));
|
||||||
renderInfo->selectedShape = &(stateOut->selectedShape);
|
renderInfo->selectedShape = &(stateOut->selectedShape);
|
||||||
renderInfo->shapes = stateOut->shapeBuffer;
|
renderInfo->shapes = stateOut->shapeBuffer;
|
||||||
|
renderInfo->startupTime = stateOut->startupTime;
|
||||||
vektor_canvas_init(wstate, stateOut->canvas, renderInfo);
|
vektor_canvas_init(wstate, stateOut->canvas, renderInfo);
|
||||||
|
|
||||||
// link all the buttons
|
// link all the buttons
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ typedef enum VektorAppTool {
|
|||||||
} VektorAppTool;
|
} VektorAppTool;
|
||||||
|
|
||||||
typedef struct VektorAppState {
|
typedef struct VektorAppState {
|
||||||
|
gint64 startupTime;
|
||||||
|
|
||||||
VektorWidgetState* widgetState;
|
VektorWidgetState* widgetState;
|
||||||
|
|
||||||
VektorAppTool selectedTool;
|
VektorAppTool selectedTool;
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ VektorBBox vektor_polygon_get_bbox(VektorPrimitive prim) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
VektorBBox vektor_rectangle_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) {
|
VektorBBox vektor_primitive_get_bbox(VektorPrimitive prim) {
|
||||||
|
|||||||
10
src/main.c
10
src/main.c
@@ -1,3 +1,4 @@
|
|||||||
|
#include "glib.h"
|
||||||
#include "gtk/gtk.h"
|
#include "gtk/gtk.h"
|
||||||
#include "src/application/applicationstate.h"
|
#include "src/application/applicationstate.h"
|
||||||
#include "src/core/primitives.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);
|
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) {
|
static void activate(GtkApplication* app, gpointer user_data) {
|
||||||
|
|
||||||
VektorWidgetState* widget_state =
|
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),
|
g_signal_connect(widget_state->window, "map", G_CALLBACK(on_map),
|
||||||
widget_state);
|
widget_state);
|
||||||
|
|
||||||
|
g_timeout_add(1, update_callback, app_state);
|
||||||
|
|
||||||
gtk_window_present(widget_state->window);
|
gtk_window_present(widget_state->window);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -168,7 +168,7 @@ static gboolean render(GtkGLArea* a, GdkGLContext* ctx, VektorCanvasRenderInfo*
|
|||||||
|
|
||||||
// PASS 2 - draw selection quads
|
// PASS 2 - draw selection quads
|
||||||
if (vb.count > shape_vertex_count) {
|
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)
|
// re-fetch bbox (we know a shape is selected)
|
||||||
VektorBBox bbox = vektor_primitive_get_bbox(
|
VektorBBox bbox = vektor_primitive_get_bbox(
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ typedef struct VektorCanvas {
|
|||||||
} VektorCanvas;
|
} VektorCanvas;
|
||||||
|
|
||||||
typedef struct VektorCanvasRenderInfo {
|
typedef struct VektorCanvasRenderInfo {
|
||||||
|
gint64 startupTime;
|
||||||
VektorShapeBuffer* shapes;
|
VektorShapeBuffer* shapes;
|
||||||
|
|
||||||
// a pointer to appstate->selectedShape
|
// a pointer to appstate->selectedShape
|
||||||
|
|||||||
Reference in New Issue
Block a user