S1ink
diff --git a/‎out/include/target.inc‎
Lines changed: 1 addition & 1 deletion b/‎out/include/target.inc‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎out/lib3407visionserver.a‎
0 Bytes b/‎out/lib3407visionserver.a‎
0 Bytes
diff --git a/‎out/vision_program‎
4 Bytes b/‎out/vision_program‎
4 Bytes
diff --git a/‎src/api/target.inc‎
Lines changed: 1 addition & 1 deletion b/‎src/api/target.inc‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main.cpp‎
Lines changed: 1 addition & 1 deletion b/‎src/main.cpp‎
Lines changed: 1 addition & 1 deletion
@@ -32,7 +32,7 @@ void Target<corners>::sort(const std::vector<cv::Point_<num_t> >& contour) {
 		this->points.end(), 
 		[this](const cv::Point2f& a, const cv::Point2f& b) {
 			this->a = a - this->center;
-			this->a = b - this->center;
+			this->b = b - this->center;
 			return -atan2(this->a.x, this->a.y) < -atan2(this->b.x, this->b.y);	// note that x and y are switched -> clockwise
 		}
 	);
 
@@ -32,7 +32,7 @@ void Target<corners>::sort(const std::vector<cv::Point_<num_t> >& contour) {
 		this->points.end(), 
 		[this](const cv::Point2f& a, const cv::Point2f& b) {
 			this->a = a - this->center;
-			this->a = b - this->center;
+			this->b = b - this->center;
 			return -atan2(this->a.x, this->a.y) < -atan2(this->b.x, this->b.y);	// note that x and y are switched -> clockwise
 		}
 	);
 
@@ -29,7 +29,7 @@ int main(int argc, char* argv[]) {
 	else { return EXIT_FAILURE; }
 
 	VisionServer server(std::move(cameras));
-	server.runVision<DefaultPipeline, BBoxDemo, TargetSolver<Test6x6, WeightedSubtraction<VThreshold::LED::BLUE> > >(25);
+	server.runVision<BBoxDemo, SquareTargetPNP, TargetSolver<Test6x6, WeightedSubtraction<VThreshold::LED::BLUE> > >(25);
 }
 
 // LIST OF THINGS
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ void Target<corners>::sort(const std::vector<cv::Point_<num_t> >& contour) {`
`32`	`32`	`this->points.end(),`
`33`	`33`	`[this](const cv::Point2f& a, const cv::Point2f& b) {`
`34`	`34`	`this->a = a - this->center;`
`35`		`- this->a = b - this->center;`
	`35`	`+ this->b = b - this->center;`
`36`	`36`	`return -atan2(this->a.x, this->a.y) < -atan2(this->b.x, this->b.y); // note that x and y are switched -> clockwise`
`37`	`37`	`}`
`38`	`38`	`);`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ int main(int argc, char* argv[]) {`
`29`	`29`	`else { return EXIT_FAILURE; }`
`30`	`30`
`31`	`31`	`VisionServer server(std::move(cameras));`
`32`		`- server.runVision<DefaultPipeline, BBoxDemo, TargetSolver<Test6x6, WeightedSubtraction<VThreshold::LED::BLUE> > >(25);`
	`32`	`+ server.runVision<BBoxDemo, SquareTargetPNP, TargetSolver<Test6x6, WeightedSubtraction<VThreshold::LED::BLUE> > >(25);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`// LIST OF THINGS`