fly/flightgear
1
0
Fork 0
Code Activity

Mac OS X fixes

Browse source
This commit is contained in:
ehofman 2003-06-20 20:18:40 +00:00
parent 45e20b6565
commit 9e07e0ac36
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/Main/main.cxx
View file

@ -143,8 +143,8 @@ SG_USING_STD(endl);
#include "fg_commands.hxx" #include "fg_commands.hxx"
glPointParameterfProc glPointParameterfPtr; glPointParameterfProc glPointParameterfPtr = 0;
glPointParameterfvProc glPointParameterfvPtr; glPointParameterfvProc glPointParameterfvPtr = 0;
float default_attenuation[3] = {1.0, 0.0, 0.0}; float default_attenuation[3] = {1.0, 0.0, 0.0};
//Required for using GL_extensions //Required for using GL_extensions
@ -767,9 +767,9 @@ void fgRenderFrame() {
// Enable states for drawing points with GL_extension // Enable states for drawing points with GL_extension
glEnable(GL_POINT_SMOOTH); glEnable(GL_POINT_SMOOTH);
#ifdef GL_EXT_point_parameters if ( fgGetBool("/sim/rendering/distance-attenuation") &&
if ( fgGetBool("/sim/rendering/distance-attenuation") ( SGIsOpenGLExtensionSupported("GL_EXT_point_parameters") ||
&& SGIsOpenGLExtensionSupported("GL_EXT_point_parameters") ) SGIsOpenGLExtensionSupported("GL_ARB_point_parameters") ) )
{ {
// Enable states for drawing points with GL_extension // Enable states for drawing points with GL_extension
glEnable(GL_POINT_SMOOTH); glEnable(GL_POINT_SMOOTH);
@ -779,7 +779,6 @@ void fgRenderFrame() {
glPointParameterfvPtr(GL_DISTANCE_ATTENUATION_EXT, quadratic); glPointParameterfvPtr(GL_DISTANCE_ATTENUATION_EXT, quadratic);
glPointParameterfPtr(GL_POINT_SIZE_MIN_EXT, 1.0); glPointParameterfPtr(GL_POINT_SIZE_MIN_EXT, 1.0);
} }
#endif
glPointSize(4.0); glPointSize(4.0);
@ -823,14 +822,13 @@ void fgRenderFrame() {
if (fgGetBool("/sim/rendering/enhanced-lighting")) { if (fgGetBool("/sim/rendering/enhanced-lighting")) {
#ifdef GL_EXT_point_parameters if ( fgGetBool("/sim/rendering/distance-attenuation") &&
if ( fgGetBool("/sim/rendering/distance-attenuation") ( SGIsOpenGLExtensionSupported("GL_EXT_point_parameters") ||
&& SGIsOpenGLExtensionSupported("GL_EXT_point_parameters") ) SGIsOpenGLExtensionSupported("GL_ARB_point_parameters") ) )
{ {
glPointParameterfvPtr(GL_DISTANCE_ATTENUATION_EXT, glPointParameterfvPtr(GL_DISTANCE_ATTENUATION_EXT,
default_attenuation); default_attenuation);
} }
#endif
glPointSize(1.0); glPointSize(1.0);
glDisable(GL_POINT_SMOOTH); glDisable(GL_POINT_SMOOTH);
@ -1658,10 +1656,18 @@ static bool fgMainInit( int argc, char **argv ) {
// get the address of our OpenGL extensions // get the address of our OpenGL extensions
if ( fgGetBool("/sim/rendering/distance-attenuation") ) if ( fgGetBool("/sim/rendering/distance-attenuation") )
{ {
glPointParameterfPtr = (glPointParameterfProc) if (SGIsOpenGLExtensionSupported("GL_EXT_point_parameters") ) {
SGLookupFunction("glPointParameterfEXT"); glPointParameterfPtr = (glPointParameterfProc)
glPointParameterfvPtr = (glPointParameterfvProc) SGLookupFunction("glPointParameterfEXT");
SGLookupFunction("glPointParameterfvEXT"); glPointParameterfvPtr = (glPointParameterfvProc)
SGLookupFunction("glPointParameterfvEXT");
} else if ( SGIsOpenGLExtensionSupported("GL_ARB_point_parameters") ) {
glPointParameterfPtr = (glPointParameterfProc)
SGLookupFunction("glPointParameterfARB");
glPointParameterfvPtr = (glPointParameterfvProc)
SGLookupFunction("glPointParameterfvARB");
}
} }
// based on the requested presets, calculate the true starting // based on the requested presets, calculate the true starting