- remove the SG_GLxxxx_H #defines, since OSG provides its own versions

[simgear.git] / simgear / scene / sky / bbcache.cxx

diff --git a/simgear/scene/sky/bbcache.cxx b/simgear/scene/sky/bbcache.cxx
index 55a2562d0d6feeabe5d3d13f18cd1a6db400c524..66b272750fc990337d0ac9cda689b1c0dec6bffd 100644 (file)
--- a/simgear/scene/sky/bbcache.cxx
+++ b/simgear/scene/sky/bbcache.cxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 //
 
@@ -28,10 +28,9 @@
 #include <simgear/debug/logstream.hxx>
 
 #include <plib/sg.h>
-#include <plib/ssg.h>
 #include <simgear/screen/extensions.hxx>
 #include <simgear/screen/RenderTexture.h>
-#include SG_GLU_H
+#include <osg/GLU>
 
 #include "bbcache.hxx"
 
@@ -91,25 +90,24 @@ bool SGBbCache::allocTextureMemory(int cacheCount, int textureDimension) {
 
 SGBbCache::SGBbCache(void) :
        bbListCount(0),
-       cacheSizeKb(0),
        textureWH(0),
+       cacheSizeKb(0),
        builtBBCount(0),
+       frameNumber(0),
        rt(0),
        rtAvailable(false),
-       frameNumber(0),
        maxImpostorRegenFrame(20)
 {
 }
 
 SGBbCache::~SGBbCache(void) {
-       if(rt)
-               delete rt;
+       delete rt;
        freeTextureMemory();
 }
 
 
 void SGBbCache::init(int cacheCount) {
-       int colorBits = 0;
+       GLint colorBits = 0;
        glGetIntegerv( GL_BLUE_BITS, &colorBits );
 
        rt = new RenderTexture();