Adding CGRectCeil, CGRectFloor and CGRectRound

Author: hfossli

Source/CoreGraphics_Extensions/CGGeometry+AGGeometryKit.h

@@ -25,6 +25,13 @@
 #import <CoreGraphics/CoreGraphics.h>
 #import <QuartzCore/QuartzCore.h>
 
+// CGFloat
+
+CGFloat CGFloatRound_AGK(CGFloat v);
+CGFloat CGFloatCeil_AGK(CGFloat v);
+CGFloat CGFloatFloor_AGK(CGFloat v);
+
+
 // CGPoint
 
 BOOL    CGPointGotAnyNanValues_AGK(CGPoint origin);
@@ -98,5 +105,9 @@ CGRect  CGRectWithOriginMidX_AGK(CGRect rect, CGFloat value);
 CGRect  CGRectWithOriginMidY_AGK(CGRect rect, CGFloat value);
 CGRect  CGRectWithOriginMid_AGK(CGRect rect, CGPoint origin);
 
+CGRect CGRectFloor_AGK(CGRect rect);
+CGRect CGRectCeil_AGK(CGRect rect);
+CGRect CGRectRound_AGK(CGRect rect);
+
 CGRect  CGRectInterpolate_AGK(CGRect rect1, CGRect rect2, CGFloat progress);
 

Source/CoreGraphics_Extensions/CGGeometry+AGGeometryKit.m

@@ -31,6 +31,37 @@
 // Usefull resources for further development:
 // http://processingjs.nihongoresources.com/bezierinfo/
 
+#pragma mark - CGFloat
+
+CGFloat CGFloatRound_AGK(CGFloat v)
+{
+    #if CGFLOAT_IS_DOUBLE
+        return round(v);
+    #else
+        return roundf(v);
+    #endif
+}
+
+CGFloat CGFloatCeil_AGK(CGFloat v)
+{
+    #if CGFLOAT_IS_DOUBLE
+        return ceil(v);
+    #else
+        return ceilf(v);
+    #endif
+}
+
+CGFloat CGFloatFloor_AGK(CGFloat v)
+{
+    #if CGFLOAT_IS_DOUBLE
+        return floor(v);
+    #else
+        return floorf(v);
+    #endif
+}
+
+
+
 #pragma mark - CGPoint
 
 BOOL CGPointGotAnyNanValues_AGK(CGPoint origin)
@@ -437,6 +468,30 @@ CGRect CGRectWithOriginMid_AGK(CGRect rect, CGPoint origin)
     return rect;
 }
 
+CGRect CGRectFloor_AGK(CGRect rect)
+{
+    return CGRectMake(CGFloatFloor_AGK(rect.origin.x),
+                      CGFloatFloor_AGK(rect.origin.y),
+                      CGFloatFloor_AGK(rect.size.width),
+                      CGFloatFloor_AGK(rect.size.height));
+}
+
+CGRect CGRectCeil_AGK(CGRect rect)
+{
+    return CGRectMake(CGFloatCeil_AGK(rect.origin.x),
+                      CGFloatCeil_AGK(rect.origin.y),
+                      CGFloatCeil_AGK(rect.size.width),
+                      CGFloatCeil_AGK(rect.size.height));
+}
+
+CGRect CGRectRound_AGK(CGRect rect)
+{
+    return CGRectMake(CGFloatRound_AGK(rect.origin.x),
+                      CGFloatRound_AGK(rect.origin.y),
+                      CGFloatRound_AGK(rect.size.width),
+                      CGFloatRound_AGK(rect.size.height));
+}
+
 CGRect CGRectInterpolate_AGK(CGRect rect1, CGRect rect2, CGFloat progress)
 {
     CGRect result;

Source/CoreGraphics_Extensions/CGGeometry+AGGeometryKitTest.m

@@ -123,8 +123,6 @@ - (void)testCGRectWith
         CGRect rect = CGRectWithOriginMinY_AGK(rectWithALongNameOrPathSinceThatsWhenItIsUsefull, 300);
         XCTAssertEqual(rect.origin.y, 300.0f);
     }
