Make StelPainterLight light a local variable

Global makes it hard to understand where the variable is used, modified,
etc. And static doesn't seem to make any sense since this variable is
only created in a function that does lots of other things, so its
constructor shouldn't affect performance.

Author: 10110111

src/core/modules/Planet.cpp

@@ -3931,15 +3931,6 @@ void Planet::draw(StelCore* core, float maxMagLabels, const QFont& planetNameFon
 	return;
 }
 
-class StelPainterLight
-{
-public:
-	Vec3d position;
-	Vec3f diffuse;
-	Vec3f ambient;
-};
-static StelPainterLight light;
-
 void Planet::PlanetShaderVars::initLocations(QOpenGLShaderProgram* p)
 {
 	GL(p->bind());
@@ -4514,6 +4505,8 @@ void Planet::draw3dModel(StelCore* core, StelProjector::ModelViewTranformP trans
 		}
 		#endif
 
+		StelPainterLight light;
+
 		// Set the main source of light to be the sun.
 		// This must be the aberrated sun! (Mostly theoretically, this displacement seems more important for the shadows, done elsewhere...)
 		Vec3d sunPos = ssm->getSun()->getEclipticPos() + ssm->getSun()->getAberrationPush();
@@ -4564,20 +4557,20 @@ void Planet::draw3dModel(StelCore* core, StelProjector::ModelViewTranformP trans
 
 		if(ssm->getFlagUseObjModels() && !objModelPath.isEmpty())
 		{
-			if(!drawObjModel(&sPainter, screenRd))
+			if(!drawObjModel(light, &sPainter, screenRd))
 			{
-				drawSphere(&sPainter, screenRd, drawOnlyRing);
+				drawSphere(light, &sPainter, screenRd, drawOnlyRing);
 			}
 		}
 		else if (!survey || survey.colors->getInterstate() < 1.0f)
 		{
-			drawSphere(&sPainter, screenRd, drawOnlyRing);
+			drawSphere(light, &sPainter, screenRd, drawOnlyRing);
 		}
 
 		if (survey && survey.colors->getInterstate() > 0.0f)
 		{
-			drawSurvey(core, &sPainter);
-			drawSphere(&sPainter, screenRd, true);
+			drawSurvey(light, core, &sPainter);
+			drawSphere(light, &sPainter, screenRd, true);
 		}
 
 
@@ -4788,7 +4781,7 @@ void Planet::computeModelMatrix(Mat4d &result, bool solarEclipseCase) const
 }
 
 Planet::RenderData Planet::setCommonShaderUniforms(const StelPainter& painter, QOpenGLShaderProgram* shader, const PlanetShaderVars& shaderVars,
-                                                   const bool hasNormalMap, const bool hasHorizonMap)
+                                                   const StelPainterLight& light, const bool hasNormalMap, const bool hasHorizonMap)
 {
 	RenderData data;
 
@@ -4878,7 +4871,7 @@ Planet::RenderData Planet::setCommonShaderUniforms(const StelPainter& painter, Q
 	return data;
 }
 
-void Planet::drawSphere(StelPainter* painter, float screenRd, bool drawOnlyRing)
+void Planet::drawSphere(const StelPainterLight& light, StelPainter* painter, float screenRd, bool drawOnlyRing)
 {
 	const float sphereScaleF=static_cast<float>(sphereScale);
 	if (horizonMap)
@@ -4968,7 +4961,7 @@ void Planet::drawSphere(StelPainter* painter, float screenRd, bool drawOnlyRing)
 
 	GL(shader->bind());
 
-	RenderData rData = setCommonShaderUniforms(*painter,shader,*shaderVars, isMoon,isMoon);
+	RenderData rData = setCommonShaderUniforms(*painter,shader,*shaderVars,light, isMoon,isMoon);
 	if(this==ssm->getSun())
 	{
 		const auto color = painter->getColor();
@@ -5190,7 +5183,7 @@ void Planet::drawSphere(StelPainter* painter, float screenRd, bool drawOnlyRing)
 }
 
 // Draw the Hips survey.
-void Planet::drawSurvey(StelCore* core, StelPainter* painter)
+void Planet::drawSurvey(const StelPainterLight& light, StelCore* core, StelPainter* painter)
 {
 	if (!Planet::initShader()) return;
 	static SolarSystem* ssm = GETSTELMODULE(SolarSystem);
@@ -5218,7 +5211,7 @@ void Planet::drawSurvey(StelCore* core, StelPainter* painter)
 	}
 
 	GL(shader->bind());
-	RenderData rData = setCommonShaderUniforms(*painter, shader, *shaderVars, !!survey.normals, !!survey.horizons);
+	RenderData rData = setCommonShaderUniforms(*painter, shader, *shaderVars, light, !!survey.normals, !!survey.horizons);
 	QVector<Vec3f> projectedVertsArray;
 	QVector<Vec3f> vertsArray;
 	const double angle = 2 * getSpheroidAngularRadius(core) * M_PI_180;
@@ -5400,7 +5393,7 @@ bool Planet::ensureObjLoaded()
 	return true;
 }
 
-bool Planet::drawObjModel(StelPainter *painter, float screenRd)
+bool Planet::drawObjModel(const StelPainterLight& light, StelPainter *painter, float screenRd)
 {
 	Q_UNUSED(screenRd) //screen size unused for now, use it for LOD or something?
 
@@ -5419,7 +5412,7 @@ bool Planet::drawObjModel(StelPainter *painter, float screenRd)
 	QMatrix4x4 shadowMatrix;
 	bool shadowmapping = false;
 	if(ssm->getFlagShowObjSelfShadows())
-		shadowmapping = drawObjShadowMap(painter,shadowMatrix);
+		shadowmapping = drawObjShadowMap(light.position, painter, shadowMatrix);
 
 	if(objModel->texture)
 	{
@@ -5512,7 +5505,7 @@ bool Planet::drawObjModel(StelPainter *painter, float screenRd)
 	GL(shd->enableAttributeArray("vertex"));
 	objModel->projPosBuffer->release();
 
-	setCommonShaderUniforms(*painter,shd,*shdVars,false,false);
+	setCommonShaderUniforms(*painter,shd,*shdVars,light,false,false);
 
 	//draw that model using the array wrapper
 	objModel->arr->draw();
@@ -5527,7 +5520,7 @@ bool Planet::drawObjModel(StelPainter *painter, float screenRd)
 	return true;
 }
 
-bool Planet::drawObjShadowMap(StelPainter *painter, QMatrix4x4& shadowMatrix)
+bool Planet::drawObjShadowMap(const Vec3d& lightPosition, StelPainter *painter, QMatrix4x4& shadowMatrix)
 {
 	if(!shadowInitialized)
 		if(!initFBO())
@@ -5543,7 +5536,7 @@ bool Planet::drawObjShadowMap(StelPainter *painter, QMatrix4x4& shadowMatrix)
 	//computeModelMatrix(modelMatrix);
 	//Mat4d worldToModel = modelMatrix.inverse();
 
-	Vec3d lightDir = light.position;
+	Vec3d lightDir = lightPosition;
 	projector->getModelViewTransform()->backward(lightDir);
 	//Vec3d lightDir(worldToModel[12], worldToModel[13], worldToModel[14]);
 	lightDir.normalize();

src/core/modules/Planet.hpp

@@ -740,6 +740,13 @@ class Planet : public StelObject
 
 	static StelTextureSP texEarthShadow;     // for lunar eclipses
 
+	struct StelPainterLight
+	{
+		Vec3d position;
+		Vec3f diffuse;
+		Vec3f ambient;
+	};
+
 	//! Used in drawSphere() to compute shadows, and inside a function to derive eclipse sizes.
 	//! @param solarEclipseCase For reasons currently unknown we must handle solar eclipses as special case.
 	void computeModelMatrix(Mat4d &result, bool solarEclipseCase) const;
@@ -762,19 +769,19 @@ class Planet : public StelObject
 	//! Draws the OBJ model, assuming it is available
 	//! @param screenRd radius in screen pixels.
 	//! @return false if the model can currently not be drawn (not loaded)
-	bool drawObjModel(StelPainter* painter, float screenRd);
+	bool drawObjModel(const StelPainterLight& light, StelPainter* painter, float screenRd);
 
-	bool drawObjShadowMap(StelPainter* painter, QMatrix4x4 &shadowMatrix);
+	bool drawObjShadowMap(const Vec3d& lightPosition, StelPainter *painter, QMatrix4x4& shadowMatrix);
 
 	//! Starts the OBJ loading process, if it has not been done yet.
 	//! Returns true when the OBJ is ready to draw
 	bool ensureObjLoaded();
 
 	//! Draw the 3D sphere
-	void drawSphere(StelPainter* painter, float screenRd, bool drawOnlyRing=false);
+	void drawSphere(const StelPainterLight& light, StelPainter* painter, float screenRd, bool drawOnlyRing=false);
 
 	//! Draw the Hips survey.
-	void drawSurvey(StelCore* core, StelPainter* painter);
+	void drawSurvey(const StelPainterLight& light, StelCore* core, StelPainter* painter);
 
 	//! Draw the circle and name of the Planet
 	void drawHints(const StelCore* core, StelPainter &sPainter, const QFont& planetNameFont);
@@ -960,8 +967,8 @@ class Planet : public StelObject
 	};
 
 	//! Calculates and uploads the common shader uniforms (projection matrix, texture, lighting&shadow data)
-	RenderData setCommonShaderUniforms(const StelPainter &painter, QOpenGLShaderProgram* shader,
-	                                   const PlanetShaderVars& shaderVars, bool hasNormalMap, bool hasHorizonMap);
+	RenderData setCommonShaderUniforms(const StelPainter& painter, QOpenGLShaderProgram* shader, const PlanetShaderVars& shaderVars,
+	                                   const StelPainterLight& light, bool hasNormalMap, bool hasHorizonMap);
 
 	static PlanetShaderVars planetShaderVars;
 	static QOpenGLShaderProgram* planetShaderProgram;