Camera refactoring (#315)

* Camera Refactoring part 1 (Mac OS X)

* fixed camera*** -> Camera***

* Fixed build for cameras Zed/RealSense/RealSense2

* increased version to 0.17.7

* fixed build for cameras K4W2 and FlyCapture2

corelib/src/CMakeLists.txt

@@ -15,11 +15,25 @@ SET(SRC_FILES
 	
     Camera.cpp
     CameraThread.cpp
-    CameraRGB.cpp
-    CameraRGBD.cpp
-    CameraStereo.cpp
     CameraModel.cpp
     
+    camera/CameraFreenect.cpp
+    camera/CameraFreenect2.cpp
+    camera/CameraImages.cpp
+    camera/CameraK4W2.cpp
+    camera/CameraOpenni.cpp
+    camera/CameraOpenNI2.cpp
+    camera/CameraOpenNICV.cpp
+    camera/CameraRealSense.cpp
+    camera/CameraRealSense2.cpp
+    camera/CameraRGBDImages.cpp
+    camera/CameraStereoDC1394.cpp
+    camera/CameraStereoFlyCapture2.cpp
+    camera/CameraStereoImages.cpp
+    camera/CameraStereoVideo.cpp
+    camera/CameraStereoZed.cpp
+    camera/CameraVideo.cpp
+    
     EpipolarGeometry.cpp
 	VisualWord.cpp
 	VWDictionary.cpp
@@ -49,10 +63,10 @@ SET(SRC_FILES
 	LaserScan.cpp
 	
 	Optimizer.cpp
-	OptimizerTORO.cpp
-	OptimizerG2O.cpp
-	OptimizerGTSAM.cpp
-	OptimizerCVSBA.cpp
+	optimizer/OptimizerTORO.cpp
+	optimizer/OptimizerG2O.cpp
+	optimizer/OptimizerGTSAM.cpp
+	optimizer/OptimizerCVSBA.cpp
 	
 	Registration.cpp
 	RegistrationIcp.cpp
@@ -60,16 +74,16 @@ SET(SRC_FILES
 	
 	Odometry.cpp
 	OdometryThread.cpp
-	OdometryF2M.cpp
-	OdometryMono.cpp
-	OdometryF2F.cpp
-	OdometryFovis.cpp
-	OdometryViso2.cpp
-	OdometryDVO.cpp
-	OdometryOkvis.cpp
-	OdometryORBSLAM2.cpp
-	OdometryLOAM.cpp
-	OdometryMSCKF.cpp
+	odometry/OdometryF2M.cpp
+	odometry/OdometryMono.cpp
+	odometry/OdometryF2F.cpp
+	odometry/OdometryFovis.cpp
+	odometry/OdometryViso2.cpp
+	odometry/OdometryDVO.cpp
+	odometry/OdometryOkvis.cpp
+	odometry/OdometryORBSLAM2.cpp
+	odometry/OdometryLOAM.cpp
+	odometry/OdometryMSCKF.cpp
 	
 	IMUThread.cpp
 	
@@ -248,12 +262,12 @@ ENDIF(FlyCapture2_FOUND)
 IF(WITH_TORO)
 	SET(SRC_FILES
     	${SRC_FILES}
-		toro3d/posegraph3.cpp
-		toro3d/treeoptimizer3_iteration.cpp
-		toro3d/treeoptimizer3.cpp
+		optimizer/toro3d/posegraph3.cpp
+		optimizer/toro3d/treeoptimizer3_iteration.cpp
+		optimizer/toro3d/treeoptimizer3.cpp
 	
-		toro3d/posegraph2.cpp
-		toro3d/treeoptimizer2.cpp
+		optimizer/toro3d/posegraph2.cpp
+		optimizer/toro3d/treeoptimizer2.cpp
 	)
 ENDIF(WITH_TORO)
 
@@ -270,11 +284,11 @@ IF(G2O_FOUND)
 	IF(WITH_VERTIGO)
 		SET(SRC_FILES
     		${SRC_FILES}
-			vertigo/g2o/edge_se2Switchable.cpp
-			vertigo/g2o/edge_se3Switchable.cpp
-			vertigo/g2o/edge_switchPrior.cpp
-			vertigo/g2o/types_g2o_robust.cpp
-			vertigo/g2o/vertex_switchLinear.cpp
+			optimizer/vertigo/g2o/edge_se2Switchable.cpp
+			optimizer/vertigo/g2o/edge_se3Switchable.cpp
+			optimizer/vertigo/g2o/edge_switchPrior.cpp
+			optimizer/vertigo/g2o/types_g2o_robust.cpp
+			optimizer/vertigo/g2o/vertex_switchLinear.cpp
 		)
 	ENDIF(WITH_VERTIGO)
 ENDIF(G2O_FOUND)