fly/flightgear
1
0
Fork 0
Code Activity

Addition Irix tweaks.

Browse source
This commit is contained in:
curt 2001-10-24 22:06:47 +00:00
parent 535d708ee0
commit 111f2b7b86
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/GUI/gui.cxx
View file

@ -167,7 +167,7 @@ void guiErrorMessage (const char *txt, const sg_throwable &throwable)
string msg = txt; string msg = txt;
msg += '\n'; msg += '\n';
msg += throwable.getFormattedMessage(); msg += throwable.getFormattedMessage();
if (throwable.getOrigin() != "") { if (throwable.getOrigin() != (string)"") {
msg += "\n (reported by "; msg += "\n (reported by ";
msg += throwable.getOrigin(); msg += throwable.getOrigin();
msg += ')'; msg += ')';

4
src/Main/main.cxx
View file

@ -113,8 +113,10 @@
// Should already be inlcluded by gl.h if needed by your platform so // Should already be inlcluded by gl.h if needed by your platform so
// we shouldn't include this here. // we shouldn't include this here.
// #include <GL/glext.h> // #include <GL/glext.h>
#if !defined(sgi)
// PFNGLPOINTPARAMETERFEXTPROC glPointParameterfEXT = 0; // PFNGLPOINTPARAMETERFEXTPROC glPointParameterfEXT = 0;
// PFNGLPOINTPARAMETERFVEXTPROC glPointParameterfvEXT = 0; // PFNGLPOINTPARAMETERFVEXTPROC glPointParameterfvEXT = 0;
#endif
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
void fgLoadDCS (void); void fgLoadDCS (void);
@ -806,10 +808,12 @@ void fgRenderFrame( void ) {
glEnable(GL_POINT_SMOOTH); glEnable(GL_POINT_SMOOTH);
float quadratic[3] = {1.0, 0.01, 0.0001}; float quadratic[3] = {1.0, 0.01, 0.0001};
// get the address of our OpenGL extensions // get the address of our OpenGL extensions
#if !defined(sgi)
glPointParameterfEXT = (PFNGLPOINTPARAMETERFEXTPROC) glPointParameterfEXT = (PFNGLPOINTPARAMETERFEXTPROC)
wglGetProcAddress("glPointParameterfEXT"); wglGetProcAddress("glPointParameterfEXT");
glPointParameterfvEXT = (PFNGLPOINTPARAMETERFVEXTPROC) glPointParameterfvEXT = (PFNGLPOINTPARAMETERFVEXTPROC)
wglGetProcAddress("glPointParameterfvEXT"); wglGetProcAddress("glPointParameterfvEXT");
#endif
// makes the points fade as they move away // makes the points fade as they move away
glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, quadratic); glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, quadratic);
glPointParameterfEXT(GL_POINT_SIZE_MIN_EXT, 1.0); glPointParameterfEXT(GL_POINT_SIZE_MIN_EXT, 1.0);

4
src/Network/httpd.cxx
View file

@ -166,7 +166,7 @@ void HttpdChannel::foundTerminator (void) {
if ( child->nChildren() > 0 ) { if ( child->nChildren() > 0 ) {
line += "<B><A HREF=\""; line += "<B><A HREF=\"";
line += request; line += request;
if ( request.substr(request.length() - 1, 1) != "/" ) { if ( request.substr(request.length() - 1, 1) != (string)"/" ) {
line += "/"; line += "/";
} }
line += name; line += name;
@ -180,7 +180,7 @@ void HttpdChannel::foundTerminator (void) {
line += name; line += name;
line += "</B> <A HREF=\""; line += "</B> <A HREF=\"";
line += request; line += request;
if ( request.substr(request.length() - 1, 1) != "/" ) { if ( request.substr(request.length() - 1, 1) != (string)"/" ) {
line += "/"; line += "/";
} }
line += name; line += name;