fly/fgdata
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
Detlef Faber 2011-12-05 22:07:50 +01:00
commit 99b5089ae5
2 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Effects/model-combined.eff
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Reflections + Bumpmapping + specular + Lightmap
<!-- Reflections + Bumpmapping + specular+Lightmap
please see Docs/README.model-combined.eff for documentation
-->
<PropertyList>
@ -92,13 +92,16 @@ please see Docs/README.model-combined.eff for documentation
<ambient_correction type="float">0.05</ambient_correction>
<!-- quality slider -->
<shader_quality type="int">2</shader_quality>
<!--<use>/sim/rendering/shaders/model/quality</use>
</shader_quality>-->
<vertex-program-two-side type="bool">false</vertex-program-two-side>
<cull-face>back</cull-face>
<!--<use>/sim/rendering/shaders/model</use>
</quality>-->
<rendering-hint>opaque</rendering-hint>
<transparent>false</transparent>
<render-bin>
<bin-number>1</bin-number>
<bin-name>RenderBin</bin-name>
</render-bin>
<!-- INTERNAL USE -->
<rendering-hint>transparent</rendering-hint>
<shade-model>smooth</shade-model>
<shade-model>smooth</shade-model>
<model_hdg>
<use>orientation/model/heading-deg</use>
</model_hdg>
@ -128,7 +131,6 @@ please see Docs/README.model-combined.eff for documentation
<use>/sim/rendering/scattering-shader</use>
</fogtype>
<!-- END fog include -->
</parameters>
<!--<generate>
@ -194,15 +196,26 @@ please see Docs/README.model-combined.eff for documentation
<shade-model>
<use>shade-model</use>
</shade-model>
<vertex-program-two-side>
<use>vertex-program-two-side</use>
</vertex-program-two-side>
<cull-face>
<use>cull-face</use>
</cull-face>
<rendering-hint>
<use>rendering-hint</use>
</rendering-hint>
<blend>
<use>transparent</use>
</blend>
<alpha-test>
<use>transparent</use>
</alpha-test>
<render-bin>
<bin-number>
<use>render-bin/bin-number</use>
</bin-number>
<bin-name>
<use>render-bin/bin-name</use>
</bin-name>
</render-bin>
<!-- Diffuse texture unit-->
<texture-unit>
<unit>0</unit>
@ -338,6 +351,10 @@ please see Docs/README.model-combined.eff for documentation
<type>noise</type>
</texture-unit>
<vertex-program-two-side>
<use>vertex-program-two-side</use>
</vertex-program-two-side>
<program>
<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader>
<vertex-shader n="1">Shaders/ubershader.vert</vertex-shader>

2
materials-dds.xml
View file

@ -2575,7 +2575,7 @@ Shared parameters for various materials.
<shininess>1.2</shininess>
<light-coverage>20000000.0</light-coverage>
<wood-coverage>8000.0</wood-coverage>
<tree-texture>Textures.high/Trees/mixed-shrub-winter.png</tree-texture>
<tree-texture>Textures/Trees/mixed-shrub-winter.png</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>2.0</tree-height-m>