From 18a399eea75df52ef8fe21d2a360f2c1281dddca Mon Sep 17 00:00:00 2001 From: avolkov Date: Sat, 28 Jan 2012 19:08:30 +0000 Subject: [PATCH] Fixes 3d planet lighting map calculations, bug #1151, from Louis Delacroix Relative lighting factor in GenerateLightMap() should now be reexamined to determine what algorithm works best. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3753 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/uqm/planets/plangen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sc2/src/uqm/planets/plangen.c b/sc2/src/uqm/planets/plangen.c index 5b13d8698..e0565040f 100644 --- a/sc2/src/uqm/planets/plangen.c +++ b/sc2/src/uqm/planets/plangen.c @@ -1572,8 +1572,8 @@ get_vblock_avg (elev_block_t *pblk, SBYTE *pTopo, int x, int y) if (y1 > MAP_HEIGHT) y1 = MAP_HEIGHT; - elev = pTopo + y0 * MAP_HEIGHT + x; - for (i = y0; i < y1; ++i, elev += MAP_HEIGHT) + elev = pTopo + y0 * MAP_WIDTH + x; + for (i = y0; i < y1; ++i, elev += MAP_WIDTH) { int delta = abs (i - y); int weight = 255; // full weight @@ -1589,7 +1589,7 @@ get_vblock_avg (elev_block_t *pblk, SBYTE *pTopo, int x, int y) max = v; if (v < min) min = v; - avg += pblk->avg * weight; + avg += v * weight; total_weight += weight; } avg /= total_weight;