curvedraw

annotate src/app.cc @ 12:84a647283237

find changesets by author, revision, files, or words in the commit message
added all the extra functionality to the curve class first pass at a project-to-curve function (needs more work)
author John Tsiombikas <nuclear@member.fsf.org>
date Sun, 20 Dec 2015 07:21:32 +0200
parents 95fada20c638
children 4da693339d99
rev   line source
nuclear@0 1 #include <stdlib.h>
nuclear@0 2 #include <float.h>
nuclear@2 3 #include <assert.h>
nuclear@0 4 #include <vector>
nuclear@0 5 #include <algorithm>
nuclear@0 6 #include "opengl.h"
nuclear@0 7 #include "app.h"
nuclear@0 8 #include "curve.h"
nuclear@0 9 #include "widgets.h"
nuclear@6 10 #include "curvefile.h"
nuclear@0 11
nuclear@3 12 enum SnapMode {
nuclear@3 13 SNAP_NONE,
nuclear@3 14 SNAP_GRID,
nuclear@3 15 SNAP_POINT
nuclear@3 16 };
nuclear@3 17
nuclear@1 18 int win_width, win_height;
nuclear@1 19 float win_aspect;
nuclear@1 20
nuclear@0 21 static void draw_grid(float sz, float sep, float alpha = 1.0f);
nuclear@0 22 static void draw_curve(const Curve *curve);
nuclear@0 23 static void on_click(int bn, float u, float v);
nuclear@0 24
nuclear@2 25 // viewport control
nuclear@2 26 static Vector2 view_pan;
nuclear@3 27 static float view_scale = 0.2f;
nuclear@3 28 static Matrix4x4 view_matrix;
nuclear@3 29
nuclear@3 30 static float grid_size = 1.0;
nuclear@3 31 static SnapMode snap_mode;
nuclear@0 32
nuclear@12 33 static bool show_bounds;
nuclear@12 34
nuclear@0 35 static std::vector<Curve*> curves;
nuclear@2 36 static Curve *sel_curve; // selected curve being edited
nuclear@2 37 static Curve *new_curve; // new curve being entered
nuclear@2 38 static Curve *hover_curve; // curve the mouse is hovering over (click to select)
nuclear@2 39 static int sel_pidx = -1; // selected point of the selected or hovered-over curve
nuclear@0 40
nuclear@2 41 static Label *weight_label; // floating label for the cp weight
nuclear@0 42
nuclear@3 43 static Vector2 mouse_pointer;
nuclear@3 44
nuclear@0 45
nuclear@0 46 bool app_init(int argc, char **argv)
nuclear@0 47 {
nuclear@5 48 glewInit();
nuclear@5 49
nuclear@0 50 glEnable(GL_MULTISAMPLE);
nuclear@0 51 glEnable(GL_CULL_FACE);
nuclear@2 52
nuclear@2 53 glEnable(GL_BLEND);
nuclear@2 54 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
nuclear@0 55 return true;
nuclear@0 56 }
nuclear@0 57
nuclear@0 58 void app_cleanup()
nuclear@0 59 {
nuclear@0 60 for(size_t i=0; i<curves.size(); i++) {
nuclear@0 61 delete curves[i];
nuclear@0 62 }
nuclear@0 63 curves.clear();
nuclear@0 64 }
nuclear@0 65
nuclear@0 66 void app_draw()
nuclear@0 67 {
nuclear@1 68 glClearColor(0.1, 0.1, 0.1, 1);
nuclear@0 69 glClear(GL_COLOR_BUFFER_BIT);
nuclear@0 70
nuclear@0 71 glMatrixMode(GL_MODELVIEW);
nuclear@0 72 glLoadIdentity();
nuclear@3 73 glTranslatef(view_pan.x * view_scale, view_pan.y * view_scale, 0);
nuclear@0 74 glScalef(view_scale, view_scale, view_scale);
nuclear@0 75
nuclear@3 76 float max_aspect = std::max(win_aspect, 1.0f / win_aspect);
nuclear@3 77 draw_grid(max_aspect, grid_size);
nuclear@0 78
nuclear@0 79 for(size_t i=0; i<curves.size(); i++) {
nuclear@0 80 draw_curve(curves[i]);
nuclear@0 81 }
nuclear@0 82 if(new_curve) {
nuclear@0 83 draw_curve(new_curve);
nuclear@0 84 }
nuclear@3 85
nuclear@3 86 #ifdef DRAW_MOUSE_POINTER
nuclear@3 87 glPointSize(6.0);
nuclear@3 88 glBegin(GL_POINTS);
nuclear@3 89 glColor3f(0, 0, 1);
nuclear@3 90 glVertex2f(mouse_pointer.x, mouse_pointer.y);
nuclear@3 91 glEnd();
nuclear@3 92 #endif
nuclear@4 93
nuclear@4 94 glMatrixMode(GL_MODELVIEW);
nuclear@4 95 glLoadIdentity();
nuclear@4 96
nuclear@4 97 if(weight_label) {
nuclear@4 98 weight_label->draw();
nuclear@4 99 }
nuclear@0 100 }
nuclear@0 101
nuclear@0 102 static void draw_grid(float sz, float sep, float alpha)
nuclear@0 103 {
nuclear@0 104 float x = 0.0f;
nuclear@3 105 float s = 1.0 / view_scale;
nuclear@3 106
nuclear@3 107 sz *= s;
nuclear@3 108 sz += sep; // one more step for when we have non-zero fractional pan
nuclear@3 109 float end = std::min(sz, 100.0f * sep);
nuclear@3 110
nuclear@3 111 // fractional pan
nuclear@3 112 Vector2 pan = view_pan;
nuclear@3 113 Vector2 fpan = Vector2(fmod(pan.x, sep), fmod(pan.y, sep));
nuclear@3 114 Vector2 offset = fpan - pan;
nuclear@3 115
nuclear@3 116 glMatrixMode(GL_MODELVIEW);
nuclear@3 117 glPushMatrix();
nuclear@3 118 glTranslatef(offset.x, offset.y, 0);
nuclear@3 119
nuclear@3 120 glBegin(GL_LINES);
nuclear@3 121 glColor4f(0.35, 0.35, 0.35, alpha);
nuclear@3 122 while(x <= end) {
nuclear@3 123 glVertex2f(-end, x);
nuclear@3 124 glVertex2f(end, x);
nuclear@3 125 glVertex2f(-end, -x);
nuclear@3 126 glVertex2f(end, -x);
nuclear@3 127 glVertex2f(x, -end);
nuclear@3 128 glVertex2f(x, end);
nuclear@3 129 glVertex2f(-x, -end);
nuclear@3 130 glVertex2f(-x, end);
nuclear@3 131 x += sep;
nuclear@3 132 }
nuclear@3 133 glEnd();
nuclear@3 134 glPopMatrix();
nuclear@3 135
nuclear@0 136
nuclear@0 137 glLineWidth(1.0);
nuclear@0 138 glBegin(GL_LINES);
nuclear@0 139 glColor4f(0.6, 0.3, 0.2, alpha);
nuclear@3 140 glVertex2f(-sz + offset.x, 0);
nuclear@3 141 glVertex2f(sz + offset.x, 0);
nuclear@0 142 glColor4f(0.2, 0.3, 0.6, alpha);
nuclear@3 143 glVertex2f(0, -sz + offset.y);
nuclear@3 144 glVertex2f(0, sz + offset.y);
nuclear@0 145 glEnd();
nuclear@3 146
nuclear@0 147 }
nuclear@0 148
nuclear@0 149 static void draw_curve(const Curve *curve)
nuclear@0 150 {
nuclear@2 151 int numpt = curve->size();
nuclear@2 152 int segm = numpt * 16;
nuclear@0 153
nuclear@12 154 if(show_bounds) {
nuclear@12 155 Vector3 bmin, bmax;
nuclear@12 156 curve->get_bbox(&bmin, &bmax);
nuclear@12 157
nuclear@12 158 glLineWidth(1.0);
nuclear@12 159 glColor3f(0, 1, 0);
nuclear@12 160 glBegin(GL_LINE_LOOP);
nuclear@12 161 glVertex2f(bmin.x, bmin.y);
nuclear@12 162 glVertex2f(bmax.x, bmin.y);
nuclear@12 163 glVertex2f(bmax.x, bmax.y);
nuclear@12 164 glVertex2f(bmin.x, bmax.y);
nuclear@12 165 glEnd();
nuclear@12 166 }
nuclear@12 167
nuclear@2 168 glLineWidth(curve == hover_curve ? 4.0 : 2.0);
nuclear@1 169 if(curve == sel_curve) {
nuclear@1 170 glColor3f(0.3, 0.4, 1.0);
nuclear@1 171 } else if(curve == new_curve) {
nuclear@1 172 glColor3f(1.0, 0.75, 0.3);
nuclear@1 173 } else {
nuclear@2 174 glColor3f(0.6, 0.6, 0.6);
nuclear@1 175 }
nuclear@0 176 glBegin(GL_LINE_STRIP);
nuclear@0 177 for(int i=0; i<segm; i++) {
nuclear@0 178 float t = (float)i / (float)(segm - 1);
nuclear@12 179 Vector3 v = curve->interpolate(t);
nuclear@0 180 glVertex2f(v.x, v.y);
nuclear@0 181 }
nuclear@0 182 glEnd();
nuclear@0 183 glLineWidth(1.0);
nuclear@0 184
nuclear@2 185 glPointSize(curve == hover_curve ? 10.0 : 7.0);
nuclear@0 186 glBegin(GL_POINTS);
nuclear@1 187 if(curve == new_curve) {
nuclear@1 188 glColor3f(1.0, 0.0, 0.0);
nuclear@1 189 } else {
nuclear@1 190 glColor3f(0.6, 0.3, 0.2);
nuclear@1 191 }
nuclear@0 192 for(int i=0; i<numpt; i++) {
nuclear@1 193 if(curve == sel_curve) {
nuclear@1 194 if(i == sel_pidx) {
nuclear@1 195 glColor3f(1.0, 0.2, 0.1);
nuclear@1 196 } else {
nuclear@1 197 glColor3f(0.2, 1.0, 0.2);
nuclear@1 198 }
nuclear@1 199 }
nuclear@12 200 Vector2 pt = curve->get_point2(i);
nuclear@0 201 glVertex2f(pt.x, pt.y);
nuclear@0 202 }
nuclear@0 203 glEnd();
nuclear@12 204
nuclear@12 205 // draw the projected mouse point on the selected curve
nuclear@12 206 /*
nuclear@12 207 if(curve == sel_curve) {
nuclear@12 208 Vector3 pp = curve->proj_point(Vector3(mouse_pointer.x, mouse_pointer.y, 0.0));
nuclear@12 209
nuclear@12 210 glPointSize(5.0);
nuclear@12 211 glBegin(GL_POINTS);
nuclear@12 212 glColor3f(1, 0.8, 0.2);
nuclear@12 213 glVertex2f(pp.x, pp.y);
nuclear@12 214 glEnd();
nuclear@12 215 }
nuclear@12 216 */
nuclear@0 217 glPointSize(1.0);
nuclear@0 218 }
nuclear@0 219
nuclear@0 220 void app_reshape(int x, int y)
nuclear@0 221 {
nuclear@0 222 win_width = x;
nuclear@0 223 win_height = y;
nuclear@0 224 win_aspect = (float)x / (float)y;
nuclear@0 225
nuclear@0 226 glViewport(0, 0, x, y);
nuclear@0 227 glMatrixMode(GL_PROJECTION);
nuclear@0 228 glLoadIdentity();
nuclear@0 229 glOrtho(-win_aspect, win_aspect, -1, 1, -1, 1);
nuclear@0 230 }
nuclear@0 231
nuclear@0 232 void app_keyboard(int key, bool pressed)
nuclear@0 233 {
nuclear@0 234 if(pressed) {
nuclear@0 235 switch(key) {
nuclear@1 236 case 'q':
nuclear@1 237 case 'Q':
nuclear@1 238 exit(0);
nuclear@1 239
nuclear@0 240 case 27:
nuclear@1 241 if(new_curve) {
nuclear@1 242 delete new_curve;
nuclear@1 243 new_curve = 0;
nuclear@1 244 post_redisplay();
nuclear@1 245 }
nuclear@1 246 break;
nuclear@0 247
nuclear@12 248 case '1':
nuclear@12 249 case '2':
nuclear@12 250 case '3':
nuclear@0 251 if(sel_curve) {
nuclear@12 252 sel_curve->set_type((CurveType)((int)CURVE_LINEAR + key - '1'));
nuclear@0 253 post_redisplay();
nuclear@0 254 }
nuclear@1 255 if(new_curve) {
nuclear@12 256 new_curve->set_type((CurveType)((int)CURVE_LINEAR + key - '1'));
nuclear@1 257 post_redisplay();
nuclear@1 258 }
nuclear@0 259 break;
nuclear@0 260
nuclear@0 261 case 'b':
nuclear@0 262 case 'B':
nuclear@12 263 show_bounds = !show_bounds;
nuclear@12 264 post_redisplay();
nuclear@0 265 break;
nuclear@0 266
nuclear@12 267 case 'n':
nuclear@12 268 case 'N':
nuclear@0 269 if(sel_curve) {
nuclear@12 270 sel_curve->normalize();
nuclear@1 271 post_redisplay();
nuclear@1 272 }
nuclear@0 273 break;
nuclear@6 274
nuclear@6 275 case 'e':
nuclear@6 276 case 'E':
nuclear@6 277 // TODO: GUI for filename at least
nuclear@10 278 if(!save_curves("test.curves", &curves[0], (int)curves.size())) {
nuclear@6 279 fprintf(stderr, "failed to export curves\n");
nuclear@6 280 }
nuclear@6 281 printf("exported %d curves\n", (int)curves.size());
nuclear@6 282 break;
nuclear@10 283
nuclear@12 284 case 'l':
nuclear@12 285 case 'L':
nuclear@10 286 {
nuclear@10 287 std::list<Curve*> clist = load_curves("test.curves");
nuclear@10 288 if(clist.empty()) {
nuclear@10 289 fprintf(stderr, "failed to import curves\n");
nuclear@10 290 }
nuclear@10 291
nuclear@12 292 for(size_t i=0; i<curves.size(); i++) {
nuclear@12 293 delete curves[i];
nuclear@12 294 }
nuclear@12 295 curves.clear();
nuclear@12 296
nuclear@10 297 int num = 0;
nuclear@10 298 std::list<Curve*>::iterator it = clist.begin();
nuclear@10 299 while(it != clist.end()) {
nuclear@10 300 curves.push_back(*it++);
nuclear@10 301 ++num;
nuclear@10 302 }
nuclear@10 303 printf("imported %d curves\n", num);
nuclear@10 304 }
nuclear@12 305 post_redisplay();
nuclear@10 306 break;
nuclear@0 307 }
nuclear@0 308 }
nuclear@3 309
nuclear@3 310
nuclear@3 311 switch(key) {
nuclear@3 312 case 's':
nuclear@3 313 snap_mode = pressed ? SNAP_GRID : SNAP_NONE;
nuclear@3 314 break;
nuclear@3 315
nuclear@3 316 case 'S':
nuclear@3 317 snap_mode = pressed ? SNAP_POINT : SNAP_NONE;
nuclear@3 318 break;
nuclear@3 319
nuclear@3 320 default:
nuclear@3 321 break;
nuclear@3 322 }
nuclear@3 323 }
nuclear@3 324
nuclear@3 325 static void calc_view_matrix()
nuclear@3 326 {
nuclear@3 327 view_matrix.reset_identity();
nuclear@3 328 view_matrix.scale(Vector3(view_scale, view_scale, view_scale));
nuclear@3 329 view_matrix.translate(Vector3(view_pan.x, view_pan.y, 0.0));
nuclear@0 330 }
nuclear@0 331
nuclear@0 332 static Vector2 pixel_to_uv(int x, int y)
nuclear@0 333 {
nuclear@0 334 float u = win_aspect * (2.0 * (float)x / (float)win_width - 1.0);
nuclear@0 335 float v = 1.0 - 2.0 * (float)y / (float)win_height;
nuclear@3 336
nuclear@3 337 u = u / view_scale - view_pan.x;
nuclear@3 338 v = v / view_scale - view_pan.y;
nuclear@0 339 return Vector2(u, v);
nuclear@3 340 /*
nuclear@3 341 Matrix4x4 inv_view_matrix = view_matrix.inverse();
nuclear@3 342 Vector4 res = Vector4(u, v, 0.0, 1.0).transformed(inv_view_matrix);
nuclear@3 343
nuclear@3 344 return Vector2(res.x, res.y);
nuclear@3 345 */
nuclear@0 346 }
nuclear@0 347
nuclear@0 348 static int prev_x, prev_y;
nuclear@0 349 static int click_pos[8][2];
nuclear@0 350 static unsigned int bnstate;
nuclear@0 351
nuclear@0 352 #define BNBIT(x) (1 << (x))
nuclear@0 353
nuclear@0 354 void app_mouse_button(int bn, bool pressed, int x, int y)
nuclear@0 355 {
nuclear@0 356 prev_x = x;
nuclear@0 357 prev_y = y;
nuclear@0 358 if(pressed) {
nuclear@0 359 bnstate |= BNBIT(bn);
nuclear@0 360 } else {
nuclear@0 361 bnstate &= ~BNBIT(bn);
nuclear@0 362 }
nuclear@0 363
nuclear@0 364 if(pressed) {
nuclear@0 365 click_pos[bn][0] = x;
nuclear@0 366 click_pos[bn][1] = y;
nuclear@0 367 } else {
nuclear@0 368 int dx = x - click_pos[bn][0];
nuclear@0 369 int dy = y - click_pos[bn][1];
nuclear@0 370
nuclear@0 371 if(abs(dx) + abs(dy) < 3) {
nuclear@0 372 Vector2 uv = pixel_to_uv(x, y);
nuclear@0 373 on_click(bn, uv.x, uv.y);
nuclear@0 374 }
nuclear@0 375
nuclear@0 376 if(!(bnstate & BNBIT(2))) {
nuclear@0 377 delete weight_label;
nuclear@0 378 weight_label = 0;
nuclear@0 379 post_redisplay();
nuclear@0 380 }
nuclear@0 381 }
nuclear@0 382 }
nuclear@0 383
nuclear@2 384 static bool point_hit_test(const Vector2 &pos, Curve **curveret, int *pidxret)
nuclear@0 385 {
nuclear@3 386 float thres = 0.02 / view_scale;
nuclear@0 387
nuclear@0 388 for(size_t i=0; i<curves.size(); i++) {
nuclear@2 389 int pidx = curves[i]->nearest_point(pos);
nuclear@0 390 if(pidx == -1) continue;
nuclear@0 391
nuclear@0 392 Vector2 cp = curves[i]->get_point(pidx);
nuclear@2 393 if((cp - pos).length_sq() < thres * thres) {
nuclear@2 394 *curveret = curves[i];
nuclear@2 395 *pidxret = pidx;
nuclear@2 396 return true;
nuclear@0 397 }
nuclear@0 398 }
nuclear@2 399 *curveret = 0;
nuclear@2 400 *pidxret = -1;
nuclear@2 401 return false;
nuclear@0 402 }
nuclear@0 403
nuclear@3 404 static Vector2 snap(const Vector2 &p)
nuclear@3 405 {
nuclear@3 406 switch(snap_mode) {
nuclear@3 407 case SNAP_GRID:
nuclear@3 408 return Vector2(round(p.x / grid_size) * grid_size, round(p.y / grid_size) * grid_size);
nuclear@3 409 case SNAP_POINT:
nuclear@3 410 // TODO
nuclear@3 411 default:
nuclear@3 412 break;
nuclear@3 413 }
nuclear@3 414 return p;
nuclear@3 415 }
nuclear@3 416
nuclear@0 417 void app_mouse_motion(int x, int y)
nuclear@0 418 {
nuclear@3 419 Vector2 prev_uv = pixel_to_uv(prev_x, prev_y);
nuclear@3 420
nuclear@0 421 int dx = x - prev_x;
nuclear@0 422 int dy = y - prev_y;
nuclear@0 423 prev_x = x;
nuclear@0 424 prev_y = y;
nuclear@0 425
nuclear@0 426 if(!dx && !dy) return;
nuclear@0 427
nuclear@2 428 Vector2 uv = pixel_to_uv(x, y);
nuclear@3 429 mouse_pointer = uv;
nuclear@3 430 post_redisplay();
nuclear@2 431
nuclear@2 432 /* when entering a new curve, have the last (extra) point following
nuclear@2 433 * the mouse until it's entered by a click (see on_click).
nuclear@2 434 */
nuclear@3 435 if(new_curve) {
nuclear@3 436 new_curve->move_point(new_curve->size() - 1, snap(uv));
nuclear@2 437 post_redisplay();
nuclear@2 438 }
nuclear@2 439
nuclear@4 440 if(!new_curve && !bnstate) {
nuclear@3 441 // not dragging, highlight curve under mouse
nuclear@2 442 point_hit_test(uv, &hover_curve, &sel_pidx);
nuclear@0 443 post_redisplay();
nuclear@0 444
nuclear@3 445 } else {
nuclear@3 446 // we're dragging with one or more buttons held down
nuclear@0 447
nuclear@3 448 if(sel_curve && sel_pidx != -1) {
nuclear@3 449 // we have a curve and a point of the curve selected
nuclear@0 450
nuclear@3 451 if(bnstate & BNBIT(0)) {
nuclear@3 452 // dragging point with left button: move it
nuclear@3 453 sel_curve->move_point(sel_pidx, snap(uv));
nuclear@3 454 post_redisplay();
nuclear@0 455 }
nuclear@3 456
nuclear@3 457 if(bnstate & BNBIT(2)) {
nuclear@3 458 // dragging point with right button: change weight
nuclear@3 459 float w = sel_curve->get_weight(sel_pidx);
nuclear@3 460 w -= dy * 0.01;
nuclear@3 461 if(w < FLT_MIN) w = FLT_MIN;
nuclear@3 462 sel_curve->set_weight(sel_pidx, w);
nuclear@3 463
nuclear@3 464 // popup floating weight label if not already there
nuclear@3 465 if(!weight_label) {
nuclear@3 466 weight_label = new Label;
nuclear@3 467 }
nuclear@3 468 weight_label->set_position(uv);
nuclear@3 469 weight_label->set_textf("w=%g", w);
nuclear@3 470 post_redisplay();
nuclear@3 471 }
nuclear@3 472 } else {
nuclear@3 473 // no selection, we're dragging in empty space: manipulate viewport
nuclear@3 474 Vector2 dir = uv - prev_uv;
nuclear@3 475
nuclear@3 476 if(bnstate & (BNBIT(0) | BNBIT(1))) {
nuclear@3 477 // panning
nuclear@3 478 view_pan += dir;
nuclear@3 479 calc_view_matrix();
nuclear@3 480 post_redisplay();
nuclear@3 481 }
nuclear@3 482 if(bnstate & BNBIT(2)) {
nuclear@3 483 // zooming
nuclear@3 484 view_scale -= ((float)dy / (float)win_height) * view_scale * 5.0;
nuclear@3 485 if(view_scale < 1e-4) view_scale = 1e-4;
nuclear@3 486 calc_view_matrix();
nuclear@3 487 post_redisplay();
nuclear@3 488 }
nuclear@0 489 }
nuclear@0 490 }
nuclear@0 491 }
nuclear@0 492
nuclear@0 493 static void on_click(int bn, float u, float v)
nuclear@0 494 {
nuclear@2 495 Vector2 uv = Vector2(u, v);
nuclear@2 496
nuclear@0 497 switch(bn) {
nuclear@2 498 case 0: // ------- LEFT CLICK ------
nuclear@2 499 if(hover_curve) {
nuclear@2 500 // if we're hovering: click selects
nuclear@2 501 sel_curve = hover_curve;
nuclear@2 502 hover_curve = 0;
nuclear@2 503 } else if(sel_curve) {
nuclear@2 504 // if we have a selected curve: click adds point (enter new_curve mode)
nuclear@2 505 std::vector<Curve*>::iterator it = std::find(curves.begin(), curves.end(), sel_curve);
nuclear@2 506 assert(it != curves.end());
nuclear@2 507 curves.erase(it, it + 1);
nuclear@2 508
nuclear@2 509 new_curve = sel_curve;
nuclear@2 510 sel_curve = 0;
nuclear@2 511 sel_pidx = -1;
nuclear@2 512
nuclear@2 513 new_curve->add_point(uv);
nuclear@2 514 } else {
nuclear@2 515 // otherwise, click starts a new curve
nuclear@2 516 if(!new_curve) {
nuclear@2 517 new_curve = new Curve;
nuclear@2 518 new_curve->add_point(uv);
nuclear@2 519 }
nuclear@2 520 new_curve->add_point(uv);
nuclear@0 521 }
nuclear@0 522 post_redisplay();
nuclear@0 523 break;
nuclear@0 524
nuclear@2 525 case 2: // ------- RIGHT CLICK ------
nuclear@2 526 if(new_curve) {
nuclear@2 527 // in new-curve mode: finish curve (cancels last floating segment)
nuclear@2 528 new_curve->remove_point(new_curve->size() - 1);
nuclear@2 529 if(new_curve->empty()) {
nuclear@2 530 delete new_curve;
nuclear@2 531 } else {
nuclear@2 532 curves.push_back(new_curve);
nuclear@2 533 }
nuclear@2 534 new_curve = 0;
nuclear@2 535
nuclear@2 536 } else if(sel_curve) {
nuclear@2 537 // in selected curve mode: delete control point or unselect
nuclear@2 538 Curve *hit_curve;
nuclear@2 539 int hit_pidx;
nuclear@2 540 if(point_hit_test(uv, &hit_curve, &hit_pidx) && hit_curve == sel_curve) {
nuclear@2 541 hit_curve->remove_point(hit_pidx);
nuclear@2 542 sel_pidx = -1;
nuclear@2 543 } else {
nuclear@2 544 sel_curve = 0;
nuclear@2 545 sel_pidx = -1;
nuclear@2 546 }
nuclear@2 547 }
nuclear@0 548 post_redisplay();
nuclear@0 549 break;
nuclear@0 550
nuclear@0 551 default:
nuclear@0 552 break;
nuclear@0 553 }
nuclear@0 554 }