Photoscenery: patch to fix missed merge items.
Author: Nathaniel Warner
This commit is contained in:
parent
76f7f1b698
commit
5512934374
2 changed files with 2 additions and 3 deletions
|
@ -80,6 +80,7 @@ void main()
|
||||||
//vec4 ecPosition = gl_ModelViewMatrix * gl_Vertex;
|
//vec4 ecPosition = gl_ModelViewMatrix * gl_Vertex;
|
||||||
gl_Position = ftransform();
|
gl_Position = ftransform();
|
||||||
gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
|
gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
|
||||||
|
orthoTexCoord = orthophotoTexCoord;
|
||||||
normal = gl_NormalMatrix * gl_Normal;
|
normal = gl_NormalMatrix * gl_Normal;
|
||||||
vec4 ambient_color, diffuse_color;
|
vec4 ambient_color, diffuse_color;
|
||||||
if (colorMode == MODE_DIFFUSE) {
|
if (colorMode == MODE_DIFFUSE) {
|
||||||
|
|
|
@ -59,9 +59,7 @@ Started September 2000 by David Megginson, david@megginson.com
|
||||||
<sun-atlas-size type="int" userarchive="y">2048</sun-atlas-size>
|
<sun-atlas-size type="int" userarchive="y">2048</sun-atlas-size>
|
||||||
</shadows>
|
</shadows>
|
||||||
<photoscenery>
|
<photoscenery>
|
||||||
<enabled type="bool" userarchive="y">true</enabled>
|
<enabled type="bool" userarchive="y">false</enabled>
|
||||||
<pixels-per-meter type="float" userarchive="y">0.25</pixels-per-meter>
|
|
||||||
<auto-download type="bool" userarchive="y">true</auto-download>
|
|
||||||
</photoscenery>
|
</photoscenery>
|
||||||
<debug type="bool">false</debug>
|
<debug type="bool">false</debug>
|
||||||
<realism type="int">5</realism>
|
<realism type="int">5</realism>
|
||||||
|
|
Loading…
Add table
Reference in a new issue