fly/fgdata
1
0
Fork 0
Code Activity

Revert "UniformFactory: merge current uniform per <name> of effect"

Browse source 
Talking with Emilian about this commit, we came to the conclusion we don't want share uniform between .eff file
This reverts commit 91a6a27f32ee5f79e1d7e0d4570e879a902de58f.
This commit is contained in:
Clément de l'Hamaide 2014-11-16 22:09:41 +01:00
parent 735035a357
commit f6f433529f
71 changed files with 115 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Effects/agriculture.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/agriculture</name>
<inherits-from>Effects/crop</inherits-from>
<parameters>
<material>

1
Effects/airfield.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/airfield</name>
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<texture n="13">

1
Effects/ambient.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/ambient</name>
<parameters>
<ambient-occlusion type="bool"><use>/sim/rendering/rembrandt/ambient-occlusion</use></ambient-occlusion>
<ambient-occlusion-strength type="float"><use>/sim/rendering/rembrandt/ambient-occlusion-strength</use></ambient-occlusion-strength>

1
Effects/bloom-blur-1.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/bloom-blur-1</name>
<inherits-from>Effects/blur</inherits-from>
<parameters>
<blurOffset_x>4.0</blurOffset_x>

1
Effects/bloom-blur-2.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/bloom-blur-2</name>
<inherits-from>Effects/blur</inherits-from>
<parameters>
<blurOffset_x>0.0</blurOffset_x>

1
Effects/bloom-combine.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/bloom-combine</name>
<parameters>
</parameters>
<technique n="11">

1
Effects/blur.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/blur</name>
<parameters>
<blurOffset_x>0.0</blurOffset_x>
<blurOffset_y>0.0</blurOffset_y>

1
Effects/bowwave.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/bowwave</name>
<inherits-from>Effects/model-default</inherits-from>
<parameters>
<texture n="0">

1
Effects/building.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/building</name>
<inherits-from>Effects/model-combined-deferred</inherits-from>
<parameters>
<texture n="0">

1
Effects/bumpspec.eff
View file

