diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 118c10ba82..30f89bfe34 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -5,8 +5,10 @@ project(interface) if (APPLE) set(CMAKE_EXE_LINKER_FLAGS "-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework CoreServices -framework Carbon") set(GLUT_HEADER_INCLUDE "") + set(GL_EXT_INCLUDE "") else (APPLE) - set(GLUT_HEADER_INCLUDE "") + set(GLUT_HEADER_INCLUDE "") + set(GL_EXT_INCLUDE "") endif (APPLE) configure_file(InterfaceConfig.h.in ${PROJECT_BINARY_DIR}/includes/InterfaceConfig.h) diff --git a/interface/InterfaceConfig.h.in b/interface/InterfaceConfig.h.in index 435c3eef7a..0084216b1e 100644 --- a/interface/InterfaceConfig.h.in +++ b/interface/InterfaceConfig.h.in @@ -9,6 +9,8 @@ #ifndef interface__InterfaceConfig__ #define interface__InterfaceConfig__ +#define GL_GLEXT_PROTOTYPES 1 #include @GLUT_HEADER_INCLUDE@ +#include @GL_EXT_INCLUDE@ #endif diff --git a/interface/src/Cloud.cpp b/interface/src/Cloud.cpp index ef978566e2..05d4ce199b 100644 --- a/interface/src/Cloud.cpp +++ b/interface/src/Cloud.cpp @@ -57,9 +57,9 @@ void Cloud::render() { glPointSize( maxSize ); - glPointParameterfv( GL_POINT_DISTANCE_ATTENUATION, particle_attenuation_quadratic ); - glPointParameterf( GL_POINT_SIZE_MAX, maxSize ); - glPointParameterf( GL_POINT_SIZE_MIN, 0.001f ); + glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, particle_attenuation_quadratic ); + glPointParameterfARB( GL_POINT_SIZE_MAX_ARB, maxSize ); + glPointParameterfARB( GL_POINT_SIZE_MIN_ARB, 0.001f ); glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE ); glEnable( GL_POINT_SPRITE_ARB ); diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp index e42d63d684..b6ea560eff 100644 --- a/interface/src/Util.cpp +++ b/interface/src/Util.cpp @@ -95,7 +95,7 @@ void render_vector(glm::vec3 * vec) glEnd(); float particle_attenuation_quadratic[] = { 0.0f, 0.0f, 2.0f }; // larger Z = smaller particles - glPointParameterfv( GL_POINT_DISTANCE_ATTENUATION, particle_attenuation_quadratic ); + glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, particle_attenuation_quadratic ); glEnable(GL_POINT_SMOOTH); glPointSize(10.0); diff --git a/interface/src/main.cpp b/interface/src/main.cpp index b6533c9b7f..8a64b7e169 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -598,7 +598,7 @@ void display(void) Audio::render(WIDTH, HEIGHT); //drawvec3(100, 100, 0.15, 0, 1.0, 0, myHead.getPos(), 0, 1, 0); - glPointParameterfv( GL_POINT_DISTANCE_ATTENUATION, pointer_attenuation_quadratic ); + glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, pointer_attenuation_quadratic ); // myFinger.render();