1
0
Fork 0

Move Transport to an urban context.

Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
This commit is contained in:
Vivian Meazza 2011-09-06 23:14:25 +01:00
parent b027d3c4e8
commit e4db63a4ff

View file

@ -904,9 +904,9 @@ Shared parameters for various materials.
</condition> </condition>
<name>BuiltUpCover</name> <name>BuiltUpCover</name>
<name>Urban</name> <name>Urban</name>
<name>Construction</name> <!--<name>Construction</name>
<name>Industrial</name> <name>Industrial</name>
<name>Port</name> <name>Port</name>-->
<effect>Effects/urban</effect> <effect>Effects/urban</effect>
<texture-set> <texture-set>
<texture>Terrain/city1.png</texture> <texture>Terrain/city1.png</texture>
@ -993,6 +993,99 @@ Shared parameters for various materials.
<tree-width-m>15.0</tree-width-m> <tree-width-m>15.0</tree-width-m>
</material> </material>
<material>
<condition>
<and>
<equals>
<property>sim/startup/season</property>
<value>summer</value>
</equals>
<property>sim/rendering/urban-shader</property>
</and>
</condition>
<!--<name>BuiltUpCover</name>
<name>Urban</name>-->
<name>Construction</name>
<name>Industrial</name>
<name>Port</name>
<name>Transport</name>
<effect>Effects/urban</effect>
<texture-set>
<texture>Terrain/city1.png</texture>
<texture n="2">Terrain/city1-relief-light.png</texture>
</texture-set>
<texture-set>
<texture>Terrain/city2.png</texture>
<texture n="2">Terrain/city2-relief-light.png</texture>
</texture-set>
<!--
<texture-set>
<texture>Terrain/city3.png</texture>
<texture n="2">Terrain/city3-relief-light.png</texture>
</texture-set>
-->
<xsize>1000</xsize>
<ysize>1000</ysize>
<light-coverage>100000.0</light-coverage>
<emissive>
<r>0.05</r>
<g>0.05</g>
<b>0.02</b>
<a>1.0</a>
</emissive>
<object-group>
<range-m>10000</range-m>
<object>
<path>Models/Buildings/oil-tanks.ac</path>
<coverage-m2>10000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/factory.ac</path>
<coverage-m2>4000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Industrial/Zone-Indus-long-ba.ac</path>
<coverage-m2>4000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Industrial/Zone-Indus-ba.ac</path>
<coverage-m2>4000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<object>
<path>Models/Commercial/small-glass-office-building.ac</path>
<path>Models/Buildings/medium-glass-office-building.ac</path>
<path>Models/Buildings/small-modern-office.ac</path>
<path>Models/Buildings/small-office.ac</path>
<coverage-m2>500000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/water-tower.ac</path>
<coverage-m2>100000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Commercial/Petrolstation1.ac</path>
<coverage-m2>10000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<wood-coverage>250000.0</wood-coverage>
<wood-size>5000.0</wood-size>
<tree-density>2000.0</tree-density>
<tree-texture>Textures.high/Trees/mixed-summer.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>25.0</tree-height-m>
<tree-width-m>15.0</tree-width-m>
</material>
<material> <material>
<condition> <condition>
<equals> <equals>
@ -1005,9 +1098,6 @@ Shared parameters for various materials.
</condition> </condition>
<name>BuiltUpCover</name> <name>BuiltUpCover</name>
<name>Urban</name> <name>Urban</name>
<name>Construction</name>
<name>Industrial</name>
<name>Port</name>
<effect>Effects/transition-base-dirt</effect> <effect>Effects/transition-base-dirt</effect>
<texture-set> <texture-set>
<texture>Terrain/city1.png</texture> <texture>Terrain/city1.png</texture>
@ -1034,11 +1124,6 @@ Shared parameters for various materials.
</emissive> </emissive>
<object-group> <object-group>
<range-m>10000</range-m> <range-m>10000</range-m>
<object>
<path>Models/Buildings/oil-tanks.ac</path>
<coverage-m2>10000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object> <object>
<path>Models/Buildings/big-apartment.ac</path> <path>Models/Buildings/big-apartment.ac</path>
<coverage-m2>10000000</coverage-m2> <coverage-m2>10000000</coverage-m2>
@ -1094,6 +1179,97 @@ Shared parameters for various materials.
<tree-width-m>15.0</tree-width-m> <tree-width-m>15.0</tree-width-m>
</material> </material>
<material>
<condition>
<equals>
<property>sim/startup/season</property>
<value>summer</value>
</equals>
<not>
<property>sim/rendering/urban-shader</property>
</not>
</condition>
<name>Construction</name>
<name>Industrial</name>
<name>Port</name>
<name>Transport</name>
<effect>Effects/transition-base-dirt</effect>
<texture-set>
<texture>Terrain/city1.png</texture>
<texture n="4">Terrain.winter/builtup.png</texture>
</texture-set>
<texture-set>
<texture>Terrain/city2.png</texture>
<texture n="4">Terrain.winter/builtup.png</texture>
</texture-set>
<!--
<texture-set>
<texture>Terrain/city3.png</texture>
<texture n="2">Terrain/city3-relief-light.png</texture>
</texture-set>
-->
<xsize>1000</xsize>
<ysize>1000</ysize>
<light-coverage>100000.0</light-coverage>
<emissive>
<r>0.05</r>
<g>0.05</g>
<b>0.02</b>
<a>1.0</a>
</emissive>
<object-group>
<range-m>10000</range-m>
<object>
<path>Models/Buildings/oil-tanks.ac</path>
<coverage-m2>10000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/factory.ac</path>
<coverage-m2>4000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Industrial/Zone-Indus-long-ba.ac</path>
<coverage-m2>4000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Industrial/Zone-Indus-ba.ac</path>
<coverage-m2>4000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<object>
<path>Models/Commercial/small-glass-office-building.ac</path>
<path>Models/Buildings/medium-glass-office-building.ac</path>
<path>Models/Buildings/small-modern-office.ac</path>
<path>Models/Buildings/small-office.ac</path>
<coverage-m2>500000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/water-tower.ac</path>
<coverage-m2>100000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Commercial/Petrolstation1.ac</path>
<coverage-m2>10000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<wood-coverage>250000.0</wood-coverage>
<wood-size>5000.0</wood-size>
<tree-density>2000.0</tree-density>
<tree-texture>Textures.high/Trees/mixed-summer.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>25.0</tree-height-m>
<tree-width-m>15.0</tree-width-m>
</material>
<material> <material>
<condition> <condition>
<equals> <equals>
@ -1997,9 +2173,9 @@ Shared parameters for various materials.
</condition> </condition>
<name>BuiltUpCover</name> <name>BuiltUpCover</name>
<name>Urban</name> <name>Urban</name>
<name>Construction</name> <!--<name>Construction</name>
<name>Industrial</name> <name>Industrial</name>
<name>Port</name> <name>Port</name>-->
<effect>Effects/urban</effect> <effect>Effects/urban</effect>
<texture-set> <texture-set>
<texture>Terrain/city1.png</texture> <texture>Terrain/city1.png</texture>
@ -2086,6 +2262,96 @@ Shared parameters for various materials.
<tree-width-m>15.0</tree-width-m> <tree-width-m>15.0</tree-width-m>
</material> </material>
<material>
<condition>
<equals>
<property>sim/startup/season</property>
<value>winter</value>
</equals>
</condition>
<!--<name>BuiltUpCover</name>
<name>Urban</name>-->
<name>Construction</name>
<name>Industrial</name>
<name>Port</name>
<name>Transport</name>
<effect>Effects/urban</effect>
<texture-set>
<texture>Terrain/city1.png</texture>
<texture n="2">Terrain/city1-relief-light.png</texture>
</texture-set>
<texture-set>
<texture>Terrain/city2.png</texture>
<texture n="2">Terrain/city2-relief-light.png</texture>
</texture-set>
<!--
<texture-set>
<texture>Terrain/city3.png</texture>
<texture n="2">Terrain/city3-relief-light.png</texture>
</texture-set>
-->
<xsize>1000</xsize>
<ysize>1000</ysize>
<light-coverage>100000.0</light-coverage>
<emissive>
<r>0.05</r>
<g>0.05</g>
<b>0.02</b>
<a>1.0</a>
</emissive>
<object-group>
<range-m>10000</range-m>
<object>
<path>Models/Buildings/oil-tanks.ac</path>
<coverage-m2>10000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/factory.ac</path>
<coverage-m2>4000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Industrial/Zone-Indus-long-ba.ac</path>
<coverage-m2>4000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Industrial/Zone-Indus-ba.ac</path>
<coverage-m2>4000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<object>
<path>Models/Commercial/small-glass-office-building.ac</path>
<path>Models/Buildings/medium-glass-office-building.ac</path>
<path>Models/Buildings/small-modern-office.ac</path>
<path>Models/Buildings/small-office.ac</path>
<coverage-m2>500000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/water-tower.ac</path>
<coverage-m2>100000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Commercial/Petrolstation1.ac</path>
<coverage-m2>10000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<wood-coverage>250000.0</wood-coverage>
<wood-size>5000.0</wood-size>
<tree-density>2000.0</tree-density>
<tree-texture>Textures.high/Trees/mixed-winter.png</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>25.0</tree-height-m>
<tree-width-m>15.0</tree-width-m>
</material>
<material> <material>
<condition> <condition>
<equals> <equals>
@ -2963,7 +3229,7 @@ Shared parameters for various materials.
<material> <material>
<name>Railroad</name> <name>Railroad</name>
<name>Transport</name> <!--<name>Transport</name>-->
<texture>Terrain/gravel.png</texture> <texture>Terrain/gravel.png</texture>
<xsize>400</xsize> <xsize>400</xsize>
<ysize>400</ysize> <ysize>400</ysize>