More MacOS X fixes

diff --git a/simgear/screen/RenderTexture.cpp b/simgear/screen/RenderTexture.cpp
index d31a61e6babf3f0a3dd55d6f1a10f4311f8bc788..2214228a53e4527fc619d406dd48d957eb152d33 100644 (file)
--- a/simgear/screen/RenderTexture.cpp
+++ b/simgear/screen/RenderTexture.cpp
@@ -579,13 +579,13 @@ bool RenderTexture::_Invalidate()
     _iNumStencilBits = 0;
     
     if (_bIsTexture)
-        glDeleteTextures(1, &_iTextureID);
+        glDeleteTextures(1, (const GLuint*)&_iTextureID);
     if (_bIsDepthTexture) 
     {
         // [Redge]
         if (!_bHasARBDepthTexture) delete[] _pPoorDepthTexture;
         // [/Redge]
-        glDeleteTextures(1, &_iDepthTextureID);
+        glDeleteTextures(1, (const GLuint*)&_iDepthTextureID);
     }
     
 #ifdef _WIN32
@@ -726,9 +726,9 @@ bool RenderTexture::Resize(int iWidth, int iHeight)
     
     // Do same basic work as _Invalidate, but don't reset all our flags
     if (_bIsTexture)
-        glDeleteTextures(1, &_iTextureID);
+        glDeleteTextures(1, (const GLuint*)&_iTextureID);
     if (_bIsDepthTexture)
-        glDeleteTextures(1, &_iDepthTextureID);
+        glDeleteTextures(1, (const GLuint*)&_iDepthTextureID);
 #ifdef _WIN32
     if ( _hPBuffer )
     {
@@ -1822,7 +1822,7 @@ bool RenderTexture::_InitializeTextures()
 
     if (_bIsTexture)
     {
-        glGenTextures(1, &_iTextureID);
+        glGenTextures(1, (GLuint*)&_iTextureID);
         glBindTexture(_iTextureTarget, _iTextureID);  
         
         // Use clamp to edge as the default texture wrap mode for all tex
@@ -1933,7 +1933,7 @@ bool RenderTexture::_InitializeTextures()
   
     if (_bIsDepthTexture)
     { 
-        glGenTextures(1, &_iDepthTextureID);
+        glGenTextures(1, (GLuint*)&_iDepthTextureID);
         glBindTexture(_iTextureTarget, _iDepthTextureID);  
         
         // Use clamp to edge as the default texture wrap mode for all tex

diff --git a/simgear/screen/RenderTexture.h b/simgear/screen/RenderTexture.h
index 9bf4402f046dc8a069a32b33e4228ae19093b52d..3b823e2d8b0629a0823c79b98d45ae689093014e 100644 (file)
--- a/simgear/screen/RenderTexture.h
+++ b/simgear/screen/RenderTexture.h
@@ -45,6 +45,7 @@
  * Changelog:
  *
  * Jan. 2005, Removed GLEW dependencies, Erik Hofman
+ *            Added MacOS X support
  */
 #include <simgear/compiler.h>
 
@@ -55,6 +56,14 @@
 #ifndef _WIN32
 #  include SG_GLX_H
 #endif
+#ifdef __APPLE__
+#  ifndef None
+#     define None false
+#  endif
+#  ifndef True
+#     define True true
+#  endif
+#endif 
 
 #include <string>
 #include <vector>

diff --git a/simgear/screen/colors.hxx b/simgear/screen/colors.hxx
index aa0d414555f390235ddffcec8c6c6a893c502666..1aa0ef47bc3474ce96dd0413db25a773a3636ec2 100644 (file)
--- a/simgear/screen/colors.hxx
+++ b/simgear/screen/colors.hxx
@@ -30,7 +30,7 @@
 const float system_gamma = 1.4;
 
 #elif defined (sgi)
-const float system_gamma = 1.7;
+const float system_gamma = 2.0/1.7;
 
 #else  // others
 const float system_gamma = 2.5;