Showing the changes to interface/src/main.cpp (1 of 9 files). Show all
Unified · Split
| @@ -611,14 +611,13 @@ void display(void) · 610 unmodified lines | |||
| 611 | glDisable(GL_DEPTH_TEST); | 611 | glDisable(GL_DEPTH_TEST); |
| 612 | glDisable(GL_LIGHTING); | 612 | glDisable(GL_LIGHTING); |
| 613 | 613 | ||
| 614 | //lattice.render(WIDTH, HEIGHT); | 614 | // lattice.render(WIDTH, HEIGHT); |
| 615 | // myFinger.render(); | ||
| 615 | Audio::render(WIDTH, HEIGHT); | 616 | Audio::render(WIDTH, HEIGHT); |
| 616 | 617 | ||
| 617 | //drawvec3(100, 100, 0.15, 0, 1.0, 0, myHead.getPos(), 0, 1, 0); | 618 | //drawvec3(100, 100, 0.15, 0, 1.0, 0, myHead.getPos(), 0, 1, 0); |
| 618 | glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, pointer_attenuation_quadratic ); | 619 | glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, pointer_attenuation_quadratic ); |
| 619 | 620 | ||
| 620 | // myFinger.render(); | ||
| 621 | |||
| 622 | if (mouse_pressed == 1) | 621 | if (mouse_pressed == 1) |
| 623 | { | 622 | { |
| 624 | glPointSize( 10.0f ); | 623 | glPointSize( 10.0f ); |
| @@ -868,7 +867,7 @@ void mouseFunc( int button, int state, int x, int y ) · 243 unmodified lines | |||
| 868 | mouse_x = x; | 867 | mouse_x = x; |
| 869 | mouse_y = y; | 868 | mouse_y = y; |
| 870 | mouse_pressed = 1; | 869 | mouse_pressed = 1; |
| 871 | // lattice.mouseClick((float)x/(float)WIDTH,(float)y/(float)HEIGHT); | 870 | lattice.mouseClick((float)x/(float)WIDTH,(float)y/(float)HEIGHT); |
| 872 | } | 871 | } |
| 873 | if( button == GLUT_LEFT_BUTTON && state == GLUT_UP ) | 872 | if( button == GLUT_LEFT_BUTTON && state == GLUT_UP ) |
| 874 | { | 873 | { |
| @@ -901,8 +900,8 @@ void mouseoverFunc( int x, int y) · 26 unmodified lines | |||
| 901 | mouse_y = y; | 900 | mouse_y = y; |
| 902 | if (mouse_pressed == 0) | 901 | if (mouse_pressed == 0) |
| 903 | { | 902 | { |
| 904 | lattice.mouseOver((float)x/(float)WIDTH,(float)y/(float)HEIGHT); | 903 | // lattice.mouseOver((float)x/(float)WIDTH,(float)y/(float)HEIGHT); |
| 905 | myFinger.setTarget(mouse_x, mouse_y); | 904 | // myFinger.setTarget(mouse_x, mouse_y); |
| 906 | } | 905 | } |
| 907 | } | 906 | } |
| 908 | 907 | ||