From: <sv...@ww...> - 2004-11-18 19:38:05
|
Author: delta Date: 2004-11-18 11:37:55 -0800 (Thu, 18 Nov 2004) New Revision: 1324 Modified: trunk/CSP/CSPSim/Source/VirtualScene.cpp Log: * Added GL_ALL_CLIENT_ATTRIB_BITS value in case GL.h doesn't define it. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1324 Modified: trunk/CSP/CSPSim/Source/VirtualScene.cpp =================================================================== --- trunk/CSP/CSPSim/Source/VirtualScene.cpp 2004-11-17 10:15:15 UTC (rev 1323) +++ trunk/CSP/CSPSim/Source/VirtualScene.cpp 2004-11-18 19:37:55 UTC (rev 1324) @@ -22,6 +22,9 @@ * **/ +#ifndef GL_ALL_CLIENT_ATTRIB_BITS +#define GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFFF +#endif #include "VirtualScene.h" #include "TerrainObject.h" @@ -403,7 +406,7 @@ //FIXME: why ALL_OPTIMIZATIONS don t work as expected? osgUtil::Optimizer opt; opt.optimize(m_RootNode.get(), osgUtil::Optimizer::COMBINE_ADJACENT_LODS); - opt.optimize(m_RootNode.get(), osgUtil::Optimizer::SHARE_DUPLICATE_STATE); + opt.optimize(m_RootNode.get(), osgUtil::Optimizer::SHARE_DUPLICATE_STATE); return 1; } @@ -439,7 +442,6 @@ m_SkyLights->addChild(pMoonLightSource); } - int VirtualScene::drawScene() { CSP_LOG(APP, DEBUG, "VirtualScene::drawScene()..."); |