fly/fgdata
1
0
Fork 0
Code Activity

Photoscenery: patch to fix missed merge items.

Browse source 
Author: Nathaniel Warner
This commit is contained in:
Scott Giese 2020-11-23 20:55:30 -06:00
parent 76f7f1b698
commit 5512934374
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Shaders/generic-ALS-base.vert
View file

@ -80,6 +80,7 @@ void main()
//vec4 ecPosition = gl_ModelViewMatrix * gl_Vertex;
gl_Position = ftransform();
gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
orthoTexCoord = orthophotoTexCoord;
normal = gl_NormalMatrix * gl_Normal;
vec4 ambient_color, diffuse_color;
if (colorMode == MODE_DIFFUSE) {

4
defaults.xml
View file

@ -59,9 +59,7 @@ Started September 2000 by David Megginson, david@megginson.com
<sun-atlas-size type="int" userarchive="y">2048</sun-atlas-size>
</shadows>
<photoscenery>
<enabled type="bool" userarchive="y">true</enabled>
<pixels-per-meter type="float" userarchive="y">0.25</pixels-per-meter>
<auto-download type="bool" userarchive="y">true</auto-download>
<enabled type="bool" userarchive="y">false</enabled>
</photoscenery>
<debug type="bool">false</debug>
<realism type="int">5</realism>