{
Lt *lt;
PointLayerState state;
- Dynarray/*<Vec2f>*/ *positions;
- Dynarray/*<Color>*/ *colors;
- Dynarray/*<char[ID_MAX_SIZE]>*/ *ids;
+ Dynarray/*<Vec2f>*/ positions;
+ Dynarray/*<Color>*/ colors;
+ Dynarray/*<char[ID_MAX_SIZE]>*/ ids;
int selection;
ColorPicker color_picker;
size_t index, size_t index2)
{
trace_assert(point_layer);
- trace_assert(index < dynarray_count(point_layer->positions));
- trace_assert(index2 < dynarray_count(point_layer->positions));
+ trace_assert(index < point_layer->positions.count);
+ trace_assert(index2 < point_layer->positions.count);
PointUndoContext undo_context;
undo_context.type = POINT_UNDO_SWAP;
size_t index =
type == POINT_UNDO_ADD
- ? dynarray_count(point_layer->positions) - 1
+ ? point_layer->positions.count - 1
: (size_t) point_layer->selection;
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);
+ 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;
switch (undo_context->type) {
case POINT_UNDO_ADD: {
- dynarray_pop(point_layer->positions, NULL);
- dynarray_pop(point_layer->colors, NULL);
- dynarray_pop(point_layer->ids, NULL);
+ dynarray_pop(&point_layer->positions, NULL);
+ dynarray_pop(&point_layer->colors, NULL);
+ dynarray_pop(&point_layer->ids, NULL);
point_layer->selection = -1;
} break;
case POINT_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);
+ 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->selection = -1;
} break;
case POINT_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);
+ 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;
case POINT_UNDO_SWAP: {
- dynarray_swap(point_layer->positions, undo_context->index, undo_context->index2);
- dynarray_swap(point_layer->colors, undo_context->index, undo_context->index2);
- dynarray_swap(point_layer->ids, undo_context->index, undo_context->index2);
+ dynarray_swap(&point_layer->positions, undo_context->index, undo_context->index2);
+ dynarray_swap(&point_layer->colors, undo_context->index, undo_context->index2);
+ dynarray_swap(&point_layer->ids, undo_context->index, undo_context->index2);
} break;
}
}
point_layer->state = POINT_LAYER_IDLE;
- point_layer->positions = PUSH_LT(lt, create_dynarray(sizeof(Vec2f)), destroy_dynarray);
- if (point_layer->positions == NULL) {
- RETURN_LT(lt, NULL);
- }
-
- point_layer->colors = PUSH_LT(lt, create_dynarray(sizeof(Color)), destroy_dynarray);
- if (point_layer->colors == NULL) {
- RETURN_LT(lt, NULL);
- }
-
- point_layer->ids = PUSH_LT(lt, create_dynarray(sizeof(char) * ID_MAX_SIZE), destroy_dynarray);
- if (point_layer->ids == NULL) {
- RETURN_LT(lt, NULL);
- }
+ point_layer->positions = create_dynarray(sizeof(Vec2f));
+ point_layer->colors = create_dynarray(sizeof(Color));
+ point_layer->ids = create_dynarray(sizeof(char) * ID_MAX_SIZE);
point_layer->edit_field = PUSH_LT(
lt,
const Color color = hexstr(color_name);
const Vec2f point = vec(x, y);
- dynarray_push(point_layer->colors, &color);
- dynarray_push(point_layer->positions, &point);
- dynarray_push(point_layer->ids, id);
+ dynarray_push(&point_layer->colors, &color);
+ dynarray_push(&point_layer->positions, &point);
+ dynarray_push(&point_layer->ids, id);
}
point_layer->selection = -1;
return point_layer;
}
+PointLayer *chop_point_layer(Memory *memory,
+ String *input,
+ const char *id_name_prefix)
+{
+ trace_assert(memory);
+ trace_assert(input);
+ trace_assert(id_name_prefix);
+
+ PointLayer *point_layer = create_point_layer(id_name_prefix);
+
+ int n = atoi(string_to_cstr(memory, trim(chop_by_delim(input, '\n'))));
+ char id[ENTITY_MAX_ID_SIZE];
+ for (int i = 0; i < n; ++i) {
+ String line = trim(chop_by_delim(input, '\n'));
+ String string_id = trim(chop_word(&line));
+ Vec2f point;
+ point.x = strtof(string_to_cstr(memory, trim(chop_word(&line))), NULL);
+ point.y = strtof(string_to_cstr(memory, trim(chop_word(&line))), NULL);
+ Color color = hexs(trim(chop_word(&line)));
+
+ memset(id, 0, ENTITY_MAX_ID_SIZE);
+ memcpy(
+ id,
+ string_id.data,
+ min_size_t(ENTITY_MAX_ID_SIZE - 1, string_id.count));
+
+ dynarray_push(&point_layer->positions, &point);
+ dynarray_push(&point_layer->colors, &color);
+ dynarray_push(&point_layer->ids, id);
+ }
+
+ point_layer->selection = -1;
+ point_layer->color_picker = create_color_picker_from_rgba(COLOR_RED);
+
+ return point_layer;
+}
+
void destroy_point_layer(PointLayer *point_layer)
{
trace_assert(point_layer);
+
+ free(point_layer->positions.data);
+ free(point_layer->colors.data);
+ free(point_layer->ids.data);
+
RETURN_LT0(point_layer->lt);
}
trace_assert(point_layer);
trace_assert(camera);
- const int n = (int) dynarray_count(point_layer->positions);
- Vec2f *positions = dynarray_data(point_layer->positions);
- Color *colors = dynarray_data(point_layer->colors);
- char *ids = dynarray_data(point_layer->ids);
+ const int n = (int)point_layer->positions.count;
+ Vec2f *positions = (Vec2f *)point_layer->positions.data;
+ Color *colors = (Color *)point_layer->colors.data;
+ char *ids = (char *)point_layer->ids.data;
for (int i = 0; i < n; ++i) {
const Color color = color_scale(
{
trace_assert(point_layer);
- int n = (int) dynarray_count(point_layer->positions);
- Vec2f *positions = dynarray_data(point_layer->positions);
+ int n = (int) point_layer->positions.count;
+ Vec2f *positions = (Vec2f *)point_layer->positions.data;
for (int i = n - 1; i >= 0; --i) {
if (vec_length(vec_sub(positions[i], position)) < POINT_LAYER_ELEMENT_RADIUS) {
point_layer->id_name_prefix,
point_layer->id_name_counter++);
- dynarray_push(point_layer->positions, &position);
- dynarray_push(point_layer->colors, &color);
- dynarray_push(point_layer->ids, id);
+ dynarray_push(&point_layer->positions, &position);
+ dynarray_push(&point_layer->colors, &color);
+ dynarray_push(&point_layer->ids, id);
POINT_UNDO_PUSH(
undo_history,
{
trace_assert(point_layer);
trace_assert(undo_history);
- trace_assert(a < dynarray_count(point_layer->positions));
- trace_assert(b < dynarray_count(point_layer->positions));
+ trace_assert(a < point_layer->positions.count);
+ trace_assert(b < point_layer->positions.count);
- dynarray_swap(point_layer->positions, a, b);
- dynarray_swap(point_layer->colors, a, b);
- dynarray_swap(point_layer->ids, a, b);
+ dynarray_swap(&point_layer->positions, a, b);
+ dynarray_swap(&point_layer->colors, a, b);
+ dynarray_swap(&point_layer->ids, a, b);
POINT_UNDO_PUSH(
undo_history,
point_layer,
POINT_UNDO_DELETE));
- dynarray_delete_at(point_layer->positions, i);
- dynarray_delete_at(point_layer->colors, i);
- dynarray_delete_at(point_layer->ids, i);
+ dynarray_delete_at(&point_layer->positions, i);
+ dynarray_delete_at(&point_layer->colors, i);
+ dynarray_delete_at(&point_layer->ids, i);
}
static
color_picker_rgba(&point_layer->color_picker),
undo_history);
} else {
- Color *colors = dynarray_data(point_layer->colors);
- Vec2f *positions = dynarray_data(point_layer->positions);
+ Color *colors = (Color*)point_layer->colors.data;
+ Vec2f *positions = (Vec2f*)point_layer->positions.data;
point_layer->state = POINT_LAYER_MOVE;
point_layer->color_picker =
case SDLK_UP: {
if ((event->key.keysym.mod & KMOD_SHIFT)
&& (point_layer->selection >= 0)
- && ((size_t)(point_layer->selection + 1) < dynarray_count(point_layer->positions))) {
+ && ((size_t)(point_layer->selection + 1) < point_layer->positions.count)) {
point_layer_swap_elements(
point_layer,
(size_t) point_layer->selection,
case SDLK_DOWN: {
if ((event->key.keysym.mod & KMOD_SHIFT)
&& (point_layer->selection > 0)
- && ((size_t) point_layer->selection < dynarray_count(point_layer->positions))) {
+ && ((size_t) point_layer->selection < point_layer->positions.count)) {
point_layer_swap_elements(
point_layer,
(size_t) point_layer->selection,
} break;
case SDLK_DELETE: {
- if (0 <= point_layer->selection && point_layer->selection < (int) dynarray_count(point_layer->positions)) {
+ if (0 <= point_layer->selection && point_layer->selection < (int) point_layer->positions.count) {
point_layer_delete_nth_element(
point_layer,
(size_t)point_layer->selection,
case SDLK_F2: {
if (point_layer->selection >= 0) {
- char *ids = dynarray_data(point_layer->ids);
+ char *ids = (char*)point_layer->ids.data;
point_layer->state = POINT_LAYER_EDIT_ID;
edit_field_replace(
point_layer->edit_field,
case SDLK_c: {
if ((event->key.keysym.mod & KMOD_LCTRL) && point_layer->selection >= 0) {
point_clipboard = 1;
- dynarray_copy_to(point_layer->colors, &point_clipboard_color, (size_t)point_layer->selection);
+ dynarray_copy_to(&point_layer->colors, &point_clipboard_color, (size_t)point_layer->selection);
}
} break;
point_layer,
POINT_UNDO_UPDATE));
- char *id = dynarray_pointer_at(point_layer->ids, (size_t) point_layer->selection);
+ char *id = dynarray_pointer_at(&point_layer->ids, (size_t) point_layer->selection);
const char *text = edit_field_as_text(point_layer->edit_field);
size_t n = min_size_t(strlen(text), ID_MAX_SIZE - 1);
memcpy(id, text, n);
trace_assert(camera);
trace_assert(point_layer->selection >= 0);
- Vec2f *positions = dynarray_data(point_layer->positions);
+ Vec2f *positions = (Vec2f*)point_layer->positions.data;
switch (event->type) {
case SDL_MOUSEBUTTONUP: {
POINT_UNDO_UPDATE));
dynarray_replace_at(
- point_layer->positions,
+ &point_layer->positions,
(size_t) point_layer->selection,
&point_layer->inter_position);
}
POINT_UNDO_UPDATE));
dynarray_replace_at(
- point_layer->colors,
+ &point_layer->colors,
(size_t) point_layer->selection,
&point_layer->inter_color);
size_t point_layer_count(const PointLayer *point_layer)
{
trace_assert(point_layer);
- return dynarray_count(point_layer->positions);
+ return point_layer->positions.count;
}
const Vec2f *point_layer_positions(const PointLayer *point_layer)
{
trace_assert(point_layer);
- return dynarray_data(point_layer->positions);
+ return (const Vec2f *)point_layer->positions.data;
}
const Color *point_layer_colors(const PointLayer *point_layer)
{
trace_assert(point_layer);
- return dynarray_data(point_layer->colors);
+ return (const Color *)point_layer->colors.data;
}
const char *point_layer_ids(const PointLayer *point_layer)
{
trace_assert(point_layer);
- return dynarray_data(point_layer->ids);
+ return (const char *)point_layer->ids.data;
}
int point_layer_dump_stream(const PointLayer *point_layer,
trace_assert(point_layer);
trace_assert(filedump);
- size_t n = dynarray_count(point_layer->ids);
- char *ids = dynarray_data(point_layer->ids);
- Vec2f *positions = dynarray_data(point_layer->positions);
- Color *colors = dynarray_data(point_layer->colors);
+ size_t n = point_layer->ids.count;
+ char *ids = (char *) point_layer->ids.data;
+ Vec2f *positions = (Vec2f *) point_layer->positions.data;
+ Color *colors = (Color *) point_layer->colors.data;
fprintf(filedump, "%zd\n", n);
for (size_t i = 0; i < n; ++i) {
projects / nothing.git / blobdiff