fly/fgdata
1
0
Fork 0
Code Activity

rename /sim/rendering/rembrandt -> /sim/rendering/rembrandt/enabled

Browse source 
and put rembrandt-related properties in /sim/rendering/rembrandt/
This commit is contained in:
Frederic Bouvier 2012-05-08 17:13:15 +02:00
parent 17740f9cf7
commit 5cfca250b1
11 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Aircraft/c172p/Models/c172p.xml
View file

@ -2386,7 +2386,7 @@
<object-name>LandingLightCone</object-name> <object-name>LandingLightCone</object-name>
<condition> <condition>
<and> <and>
<property>/sim/rendering/rembrandt</property> <property>/sim/rendering/rembrandt/enabled</property>
<property>controls/lighting/landing-lights</property> <property>controls/lighting/landing-lights</property>
</and> </and>
</condition> </condition>
@ -2401,7 +2401,7 @@
<and> <and>
<property>controls/lighting/landing-lights</property> <property>controls/lighting/landing-lights</property>
<not> <not>
<property>/sim/rendering/rembrandt</property> <property>/sim/rendering/rembrandt/enabled</property>
</not> </not>
</and> </and>
</condition> </condition>

4
Effects/display.eff
View file

@ -2,8 +2,8 @@
<PropertyList> <PropertyList>
<name>Effects/display</name> <name>Effects/display</name>
<parameters> <parameters>
<exposure type="float"><use>/sim/rendering/exposure</use></exposure> <exposure type="float"><use>/sim/rendering/rembrandt/exposure</use></exposure>
<show-buffers type="bool"><use>/sim/rendering/show-buffers</use></show-buffers> <show-buffers type="bool"><use>/sim/rendering/rembrandt/show-buffers</use></show-buffers>
</parameters> </parameters>
<technique n="11"> <technique n="11">
<pass> <pass>

2
Effects/model-combined-deferred.eff
View file

@ -12,7 +12,7 @@ the objects that use it, and replaces it with the default shader.
<technique n="8"> <technique n="8">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/rembrandt</property> <property>/sim/rendering/rembrandt/enabled</property>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>

4
Effects/model-combined.eff
View file

@ -141,7 +141,7 @@ please see Docs/README.model-combined.eff for documentation
<use>/sim/rendering/shaders/skydome</use> <use>/sim/rendering/shaders/skydome</use>
</fogtype> </fogtype>
<rembrandt> <rembrandt>
<use>/sim/rendering/rembrandt</use> <use>/sim/rendering/rembrandt/enabled</use>
</rembrandt> </rembrandt>
<!-- END fog include --> <!-- END fog include -->
</parameters> </parameters>
@ -156,7 +156,7 @@ please see Docs/README.model-combined.eff for documentation
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/model</property> <property>/sim/rendering/shaders/model</property>
<property>/sim/rendering/rembrandt</property> <property>/sim/rendering/rembrandt/enabled</property>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>

2
Effects/model-default.eff
View file

@ -142,7 +142,7 @@
<technique n="10"> <technique n="10">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/rembrandt</property> <property>/sim/rendering/rembrandt/enabled</property>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>

2
Effects/terrain-default.eff
View file

@ -415,7 +415,7 @@
<technique n="10"> <technique n="10">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/rembrandt</property> <property>/sim/rendering/rembrandt/enabled</property>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>

2
Effects/tree.eff
View file

@ -40,7 +40,7 @@
<technique n="9"> <technique n="9">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/rembrandt</property> <property>/sim/rendering/rembrandt/enabled</property>
<property>/sim/rendering/random-vegetation</property> <property>/sim/rendering/random-vegetation</property>
</and> </and>
</predicate> </predicate>

4
Effects/urban.eff
View file

@ -42,7 +42,7 @@
<technique n="6"> <technique n="6">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/rembrandt</property> <property>/sim/rendering/rembrandt/enabled</property>
<property>/sim/rendering/shaders/urban</property> <property>/sim/rendering/shaders/urban</property>
<less-equal> <less-equal>
<value type="float">4.0</value> <value type="float">4.0</value>
@ -233,7 +233,7 @@
<technique n="7"> <technique n="7">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/rembrandt</property> <property>/sim/rendering/rembrandt/enabled</property>
<property>/sim/rendering/shaders/urban</property> <property>/sim/rendering/shaders/urban</property>
<less-equal> <less-equal>
<value type="float">1.0</value> <value type="float">1.0</value>

8
gui/dialogs/rendering.xml
View file

@ -547,13 +547,13 @@
<label>Rembrandt</label> <label>Rembrandt</label>
<halign>left</halign> <halign>left</halign>
<visible> <visible>
<property>/sim/rendering/rembrandt</property> <property>/sim/rendering/rembrandt/enabled</property>
</visible> </visible>
</text> </text>
<hrule> <hrule>
<stretch>true</stretch> <stretch>true</stretch>
<visible> <visible>
<property>/sim/rendering/rembrandt</property> <property>/sim/rendering/rembrandt/enabled</property>
</visible> </visible>
</hrule> </hrule>
</group> </group>
@ -568,7 +568,7 @@
<object-name>shadow</object-name> <object-name>shadow</object-name>
</binding> </binding>
<visible> <visible>
<property>/sim/rendering/rembrandt</property> <property>/sim/rendering/rembrandt/enabled</property>
</visible> </visible>
</checkbox> </checkbox>
@ -576,7 +576,7 @@
<layout>hbox</layout> <layout>hbox</layout>
<halign>right</halign> <halign>right</halign>
<visible> <visible>
<property>/sim/rendering/rembrandt</property> <property>/sim/rendering/rembrandt/enabled</property>
</visible> </visible>
<text> <text>

2
gui/menubar.xml
View file

@ -662,7 +662,7 @@
<name>rendering-buffers</name> <name>rendering-buffers</name>
<binding> <binding>
<command>property-toggle</command> <command>property-toggle</command>
<property>/sim/rendering/show-buffers</property> <property>/sim/rendering/rembrandt/show-buffers</property>
</binding> </binding>
<enabled>false</enabled> <enabled>false</enabled>
</item> </item>

14
preferences.xml
View file

@ -64,12 +64,14 @@ Started September 2000 by David Megginson, david@megginson.com
</startup> </startup>
<rendering> <rendering>
<materials-file>Materials/default/materials.xml</materials-file> <materials-file>Materials/default/materials.xml</materials-file>
<rembrandt type="bool">false</rembrandt> <rembrandt>
<renderer userarchive="y">default-pipeline</renderer> <enabled type="bool">false</enabled>
<show-buffers type="bool" userarchive="y">true</show-buffers> <renderer userarchive="y">default-pipeline</renderer>
<ambient-occlusion type="bool" userarchive="y">false</ambient-occlusion> <show-buffers type="bool" userarchive="y">true</show-buffers>
<exposure type="float" userarchive="y">1.0</exposure> <ambient-occlusion type="bool" userarchive="y">false</ambient-occlusion>
<use-color-for-depth type="bool">false</use-color-for-depth> <exposure type="float" userarchive="y">1.0</exposure>
<use-color-for-depth type="bool">false</use-color-for-depth>
</rembrandt>
<debug type="bool">false</debug> <debug type="bool">false</debug>
<realism type="int">5</realism> <realism type="int">5</realism>
<filtering type="int">8</filtering> <filtering type="int">8</filtering>