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

Frederic Bouvier:

Browse Source 
This patch was inspired by Norman. Otherwise there is a segfault on Linux because the global variable tries to access OGL before a valid context is initialized.
This commit is contained in:
ehofman
2003-08-16 12:30:25 +00:00
parent 2e1accc0f3
commit 5628c85b51
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/sky/clouds3d/SkySceneLoader.cpp
+2 -1
View File
@@ -49,7 +49,7 @@ Point3D origin;
Camera *pCam = new Camera(); Camera *pCam = new Camera();
// Need to add a light here until we figure out how to use the sun position and color // Need to add a light here until we figure out how to use the sun position and color
SkyLight::SkyLightType eType = SkyLight::SKY_LIGHT_DIRECTIONAL; SkyLight::SkyLightType eType = SkyLight::SKY_LIGHT_DIRECTIONAL;
SkyLight *pLight = new SkyLight(eType); SkyLight *pLight = 0;
// hack // hack
sgMat4 my_copy_of_ssgOpenGLAxisSwapMatrix = sgMat4 my_copy_of_ssgOpenGLAxisSwapMatrix =
@@ -105,6 +105,7 @@ SkySceneLoader::~SkySceneLoader()
//bool SkySceneLoader::Load(std::string filepath) //bool SkySceneLoader::Load(std::string filepath)
bool SkySceneLoader::Load( unsigned char *data, unsigned int size, double latitude, double longitude ) bool SkySceneLoader::Load( unsigned char *data, unsigned int size, double latitude, double longitude )
{ {
pLight = new SkyLight(eType);
// Need to create the managers // Need to create the managers
cout << "GraphicsContext::Instantiate();" << endl; cout << "GraphicsContext::Instantiate();" << endl;
GraphicsContext::Instantiate(); GraphicsContext::Instantiate();