Mercurial > fife-parpg

changeset 155:29309cd5e240

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix searching for instances in a rect - old code had false positives
author spq@33b003aa-7bff-0310-803a-e67f0ece8222
date Sun, 12 Oct 2008 19:23:10 +0000
parents d29593182f40
children 376b8afc9a18
files engine/core/view/camera.cpp
diffstat 1 files changed, 19 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/engine/core/view/camera.cpp	Sat Oct 11 14:13:56 2008 +0000
+++ b/engine/core/view/camera.cpp	Sun Oct 12 19:23:10 2008 +0000
@@ -337,23 +337,25 @@
 				Uint8 r, g, b, a;
 				for(int xx = screen_rect.x; xx < screen_rect.x + screen_rect.w; xx++) {
 					for(int yy = screen_rect.y; yy < screen_rect.y + screen_rect.h; yy++) {
-						int x = xx - vc.dimensions.x;
-						int y = yy - vc.dimensions.y;
-						if (m_zoom != 1.0) {
-							double fx = static_cast<double>(x);
-							double fy = static_cast<double>(y);
-							double fow = static_cast<double>(vc.image->getWidth());
-							double foh = static_cast<double>(vc.image->getHeight());
-							double fsw = static_cast<double>(vc.dimensions.w);
-							double fsh = static_cast<double>(vc.dimensions.h);
-							x = static_cast<int>(round(fx / fsw * fow));
-							y = static_cast<int>(round(fy / fsh * foh));
-						}
-						vc.image->getPixelRGBA(x, y, &r, &g, &b, &a);
-						// instance is hit with mouse if not totally transparent
-						if (a != 0) {
-							instances.push_back(i);
-							goto found_non_transparent_pixel;
+						if ((vc.dimensions.contains(Point(xx, yy)))) {
+							int x = xx - vc.dimensions.x;
+							int y = yy - vc.dimensions.y;
+							if (m_zoom != 1.0) {
+								double fx = static_cast<double>(x);
+								double fy = static_cast<double>(y);
+								double fow = static_cast<double>(vc.image->getWidth());
+								double foh = static_cast<double>(vc.image->getHeight());
+								double fsw = static_cast<double>(vc.dimensions.w);
+								double fsh = static_cast<double>(vc.dimensions.h);
+								x = static_cast<int>(round(fx / fsw * fow));
+								y = static_cast<int>(round(fy / fsh * foh));
+							}
+							vc.image->getPixelRGBA(x, y, &r, &g, &b, &a);
+							// instance is hit with mouse if not totally transparent
+							if (a != 0) {
+								instances.push_back(i);
+								goto found_non_transparent_pixel;
+							}
 						}
 					}
 				}