graphics/paysages3d
1
0
Fork 0
Code Releases Activity

Fixed a problem with direct scenery access in C-API

Browse source
This commit is contained in:
Michaël Lemaire 2013-10-29 21:38:27 +01:00
parent ce56f0a985
commit 00cbc7f424
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/rendering/Scenery.cpp
View file

@ -233,7 +233,14 @@ void sceneryGetTerrain(TerrainDefinition* terrain)
TerrainDefinition* sceneryGetTerrainDirect() TerrainDefinition* sceneryGetTerrainDirect()
{ {
return _main_scenery->getTerrain(); if (_main_scenery)
{
return _main_scenery->getTerrain();
}
else
{
return NULL;
}
} }
void scenerySetTextures(TexturesDefinition* textures) void scenerySetTextures(TexturesDefinition* textures)

7
src/rendering/textures/tex_definition.c
View file

@ -71,8 +71,11 @@ static void _layerValidateDefinition(TexturesLayerDefinition* definition)
/* Update zone height range */ /* Update zone height range */
TerrainDefinition* terrain = sceneryGetTerrainDirect(); TerrainDefinition* terrain = sceneryGetTerrainDirect();
HeightInfo height_info = terrainGetHeightInfo(terrain); if (terrain)
zoneSetRelativeHeight(definition->terrain_zone, height_info.min_height, height_info.base_height, height_info.max_height); {
HeightInfo height_info = terrainGetHeightInfo(terrain);
zoneSetRelativeHeight(definition->terrain_zone, height_info.min_height, height_info.base_height, height_info.max_height);
}
} }
static TexturesLayerDefinition* _layerCreateDefinition() static TexturesLayerDefinition* _layerCreateDefinition()