fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of git://gitorious.org/fg/fgdata

Browse source
This commit is contained in:
BARANGER Emmanuel 2012-03-17 14:50:01 +01:00
commit 087ad94932
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Nasal/controls.nas
View file

@ -462,6 +462,9 @@ _setlistener("/sim/signals/fdm-initialized", func {
var sel = props.globals.getNode("/sim/input/selected", 1); var sel = props.globals.getNode("/sim/input/selected", 1);
var engs = props.globals.getNode("/controls/engines").getChildren("engine"); var engs = props.globals.getNode("/controls/engines").getChildren("engine");
# need to reset engine list on every FDM reset
engines = [];
# process all engines
foreach(var e; engs) { foreach(var e; engs) {
var index = e.getIndex(); var index = e.getIndex();
var s = sel.getChild("engine", index, 1); var s = sel.getChild("engine", index, 1);

2
Shaders/include_fog.frag
View file

@ -6,7 +6,7 @@ vec3 fog_Func(vec3 color, int type)
//if (type == 0){ //if (type == 0){
const float LOG2 = 1.442695; const float LOG2 = 1.442695;
//float fogCoord =length(PointPos); //float fogCoord =length(PointPos);
float fogCoord = gl_FragCoord.z / gl_FragCoord.w; float fogCoord = gl_ProjectionMatrix[3].z/(gl_FragCoord.z * -2.0 + 1.0 - gl_ProjectionMatrix[2].z);
float fogFactor = exp2(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord * LOG2); float fogFactor = exp2(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord * LOG2);
if(gl_Fog.density == 1.0) if(gl_Fog.density == 1.0)

1
preferences.xml
View file

@ -33,7 +33,6 @@ Started September 2000 by David Megginson, david@megginson.com
<read type="string"/> <read type="string"/>
<write type="string"/> <write type="string"/>
</validate> </validate>
<use-custom-scenery-data type="bool">true</use-custom-scenery-data>
</paths> </paths>
<intl include="Translations/locale.xml"/> <intl include="Translations/locale.xml"/>