Consolidate Fresnel and Rainbow look-up textures. Re-instate Rainbow effect in ALS shader.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
This commit is contained in:
Vivian Meazza
parent
982a49d39a
commit
646a74f915
2 changed files with 15 additions and 102 deletions
|
|
@ -287,7 +287,7 @@ and fallback to plain transparency when the model shader is disabled.
|
|||
</images>
|
||||
<!-- END 6 image cube map -->
|
||||
</texture-unit>
|
||||
<!-- Reflection fresnel texture unit-->
|
||||
<!-- Reflection Gradients texture unit-->
|
||||
<texture-unit>
|
||||
<unit>6</unit>
|
||||
<image>
|
||||
|
|
@ -306,27 +306,7 @@ and fallback to plain transparency when the model shader is disabled.
|
|||
<use>texture[6]/internal-format</use>
|
||||
</internal-format>
|
||||
</texture-unit>
|
||||
<!-- Reflection rainbow texture unit-->
|
||||
<texture-unit>
|
||||
<unit>7</unit>
|
||||
<image>
|
||||
<use>texture[7]/image</use>
|
||||
</image>
|
||||
<filter>
|
||||
<use>texture[7]/filter</use>
|
||||
</filter>
|
||||
<wrap-s>
|
||||
<use>texture[7]/wrap-s</use>
|
||||
</wrap-s>
|
||||
<wrap-t>
|
||||
<use>texture[7]/wrap-t</use>
|
||||
</wrap-t>
|
||||
<internal-format>
|
||||
<use>texture[7]/internal-format</use>
|
||||
</internal-format>
|
||||
</texture-unit>
|
||||
|
||||
|
||||
|
||||
<vertex-program-two-side>
|
||||
<use>vertex-program-two-side</use>
|
||||
</vertex-program-two-side>
|
||||
|
|
@ -383,17 +363,11 @@ and fallback to plain transparency when the model shader is disabled.
|
|||
</uniform>
|
||||
|
||||
<uniform>
|
||||
<name>ReflFresnelTex</name>
|
||||
<name>ReflGradientsTex</name>
|
||||
<type>sampler-2d</type>
|
||||
<value type="int">6</value>
|
||||
</uniform>
|
||||
|
||||
<uniform>
|
||||
<name>ReflRainbowTex</name>
|
||||
<type>sampler-2d</type>
|
||||
<value type="int">7</value>
|
||||
</uniform>
|
||||
|
||||
|
||||
<!-- NORMAL MAP -->
|
||||
<!-- normalmap is used-->
|
||||
<uniform>
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ please see Docs/README.model-combined.eff for documentation
|
|||
<!-- Reflection fresnel -->
|
||||
<reflection-fresnel type="float">0.1</reflection-fresnel>
|
||||
<texture n="6">
|
||||
<image>Aircraft/Generic/Effects/FresnelLookUp.png</image>
|
||||
<image>Aircraft/Generic/Effects/Gradients.png</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
|
|
@ -80,19 +80,12 @@ please see Docs/README.model-combined.eff for documentation
|
|||
</texture>
|
||||
<!-- Reflection rainbow -->
|
||||
<reflection-rainbow type="float">0.01</reflection-rainbow>
|
||||
<texture n="7">
|
||||
<image>Aircraft/Generic/Effects/Rainbow.png</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
<reflection-noise type="float">0.25</reflection-noise>
|
||||
<!-- END Reflection -->
|
||||
<!-- grain texture -->
|
||||
<grain-texture-enabled type="int">0</grain-texture-enabled>
|
||||
<grain-magnification type="float">10</grain-magnification>
|
||||
<texture n="14">
|
||||
<texture n="7">
|
||||
<image>Textures/Terrain/void.png</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
|
|
@ -339,7 +332,7 @@ please see Docs/README.model-combined.eff for documentation
|
|||
</images>
|
||||
<!-- END 6 image cube map -->
|
||||
</texture-unit>
|
||||
<!-- Reflection fresnel texture unit-->
|
||||
<!-- Reflection gradients texture unit-->
|
||||
<texture-unit>
|
||||
<unit>6</unit>
|
||||
<image>
|
||||
|
|
@ -358,43 +351,23 @@ please see Docs/README.model-combined.eff for documentation
|
|||
<use>texture[6]/internal-format</use>
|
||||
</internal-format>
|
||||
</texture-unit>
|
||||
<!-- Reflection rainbow texture unit-->
|
||||
<!--<texture-unit>
|
||||
<unit>7</unit>
|
||||
<image>
|
||||
<use>texture[7]/image</use>
|
||||
</image>
|
||||
<filter>
|
||||
<use>texture[7]/filter</use>
|
||||
</filter>
|
||||
<wrap-s>
|
||||
<use>texture[7]/wrap-s</use>
|
||||
</wrap-s>
|
||||
<wrap-t>
|
||||
<use>texture[7]/wrap-t</use>
|
||||
</wrap-t>
|
||||
<internal-format>
|
||||
<use>texture[7]/internal-format</use>
|
||||
</internal-format>
|
||||
</texture-unit>-->
|
||||
|
||||
<!-- Grain texture -->
|
||||
<texture-unit>
|
||||
<unit>7</unit>
|
||||
<image>
|
||||
<use>texture[14]/image</use>
|
||||
<use>texture[7]/image</use>
|
||||
</image>
|
||||
<filter>
|
||||
<use>texture[14]/filter</use>
|
||||
<use>texture[7]/filter</use>
|
||||
</filter>
|
||||
<wrap-s>
|
||||
<use>texture[14]/wrap-s</use>
|
||||
<use>texture[7]/wrap-s</use>
|
||||
</wrap-s>
|
||||
<wrap-t>
|
||||
<use>texture[14]/wrap-t</use>
|
||||
<use>texture[7]/wrap-t</use>
|
||||
</wrap-t>
|
||||
<internal-format>
|
||||
<use>texture[14]/internal-format</use>
|
||||
<use>texture[7]/internal-format</use>
|
||||
</internal-format>
|
||||
</texture-unit>
|
||||
|
||||
|
|
@ -444,17 +417,11 @@ please see Docs/README.model-combined.eff for documentation
|
|||
</uniform>
|
||||
|
||||
<uniform>
|
||||
<name>ReflFresnelTex</name>
|
||||
<name>ReflGradientsTex</name>
|
||||
<type>sampler-2d</type>
|
||||
<value type="int">6</value>
|
||||
</uniform>
|
||||
|
||||
<!--<uniform>
|
||||
<name>ReflRainbowTex</name>
|
||||
<type>sampler-2d</type>
|
||||
<value type="int">7</value>
|
||||
</uniform>-->
|
||||
|
||||
<uniform>
|
||||
<name>GrainTex</name>
|
||||
<type>sampler-2d</type>
|
||||
|
|
@ -1024,7 +991,7 @@ please see Docs/README.model-combined.eff for documentation
|
|||
</images>
|
||||
<!-- END 6 image cube map -->
|
||||
</texture-unit>
|
||||
<!-- Reflection fresnel texture unit-->
|
||||
<!-- Reflection gradients texture unit-->
|
||||
<texture-unit>
|
||||
<unit>6</unit>
|
||||
<image>
|
||||
|
|
@ -1043,26 +1010,6 @@ please see Docs/README.model-combined.eff for documentation
|
|||
<use>texture[6]/internal-format</use>
|
||||
</internal-format>
|
||||
</texture-unit>
|
||||
<!-- Reflection rainbow texture unit-->
|
||||
<texture-unit>
|
||||
<unit>7</unit>
|
||||
<image>
|
||||
<use>texture[7]/image</use>
|
||||
</image>
|
||||
<filter>
|
||||
<use>texture[7]/filter</use>
|
||||
</filter>
|
||||
<wrap-s>
|
||||
<use>texture[7]/wrap-s</use>
|
||||
</wrap-s>
|
||||
<wrap-t>
|
||||
<use>texture[7]/wrap-t</use>
|
||||
</wrap-t>
|
||||
<internal-format>
|
||||
<use>texture[7]/internal-format</use>
|
||||
</internal-format>
|
||||
</texture-unit>
|
||||
|
||||
|
||||
<vertex-program-two-side>
|
||||
<use>vertex-program-two-side</use>
|
||||
|
|
@ -1120,19 +1067,11 @@ please see Docs/README.model-combined.eff for documentation
|
|||
</uniform>
|
||||
|
||||
<uniform>
|
||||
<name>ReflFresnelTex</name>
|
||||
<name>ReflGradientsTex</name>
|
||||
<type>sampler-2d</type>
|
||||
<value type="int">6</value>
|
||||
</uniform>
|
||||
|
||||
<uniform>
|
||||
<name>ReflRainbowTex</name>
|
||||
<type>sampler-2d</type>
|
||||
<value type="int">7</value>
|
||||
</uniform>
|
||||
|
||||
|
||||
|
||||
<!-- NORMAL MAP -->
|
||||
<!-- normalmap is used-->
|
||||
<uniform>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue