Sim: Fix slight things with lighting

This commit is contained in:
Joshua Davidson 2019-01-12 09:39:01 -05:00
parent e7800ed20d
commit 24bfffefb2
3 changed files with 14 additions and 16 deletions

View file

@ -187,7 +187,7 @@ var renderingSettings = {
var ALS = getprop("/sim/rendering/shaders/skydome"); var ALS = getprop("/sim/rendering/shaders/skydome");
var customSettings = getprop("/sim/rendering/shaders/custom-settings") == 1; var customSettings = getprop("/sim/rendering/shaders/custom-settings") == 1;
var landmass = getprop("/sim/rendering/shaders/landmass") >= 4; var landmass = getprop("/sim/rendering/shaders/landmass") >= 4;
var model = getprop("/sim/rendering/shaders/model") >= 1; var model = getprop("/sim/rendering/shaders/model") >= 2;
if (!rembrandt and (!ALS or !customSettings or !landmass or !model)) { if (!rembrandt and (!ALS or !customSettings or !landmass or !model)) {
rendering_dlg.open(); rendering_dlg.open();
} }
@ -195,12 +195,12 @@ var renderingSettings = {
fixAll: func() { fixAll: func() {
me.fixCore(); me.fixCore();
var landmass = getprop("/sim/rendering/shaders/landmass") >= 4; var landmass = getprop("/sim/rendering/shaders/landmass") >= 4;
var model = getprop("/sim/rendering/shaders/model") >= 1; var model = getprop("/sim/rendering/shaders/model") >= 2;
if (!landmass) { if (!landmass) {
setprop("/sim/rendering/shaders/landmass", 4); setprop("/sim/rendering/shaders/landmass", 4);
} }
if (!model) { if (!model) {
setprop("/sim/rendering/shaders/model", 1); setprop("/sim/rendering/shaders/model", 2);
} }
}, },
fixCore: func() { fixCore: func() {

View file

@ -5703,34 +5703,32 @@
<object-name>DomeLtSwtch</object-name> <object-name>DomeLtSwtch</object-name>
<action> <action>
<button>0</button> <button>0</button>
<button>3</button>
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-cycle</command>
<property>controls/lighting/dome-norm</property> <property>controls/lighting/dome-norm</property>
<step>0.5</step> <value>0.0</value>
<min>0</min> <value>0.5</value>
<max>1</max> <value>1.0</value>
</binding> </binding>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>setprop("/sim/sounde/knb1", 1);</script> <script>setprop("/sim/sounde/switch1", 1);</script>
</binding> </binding>
</action> </action>
<action> <action>
<button>1</button> <button>1</button>
<button>4</button>
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-cycle</command>
<property>controls/lighting/dome-norm</property> <property>controls/lighting/dome-norm</property>
<step>-0.5</step> <value>1.0</value>
<min>0</min> <value>0.5</value>
<max>1</max> <value>0.0</value>
</binding> </binding>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>setprop("/sim/sounde/knb1", 1);</script> <script>setprop("/sim/sounde/switch1", 1);</script>
</binding> </binding>
</action> </action>
</animation> </animation>

View file

@ -1 +1 @@
4734 4735