#include "ui/edit_field.h"
#include "./point_layer.h"
#include "math/extrema.h"
+#include "math/mat3x3.h"
#include "./color_picker.h"
+#include "undo_history.h"
#define POINT_LAYER_ELEMENT_RADIUS 10.0f
#define POINT_LAYER_ID_TEXT_SIZE vec(2.0f, 2.0f)
#define POINT_LAYER_ID_TEXT_COLOR COLOR_BLACK
-// TODO(#985): PointLayer cannot move its points
typedef enum {
POINT_LAYER_IDLE = 0,
- POINT_LAYER_EDIT_ID
+ POINT_LAYER_EDIT_ID,
+ POINT_LAYER_MOVE,
+ POINT_LAYER_RECOLOR
} PointLayerState;
struct PointLayer
Dynarray/*<Point>*/ *positions;
Dynarray/*<Color>*/ *colors;
Dynarray/*<char[ID_MAX_SIZE]>*/ *ids;
- Edit_field *edit_field;
int selected;
ColorPicker color_picker;
+
+ Point inter_position;
+ Color inter_color;
+ Edit_field *edit_field;
};
+typedef enum {
+ UNDO_ADD,
+ UNDO_DELETE,
+ UNDO_UPDATE
+} UndoType;
+
+typedef struct {
+ UndoType type;
+ PointLayer *layer;
+ Point position;
+ Color color;
+ char id[ID_MAX_SIZE];
+ size_t index;
+} UndoContext;
+
+static
+UndoContext point_layer_create_undo_context(PointLayer *point_layer,
+ UndoType type)
+{
+ UndoContext undo_context;
+
+ size_t index =
+ type == UNDO_ADD
+ ? dynarray_count(point_layer->positions) - 1
+ : (size_t) point_layer->selected;
+
+ undo_context.type = type;
+ undo_context.layer = point_layer;
+ dynarray_copy_to(point_layer->positions, &undo_context.position, index);
+ dynarray_copy_to(point_layer->colors, &undo_context.color, index);
+ dynarray_copy_to(point_layer->ids, &undo_context.id, index);
+ undo_context.index = index;
+
+ return undo_context;
+}
+
+static
+void point_layer_undo(void *context, size_t context_size)
+{
+ trace_assert(context);
+ trace_assert(sizeof(UndoContext) == context_size);
+
+ UndoContext *undo_context = context;
+ PointLayer *point_layer = undo_context->layer;
+
+ switch (undo_context->type) {
+ case UNDO_ADD: {
+ dynarray_pop(point_layer->positions, NULL);
+ dynarray_pop(point_layer->colors, NULL);
+ dynarray_pop(point_layer->ids, NULL);
+ point_layer->selected = -1;
+ } break;
+
+ case UNDO_DELETE: {
+ dynarray_insert_before(point_layer->positions, undo_context->index, &undo_context->position);
+ dynarray_insert_before(point_layer->colors, undo_context->index, &undo_context->color);
+ dynarray_insert_before(point_layer->ids, undo_context->index, &undo_context->id);
+ point_layer->selected = -1;
+ } break;
+
+ case UNDO_UPDATE: {
+ dynarray_replace_at(point_layer->positions, undo_context->index, &undo_context->position);
+ dynarray_replace_at(point_layer->colors, undo_context->index, &undo_context->color);
+ dynarray_replace_at(point_layer->ids, undo_context->index, &undo_context->id);
+ } break;
+ }
+}
+
+#define UNDO_PUSH(LAYER, HISTORY, UNDO_TYPE) \
+ do { \
+ UndoContext context = point_layer_create_undo_context(LAYER, UNDO_TYPE); \
+ undo_history_push( \
+ HISTORY, \
+ point_layer_undo, \
+ &context, \
+ sizeof(context)); \
+ } while(0)
+
LayerPtr point_layer_as_layer(PointLayer *point_layer)
{
LayerPtr layer = {
point_layer->selected = -1;
- point_layer->color_picker = create_color_picker_from_rgba(rgba(1.0f, 0.0f, 0.0f, 1.0f));
+ point_layer->color_picker = create_color_picker_from_rgba(COLOR_RED);
return point_layer;
}
RETURN_LT0(point_layer->lt);
}
+static inline
+Triangle element_shape(Point position, float scale)
+{
+ return triangle_mat3x3_product(
+ equilateral_triangle(),
+ mat3x3_product(
+ trans_mat_vec(position),
+ scale_mat(scale)));
+}
+
int point_layer_render(const PointLayer *point_layer,
Camera *camera,
int active)
char *ids = dynarray_data(point_layer->ids);
for (int i = 0; i < n; ++i) {
- const Triangle t = triangle_mat3x3_product(
- equilateral_triangle(),
- mat3x3_product(
- trans_mat(positions[i].x, positions[i].y),
- scale_mat(POINT_LAYER_ELEMENT_RADIUS)));
-
const Color color = color_scale(
- colors[i],
+ point_layer->state == POINT_LAYER_RECOLOR && i == point_layer->selected
+ ? point_layer->inter_color
+ : colors[i],
rgba(1.0f, 1.0f, 1.0f, active ? 1.0f : 0.5f));
- if (i == point_layer->selected) {
- const Triangle t0 = triangle_mat3x3_product(
- equilateral_triangle(),
- mat3x3_product(
- trans_mat(positions[i].x, positions[i].y),
- scale_mat(15.0f)));
+ const Point position =
+ point_layer->state == POINT_LAYER_MOVE && i == point_layer->selected
+ ? point_layer->inter_position
+ : positions[i];
- if (camera_fill_triangle(camera, t0, color_invert(color)) < 0) {
+ // Selection Layer
+ if (active && i == point_layer->selected) {
+ if (camera_fill_triangle(
+ camera,
+ element_shape(
+ position,
+ POINT_LAYER_ELEMENT_RADIUS + 5.0f),
+ color_invert(color)) < 0) {
return -1;
}
- if (point_layer->state == POINT_LAYER_IDLE &&
+ if (point_layer->state != POINT_LAYER_EDIT_ID &&
camera_render_text(
camera,
ids + ID_MAX_SIZE * i,
POINT_LAYER_ID_TEXT_SIZE,
POINT_LAYER_ID_TEXT_COLOR,
- positions[i]) < 0) {
+ position) < 0) {
return -1;
}
}
- if (camera_fill_triangle(camera, t, color) < 0) {
+ if (camera_fill_triangle(
+ camera,
+ element_shape(
+ position,
+ POINT_LAYER_ELEMENT_RADIUS),
+ color) < 0) {
return -1;
}
-
}
if (point_layer->state == POINT_LAYER_EDIT_ID) {
- /* TODO(#855): PointLayer edit field is not scaled on zoom */
if (edit_field_render_world(
point_layer->edit_field,
camera,
return 0;
}
+static
+int point_layer_element_at(const PointLayer *point_layer,
+ Point position)
+{
+ trace_assert(point_layer);
+
+ int n = (int) dynarray_count(point_layer->positions);
+ Point *positions = dynarray_data(point_layer->positions);
+
+ for (int i = 0; i < n; ++i) {
+ if (vec_length(vec_sub(positions[i], position)) < POINT_LAYER_ELEMENT_RADIUS) {
+ return i;
+ }
+ }
+
+ return -1;
+}
+
+static
+int point_layer_add_element(PointLayer *point_layer,
+ Point position,
+ Color color,
+ UndoHistory *undo_history)
+{
+ trace_assert(point_layer);
+ trace_assert(undo_history);
+
+ char id[ID_MAX_SIZE];
+ for (size_t i = 0; i < ID_MAX_SIZE - 1; ++i) {
+ id[i] = (char) ('a' + rand() % ('z' - 'a' + 1));
+ }
+ id[ID_MAX_SIZE - 1] = '\0';
+
+ dynarray_push(point_layer->positions, &position);
+ dynarray_push(point_layer->colors, &color);
+ dynarray_push(point_layer->ids, id);
+
+ UNDO_PUSH(point_layer, undo_history, UNDO_ADD);
+
+ return 0;
+}
+
+static
+void point_layer_delete_nth_element(PointLayer *point_layer,
+ size_t i,
+ UndoHistory *undo_history)
+{
+ trace_assert(point_layer);
+
+ UNDO_PUSH(point_layer, undo_history, UNDO_DELETE);
+
+ dynarray_delete_at(point_layer->positions, i);
+ dynarray_delete_at(point_layer->colors, i);
+ dynarray_delete_at(point_layer->ids, i);
+}
+
static
int point_layer_idle_event(PointLayer *point_layer,
const SDL_Event *event,
- const Camera *camera)
+ const Camera *camera,
+ UndoHistory *undo_history)
{
trace_assert(point_layer);
trace_assert(event);
if (color_picker_event(
&point_layer->color_picker,
event,
+ camera,
&selected) < 0) {
return -1;
}
if (selected) {
+ if (point_layer->selected >= 0) {
+ point_layer->inter_color = color_picker_rgba(&point_layer->color_picker);
+ point_layer->state = POINT_LAYER_RECOLOR;
+ }
return 0;
}
case SDL_MOUSEBUTTONDOWN: {
switch (event->button.button) {
case SDL_BUTTON_LEFT: {
- const int n = (int) dynarray_count(point_layer->positions);
- const Point *positions = dynarray_data(point_layer->positions);
- const Point point = camera_map_screen(camera, event->button.x, event->button.y);
- const Color color = color_picker_rgba(&point_layer->color_picker);
-
- for (int i = 0; i < n; ++i) {
- if (vec_length(vec_sub(positions[i], point)) < POINT_LAYER_ELEMENT_RADIUS) {
- point_layer->selected = i;
- return 0;
- }
- }
-
- char id[ID_MAX_SIZE];
-
- for (size_t i = 0; i < ID_MAX_SIZE - 1; ++i) {
- id[i] = (char) ('a' + rand() % ('z' - 'a' + 1));
+ const Point position = camera_map_screen(camera, event->button.x, event->button.y);
+
+ point_layer->selected = point_layer_element_at(
+ point_layer, position);
+
+ if (point_layer->selected < 0) {
+ point_layer_add_element(
+ point_layer,
+ position,
+ color_picker_rgba(&point_layer->color_picker),
+ undo_history);
+ } else {
+ Color *colors = dynarray_data(point_layer->colors);
+ Point *positions = dynarray_data(point_layer->positions);
+
+ point_layer->state = POINT_LAYER_MOVE;
+ point_layer->color_picker =
+ create_color_picker_from_rgba(colors[point_layer->selected]);
+ point_layer->inter_position = positions[point_layer->selected];
}
- id[ID_MAX_SIZE - 1] = '\0';
-
- dynarray_push(point_layer->positions, &point);
- dynarray_push(point_layer->colors, &color);
- dynarray_push(point_layer->ids, id);
} break;
}
} break;
switch (event->key.keysym.sym) {
case SDLK_DELETE: {
if (0 <= point_layer->selected && point_layer->selected < (int) dynarray_count(point_layer->positions)) {
- dynarray_delete_at(point_layer->positions, (size_t) point_layer->selected);
- dynarray_delete_at(point_layer->colors, (size_t) point_layer->selected);
- dynarray_delete_at(point_layer->ids, (size_t) point_layer->selected);
+ point_layer_delete_nth_element(
+ point_layer,
+ (size_t)point_layer->selected,
+ undo_history);
+ point_layer->selected = -1;
}
- point_layer->selected = -1;
} break;
case SDLK_F2: {
static
int point_layer_edit_id_event(PointLayer *point_layer,
const SDL_Event *event,
- const Camera *camera)
+ const Camera *camera,
+ UndoHistory *undo_history)
{
trace_assert(point_layer);
trace_assert(event);
case SDL_KEYDOWN: {
switch(event->key.keysym.sym) {
case SDLK_RETURN: {
- char *ids = dynarray_data(point_layer->ids);
+ UNDO_PUSH(point_layer, undo_history, UNDO_UPDATE);
+
+ char *id = dynarray_pointer_at(point_layer->ids, (size_t) point_layer->selected);
const char *text = edit_field_as_text(point_layer->edit_field);
- size_t n = max_size_t(strlen(text), ID_MAX_SIZE - 1);
- memcpy(ids + point_layer->selected * ID_MAX_SIZE, text, n);
- *(ids + point_layer->selected * ID_MAX_SIZE + n) = '\0';
+ size_t n = min_size_t(strlen(text), ID_MAX_SIZE - 1);
+ memcpy(id, text, n);
+ memset(id + n, 0, ID_MAX_SIZE - n);
+
point_layer->state = POINT_LAYER_IDLE;
SDL_StopTextInput();
return 0;
return edit_field_event(point_layer->edit_field, event);
}
+static
+int point_layer_move_event(PointLayer *point_layer,
+ const SDL_Event *event,
+ const Camera *camera,
+ UndoHistory *undo_history)
+{
+ trace_assert(point_layer);
+ trace_assert(event);
+ trace_assert(camera);
+ trace_assert(point_layer->selected >= 0);
+
+ switch (event->type) {
+ case SDL_MOUSEBUTTONUP: {
+ switch (event->button.button) {
+ case SDL_BUTTON_LEFT: {
+ point_layer->state = POINT_LAYER_IDLE;
+
+ // TODO(#1014): just click (without moving) on the point creates an undo history entry
+ UNDO_PUSH(point_layer, undo_history, UNDO_UPDATE);
+
+ dynarray_replace_at(
+ point_layer->positions,
+ (size_t) point_layer->selected,
+ &point_layer->inter_position);
+ } break;
+ }
+ } break;
+
+ case SDL_MOUSEMOTION: {
+ point_layer->inter_position =
+ camera_map_screen(camera, event->motion.x, event->motion.y);
+ } break;
+ }
+
+ return 0;
+}
+
+static
+int point_layer_recolor_event(PointLayer *point_layer,
+ const SDL_Event *event,
+ const Camera *camera,
+ UndoHistory *undo_history)
+{
+ trace_assert(point_layer);
+ trace_assert(event);
+ trace_assert(camera);
+ trace_assert(undo_history);
+ trace_assert(point_layer->selected >= 0);
+
+ int selected = 0;
+ if (color_picker_event(
+ &point_layer->color_picker,
+ event,
+ camera,
+ &selected) < 0) {
+ return -1;
+ }
+
+ if (selected) {
+ point_layer->inter_color = color_picker_rgba(&point_layer->color_picker);
+
+ if (!color_picker_drag(&point_layer->color_picker)) {
+ UNDO_PUSH(point_layer, undo_history, UNDO_UPDATE);
+
+ dynarray_replace_at(
+ point_layer->colors,
+ (size_t) point_layer->selected,
+ &point_layer->inter_color);
+
+ point_layer->state = POINT_LAYER_IDLE;
+ }
+ }
+
+
+ return 0;
+}
+
int point_layer_event(PointLayer *point_layer,
const SDL_Event *event,
- const Camera *camera)
+ const Camera *camera,
+ UndoHistory *undo_history)
{
trace_assert(point_layer);
trace_assert(event);
trace_assert(camera);
+ trace_assert(undo_history);
switch (point_layer->state) {
case POINT_LAYER_IDLE:
- return point_layer_idle_event(point_layer, event, camera);
+ return point_layer_idle_event(point_layer, event, camera, undo_history);
case POINT_LAYER_EDIT_ID:
- return point_layer_edit_id_event(point_layer, event, camera);
+ return point_layer_edit_id_event(point_layer, event, camera, undo_history);
+
+ case POINT_LAYER_MOVE:
+ return point_layer_move_event(point_layer, event, camera, undo_history);
+
+ case POINT_LAYER_RECOLOR:
+ return point_layer_recolor_event(point_layer, event, camera, undo_history);
}
return 0;
projects / nothing.git / blobdiff