-    
-    
     {
         CGRect rectWithALongNameOrPathSinceThatsWhenItIsUsefull = CGRectMake(40, 20, 150, 100);
         CGRect rect = CGRectWithOriginMidX_AGK(rectWithALongNameOrPathSinceThatsWhenItIsUsefull, 300);
@@ -135,7 +133,6 @@ - (void)testCGRectWith
         CGRect rect = CGRectWithOriginMidY_AGK(rectWithALongNameOrPathSinceThatsWhenItIsUsefull, 300);
         XCTAssertEqual(rect.origin.y, 250.0f);
     }
-    
     {
         CGRect rectWithALongNameOrPathSinceThatsWhenItIsUsefull = CGRectMake(40, 20, 150, 100);
         CGRect rect = CGRectWithOriginMaxX_AGK(rectWithALongNameOrPathSinceThatsWhenItIsUsefull, 300);
@@ -168,4 +165,64 @@ - (void)testCGPointModifiedCATransform3D_AGK
     }
 }
 
+- (void)testCGFloatRound_AGK
+{
+    XCTAssertEqual(CGFloatRound_AGK(-0.2), 0.0, @"");
+    XCTAssertEqual(CGFloatRound_AGK(0.0), 0.0, @"");
+    XCTAssertEqual(CGFloatRound_AGK(0.4), 0.0, @"");
+    XCTAssertEqual(CGFloatRound_AGK(0.5), 1.0, @"");
+    XCTAssertEqual(CGFloatRound_AGK(0.6), 1.0, @"");
+    XCTAssertEqual(CGFloatRound_AGK(1.0), 1.0, @"");
+    XCTAssertEqual(CGFloatRound_AGK(1.3), 1.0, @"");
+}
+
+- (void)testCGFloatCeil_AGK
+{
+    XCTAssertEqual(CGFloatCeil_AGK(-0.2), 0.0, @"");
+    XCTAssertEqual(CGFloatCeil_AGK(0.0), 0.0, @"");
+    XCTAssertEqual(CGFloatCeil_AGK(0.4), 1.0, @"");
+    XCTAssertEqual(CGFloatCeil_AGK(0.5), 1.0, @"");
+    XCTAssertEqual(CGFloatCeil_AGK(0.6), 1.0, @"");
+    XCTAssertEqual(CGFloatCeil_AGK(1.0), 1.0, @"");
+    XCTAssertEqual(CGFloatCeil_AGK(1.3), 2.0, @"");
+}
+
+- (void)testCGFloatFloor_AGK
+{
+    XCTAssertEqual(CGFloatFloor_AGK(-0.2), -1.0, @"");
+    XCTAssertEqual(CGFloatFloor_AGK(0.0), 0.0, @"");
+    XCTAssertEqual(CGFloatFloor_AGK(0.4), 0.0, @"");
+    XCTAssertEqual(CGFloatFloor_AGK(0.5), 0.0, @"");
+    XCTAssertEqual(CGFloatFloor_AGK(0.6), 0.0, @"");
+    XCTAssertEqual(CGFloatFloor_AGK(1.0), 1.0, @"");
+    XCTAssertEqual(CGFloatFloor_AGK(1.3), 1.0, @"");
+}
+
+- (void)testCGRectFloor_AGK
+{
+    {
+        CGRect rect = CGRectFloor_AGK(CGRectMake(40.9, 20.1, 150.0, 100.0005));
+        CGRect expected = CGRectMake(40, 20, 150, 100);
+        XCTAssertEqualObjects([NSValue valueWithCGRect:rect], [NSValue valueWithCGRect:expected]);
+    }
+}
+
+- (void)testCGRectCeil_AGK
+{
+    {
+        CGRect rect = CGRectCeil_AGK(CGRectMake(40.9, 20.1, 150.0, 100.0005));
+        CGRect expected = CGRectMake(41, 21, 150, 101);
+        XCTAssertEqualObjects([NSValue valueWithCGRect:rect], [NSValue valueWithCGRect:expected]);
+    }
+}
+
+- (void)testCGRectRound_AGK
+{
+    {
+        CGRect rect = CGRectRound_AGK(CGRectMake(40.9, 20.1, 150.0, 100.0005));
+        CGRect expected = CGRectMake(41, 20, 150, 100);
+        XCTAssertEqualObjects([NSValue valueWithCGRect:rect], [NSValue valueWithCGRect:expected]);
+    }
+}
+
 @end