diff --git a/examples/camera/example.cpp b/examples/camera/example.cpp index de343708d..1698ec0dd 100644 --- a/examples/camera/example.cpp +++ b/examples/camera/example.cpp @@ -26,6 +26,22 @@ #include #endif +#ifndef GLUT_WHEEL_UP +#define GLUT_WHEEL_UP 3 +#endif +#ifndef GLUT_WHEEL_DOWN +#define GLUT_WHEEL_DOWN 4 +#endif +#ifndef GLUT_WHEEL_RIGHT +#define GLUT_WHEEL_RIGHT 5 +#endif +#ifndef GLUT_WHEEL_LEFT +#define GLUT_WHEEL_LEFT 6 +#endif +#ifndef GLUT_ACTIVE_COMMAND +#define GLUT_ACTIVE_COMMAND 8 +#endif + #include #include #include diff --git a/examples/flare-eyes/example.cpp b/examples/flare-eyes/example.cpp index 26bee0cc9..804992250 100644 --- a/examples/flare-eyes/example.cpp +++ b/examples/flare-eyes/example.cpp @@ -35,6 +35,22 @@ #include #endif +#ifndef GLUT_WHEEL_UP +#define GLUT_WHEEL_UP 3 +#endif +#ifndef GLUT_WHEEL_DOWN +#define GLUT_WHEEL_DOWN 4 +#endif +#ifndef GLUT_WHEEL_RIGHT +#define GLUT_WHEEL_RIGHT 5 +#endif +#ifndef GLUT_WHEEL_LEFT +#define GLUT_WHEEL_LEFT 6 +#endif +#ifndef GLUT_ACTIVE_COMMAND +#define GLUT_ACTIVE_COMMAND 8 +#endif + #include #include #include diff --git a/examples/patches/example.cpp b/examples/patches/example.cpp index 0e882aa05..5516b0e99 100644 --- a/examples/patches/example.cpp +++ b/examples/patches/example.cpp @@ -43,10 +43,18 @@ #ifndef GLUT_WHEEL_UP #define GLUT_WHEEL_UP 3 +#endif +#ifndef GLUT_WHEEL_DOWN #define GLUT_WHEEL_DOWN 4 +#endif +#ifndef GLUT_WHEEL_RIGHT #define GLUT_WHEEL_RIGHT 5 +#endif +#ifndef GLUT_WHEEL_LEFT #define GLUT_WHEEL_LEFT 6 -#define GLUT_ACTIVE_COMMAND 1 +#endif +#ifndef GLUT_ACTIVE_COMMAND +#define GLUT_ACTIVE_COMMAND 8 #endif #include diff --git a/examples/randomly-sample-mesh/example.cpp b/examples/randomly-sample-mesh/example.cpp index a64b65ce8..bb51c3cbb 100644 --- a/examples/randomly-sample-mesh/example.cpp +++ b/examples/randomly-sample-mesh/example.cpp @@ -32,6 +32,22 @@ #include #endif +#ifndef GLUT_WHEEL_UP +#define GLUT_WHEEL_UP 3 +#endif +#ifndef GLUT_WHEEL_DOWN +#define GLUT_WHEEL_DOWN 4 +#endif +#ifndef GLUT_WHEEL_RIGHT +#define GLUT_WHEEL_RIGHT 5 +#endif +#ifndef GLUT_WHEEL_LEFT +#define GLUT_WHEEL_LEFT 6 +#endif +#ifndef GLUT_ACTIVE_COMMAND +#define GLUT_ACTIVE_COMMAND 8 +#endif + #include #include #include diff --git a/examples/rotate-widget/example.cpp b/examples/rotate-widget/example.cpp index ebf79a6f4..f09164e94 100644 --- a/examples/rotate-widget/example.cpp +++ b/examples/rotate-widget/example.cpp @@ -33,6 +33,22 @@ # include #endif +#ifndef GLUT_WHEEL_UP +#define GLUT_WHEEL_UP 3 +#endif +#ifndef GLUT_WHEEL_DOWN +#define GLUT_WHEEL_DOWN 4 +#endif +#ifndef GLUT_WHEEL_RIGHT +#define GLUT_WHEEL_RIGHT 5 +#endif +#ifndef GLUT_WHEEL_LEFT +#define GLUT_WHEEL_LEFT 6 +#endif +#ifndef GLUT_ACTIVE_COMMAND +#define GLUT_ACTIVE_COMMAND 8 +#endif + #include #include #include diff --git a/examples/scene-rotation/example.cpp b/examples/scene-rotation/example.cpp index 0515c4f35..1f65a9e98 100644 --- a/examples/scene-rotation/example.cpp +++ b/examples/scene-rotation/example.cpp @@ -36,6 +36,22 @@ #include #endif +#ifndef GLUT_WHEEL_UP +#define GLUT_WHEEL_UP 3 +#endif +#ifndef GLUT_WHEEL_DOWN +#define GLUT_WHEEL_DOWN 4 +#endif +#ifndef GLUT_WHEEL_RIGHT +#define GLUT_WHEEL_RIGHT 5 +#endif +#ifndef GLUT_WHEEL_LEFT +#define GLUT_WHEEL_LEFT 6 +#endif +#ifndef GLUT_ACTIVE_COMMAND +#define GLUT_ACTIVE_COMMAND 8 +#endif + #include #include #include diff --git a/examples/shadow-mapping/example.cpp b/examples/shadow-mapping/example.cpp index 135b2d53b..00be7685f 100644 --- a/examples/shadow-mapping/example.cpp +++ b/examples/shadow-mapping/example.cpp @@ -43,10 +43,18 @@ #ifndef GLUT_WHEEL_UP #define GLUT_WHEEL_UP 3 +#endif +#ifndef GLUT_WHEEL_DOWN #define GLUT_WHEEL_DOWN 4 +#endif +#ifndef GLUT_WHEEL_RIGHT #define GLUT_WHEEL_RIGHT 5 +#endif +#ifndef GLUT_WHEEL_LEFT #define GLUT_WHEEL_LEFT 6 -#define GLUT_ACTIVE_COMMAND 1 +#endif +#ifndef GLUT_ACTIVE_COMMAND +#define GLUT_ACTIVE_COMMAND 8 #endif #include diff --git a/examples/skeleton-builder/example.cpp b/examples/skeleton-builder/example.cpp index 6d962f1af..9466f6466 100644 --- a/examples/skeleton-builder/example.cpp +++ b/examples/skeleton-builder/example.cpp @@ -51,6 +51,22 @@ #include #endif +#ifndef GLUT_WHEEL_UP +#define GLUT_WHEEL_UP 3 +#endif +#ifndef GLUT_WHEEL_DOWN +#define GLUT_WHEEL_DOWN 4 +#endif +#ifndef GLUT_WHEEL_RIGHT +#define GLUT_WHEEL_RIGHT 5 +#endif +#ifndef GLUT_WHEEL_LEFT +#define GLUT_WHEEL_LEFT 6 +#endif +#ifndef GLUT_ACTIVE_COMMAND +#define GLUT_ACTIVE_COMMAND 8 +#endif + #include #include #include diff --git a/examples/skeleton-poser/example.cpp b/examples/skeleton-poser/example.cpp index 9de69741e..76003786c 100644 --- a/examples/skeleton-poser/example.cpp +++ b/examples/skeleton-poser/example.cpp @@ -49,13 +49,26 @@ #ifdef __APPLE__ #include -#ifndef GLUT_ACTIVE_COMMAND -# define GLUT_ACTIVE_COMMAND 9 -#endif #else #include #endif +#ifndef GLUT_WHEEL_UP +#define GLUT_WHEEL_UP 3 +#endif +#ifndef GLUT_WHEEL_DOWN +#define GLUT_WHEEL_DOWN 4 +#endif +#ifndef GLUT_WHEEL_RIGHT +#define GLUT_WHEEL_RIGHT 5 +#endif +#ifndef GLUT_WHEEL_LEFT +#define GLUT_WHEEL_LEFT 6 +#endif +#ifndef GLUT_ACTIVE_COMMAND +#define GLUT_ACTIVE_COMMAND 8 +#endif + #include #include #include diff --git a/examples/skeleton/example.cpp b/examples/skeleton/example.cpp index 92f6c6891..8b1de8c4d 100644 --- a/examples/skeleton/example.cpp +++ b/examples/skeleton/example.cpp @@ -40,6 +40,22 @@ #include #endif +#ifndef GLUT_WHEEL_UP +#define GLUT_WHEEL_UP 3 +#endif +#ifndef GLUT_WHEEL_DOWN +#define GLUT_WHEEL_DOWN 4 +#endif +#ifndef GLUT_WHEEL_RIGHT +#define GLUT_WHEEL_RIGHT 5 +#endif +#ifndef GLUT_WHEEL_LEFT +#define GLUT_WHEEL_LEFT 6 +#endif +#ifndef GLUT_ACTIVE_COMMAND +#define GLUT_ACTIVE_COMMAND 8 +#endif + #include #include #include diff --git a/examples/upright/example.cpp b/examples/upright/example.cpp index c50124d2e..fe492247a 100644 --- a/examples/upright/example.cpp +++ b/examples/upright/example.cpp @@ -34,6 +34,22 @@ #include #endif +#ifndef GLUT_WHEEL_UP +#define GLUT_WHEEL_UP 3 +#endif +#ifndef GLUT_WHEEL_DOWN +#define GLUT_WHEEL_DOWN 4 +#endif +#ifndef GLUT_WHEEL_RIGHT +#define GLUT_WHEEL_RIGHT 5 +#endif +#ifndef GLUT_WHEEL_LEFT +#define GLUT_WHEEL_LEFT 6 +#endif +#ifndef GLUT_ACTIVE_COMMAND +#define GLUT_ACTIVE_COMMAND 8 +#endif + #include #include #include