updated structure and includes. about to update all the projects.

kylemcdonald · kylemcdonald · commit 46e0879a6c52 · 2011-10-06T14:14:12.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -9,5 +9,4 @@
 obj/
 bin/
 build/
-!data/
-libs/
+!data/
diff --git a/libs/.gitignore b/libs/.gitignore
@@ -0,0 +1 @@
+opencv/
diff --git a/libs/ofxCv/include/ofxCv/Calibration.h b/libs/ofxCv/include/ofxCv/Calibration.h
diff --git a/libs/ofxCv/include/ofxCv/ContourFinder.h b/libs/ofxCv/include/ofxCv/ContourFinder.h
@@ -28,8 +28,8 @@
 
 #pragma once
 
-#include "Utilities.h"
-#include "Tracker.h"
+#include "ofxCv/Utilities.h"
+#include "ofxCv/Tracker.h"
 
 namespace ofxCv {
 	
diff --git a/libs/ofxCv/include/ofxCv/Distance.h b/libs/ofxCv/include/ofxCv/Distance.h
diff --git a/libs/ofxCv/include/ofxCv/Helpers.h b/libs/ofxCv/include/ofxCv/Helpers.h
diff --git a/libs/ofxCv/include/ofxCv/RunningBackground.h b/libs/ofxCv/include/ofxCv/RunningBackground.h
@@ -31,7 +31,7 @@
 
 #pragma once
 
-#include "Utilities.h"
+#include "ofxCv/Utilities.h"
 
 namespace ofxCv {
 	class RunningBackground {
diff --git a/libs/ofxCv/include/ofxCv/Tracker.h b/libs/ofxCv/include/ofxCv/Tracker.h
diff --git a/libs/ofxCv/include/ofxCv/Utilities.h b/libs/ofxCv/include/ofxCv/Utilities.h
diff --git a/libs/ofxCv/include/ofxCv/Wrappers.h b/libs/ofxCv/include/ofxCv/Wrappers.h
@@ -15,7 +15,7 @@
 
 #include "ofMain.h"
 #include "opencv2/opencv.hpp"
-#include "Utilities.h"
+#include "ofxCv/Utilities.h"
 
 namespace ofxCv {
 	
diff --git a/libs/ofxCv/src/Calibration.cpp b/libs/ofxCv/src/Calibration.cpp
@@ -1,6 +1,6 @@
-#include "Calibration.h"
+#include "ofxCv/Calibration.h"
+#include "ofxCv/Helpers.h"
 #include "ofFileUtils.h"
-#include "Helpers.h"
 
 namespace ofxCv {
 
diff --git a/libs/ofxCv/src/ContourFinder.cpp b/libs/ofxCv/src/ContourFinder.cpp
@@ -1,5 +1,5 @@
-#include "ContourFinder.h"
-#include "Wrappers.h"
+#include "ofxCv/ContourFinder.h"
+#include "ofxCv/Wrappers.h"
 
 namespace ofxCv {
 	
diff --git a/libs/ofxCv/src/Distance.cpp b/libs/ofxCv/src/Distance.cpp
@@ -1,4 +1,4 @@
-#include "Distance.h"
+#include "ofxCv/Distance.h"
 #include <string.h>
 
 namespace ofxCv {
diff --git a/libs/ofxCv/src/Helpers.cpp b/libs/ofxCv/src/Helpers.cpp
@@ -1,5 +1,5 @@
-#include "Helpers.h"
-#include "Utilities.h"
+#include "ofxCv/Helpers.h"
+#include "ofxCv/Utilities.h"
 
 namespace ofxCv {
 
diff --git a/libs/ofxCv/src/RunningBackground.cpp b/libs/ofxCv/src/RunningBackground.cpp
@@ -1,4 +1,4 @@
-#include "RunningBackground.h"
+#include "ofxCv/RunningBackground.h"
 
 namespace ofxCv {
 	RunningBackground::RunningBackground()
diff --git a/libs/ofxCv/src/Tracker.cpp b/libs/ofxCv/src/Tracker.cpp
@@ -1,4 +1,4 @@
-#include "Tracker.h"
+#include "ofxCv/Tracker.h"
 
 namespace ofxCv {
 	
diff --git a/libs/ofxCv/src/Utilities.cpp b/libs/ofxCv/src/Utilities.cpp
@@ -1,4 +1,4 @@
-#include "Utilities.h"
+#include "ofxCv/Utilities.h"
 
 #include "ofMath.h"
 
diff --git a/libs/ofxCv/src/Wrappers.cpp b/libs/ofxCv/src/Wrappers.cpp
@@ -1,4 +1,4 @@
-#include "Wrappers.h"
+#include "ofxCv/Wrappers.h"
 
 namespace ofxCv {
 	
diff --git a/src/ofxCv.h b/src/ofxCv.h
@@ -20,17 +20,14 @@
 #include "opencv2/opencv.hpp"
 
 // ofxCv
-#include "Utilities.h"
-#include "Wrappers.h"
-#include "Helpers.h"
+#include "ofxCv/Utilities.h"
+#include "ofxCv/Wrappers.h"
+#include "ofxCv/Helpers.h"
 
-#include "Distance.h"
-#include "Calibration.h"
-#include "ContourFinder.h"
-#include "Tracker.h"
-#include "RunningBackground.h"
-
-using namespace ofxCv;
-using namespace cv;
+#include "ofxCv/Distance.h"
+#include "ofxCv/Calibration.h"
+#include "ofxCv/ContourFinder.h"
+#include "ofxCv/Tracker.h"
+#include "ofxCv/RunningBackground.h"
 
 // <3 kyle

-Original file line number
+Diff line change
 obj/
 bin/
 build/
 -!data/
 -libs/
 +!data/
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "Distance.h"`
	`1`	`+#include "ofxCv/Distance.h"`
`2`	`2`	`#include <string.h>`
`3`	`3`
`4`	`4`	`namespace ofxCv {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "RunningBackground.h"`
	`1`	`+#include "ofxCv/RunningBackground.h"`
`2`	`2`
`3`	`3`	`namespace ofxCv {`
`4`	`4`	`RunningBackground::RunningBackground()`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "Tracker.h"`
	`1`	`+#include "ofxCv/Tracker.h"`
`2`	`2`
`3`	`3`	`namespace ofxCv {`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "Utilities.h"`
	`1`	`+#include "ofxCv/Utilities.h"`
`2`	`2`
`3`	`3`	`#include "ofMath.h"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "Wrappers.h"`
	`1`	`+#include "ofxCv/Wrappers.h"`
`2`	`2`
`3`	`3`	`namespace ofxCv {`
`4`	`4`