widelands-dev team mailing list archive

[SirVer <SirVer@xxxxxx>]

SirVer has proposed merging lp:~widelands-dev/widelands/rotate_terrains into lp:widelands.

Commit message:
Fixes an error in converting from pixel space to opengl space which flipped all textures vertically when drawn on screen.


Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1532019 in widelands: "Animated terrains are flipped"
  https://bugs.launchpad.net/widelands/+bug/1532019

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/rotate_terrains/+merge/283389

A one byte fix for the flipped terrains.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/rotate_terrains into lp:widelands.

=== modified file 'src/graphic/game_renderer.cc'
--- src/graphic/game_renderer.cc	2016-01-10 11:36:05 +0000
+++ src/graphic/game_renderer.cc	2016-01-21 07:04:27 +0000
@@ -188,7 +188,7 @@
 			const FCoords& fcoords = map.get_fcoords(coords);
 
 			f.texture_x = float(x) / kTextureSideLength;
-			f.texture_y = float(y) / kTextureSideLength;
+			f.texture_y = -float(y) / kTextureSideLength;
 
 			f.gl_x = f.pixel_x = x + surface_offset.x;
 			f.gl_y = f.pixel_y = y + surface_offset.y - fcoords.field->get_height() * HEIGHT_FACTOR;