wrong merge fix

This commit is contained in:
Anis 2014-11-27 00:55:01 +01:00 committed by LuisAntonRebollo
parent a954daa43f
commit 09b6a06bbc

View file

@ -20,3 +20,227 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// Sample grass
// ----------------------------------------------------------------------------
singleton Material(TerrainFX_grass1)
{
mapTo = "grass1";
footstepSoundId = 0;
terrainMaterials = "1";
ShowDust = "1";
showFootprints = "1";
materialTag0 = "Terrain";
effectColor[0] = "0.42 0.42 0 1";
effectColor[1] = "0.42 0.42 0 1";
impactSoundId = "0";
};
new TerrainMaterial()
{
internalName = "grass1";
diffuseMap = "art/terrains/Example/grass1";
detailMap = "art/terrains/Example/grass1_d";
detailSize = "10";
isManaged = "1";
detailBrightness = "1";
Enabled = "1";
diffuseSize = "200";
normalMap = "art/terrains/Example/grass1_n";
};
singleton Material(TerrainFX_grass2)
{
mapTo = "grass2";
footstepSoundId = 0;
terrainMaterials = "1";
ShowDust = "1";
showFootprints = "1";
materialTag0 = "Terrain";
effectColor[0] = "0.42 0.42 0 1";
effectColor[1] = "0.42 0.42 0 1";
impactSoundId = "0";
};
new TerrainMaterial()
{
internalName = "grass2";
diffuseMap = "art/terrains/Example/grass2";
detailMap = "art/terrains/Example/grass2_d";
detailSize = "10";
isManaged = "1";
detailBrightness = "1";
Enabled = "1";
diffuseSize = "200";
};
singleton Material(TerrainFX_grass1dry)
{
mapTo = "grass1_dry";
footstepSoundId = 0;
terrainMaterials = "1";
ShowDust = "1";
showFootprints = "1";
materialTag0 = "Terrain";
effectColor[0] = "0.63 0.55 0 1";
};
new TerrainMaterial()
{
internalName = "grass1_dry";
diffuseMap = "art/terrains/Example/grass1_dry";
detailMap = "art/terrains/Example/grass1_dry_d";
detailSize = "10";
detailDistance = "100";
isManaged = "1";
detailBrightness = "1";
Enabled = "1";
diffuseSize = "250";
detailStrength = "2";
normalMap = "art/terrains/Example/grass1_dry_n";
};
singleton Material(TerrainFX_dirt_grass)
{
mapTo = "dirt_grass";
footstepSoundId = 0;
terrainMaterials = "1";
ShowDust = "1";
showFootprints = "1";
materialTag0 = "Terrain";
effectColor[0] = "0.63 0.55 0 1";
diffuseMap = "art/terrains/Example/dirt_grass";
diffuseSize = "200";
normalMap = "art/terrains/Example/dirt_grass_n";
detailMap = "art/terrains/Example/dirt_grass_d";
detailDistance = "100";
internalName = "dirt_grass";
isManaged = "1";
detailBrightness = "1";
enabled = "1";
};
new TerrainMaterial()
{
internalName = "dirt_grass";
diffuseMap = "art/terrains/Example/dirt_grass";
detailMap = "art/terrains/Example/dirt_grass_d";
detailSize = "5";
detailDistance = "100";
isManaged = "1";
detailBrightness = "1";
Enabled = "1";
diffuseSize = "200";
};
// ----------------------------------------------------------------------------
// Sample rock
// ----------------------------------------------------------------------------
singleton Material(TerrainFX_rocktest)
{
mapTo = "rocktest";
footstepSoundId = "1";
terrainMaterials = "1";
ShowDust = "1";
showFootprints = "1";
materialTag0 = "Terrain";
impactSoundId = "1";
effectColor[0] = "0.25 0.25 0.25 1";
effectColor[1] = "0.25 0.25 0.25 0";
diffuseMap = "art/terrains/Example/rocktest";
diffuseSize = "400";
normalMap = "art/terrains/Example/rocktest_n";
detailMap = "art/terrains/Example/rocktest_d";
detailSize = "10";
detailDistance = "100";
internalName = "rocktest";
isManaged = "1";
detailBrightness = "1";
enabled = "1";
};
new TerrainMaterial()
{
internalName = "rocktest";
diffuseMap = "art/terrains/Example/rocktest";
detailMap = "art/terrains/Example/rocktest_d";
detailSize = "10";
detailDistance = "100";
isManaged = "1";
detailBrightness = "1";
Enabled = "1";
diffuseSize = "400";
};
// ----------------------------------------------------------------------------
// Sample rock
// ----------------------------------------------------------------------------
singleton Material(TerrainFX_stone)
{
mapTo = "stone";
footstepSoundId = "1";
terrainMaterials = "1";
ShowDust = "1";
showFootprints = "1";
materialTag0 = "Terrain";
impactSoundId = "1";
effectColor[0] = "0.25 0.25 0.25 1";
effectColor[1] = "0.25 0.25 0.25 0";
diffuseMap = "art/terrains/Example/stone";
diffuseSize = "400";
normalMap = "art/terrains/Example/stone_n";
detailMap = "art/terrains/Example/stone_d";
detailSize = "10";
detailDistance = "100";
internalName = "stone";
isManaged = "1";
detailBrightness = "1";
enabled = "1";
};
new TerrainMaterial()
{
internalName = "stone";
diffuseMap = "art/terrains/Example/stone";
detailMap = "art/terrains/Example/stone_d";
detailSize = "10";
detailDistance = "100";
isManaged = "1";
detailBrightness = "1";
Enabled = "1";
diffuseSize = "400";
useSideProjection = "0";
};
// ----------------------------------------------------------------------------
// Sample sand
// ----------------------------------------------------------------------------
singleton Material(TerrainFX_sand)
{
mapTo = "sand";
footstepSoundId = "3";
terrainMaterials = "1";
ShowDust = "1";
showFootprints = "1";
materialTag0 = "Terrain";
specularPower[0] = "1";
effectColor[0] = "0.84 0.71 0.5 1";
effectColor[1] = "0.84 0.71 0.5 0.349";
};
new TerrainMaterial()
{
internalName = "sand";
diffuseMap = "art/terrains/Example/sand";
detailMap = "art/terrains/Example/sand_d";
detailSize = "10";
detailDistance = "100";
isManaged = "1";
detailBrightness = "1";
Enabled = "1";
diffuseSize = "200";
normalMap = "art/terrains/Example/sand_n";
};