FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MacOS X fixes

Browse Source
This commit is contained in:
ehofman
2003-08-19 08:25:16 +00:00
parent c0a633ea1d
commit 1623aee1e0
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/sky/clouds3d/SkyContext.cpp
+13 -1
View File
@@ -30,7 +30,11 @@
// #include GLUT_H // #include GLUT_H
#ifndef WIN32 #if defined (__APPLE__)
# include <OpenGL/OpenGL.h>
#endif
#if !defined (WIN32) && !defined(__APPLE__)
#include <GL/glx.h> #include <GL/glx.h>
#endif #endif
@@ -138,6 +142,8 @@ SkyMaterial* SkyContext::GetCurrentMaterial()
{ {
#ifdef WIN32 #ifdef WIN32
ContextMaterialIterator cmi = _currentMaterials.find(wglGetCurrentContext()); ContextMaterialIterator cmi = _currentMaterials.find(wglGetCurrentContext());
#elif defined(__APPLE__)
ContextMaterialIterator cmi = _currentMaterials.find(CGLGetCurrentContext());
#else #else
ContextMaterialIterator cmi = _currentMaterials.find(glXGetCurrentContext()); ContextMaterialIterator cmi = _currentMaterials.find(glXGetCurrentContext());
#endif #endif
@@ -166,6 +172,8 @@ SkyTextureState* SkyContext::GetCurrentTextureState()
{ {
#ifdef WIN32 #ifdef WIN32
ContextTextureStateIterator ctsi = _currentTextureState.find(wglGetCurrentContext()); ContextTextureStateIterator ctsi = _currentTextureState.find(wglGetCurrentContext());
#elif defined(__APPLE__)
ContextTextureStateIterator ctsi = _currentTextureState.find(CGLGetCurrentContext());
#else #else
ContextTextureStateIterator ctsi = _currentTextureState.find(glXGetCurrentContext()); ContextTextureStateIterator ctsi = _currentTextureState.find(glXGetCurrentContext());
#endif #endif
@@ -194,6 +202,8 @@ SKYRESULT SkyContext::AddCurrentGLContext()
SkyMaterial *pCurrentMaterial = new SkyMaterial; SkyMaterial *pCurrentMaterial = new SkyMaterial;
#ifdef WIN32 #ifdef WIN32
_currentMaterials.insert(std::make_pair(wglGetCurrentContext(), pCurrentMaterial)); _currentMaterials.insert(std::make_pair(wglGetCurrentContext(), pCurrentMaterial));
#elif defined (__APPLE__)
_currentMaterials.insert(std::make_pair(CGLGetCurrentContext(), pCurrentMaterial));
#else #else
_currentMaterials.insert(std::make_pair(glXGetCurrentContext(), pCurrentMaterial)); _currentMaterials.insert(std::make_pair(glXGetCurrentContext(), pCurrentMaterial));
#endif #endif
@@ -201,6 +211,8 @@ SKYRESULT SkyContext::AddCurrentGLContext()
SkyTextureState *pCurrentTS = new SkyTextureState; SkyTextureState *pCurrentTS = new SkyTextureState;
#ifdef WIN32 #ifdef WIN32
_currentTextureState.insert(std::make_pair(wglGetCurrentContext() , pCurrentTS)); _currentTextureState.insert(std::make_pair(wglGetCurrentContext() , pCurrentTS));
#elif defined (__APPLE__)
_currentTextureState.insert(std::make_pair(CGLGetCurrentContext() , pCurrentTS));
#else #else
_currentTextureState.insert(std::make_pair(glXGetCurrentContext() , pCurrentTS)); _currentTextureState.insert(std::make_pair(glXGetCurrentContext() , pCurrentTS));
#endif #endif