Minor formatting tweaks and renaming PolyLine::isCounterClockwise() t…

…o PolyLine::isCounterclockwise()
cinder · Oct 21, 2016 · 5e9008b · 5e9008b
1 parent c1a91f3
commit 5e9008b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/include/cinder/PolyLine.h b/include/cinder/PolyLine.h
@@ -54,7 +54,7 @@ class PolyLineT {
 	//! Returns \c true if PolyLine is clockwise-oriented. If \a isColinear is non-null, it receives \c true if all points are colinear
 	bool  isClockwise( bool *isColinear = nullptr ) const;
 	//! Returns \c true if PolyLine is counterclockwise-oriented. If \a isColinear is non-null, it receives \c true if all points are colinear
-	bool  isCounterClockwise( bool *isColinear = nullptr ) const;
+	bool  isCounterclockwise( bool *isColinear = nullptr ) const;
 
 	T			getPosition( float t ) const;
 	T			getDerivative( float t ) const;

diff --git a/src/cinder/PolyLine.cpp b/src/cinder/PolyLine.cpp
@@ -47,7 +47,8 @@ bool PolyLineT<T>::isClockwise( bool *isColinear ) const
 	for( size_t i = 1; i <= last; ++i ) {
 		if( mPoints[i].x < mPoints[smallest].x ) {
 			smallest = i;
-		} else if( mPoints[i].x == mPoints[smallest].x && mPoints[i].y < mPoints[smallest].y ) {
+		}
+		else if( mPoints[i].x == mPoints[smallest].x && mPoints[i].y < mPoints[smallest].y ) {
 			smallest = i;
 		}
 	};
@@ -66,12 +67,12 @@ bool PolyLineT<T>::isClockwise( bool *isColinear ) const
 }
 
 template<typename T>
-bool PolyLineT<T>::isCounterClockwise( bool *isColinear ) const
+bool PolyLineT<T>::isCounterclockwise( bool *isColinear ) const
 {
 	bool colinear;
 	bool clockwise = this->isClockwise( &colinear );
 	if( isColinear != nullptr ) *isColinear = colinear;
-	return colinear ? false : !clockwise;
+	return colinear ? false : ! clockwise;
 }
 
 template<typename T>

diff --git a/test/unit/src/PolyLineTest.cpp b/test/unit/src/PolyLineTest.cpp
@@ -23,8 +23,8 @@ TEST_CASE("PolyLine", "Orientation")
 		REQUIRE( ! p1.isClockwise( &colinear ) );
 		REQUIRE( colinear );
 
-		REQUIRE( ! p1.isCounterClockwise() );
-		REQUIRE( ! p1.isCounterClockwise( &colinear ) );
+		REQUIRE( ! p1.isCounterclockwise() );
+		REQUIRE( ! p1.isCounterclockwise( &colinear ) );
 		REQUIRE( colinear );
 	}
 
@@ -42,8 +42,8 @@ TEST_CASE("PolyLine", "Orientation")
 		REQUIRE( ! p1.isClockwise( &colinear ) );
 		REQUIRE( colinear );
 
-		REQUIRE( ! p1.isCounterClockwise() );
-		REQUIRE( ! p1.isCounterClockwise( &colinear ) );
+		REQUIRE( ! p1.isCounterclockwise() );
+		REQUIRE( ! p1.isCounterclockwise( &colinear ) );
 		REQUIRE( colinear );
 	}