From 74b260a33eab31c03e03bdebacc726564658c03b Mon Sep 17 00:00:00 2001
From: unknown <sonofgrendel@gmail.com>
Date: Fri, 20 Jun 2014 11:31:09 -0430
Subject: [PATCH] Fixed marker rotation bug. Added device orientation slider.

---
 assets/data/gfx/gui/slider_black.png | Bin 0 -> 3438 bytes
 jni/marker.cpp                       |  26 +++++++++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 assets/data/gfx/gui/slider_black.png

diff --git a/assets/data/gfx/gui/slider_black.png b/assets/data/gfx/gui/slider_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..91236e0182788846bcf7f8605a06b646d33ce671
GIT binary patch
literal 3438
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
DlZ<xV

literal 0
HcmV?d00001

diff --git a/jni/marker.cpp b/jni/marker.cpp
index ba51285..07a410a 100644
--- a/jni/marker.cpp
+++ b/jni/marker.cpp
@@ -77,7 +77,7 @@ int hammDistMarker(cv::Mat);
 
 cv::Mat rotate(cv::Mat);
 
-int decodeMarker(cv::Mat &);
+int decodeMarker(cv::Mat &, int &);
 
 void renderMarkers(markers_vector &, cv::Mat &);
 
@@ -92,9 +92,11 @@ void warpMarker(Marker &, cv::Mat &, cv::Mat &);
  ******************************************************************************/
 
 void getAllMarkers(markers_vector & valid_markers, cv::Mat & img){
+	int rotations = 0;
 	cv::Mat gray, thresh, cont, mark;
 	contours_vector contours;
 	markers_vector markers;
+	cv::Point2f point;
 #ifdef DESKTOP
 	std::ostringstream oss;
 #endif
@@ -116,10 +118,25 @@ void getAllMarkers(markers_vector & valid_markers, cv::Mat & img){
 	for(int i = 0; i < markers.size(); i++){
 		warpMarker(markers[i], gray, mark);
 
-		int code = decodeMarker(mark);
+		int code = decodeMarker(mark, rotations);
 
 		if(code != -1){
 			markers[i].code = code;
+
+			// If the decoder detected the marker is rotated then reorder the points
+			// so that the orientation calculations always use the correct top of the marker.
+			if(rotations > 0){
+				while(rotations > 0){
+					for(int r = 0; r < 3; r++){
+						point = markers[i].points.at(markers[i].points.size() - 1);
+						markers[i].points.pop_back();
+						markers[i].points.insert(markers[i].points.begin(), point);
+					}
+
+					rotations--;
+				}
+			}
+
 			valid_markers.push_back(markers[i]);
 		}
 	}
@@ -434,11 +451,13 @@ cv::Mat rotate(cv::Mat in){
  * Decode a marker image and return it's code. Returns -1 if the image is
  * not a valid marker.
  */
-int decodeMarker(cv::Mat & marker){
+int decodeMarker(cv::Mat & marker, int & rotations){
 	bool found = false;
 	int code = 0;
 	cv::Mat bits;
 
+	rotations = 0;
+
 	// Verify that the outer rim of marker cells are all black.
 	for(int y = 0; y < 7; y++){
 		int inc = (y == 0 || y == 6) ? 1 : 6;
@@ -478,6 +497,7 @@ int decodeMarker(cv::Mat & marker){
 	if(hammDistMarker(bits) != 0){
 		for(int r = 1; r < 4; r++){
 			bits = rotate(bits);
+			rotations++;
 			if(hammDistMarker(bits) != 0) continue;
 			else{ found = true; break;}
 		}