Fixed the light direction being reset on changes to render settings

fo76utils · Jan 31, 2025 · 3fdca33 · 3fdca33
1 parent d1aeaf2
commit 3fdca33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/glview.cpp b/src/glview.cpp
@@ -214,11 +214,7 @@ void GLView::updateSettings()
 	cfg.moveSpd = settings.value( "General/Camera/Movement Speed" ).toFloat();
 	cfg.rotSpd = settings.value( "General/Camera/Rotation Speed" ).toFloat();
 	cfg.upAxis = UpAxis(settings.value( "General/Up Axis", ZAxis ).toInt());
-	int	z = settings.value( "Lighting/Declination", 0 ).toInt();
-	declination = float( z % 720 ) * 0.25f;		// Divide by 4 because sliders are -720 <-> 720
-	z = settings.value( "Lighting/Planar Angle", 0 ).toInt();
-	planarAngle = float( z % 720 ) * 0.25f;
-	z = settings.value( "General/Camera/Startup Direction", 1 ).toInt();
+	int	z = settings.value( "General/Camera/Startup Direction", 1 ).toInt();
 	static const ViewState	startupDirections[6] = {
 		ViewLeft, ViewFront, ViewTop, ViewRight, ViewBack, ViewBottom
 	};

diff --git a/src/ui/widgets/lightingwidget.cpp b/src/ui/widgets/lightingwidget.cpp
@@ -59,6 +59,11 @@ LightingWidget::LightingWidget( GLView * ogl, QWidget * parent ) : QWidget(paren
 	tmp = settings.value( "Settings/Render/Lighting/Tone Mapping", POS ).toInt();
 	ui->sldToneMapping->setValue( std::clamp< int >( tmp, 0, BRIGHT ) );
 	ui->btnFrontal->setChecked( settings.value( "Settings/Render/Lighting/Frontal Light", true ).toBool() );
+
+	tmp = settings.value( "Lighting/Declination", 0 ).toInt();
+	ogl->declination = float( tmp % int(POS) ) * ( 180.0f / float(POS) );
+	tmp = settings.value( "Lighting/Planar Angle", 0 ).toInt();
+	ogl->planarAngle = float( tmp % int(POS) ) * ( 180.0f / float(POS) );
 }
 
 LightingWidget::~LightingWidget()