graphics/paysages3d
1
0
Fork 0
Code Releases Activity

Removed unused water_height parameter

Browse source
This commit is contained in:
Michaël Lemaire 2013-06-27 11:49:32 +02:00
parent 390fa99bab
commit cbb4455ab5
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/rendering/terrain/ter_raster.c
View file

@ -84,7 +84,7 @@ void terrainTessellateChunk(Renderer* renderer, TerrainChunkInfo* chunk, int det
} }
} }
static void _getChunk(Renderer* renderer, TerrainChunkInfo* chunk, double x, double z, double size, double water_height, int displaced) static void _getChunk(Renderer* renderer, TerrainChunkInfo* chunk, double x, double z, double size, int displaced)
{ {
chunk->point_nw = renderer->terrain->getResult(renderer, x, z, 1, displaced).location; chunk->point_nw = renderer->terrain->getResult(renderer, x, z, 1, displaced).location;
chunk->point_sw = renderer->terrain->getResult(renderer, x, z + size, 1, displaced).location; chunk->point_sw = renderer->terrain->getResult(renderer, x, z + size, 1, displaced).location;
@ -159,31 +159,29 @@ void terrainGetTessellationInfo(Renderer* renderer, FuncTerrainTessellationCallb
double cx = cam.x - fmod(cam.x, base_chunk_size); double cx = cam.x - fmod(cam.x, base_chunk_size);
double cz = cam.z - fmod(cam.x, base_chunk_size); double cz = cam.z - fmod(cam.x, base_chunk_size);
double water_height = renderer->water->getHeightInfo(renderer).min_height;
while (radius_int < 5000.0) while (radius_int < 5000.0)
{ {
for (i = 0; i < chunk_count - 1; i++) for (i = 0; i < chunk_count - 1; i++)
{ {
_getChunk(renderer, &chunk, cx - radius_ext + chunk_size * i, cz - radius_ext, chunk_size, water_height, displaced); _getChunk(renderer, &chunk, cx - radius_ext + chunk_size * i, cz - radius_ext, chunk_size, displaced);
if (!callback(renderer, &chunk, progress)) if (!callback(renderer, &chunk, progress))
{ {
return; return;
} }
_getChunk(renderer, &chunk, cx + radius_int, cz - radius_ext + chunk_size * i, chunk_size, water_height, displaced); _getChunk(renderer, &chunk, cx + radius_int, cz - radius_ext + chunk_size * i, chunk_size, displaced);
if (!callback(renderer, &chunk, progress)) if (!callback(renderer, &chunk, progress))
{ {
return; return;
} }
_getChunk(renderer, &chunk, cx + radius_int - chunk_size * i, cz + radius_int, chunk_size, water_height, displaced); _getChunk(renderer, &chunk, cx + radius_int - chunk_size * i, cz + radius_int, chunk_size, displaced);
if (!callback(renderer, &chunk, progress)) if (!callback(renderer, &chunk, progress))
{ {
return; return;
} }
_getChunk(renderer, &chunk, cx - radius_ext, cz + radius_int - chunk_size * i, chunk_size, water_height, displaced); _getChunk(renderer, &chunk, cx - radius_ext, cz + radius_int - chunk_size * i, chunk_size, displaced);
if (!callback(renderer, &chunk, progress)) if (!callback(renderer, &chunk, progress))
{ {
return; return;