Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 04:08:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

switch back to ARB functions with glext include

Browse source
This commit is contained in:
Stephen Birarda 2013-02-08 14:49:12 -08:00
parent 9095508238
commit d394035e7e
5 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/CMakeLists.txt
View file

@ -5,8 +5,10 @@ project(interface)
if (APPLE) if (APPLE)
set(CMAKE_EXE_LINKER_FLAGS "-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework CoreServices -framework Carbon") set(CMAKE_EXE_LINKER_FLAGS "-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework CoreServices -framework Carbon")
set(GLUT_HEADER_INCLUDE "<GLUT/glut.h>") set(GLUT_HEADER_INCLUDE "<GLUT/glut.h>")
set(GL_EXT_INCLUDE "<OpenGL/glext.h>")
else (APPLE) else (APPLE)
set(GLUT_HEADER_INCLUDE "<GL/glut.h>") set(GLUT_HEADER_INCLUDE "<GL/gl.h>")
set(GL_EXT_INCLUDE "<GL/glext.h>")
endif (APPLE) endif (APPLE)
configure_file(InterfaceConfig.h.in ${PROJECT_BINARY_DIR}/includes/InterfaceConfig.h) configure_file(InterfaceConfig.h.in ${PROJECT_BINARY_DIR}/includes/InterfaceConfig.h)

2
interface/InterfaceConfig.h.in
View file

@ -9,6 +9,8 @@
#ifndef interface__InterfaceConfig__ #ifndef interface__InterfaceConfig__
#define interface__InterfaceConfig__ #define interface__InterfaceConfig__
#define GL_GLEXT_PROTOTYPES 1
#include @GLUT_HEADER_INCLUDE@ #include @GLUT_HEADER_INCLUDE@
#include @GL_EXT_INCLUDE@
#endif #endif

6
interface/src/Cloud.cpp
View file

@ -57,9 +57,9 @@ void Cloud::render() {
glPointSize( maxSize ); glPointSize( maxSize );
glPointParameterfv( GL_POINT_DISTANCE_ATTENUATION, particle_attenuation_quadratic ); glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, particle_attenuation_quadratic );
glPointParameterf( GL_POINT_SIZE_MAX, maxSize ); glPointParameterfARB( GL_POINT_SIZE_MAX_ARB, maxSize );
glPointParameterf( GL_POINT_SIZE_MIN, 0.001f ); glPointParameterfARB( GL_POINT_SIZE_MIN_ARB, 0.001f );
glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE ); glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE );
glEnable( GL_POINT_SPRITE_ARB ); glEnable( GL_POINT_SPRITE_ARB );

2
interface/src/Util.cpp
View file

@ -95,7 +95,7 @@ void render_vector(glm::vec3 * vec)
glEnd(); glEnd();
float particle_attenuation_quadratic[] = { 0.0f, 0.0f, 2.0f }; // larger Z = smaller particles 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); glEnable(GL_POINT_SMOOTH);
glPointSize(10.0); glPointSize(10.0);

2
interface/src/main.cpp
View file

@ -598,7 +598,7 @@ void display(void)
Audio::render(WIDTH, HEIGHT); Audio::render(WIDTH, HEIGHT);
//drawvec3(100, 100, 0.15, 0, 1.0, 0, myHead.getPos(), 0, 1, 0); //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(); // myFinger.render();