fly/fgdata
1
0
Fork 0
Code Activity

Rmove stray .dds references in terrain-default.eff and non-dds materials file

Browse source 
This should hopefuly prevent any dds files from being loaded when using the default/regional materials file
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
This commit is contained in:
Emilian Huminiuc 2012-07-13 13:28:54 +03:00
parent 4ddb325ff9
commit b1b263b483
7 changed files with 137 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Effects/terrain-default.eff
View file

@ -31,7 +31,7 @@
<internal-format>normalized</internal-format>
</texture>
<texture n="10">
<image>Textures.high/Terrain/snow3.dds</image>
<image>Textures.high/Terrain/snow3.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>
@ -679,7 +679,7 @@
</pass>
</technique>
<technique n="12">
<pass>
<lighting>true</lighting>

16
Materials/base/materials-base.xml
View file

@ -400,22 +400,6 @@ Shared parameters for various materials.
<bumpiness>0.1</bumpiness>
</material>
<material n="2006">
<name>BarrenCover</name>
<name>Dirt</name>
<name>OpenMining</name>
<name>Rock</name>
<name>Dump</name>
<effect>Effects/transition-base-grass-inverse</effect>
<texture>Terrain/rock.png</texture>
<xsize>500</xsize>
<ysize>500</ysize>
<solid>1</solid>
<friction-factor>0.9</friction-factor>
<rolling-friction>0.1</rolling-friction>
<bumpiness>0.3</bumpiness>
</material>
<material n="2007">
<name>Lava</name>
<name>Burnt</name>

10
Materials/base/rock.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0"?>
<!-- common rock settings -->
<PropertyList>
<xsize>500</xsize>
<ysize>500</ysize>
<solid>1</solid>
<friction-factor>0.9</friction-factor>
<rolling-friction>0.1</rolling-friction>
<bumpiness>0.3</bumpiness>
</PropertyList>

196
Materials/base/water.xml
View file

@ -1,102 +1,102 @@
<?xml version="1.0"?>
<!-- common water settings -->
<PropertyList>
<xsize>400</xsize>
<ysize>400</ysize>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Geometry/container_carrier.ac</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Maritime/Civilian/ContainerShip.xml</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Maritime/Civilian/Trawler.xml</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Maritime/Civilian/Trawler.xml</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Maritime/Civilian/Trawler.xml</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Maritime/Civilian/Freighter.xml</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Maritime/Civilian/LargeTrawler.xml</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Maritime/Civilian/SailBoatUnderSail.xml</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Maritime/Civilian/CruiseShip.xml</path>
<coverage-m2>5000000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Maritime/Civilian/MPPShip.xml</path>
<coverage-m2>5000000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<ambient>
<r>0.0</r>
<g>0.0</g>
<b>0.0</b>
<a>1.0</a>
</ambient>
<diffuse>
<r>0.4</r>
<g>0.4</g>
<b>0.4</b>
<a>1.0</a>
</diffuse>
<specular>
<r>0.0</r>
<g>0.0</g>
<b>0.2</b>
<a>1.0</a>
</specular>
<shininess>0</shininess>
<solid>0</solid>
<rolling-friction>2</rolling-friction>
<bumpiness>0.8</bumpiness>
<xsize>400</xsize>
<ysize>400</ysize>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Geometry/container_carrier.ac</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Maritime/Civilian/ContainerShip.xml</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Maritime/Civilian/Trawler.xml</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Maritime/Civilian/Trawler.xml</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Maritime/Civilian/Trawler.xml</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Maritime/Civilian/Freighter.xml</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Maritime/Civilian/LargeTrawler.xml</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Maritime/Civilian/SailBoatUnderSail.xml</path>
<coverage-m2>500000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Maritime/Civilian/CruiseShip.xml</path>
<coverage-m2>5000000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<object-group>
<range-m>40000</range-m>
<object>
<path>Models/Maritime/Civilian/MPPShip.xml</path>
<coverage-m2>5000000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<ambient>
<r>0.0</r>
<g>0.0</g>
<b>0.0</b>
<a>1.0</a>
</ambient>
<diffuse>
<r>0.4</r>
<g>0.4</g>
<b>0.4</b>
<a>1.0</a>
</diffuse>
<specular>
<r>0.0</r>
<g>0.0</g>
<b>0.2</b>
<a>1.0</a>
</specular>
<shininess>0</shininess>
<solid>0</solid>
<rolling-friction>2</rolling-friction>
<bumpiness>0.8</bumpiness>
</PropertyList>

9
Materials/dds/materials.xml
View file

@ -2352,6 +2352,15 @@
<!-- end winter-->
<material include="Materials/base/rock.xml">
<name>BarrenCover</name>
<name>Dirt</name>
<name>OpenMining</name>
<name>Rock</name>
<name>Dump</name>
<effect>Effects/transition-base-grass-inverse</effect>
<texture>Terrain/rock7.dds</texture>
</material>
<!-- runway and taxiway signs -->

9
Materials/default/materials.xml
View file

@ -2199,6 +2199,15 @@
<!-- end winter-->
<material include="Materials/base/rock.xml">
<name>BarrenCover</name>
<name>Dirt</name>
<name>OpenMining</name>
<name>Rock</name>
<name>Dump</name>
<texture>Terrain/rock.png</texture>
</material>
<!-- runway and taxiway signs -->
<material include="Materials/base/glyphs-yellow.xml">

9
Materials/regions/materials.xml
View file

@ -3034,6 +3034,15 @@
<!-- end winter-->
<material include="Materials/base/rock.xml">
<name>BarrenCover</name>
<name>Dirt</name>
<name>OpenMining</name>
<name>Rock</name>
<name>Dump</name>
<texture>Terrain/rock.png</texture>
</material>
<!-- runway and taxiway signs -->
<material include="Materials/base/glyphs-yellow.xml">