some linux compilation fixes..

Former-commit-id: 5527a26086
This commit is contained in:
Wenzel Jakob
2014-02-24 16:07:31 +01:00
parent 346f7db74b
commit f12fa9bd9d
12 changed files with 91 additions and 41 deletions
+35 -27
View File
@@ -18,10 +18,10 @@
#include <Eigen/Core>
#include <Eigen/Geometry>
#ifdef WIN32
#include <GL/glut.h>
#else
#ifdef __APPLE__
#include <GLUT/glut.h>
#else
#include <GL/glut.h>
#endif
#include <vector>
@@ -509,30 +509,38 @@ void mouse(int glutButton, int glutState, int mouse_x, int mouse_y)
break;
}
break;
// Scroll down
case GLUT_WHEEL_DOWN:
{
mouse_wheel(0,-1,mouse_x,mouse_y);
break;
}
// Scroll up
case GLUT_WHEEL_UP:
{
mouse_wheel(0,1,mouse_x,mouse_y);
break;
}
// Scroll left
case GLUT_WHEEL_LEFT:
{
mouse_wheel(1,-1,mouse_x,mouse_y);
break;
}
// Scroll right
case GLUT_WHEEL_RIGHT:
{
mouse_wheel(1,1,mouse_x,mouse_y);
break;
}
#ifdef GLUT_WHEEL_DOWN
// Scroll down
case GLUT_WHEEL_DOWN:
{
mouse_wheel(0,-1,mouse_x,mouse_y);
break;
}
#endif
#ifdef GLUT_WHEEL_UP
// Scroll up
case GLUT_WHEEL_UP:
{
mouse_wheel(0,1,mouse_x,mouse_y);
break;
}
#endif
#ifdef GLUT_WHEEL_LEFT
// Scroll left
case GLUT_WHEEL_LEFT:
{
mouse_wheel(1,-1,mouse_x,mouse_y);
break;
}
#endif
#ifdef GLUT_WHEEL_RIGHT
// Scroll right
case GLUT_WHEEL_RIGHT:
{
mouse_wheel(1,1,mouse_x,mouse_y);
break;
}
#endif
}
}
}