@ -28,6 +28,7 @@ in Aircraft/A320/Models/Effects/a320_bumpspec.eff ( or whatever, private to the
</PropertyList>
-->
<PropertyList>
<name>Effects/bumpspec</name>
<inherits-from>Effects/model-default</inherits-from>
<generate>
<tangent type="int">6</tangent>

1
Effects/chrome.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/chrome</name>
<parameters>
<texture n ="0">
<type>transparent</type>

1
Effects/cloud-impostor.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/cloud-impostor</name>
<parameters>
<texture n ="0">
</texture>

1
Effects/cloud-models.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/cloud-models</name>
<parameters>
<texture n ="0">
<type>white</type>

1
Effects/cloud-noctilucent.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/cloud-noctilucent</name>
<parameters>
<texture n ="0">
</texture>

49
Effects/cloud-static.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/cloud-static</name>
<parameters>
<texture n ="0">
</texture>
@ -63,25 +64,25 @@
<type>sampler-2d</type>
<value type="int">0</value>
</uniform>
<uniform>
<name>terminator</name>
<type>float</type>
<value><use>terminator</use></value>
<uniform>
<name>terminator</name>
<type>float</type>
<value><use>terminator</use></value>
</uniform>
<uniform>
<name>altitude</name>
<type>float</type>
<value><use>altitude</use></value>
<uniform>
<name>altitude</name>
<type>float</type>
<value><use>altitude</use></value>
</uniform>
<uniform>
<name>cloud_self_shading</name>
<type>float</type>
<value><use>cloud_self_shading</use></value>
<uniform>
<name>cloud_self_shading</name>
<type>float</type>
<value><use>cloud_self_shading</use></value>
</uniform>
<uniform>
<name>moonlight</name>
<type>float</type>
<value><use>moonlight</use></value>
<uniform>
<name>moonlight</name>
<type>float</type>
<value><use>moonlight</use></value>
</uniform>
<vertex-program-two-side>true</vertex-program-two-side>
</pass>
@ -139,15 +140,15 @@
<type>sampler-2d</type>
<value type="int">0</value>
</uniform>
<uniform>
<name>terminator</name>
<type>float</type>
<value><use>terminator</use></value>
<uniform>
<name>terminator</name>
<type>float</type>
<value><use>terminator</use></value>
</uniform>
<uniform>
<name>altitude</name>
<type>float</type>
<value><use>altitude</use></value>
<uniform>
<name>altitude</name>
<type>float</type>
<value><use>altitude</use></value>
</uniform>
<vertex-program-two-side>true</vertex-program-two-side>
</pass>

1
Effects/cloud.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/cloud</name>
<parameters>
<texture n ="0">
</texture>

1
Effects/clouds-box.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/clouds-thin</name>
<parameters>
<texture n ="0">
</texture>

1
Effects/clouds-layered.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/clouds-layered</name>
<parameters>
<texture n ="0">
</texture>

1
Effects/clouds-thick.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/clouds-thick</name>
<parameters>
<texture n ="0">
</texture>

1
Effects/clouds-thin.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/clouds-thin</name>
<parameters>
<texture n ="0">
</texture>

1
Effects/clouds-thinlayer.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/clouds-layered</name>
<parameters>
<texture n ="0">
</texture>

1
Effects/crop.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/crop</name>
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<texture n="2">

1
Effects/cropgrass.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/cropgrass</name>
<inherits-from>Effects/crop</inherits-from>
<parameters>
<texture n="2">

1
Effects/dirt-runway.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/dirt-runway</name>
<inherits-from>Effects/runway</inherits-from>
<parameters>
<texture n="16">

1
Effects/display.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/display</name>
<parameters>
<show-buffers type="bool"><use>/sim/rendering/rembrandt/show-buffers</use></show-buffers>
<bloom type="bool"><use>/sim/rendering/rembrandt/bloom</use></bloom>

1
Effects/flutter.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/flutter</name>
<inherits-from>Effects/model-default</inherits-from>
<parameters>
<vertex-program-two-side type="bool">true</vertex-program-two-side>

1
Effects/fog.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/fog</name>
<technique n="11">
<pass>
<lighting>false</lighting>

1
Effects/forest.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/forest</name>
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<texture n="2">

1
Effects/glacier.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/glacier</name>
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<texture n="2">

1
Effects/herbtundra.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/herbtundra</name>
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<texture n="2">

1
Effects/landmass-nowood.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/landmass-nowood</name>
<inherits-from>Effects/landmass</inherits-from>
<parameters>
<canopy-height type="float">0.0</canopy-height>

1
Effects/landmass-scrub.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/landmass-scrub</name>
<inherits-from>Effects/landmass</inherits-from>
<parameters>
<texture n="2">

1
Effects/landmass.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/landmass</name>
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<texture n="2">

1
Effects/lfeat.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/lfeat</name>
<inherits-from>Effects/runway</inherits-from>
<parameters>
<material>

1
Effects/light-cone.eff
View file

@ -14,6 +14,7 @@ Uses stencil buffer.
<PropertyList>
<name>Effects/light-cone</name>
<inherits-from>Effects/model-default</inherits-from>
<parameters>
<texture n ="0">

1
Effects/light-point.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/light-point</name>
<parameters></parameters>
<technique n="10">
<pass>

1
Effects/light-spot.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/light-spot</name>
<parameters></parameters>
<technique n="10">
<pass>

1
Effects/lightmap.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/lightmap</name>
<parameters>
<texture n ="0">
<type>white</type>

1
Effects/material-diffuse.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/material-diffuse</name>
<parameters>
<material>
<color-mode-uniform>1</color-mode-uniform> <!-- DIFFUSE -->

1
Effects/material-off.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/material-off</name>
<parameters>
<material>
<color-mode-uniform>0</color-mode-uniform> <!-- OFF -->

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

@ -6,6 +6,7 @@ For now it only disables the ubershader under Rembrandt for
the objects that use it, and replaces it with the default shader.
-->
<PropertyList>
<name>Effects/model-combined-deferred</name>
<inherits-from>Effects/model-combined</inherits-from>
<technique n="7">
@ -623,4 +624,4 @@ the objects that use it, and replaces it with the default shader.
</uniform>
</pass>
</technique>
</PropertyList>
</PropertyList>

1
Effects/model-combined-transparent.eff
View file

@ -4,6 +4,7 @@ to provide glass/transparent surfaces with the ubershader active,
and fallback to plain transparency when the model shader is disabled.
-->
<PropertyList>
<name>Effects/model-combined-transparent</name>
<inherits-from>Effects/model-combined</inherits-from>
<technique n="7">

1
Effects/model-combined.eff
View file

@ -3,6 +3,7 @@
please see Docs/README.model-combined.eff for documentation
-->
<PropertyList>
<name>Effects/model-combined</name>
<inherits-from>Effects/model-default</inherits-from>
<parameters>

1
Effects/model-default.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/model-default</name>
<!-- <inherits-from>Effects/shadow</inherits-from> -->
<parameters>
<texture n ="0">

1
Effects/model-transparent.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/model-transparent</name>
<!-- <inherits-from>Effects/shadow</inherits-from> -->
<parameters>
<texture n ="0">

1
Effects/planet-cloudlayer.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/planet</name>
<!-- <inherits-from>Effects/shadow</inherits-from> -->
<parameters>
<texture n ="0">

1
Effects/planet.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/planet</name>
<!-- <inherits-from>Effects/shadow</inherits-from> -->
<parameters>
<texture n ="0">

17
Effects/rain-layer.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/rain-layer</name>
<parameters>
<texture n ="0">
</texture>
@ -77,10 +78,10 @@
<type>float</type>
<value><use>scattering</use></value>
</uniform>
<uniform>
<name>terminator</name>
<type>float</type>
<value><use>terminator</use></value>
<uniform>
<name>terminator</name>
<type>float</type>
<value><use>terminator</use></value>
</uniform>
<vertex-program-two-side>true</vertex-program-two-side>
</pass>
@ -148,10 +149,10 @@
<type>float</type>
<value><use>scattering</use></value>
</uniform>
<uniform>
<name>terminator</name>
<type>float</type>
<value><use>terminator</use></value>
<uniform>
<name>terminator</name>
<type>float</type>
<value><use>terminator</use></value>
</uniform>
<vertex-program-two-side>true</vertex-program-two-side>
</pass>

23
Effects/reflect-bump-spec.eff
View file

@ -50,6 +50,7 @@ To use your own effect place your efffect file containing something like this:
EXAMPLES: You can find examples of both usages in the Hunter and Lightning models.
-->
<PropertyList>
<name>Effects/reflect-bump-spec</name>
<inherits-from>Effects/model-default</inherits-from>
<parameters>
@ -202,9 +203,9 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
<image>
<use>texture[0]/image</use>
</image>
<type>
<use>texture[0]/type</use>
</type>
<type>
<use>texture[0]/type</use>
</type>
<filter>
<use>texture[0]/filter</use>
</filter>
@ -224,9 +225,9 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
<image>
<use>texture[8]/image</use>
</image>
<type>
<use>texture[8]/type</use>
</type>
<type>
<use>texture[8]/type</use>
</type>
<filter>
<use>texture[8]/filter</use>
</filter>
@ -237,7 +238,7 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
<use>texture[8]/wrap-t</use>
</wrap-t>
<internal-format>
<use>texture[8]/internal-format</use>
<use>texture[8]/internal-format</use>
</internal-format>
</texture-unit>
@ -251,9 +252,9 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
<image>
<use>texture[4]/image</use>
</image>
<type>
<use>texture[4]/type</use>
</type>
<type>
<use>texture[4]/type</use>
</type>
<filter>
<use>texture[4]/filter</use>
</filter>
@ -488,4 +489,4 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
</uniform>
</pass>
</technique>
</PropertyList>
</PropertyList>

1
Effects/reflect.eff
View file

@ -48,6 +48,7 @@
-->
<PropertyList>
<name>Effects/reflect</name>
<inherits-from>Effects/model-default</inherits-from>
<parameters>

1
Effects/rock.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/rock</name>
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<!-- light grey rock with pronounced cracks -->

1
Effects/runway-dds.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/runway-dds</name>
<inherits-from>Effects/runway</inherits-from>
<parameters>
<texture n="4">

1
Effects/runway.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/runway</name>
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<texture n="4">

1
Effects/skydome.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/skydome</name>
<parameters>
<mie><use>/sim/rendering/mie</use></mie>
<rayleigh><use>/sim/rendering/rayleigh</use></rayleigh>

1
Effects/ssao-blur-1.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/ssao-blur-1</name>
<inherits-from>Effects/blur</inherits-from>
<parameters>
<blurOffset_x>4.0</blurOffset_x>

1
Effects/ssao-blur-2.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/ssao-blur-2</name>
<inherits-from>Effects/blur</inherits-from>
<parameters>
<blurOffset_x>0.0</blurOffset_x>

1
Effects/ssao.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/ssao</name>
<parameters>
<g_scale type="float">1.0</g_scale>
<g_bias type="float">0.0</g_bias>

1
Effects/sunlight.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/sunlight</name>
<parameters>
<filtering><use>/sim/rendering/shadows/filtering</use></filtering>
</parameters>

1
Effects/surface-lights.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/surface-lights</name>
<parameters>
<!-- min-size, max-size, size, attenuation, cull-face parameters filled in by C++ code -->
<texture n="0">

1
Effects/terrain-default.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/terrain-default</name>
<!-- <inherits-from>another-effect</inherits-from> -->
<parameters>
<material>

1
Effects/test.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/test</name>
<parameters>
<texture n ="0">
</texture>

1
Effects/transition-base-dirt.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/transition-base-dirt</name>
<inherits-from>Effects/transition</inherits-from>
<parameters>
<texture n="3">

1
Effects/transition-base-grass-inverse.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/transition-base-rock</name>
<inherits-from>Effects/transition</inherits-from>
<parameters>
<texture n="3">

1
Effects/transition-base-grass-rock.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/transition-base-grass-rock</name>
<inherits-from>Effects/transition</inherits-from>
<parameters>
<texture n="2">

1
Effects/transition-base-rock.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/transition-base-rock</name>
<inherits-from>Effects/transition</inherits-from>
<parameters>
<texture n="3">

1
Effects/transition.eff
View file

@ -12,6 +12,7 @@ parameters :
-->
<PropertyList>
<name>Effects/transition</name>
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<texture n="2">

1
Effects/tree.eff
View file

@ -12,6 +12,7 @@
Note: no sorting needed! -->
<PropertyList>
<name>Effects/tree</name>
<parameters>
<texture n ="0">
</texture>

1
Effects/urban.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/urban</name>
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<snow-level>

1
Effects/water-dds.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/water-dds</name>
<inherits-from>Effects/water</inherits-from>
<parameters>
<texture n="0">

1
Effects/water-inland.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/water-inland</name>
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<texture n="0">

1
Effects/water.eff
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/water</name>
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<texture n="0">