stephenseo/Triangles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fix edit-tri mode

Browse source
This commit is contained in:
Stephen Seo 2024-02-29 15:55:34 +09:00
parent b8d4521223
commit 7480c11d95
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/state.cpp
View file

@ -121,6 +121,10 @@ void Tri::State::handle_events() {
flags.flip(F_DISPLAY_HELP); flags.flip(F_DISPLAY_HELP);
break; break;
case KEY_U: case KEY_U:
if (flags.test(F_TRI_EDIT_MODE)) {
set_notification_text("Cannot undo during editing tri!");
break;
}
flags.set(F_DRAW_CACHE_DIRTY); flags.set(F_DRAW_CACHE_DIRTY);
if (history_idx > 0) { if (history_idx > 0) {
switch(history[history_idx-1].type) { switch(history[history_idx-1].type) {
@ -345,14 +349,15 @@ void Tri::State::handle_events() {
if(my < 0) { my = 0; } if(my < 0) { my = 0; }
else if(my >= (int)height) { my = height - 1; } else if(my >= (int)height) { my = height - 1; }
for (auto &tri : tris) { for (unsigned int i = 0; i < tris.size(); ++i) {
if(is_within_shape(tri, {mx, my})) { if(is_within_shape(tris[i], {mx, my})) {
tri.outlineColor = invert_color(tri.fillColor); tris[i].outlineColor = invert_color(tris[i].fillColor);
flags.reset(F_SELECT_TRI_MODE); flags.reset(F_SELECT_TRI_MODE);
flags.set(F_TRI_EDIT_MODE); flags.set(F_TRI_EDIT_MODE);
flags.set(F_TRI_EDIT_DRAW_TRI); flags.set(F_TRI_EDIT_DRAW_TRI);
selectedTriBlinkTimer = 1.0f; selectedTriBlinkTimer = 1.0f;
selectedTriColor = tri.fillColor; selectedTriColor = tris[i].fillColor;
selectedTri = i;
break; break;
} }
} }
@ -367,6 +372,7 @@ void Tri::State::update() {
dt = GetFrameTime(); dt = GetFrameTime();
if(notificationAlpha > 0.0f) { if(notificationAlpha > 0.0f) {
// TODO use sq_lerp
notificationAlpha -= dt * STARTING_HELP_FADE_RATE; notificationAlpha -= dt * STARTING_HELP_FADE_RATE;
if(notificationAlpha < 0.0f) { if(notificationAlpha < 0.0f) {
notificationAlpha = 0.0f; notificationAlpha = 0.0f;
@ -418,7 +424,7 @@ void Tri::State::draw() {
if(flags.test(F_TRI_EDIT_MODE) && flags.test(F_TRI_EDIT_DRAW_TRI)) { if(flags.test(F_TRI_EDIT_MODE) && flags.test(F_TRI_EDIT_DRAW_TRI)) {
// tris.at(selectedTri).setOutlineThickness(4.0f); // tris.at(selectedTri).setOutlineThickness(4.0f);
tris[selectedTri].draw(); tris.at(selectedTri).draw();
// tris.at(selectedTri).setOutlineThickness(0.0f); // tris.at(selectedTri).setOutlineThickness(0.0f);
} }
@ -639,6 +645,20 @@ Color& Tri::State::get_selected_tri_color() {
void Tri::State::close_selected_tri_mode() { void Tri::State::close_selected_tri_mode() {
tris.at(selectedTri).fillColor = selectedTriColor; tris.at(selectedTri).fillColor = selectedTriColor;
flags.set(F_DRAW_CACHE_DIRTY); flags.set(F_DRAW_CACHE_DIRTY);
// Set tri's new color in history.
for (auto &action : history) {
if (action.type == Action::AT_TRI
&& tris.at(selectedTri).vertices.at(0).x == action.data.tri[0]
&& tris.at(selectedTri).vertices.at(0).y == action.data.tri[1]
&& tris.at(selectedTri).vertices.at(1).x == action.data.tri[2]
&& tris.at(selectedTri).vertices.at(1).y == action.data.tri[3]
&& tris.at(selectedTri).vertices.at(2).x == action.data.tri[4]
&& tris.at(selectedTri).vertices.at(2).y == action.data.tri[5]) {
action.color = selectedTriColor;
break;
}
}
reset_modes(); reset_modes();
} }