graphics/paysages3d
1
0
Fork 0
Code Releases Activity

Fixed initial textures definition

Browse source
This commit is contained in:
Michaël Lemaire 2015-08-19 18:14:15 +02:00
parent 100ee0eec1
commit fde385a51a
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/definition/TerrainDefinition.cpp
View file

@ -126,7 +126,7 @@ HeightInfo TerrainDefinition::getHeightInfo()
result.min_height = _min_height; result.min_height = _min_height;
result.max_height = _max_height; result.max_height = _max_height;
/* TODO This is duplicated in ter_render.c (_realGetWaterHeight) */ /* TODO This is duplicated in ter_render.c (_realGetWaterHeight) */
result.base_height = water_height->getValue() * height * scaling; result.base_height = -getWaterOffset();
return result; return result;
} }

14
src/definition/TextureLayerDefinition.cpp
View file

@ -113,15 +113,15 @@ void TextureLayerDefinition::applyPreset(TextureLayerPreset preset)
switch (preset) switch (preset)
{ {
case TEXTURES_LAYER_PRESET_MUD: case TEXTURES_LAYER_PRESET_MUD:
displacement_height = 0.05; displacement_height = 0.02;
displacement_scaling = 3.0; displacement_scaling = 3.0;
displacement_offset = 0.0; displacement_offset = 0.0;
material->base = colorToHSL(Color(0.4, 0.38, 0.35, 1.0)); material->base = colorToHSL(Color(0.015, 0.014, 0.014, 1.0));
material->reflection = 0.003; material->reflection = 0.003;
material->shininess = 4.0; material->shininess = 4.0;
break; break;
case TEXTURES_LAYER_PRESET_ROCK: case TEXTURES_LAYER_PRESET_ROCK:
terrain_zone->addHeightRangeQuick(1.0, 0.5, 0.55, 1.0, 1.0); terrain_zone->addHeightRangeQuick(1.0, 0.6, 0.7, 1.0, 1.0);
displacement_height = 0.3; displacement_height = 0.3;
displacement_scaling = 2.0; displacement_scaling = 2.0;
displacement_offset = 0.0; displacement_offset = 0.0;
@ -140,12 +140,12 @@ void TextureLayerDefinition::applyPreset(TextureLayerPreset preset)
material->shininess = 4.0; material->shininess = 4.0;
break; break;
case TEXTURES_LAYER_PRESET_SAND: case TEXTURES_LAYER_PRESET_SAND:
terrain_zone->addHeightRangeQuick(1.0, 0.498, 0.502, 0.505, 0.51); terrain_zone->addHeightRangeQuick(1.0, 0.495, 0.505, 0.56, 0.63);
terrain_zone->addSlopeRangeQuick(1.0, 0.0, 0.0, 0.7, 0.1); terrain_zone->addSlopeRangeQuick(1.0, 0.0, 0.0, 0.1, 0.4);
displacement_height = 0.02; displacement_height = 0.05;
displacement_scaling = 5.0; displacement_scaling = 5.0;
displacement_offset = 0.0; displacement_offset = 0.0;
material->base = colorToHSL(Color(0.93, 0.9, 0.8, 1.0)); material->base = colorToHSL(Color(1.2, 1.1, 0.9, 1.0));
material->reflection = 0.008; material->reflection = 0.008;
material->shininess = 1.0; material->shininess = 1.0;
break; break;