Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8296 in orxonox.OLD for branches/terrain/src/lib/graphics


Ignore:
Timestamp:
Jun 9, 2006, 1:04:56 AM (19 years ago)
Author:
ponder
Message:
  • volfog_effect.cc didn't compile on macosx, because there's no glX* stuff. Now macosx is handled specially
  • For some reason, PACKAGE_NAME, PACKAGE_VERSION and similar variables were not found. I added them to debug.h, but thats just temporary.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/terrain/src/lib/graphics/effects/volfog_effect.cc

    r7810 r8296  
    2323#include "glincl.h"
    2424//#include "shell_command.h"
    25 
    2625#define GLX_GLXEXT_PROTOTYPES
    27 #include <GL/glx.h>
    28 // #include <GL/glut.h>
    29 
    30 //#include <GL/glext.h> //OpenGL Extensions
    31 //#include <GL/glxext.h> // GLX Extensions
    32 
     26
     27//#include <OpenGL/glext.h> //OpenGL Extensions
     28//#include <OpenGL/glxext.h> // GLX Extensions
     29#ifndef __APPLE__
    3330#ifndef GL_EXT_fog_coord
    3431#define GL_EXT_fog_coord 1
     
    4542PFNGLFOGCOORDDVEXTPROC glFogCoorddvEXT = 0;
    4643PFNGLFOGCOORDPOINTEREXTPROC glFogCoordPointerEXT = 0;
    47 
     44#endif
    4845
    4946using namespace std;
     
    9390        float fogColor[4] = {0.6f,0.58f,0.79f,0.0f};
    9491       
    95 
     92#ifndef __APPLE__
    9693        glFogCoordfEXT       = (PFNGLFOGCOORDFEXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoordfEXT");
    9794        glFogCoordfvEXT      = (PFNGLFOGCOORDFVEXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoordfvEXT");
     
    9996        glFogCoorddvEXT      = (PFNGLFOGCOORDDVEXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoorddvEXT");
    10097        glFogCoordPointerEXT = (PFNGLFOGCOORDPOINTEREXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoordPointerEXT");
    101 
     98#endif
    10299        // set the fog attributes
    103100        glFogf (GL_FOG_START,  fogStart);
Note: See TracChangeset for help on using the changeset viewer.