fly/fgdata
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
Vivian Meazza 2011-12-11 17:24:09 +00:00
commit 35312c1b82
3 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
Effects/urban.eff
View file

@ -48,24 +48,22 @@
<value type="float">4.0</value> <value type="float">4.0</value>
<float-property>/sim/rendering/shaders/urban</float-property> <float-property>/sim/rendering/shaders/urban</float-property>
</less-equal> </less-equal>
<and> <or>
<or> <less-equal>
<less-equal> <value type="float">2.0</value>
<value type="float">2.0</value> <glversion/>
<glversion/> </less-equal>
</less-equal> <and>
<and> <extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_shader_objects</extension-supported> <extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_shading_language_100</extension-supported> <extension-supported>GL_ARB_vertex_shader</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported> <extension-supported>GL_ARB_fragment_shader</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported> </and>
</and> </or>
</or> <or>
<or> <extension-supported>GL_ATI_shader_texture_lod</extension-supported>
<extension-supported>GL_ATI_shader_texture_lod</extension-supported> <extension-supported>GL_ARB_shader_texture_lod</extension-supported>
<extension-supported>GL_ARB_shader_texture_lod</extension-supported> </or>
</or>
</and>
</and> </and>
</predicate> </predicate>
<pass> <pass>
@ -295,24 +293,19 @@
<value type="float">2.0</value> <value type="float">2.0</value>
<float-property>/sim/rendering/shaders/quality-level</float-property> <float-property>/sim/rendering/shaders/quality-level</float-property>
</less-equal> </less-equal>
<and> <or>
<or> <less-equal>
<less-equal> <value type="float">2.0</value>
<value type="float">2.0</value> <glversion/>
<glversion/> </less-equal>
</less-equal> <and>
<and> <extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_shader_objects</extension-supported> <extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_shading_language_100</extension-supported> <extension-supported>GL_ARB_vertex_shader</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported> <extension-supported>GL_ARB_fragment_shader</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported> </and>
</and> </or>
</or> <!-- quality level below 4.0 doesn't require GL_ATI_shader_texture_lod or GL_ARB_shader_texture_lod -->
<or>
<extension-supported>GL_ATI_shader_texture_lod</extension-supported>
<extension-supported>GL_ARB_shader_texture_lod</extension-supported>
</or>
</and>
</and> </and>
</predicate> </predicate>
<pass> <pass>

1
Translations/strings-default.xml
View file

@ -309,5 +309,6 @@
<trace-read-desc>Trace the reads for a property;</trace-read-desc> <trace-read-desc>Trace the reads for a property;</trace-read-desc>
<trace-write-desc>Trace the writes for a property;</trace-write-desc> <trace-write-desc>Trace the writes for a property;</trace-write-desc>
<log-level-desc>Specify which logging level to use</log-level-desc> <log-level-desc>Specify which logging level to use</log-level-desc>
<log-class-desc>Specify which logging class(es) to use</log-class-desc>
</PropertyList> </PropertyList>

6
options.xml
View file

@ -1150,6 +1150,12 @@
<description>strings/log-level-desc</description> <description>strings/log-level-desc</description>
</option> </option>
<option>
<name>log-class</name>
<arg>[ai,environment,flight,general,io,network,sound,terrain,...]</arg>
<description>strings/log-class-desc</description>
</option>
<option> <option>
<name>trace-read</name> <name>trace-read</name>
<arg>property</arg> <arg>property</arg>