Sim: ACCONFIG 1.5.1: Rendering options wrong detection

AircraftConfig/about.xml

@@ -61,7 +61,7 @@
 		</text>
 		<text>
 			<halign>left</halign>
-			<label>Pre V1.0, Shared Libraries 1.5.0</label>
+			<label>Pre V1.0, Shared Libraries 1.5.1</label>
 		</text>
 	
 	</group>

AircraftConfig/acconfig.nas

@@ -88,6 +88,7 @@ setprop("/systems/acconfig/options/keyboard-mode", 0);
 setprop("/systems/acconfig/options/laptop-mode", 0);
 setprop("/systems/acconfig/options/adirs-skip", 0);
 setprop("/systems/acconfig/options/welcome-skip", 0);
+setprop("/systems/acconfig/options/no-rendering-warn", 0);
 setprop("/systems/acconfig/options/pfd-rate", 1);
 setprop("/systems/acconfig/options/nd-rate", 1);
 setprop("/systems/acconfig/options/uecam-rate", 1);
@@ -108,6 +109,7 @@ var error_mismatch = gui.Dialog.new("sim/gui/dialogs/acconfig/error/mismatch/dia
 var groundservices_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/groundsrvc/dialog", "Aircraft/IDG-A32X/AircraftConfig/groundservices.xml");
 var du_quality = gui.Dialog.new("sim/gui/dialogs/acconfig/du-quality/dialog", "Aircraft/IDG-A32X/AircraftConfig/du-quality.xml");
 var autopush_dlg = gui.Dialog.new("sim/gui/dialogs/autopush/dialog", "Aircraft/IDG-A32X/AircraftConfig/autopush.xml");
+var rendering_dlg = gui.Dialog.new("sim/gui/dialogs/rendering/dialog", "Aircraft/IDG-A32X/AircraftConfig/rendering.xml");
 spinning.start();
 init_dlg.open();
 
@@ -132,6 +134,7 @@ var mismatch_chk = func {
 		if (getprop("/systems/acconfig/out-of-date") != 1) {
 			error_mismatch.open();
 		}
+		libraries.systemsLoop.stop();
 		print("Mismatch: 0x121");
 		welcome_dlg.close();
 	} else if (getprop("/gear/gear[0]/wow") == 0 or getprop("/position/altitude-ft") >= 15000) {
@@ -140,6 +143,7 @@ var mismatch_chk = func {
 		if (getprop("/systems/acconfig/out-of-date") != 1) {
 			error_mismatch.open();
 		}
+		libraries.systemsLoop.stop();
 		print("Mismatch: 0x223");
 		welcome_dlg.close();
 	} else if (getprop("/systems/acconfig/libraries-loaded") != 1) {
@@ -148,6 +152,7 @@ var mismatch_chk = func {
 		if (getprop("/systems/acconfig/out-of-date") != 1) {
 			error_mismatch.open();
 		}
+		libraries.systemsLoop.stop();
 		print("Mismatch: 0x247");
 		welcome_dlg.close();
 	}
@@ -163,14 +168,49 @@ setlistener("/sim/signals/fdm-initialized", func {
 	readSettings();
 	if (getprop("/systems/acconfig/out-of-date") != 1 and getprop("/systems/acconfig/options/revision") < current_revision and getprop("/systems/acconfig/mismatch-code") == "0x000") {
 		updated_dlg.open();
+		if (getprop("/systems/acconfig/options/no-rendering-warn") != 1) {
+			renderingSettings.check();
+		}
 	} else if (getprop("/systems/acconfig/out-of-date") != 1 and getprop("/systems/acconfig/mismatch-code") == "0x000" and getprop("/systems/acconfig/options/welcome-skip") != 1) {
 		welcome_dlg.open();
+		if (getprop("/systems/acconfig/options/no-rendering-warn") != 1) {
+			renderingSettings.check();
+		}
 	}
 	setprop("/systems/acconfig/options/revision", current_revision);
 	writeSettings();
 	spinning.stop();
 });
 
+var renderingSettings = {
+	check: func() {
+		var rembrandt = getprop("/sim/rendering/rembrandt/enabled");
+		var ALS = getprop("/sim/rendering/shaders/skydome");
+		var customSettings = getprop("/sim/rendering/shaders/custom-settings") == 1;
+		var landmass = getprop("/sim/rendering/shaders/landmass") >= 4;
+		var model = getprop("/sim/rendering/shaders/model") >= 1;
+		if (!rembrandt and (!ALS or !customSettings or !landmass or !model)) {
+			rendering_dlg.open();
+		}
+	},
+	fixAll: func() {
+		me.fixCore();
+		var landmass = getprop("/sim/rendering/shaders/landmass") >= 4;
+		var model = getprop("/sim/rendering/shaders/model") >= 1;
+		if (!landmass) {
+			setprop("/sim/rendering/shaders/landmass", 4);
+		}
+		if (!model) {
+			setprop("/sim/rendering/shaders/model", 1);
+		}
+	},
+	fixCore: func() {
+		setprop("/sim/rendering/shaders/skydome", 1); # ALS on
+		setprop("/sim/rendering/shaders/custom-settings", 1);
+		gui.popupTip("Rendering Settings updated!");
+	},
+};
+
 var readSettings = func {
 	io.read_properties(getprop("/sim/fg-home") ~ "/Export/IDG-A32X-config.xml", "/systems/acconfig/options");
 	setprop("/options/system/keyboard-mode", getprop("/systems/acconfig/options/keyboard-mode"));
@@ -191,6 +231,7 @@ var writeSettings = func {
 
 # Cold and Dark
 var colddark = func {
+	if (getprop("/systems/acconfig/mismatch-code") == "0x000") {
 		spinning.start();
 		ps_load_dlg.open();
 		setprop("/systems/acconfig/autoconfig-running", 1);
@@ -223,6 +264,7 @@ var colddark = func {
 			});
 		}
 	}
+}
 var colddark_b = func {
 	# Continues the Cold and Dark script, after engines fully shutdown.
 	setprop("/controls/APU/master", 0);
@@ -237,6 +279,7 @@ var colddark_b = func {
 
 # Ready to Start Eng
 var beforestart = func {
+	if (getprop("/systems/acconfig/mismatch-code") == "0x000") {
 		spinning.start();
 		ps_load_dlg.open();
 		setprop("/systems/acconfig/autoconfig-running", 1);
@@ -273,6 +316,7 @@ var beforestart = func {
 			}
 		});
 	}
+}
 var beforestart_b = func {
 	# Continue with engine start prep.
 	setprop("/controls/fuel/tank0pump1", 1);
@@ -312,6 +356,7 @@ var beforestart_b = func {
 
 # Ready to Taxi
 var taxi = func {
+	if (getprop("/systems/acconfig/mismatch-code") == "0x000") {
 		spinning.start();
 		ps_load_dlg.open();
 		setprop("/systems/acconfig/autoconfig-running", 1);
@@ -348,6 +393,7 @@ var taxi = func {
 			}
 		});
 	}
+}
 var taxi_b = func {
 	# Continue with engine start prep, and start engines.
 	setprop("/controls/fuel/tank0pump1", 1);
@@ -404,6 +450,7 @@ var taxi_d = func {
 
 # Ready to Takeoff
 var takeoff = func {
+	if (getprop("/systems/acconfig/mismatch-code") == "0x000") {
 		# The same as taxi, except we set some things afterwards.
 		taxi();
 		var eng_one_chk_c = setlistener("/engines/engine[0]/state", func {
@@ -425,3 +472,4 @@ var takeoff = func {
 			}
 		});
 	}
+}

AircraftConfig/main.xml

@@ -13,7 +13,7 @@
 		<layout>hbox</layout>
 		<text>
 			<halign>left</halign>
-			<label>Aircraft Configuration V1.5.0</label>
+			<label>Aircraft Configuration V1.5.1</label>
 		</text>
 		<empty><stretch>1</stretch></empty>
 		<button>

AircraftConfig/rendering.xml

@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- Copyright (c) 2018 Joshua Davidson (it0uchpods) -->
+
+<!-- A3XX Aircraft Config Dialog -->
+
+<PropertyList>
+
+	<name>aircraft-config-rendering</name>
+	<layout>vbox</layout>
+	
+	<group>
+		<layout>hbox</layout>
+		<text>
+			<halign>left</halign>
+			<label>Rendering Settings</label>
+		</text>
+		<button>
+			<halign>right</halign>
+			<pref-width>20</pref-width>
+			<pref-height>20</pref-height>
+			<legend>X</legend>
+			<key>Esc</key>
+			<binding>
+				<command>dialog-close</command>
+			</binding>
+		</button>
+	</group>
+	
+	<hrule/>
+	
+	<group>
+		<layout>vbox</layout>
+		
+		<text>
+			<halign>left</halign>
+			<label>IDG Aircraft Config has detected that rendering settings are not set properly!</label>
+		</text>
+		
+		<text>
+			<halign>left</halign>
+			<label>This means lighting effects on the exterior and in the virtual cockpit will not be visible.</label>
+		</text>
+		
+		<text>
+			<halign>left</halign>
+			<label>ALS, and custom shader settings must be on.</label>
+		</text>
+		
+		<text>
+			<halign>left</halign>
+			<label>Landmass shader must be at least 4 for lightspots to work.</label>
+		</text>
+		
+		<text>
+			<halign>left</halign>
+			<label>Model shader must be at least 1 for lightmaps to work.</label>
+		</text>
+		
+		<hrule/>
+		
+		<text>
+			<halign>left</halign>
+			<label>Would you like IDG Aircraft Config to automatically turn on ALS and fix shader settings?</label>
+		</text>
+		
+		<text>
+			<halign>left</halign>
+			<label>If the settings do not save after fixing, try quitting FlightGear through File -&gt; Exit after fixing.</label>
+		</text>
+	
+	</group>
+	
+	<hrule/>
+	
+	<group>
+		<layout>hbox</layout>
+	
+		<checkbox>
+			<label>Do not warn me about rendering settings again</label>
+			<halign>center</halign>
+			<property>/systems/acconfig/options/no-rendering-warn</property>
+			<binding>
+				<command>property-toggle</command>
+				<property>/systems/acconfig/options/no-rendering-warn</property>
+			</binding>
+			<binding>
+				<command>dialog-apply</command>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>
+				acconfig.writeSettings();
+				</script>
+			</binding>
+			<live>true</live>
+		</checkbox>
+		
+	</group>
+	
+	<hrule/>
+	
+	<group>
+		<layout>hbox</layout>
+		
+		<button>
+			<halign>center</halign>
+			<legend>Yes, fix all settings</legend>
+			<pref-width>180</pref-width>
+			<binding>
+				<command>nasal</command>
+				<script>
+				acconfig.renderingSettings.fixAll();
+				</script>
+			</binding>
+			<binding>
+				<command>dialog-close</command>
+			</binding>
+		</button>
+		
+		<button>
+			<halign>center</halign>
+			<legend>Yes, but I'll fix shaders myself</legend>
+			<pref-width>180</pref-width>
+			<binding>
+				<command>nasal</command>
+				<script>
+				acconfig.renderingSettings.fixCore();
+				</script>
+			</binding>
+			<binding> <!-- Close the non-ALS shader dialog if it is open for some bizarre reason -->
+				<command>dialog-close</command>
+				<dialog-name>shaders</dialog-name>
+			</binding>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>shaders-lightfield</dialog-name>
+			</binding>
+			<binding>
+				<command>dialog-close</command>
+			</binding>
+		</button>
+		
+		<button>
+			<halign>center</halign>
+			<legend>I don't care</legend>
+			<pref-width>180</pref-width>
+			<binding>
+				<command>dialog-close</command>
+			</binding>
+		</button>
+	
+	</group>
+	
+</PropertyList>

Nasal/electrical.nas

@@ -160,6 +160,8 @@ var ELEC = {
 		setprop("/systems/electrical/battery2-amps", 0);
 		setprop("/systems/electrical/battery1-percent", 68);
 		setprop("/systems/electrical/battery2-percent", 68);
+		setprop("/systems/electrical/battery1-time", 0);
+		setprop("/systems/electrical/battery2-time", 0);
 		setprop("/systems/electrical/bus/dc1", 0);
 		setprop("/systems/electrical/bus/dc2", 0);
 		setprop("/systems/electrical/bus/dcbat", 0);

revision.txt

@@ -1 +1 @@
-4715
+4716