X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fquadtree.cpp;h=04630b7cf34862850e518e2cb0b86b911289c686;hp=9ba2cee2330d8d97e85369e90d18a2f4e0e07613;hb=ac518ad085eb5bc84647e4aebe0c5ff06640cd0d;hpb=8793e48b5e8f28f59d9db8325ce05ec7c0431d40

diff --git a/src/quadtree.cpp b/src/quadtree.cpp
index 9ba2cee..04630b7 100644
--- a/src/quadtree.cpp
+++ b/src/quadtree.cpp
@@ -12,11 +12,11 @@ Rect TransformToQuadChild(const Rect& src, QuadTreeNodeChildren child_type)
 	dst.h *= 2;
 	if (child_type == QTC_BOTTOM_LEFT || child_type == QTC_BOTTOM_RIGHT)
 	{
-		dst.x -= 1;
+		dst.y -= 1;
 	}
 	if (child_type == QTC_TOP_RIGHT || child_type == QTC_BOTTOM_RIGHT)
 	{
-		dst.y -= 1;
+		dst.x -= 1;
 	}
 	return dst;
 }
@@ -30,15 +30,26 @@ Rect TransformFromQuadChild(const Rect& src, QuadTreeNodeChildren child_type)
 	dst.h *= 0.5;
 	if (child_type == QTC_BOTTOM_LEFT || child_type == QTC_BOTTOM_RIGHT)
 	{
-		dst.x += 1;
+		dst.y += 1;
 	}
 	if (child_type == QTC_TOP_RIGHT || child_type == QTC_BOTTOM_RIGHT)
 	{
-		dst.y += 1;
+		dst.x += 1;
 	}
 	return dst;
 }
 
+bool ContainedInQuadChild(const Rect& src, QuadTreeNodeChildren child_type)
+{
+	Rect std = {0,0,1,1};
+	Rect dst = TransformFromQuadChild(std, child_type);
+	if (src.x + src.w < dst.x) return false;
+	if (src.y + src.h < dst.y) return false;
+	if (src.x > dst.x + dst.w) return false;
+	if (src.y > dst.y + dst.h) return false;
+	return true;
+}
+
 }
 
 #endif