Adjusted header includes.

CMakeLists.txt

@@ -163,15 +163,15 @@ include(UseCodeCoverage) # for codecoverage tools with gcc (optional)
 # set parameters for build paths
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_HOME_DIRECTORY}/bin/ CACHE PATH "Configure the executable output path.")
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_HOME_DIRECTORY}/lib/ CACHE PATH "Configure the library output path.")
-SET(BRICS_3D_INSTALL_NAME brics3d)
+SET(BRICS_3D_INSTALL_NAME brics_3d)
 #SET(INCLUDE_INSTALL_DIR /usr/local/include/brics CACHE PATH "The subdirectory to the header prefix")
 #SET(LIBRARY_INSTALL_DIR /usr/local/lib/brics CACHE PATH "The subdirectory to the header prefix")
 
 ## do compilations
 ADD_SUBDIRECTORY(./external/6dslam)
 ADD_SUBDIRECTORY(./external/flann)
 ADD_SUBDIRECTORY(./external/ann)
-ADD_SUBDIRECTORY(./src) #compile everything in src to create the libraries
+ADD_SUBDIRECTORY(./src/brics_3d) #compile everything in src to create the libraries
 ADD_SUBDIRECTORY(./examples) #compile everything in examples to create the example binaries
 
 IF(CppUnit_FOUND)

examples/BRICS_3D_Demo.cpp

@@ -18,17 +18,17 @@
 ******************************************************************************/
 
 /* BRICS_3D includes */
-#include <util/DepthImageLoader.h>
-#include <util/OSGPointCloudVisualizer.h>
-#include <util/OSGTriangleMeshVisualizer.h>
-#include <core/PointCloud3D.h>
-#include <core/HomogeneousMatrix44.h>
-#include <core/TriangleMeshImplicit.h>
-#include <core/TriangleMeshExplicit.h>
-#include <algorithm/filtering/Octree.h>
-#include <algorithm/registration/IterativeClosestPointFactory.h>
-#include <algorithm/depthPerception/DepthImageToPointCloudTransformation.h>
-#include <algorithm/meshGeneration/DelaunayTriangulationOSG.h>
+#include <brics_3d/util/DepthImageLoader.h>
+#include <brics_3d/util/OSGPointCloudVisualizer.h>
+#include <brics_3d/util/OSGTriangleMeshVisualizer.h>
+#include <brics_3d/core/PointCloud3D.h>
+#include <brics_3d/core/HomogeneousMatrix44.h>
+#include <brics_3d/core/TriangleMeshImplicit.h>
+#include <brics_3d/core/TriangleMeshExplicit.h>
+#include <brics_3d/algorithm/filtering/Octree.h>
+#include <brics_3d/algorithm/registration/IterativeClosestPointFactory.h>
+#include <brics_3d/algorithm/depthPerception/DepthImageToPointCloudTransformation.h>
+#include <brics_3d/algorithm/meshGeneration/DelaunayTriangulationOSG.h>
 
 /* general includes */
 #include <iostream>

examples/demoComparison.cpp

@@ -34,19 +34,19 @@
 
 
 #include<iostream>
-#include <algorithm/segmentation/evaluation/Evaluator.h>
-#include <algorithm/segmentation/evaluation/FileReader.h>
-#include <algorithm/segmentation/evaluation/FileWriter.h>
-#include <algorithm/segmentation/evaluation/MetricCalculator.h>
-#include <algorithm/segmentation/evaluation/Comparator.h>
+#include <brics_3d/algorithm/segmentation/evaluation/Evaluator.h>
+#include <brics_3d/algorithm/segmentation/evaluation/FileReader.h>
+#include <brics_3d/algorithm/segmentation/evaluation/FileWriter.h>
+#include <brics_3d/algorithm/segmentation/evaluation/MetricCalculator.h>
+#include <brics_3d/algorithm/segmentation/evaluation/Comparator.h>
 using namespace std;
 
 int main(){
 
 
 	//Create a string vector containing the names of the methods. These names will be used
 	//to fetch the metric files so they should be consistent with the filenames. For more help
-	//regarding filename conventions see "trunk/src/algorithm/segmentation/evaluation/FileNameReadMe.txt"
+	//regarding filename conventions see "trunk/src/brics_3d/algorithm/segmentation/evaluation/FileNameReadMe.txt"
 	vector<string> methodNames;
 	methodNames.push_back("RANSAC");
 	methodNames.push_back("MSAC");
@@ -59,7 +59,7 @@ int main(){
 	//If the naming conventions are different for storing the evaluation metrics then it
 	//should be modified
 	comparatorObject.setMethods(methodNames);
-	comparatorObject.setPath("../src/algorithm/segmentation/evaluation/data/");
+	comparatorObject.setPath("../src/brics_3d/algorithm/segmentation/evaluation/data/");
 	comparatorObject.setGtMetricsBaseName("_result_GtMetrics.csv");
 	comparatorObject.setMsMetricsBaseName("_result_MsMetrics.csv");
 	comparatorObject.setOverlapBaseName("_result_overlapMatrix.csv");

examples/demoEvaluation.cpp

@@ -34,11 +34,11 @@
 
 
 #include<iostream>
-#include <algorithm/segmentation/evaluation/Evaluator.h>
-#include <algorithm/segmentation/evaluation/FileReader.h>
-#include <algorithm/segmentation/evaluation/FileWriter.h>
-#include <algorithm/segmentation/evaluation/MetricCalculator.h>
-#include <algorithm/segmentation/evaluation/Comparator.h>
+#include <brics_3d/algorithm/segmentation/evaluation/Evaluator.h>
+#include <brics_3d/algorithm/segmentation/evaluation/FileReader.h>
+#include <brics_3d/algorithm/segmentation/evaluation/FileWriter.h>
+#include <brics_3d/algorithm/segmentation/evaluation/MetricCalculator.h>
+#include <brics_3d/algorithm/segmentation/evaluation/Comparator.h>
 using namespace std;
 
 int main(){
@@ -54,19 +54,19 @@ int main(){
 	//Evaluator Initialization
 	//ToDo set the ground truth file path properly
 	stringstream baseName;
-	string folderPath = "../src/algorithm/segmentation/evaluation/groundTruthData/";
+	string folderPath = "../src/brics_3d/algorithm/segmentation/evaluation/groundTruthData/";
 	string scenarioName = "bureau3/";
 	string prefix ="bureau3_gt_";
 
 	//set the ground truth base file name. For more info on file convention see
-	// "trunk/src/algorithm/segmentation/evaluation/FileNameReadMe.txt"
+	// "trunk/src/brics_3d/algorithm/segmentation/evaluation/FileNameReadMe.txt"
 	baseName.str("");
 	baseName.clear();
 	baseName << folderPath << scenarioName << prefix;
 	evaluator.setGtBaseName(baseName.str());
 
 	//set the machne segmented file names.
-	folderPath = "../src/algorithm/segmentation/evaluation/data/MSAC_results/";
+	folderPath = "../src/brics_3d/algorithm/segmentation/evaluation/data/MSAC_results/";
 	prefix="bureau3_plane_msac_";
 	baseName.str("");
 	baseName.clear();

examples/demoSegmentationNormalPlane.cpp

@@ -17,12 +17,12 @@
 *
 ******************************************************************************/
 
-#include "algorithm/segmentation/RegionBasedSACSegmentationUsingNormals.h"
-#include "core/PointCloud3D.h"
-#include "core/Point3D.h"
+#include "brics_3d/algorithm/segmentation/RegionBasedSACSegmentationUsingNormals.h"
+#include "brics_3d/core/PointCloud3D.h"
+#include "brics_3d/core/Point3D.h"
 #include <iostream>
-#include "algorithm/segmentation/features/NormalEstimation.h"
-#include "algorithm/nearestNeighbor/NearestNeighborANN.h"
+#include "brics_3d/algorithm/segmentation/features/NormalEstimation.h"
+#include "brics_3d/algorithm/nearestNeighbor/NearestNeighborANN.h"
 
 int main(){
 
@@ -40,7 +40,7 @@ int main(){
 	//read the points into the pointcloud
 	//Please modify the path if there is a file read error.
 	//FIXME do not use absolute path
-	cloud.readFromTxtFile("./src/algorithm/segmentation/evaluation/data/demoCloud.txt");
+	cloud.readFromTxtFile("./src/brics_3d/algorithm/segmentation/evaluation/data/demoCloud.txt");
 
 	if (cloud.getSize()>0){
 	cout<< "INFO: Current PointCloud Size: " <<cloud.getSize()<<endl;

examples/demoSegmentationPlane.cpp

@@ -17,11 +17,11 @@
 *
 ******************************************************************************/
 
-#include <core/PointCloud3D.h>
-#include <core/Point3D.h>
-#include <algorithm/segmentation/RegionBasedSACSegmentation.h>
-#include <algorithm/filtering/MaskROIExtractor.h>
-#include <util/OSGPointCloudVisualizer.h>
+#include <brics_3d/core/PointCloud3D.h>
+#include <brics_3d/core/Point3D.h>
+#include <brics_3d/algorithm/segmentation/RegionBasedSACSegmentation.h>
+#include <brics_3d/algorithm/filtering/MaskROIExtractor.h>
+#include <brics_3d/util/OSGPointCloudVisualizer.h>
 
 #include <iostream>
 
@@ -33,8 +33,8 @@ int main(){
 
 	//read the points into the pointcloud
 	//Please modify the path if there is a file read error.
-//	cloud.readFromTxtFile("./src/algorithm/segmentation/evaluation/data/demoCloud.txt");
-	cloud.readFromTxtFile("./src/algorithm/segmentation/evaluation/groundTruthData/bureau3/bureau3.txt");
+//	cloud.readFromTxtFile("./src/brics_3d/algorithm/segmentation/evaluation/data/demoCloud.txt");
+	cloud.readFromTxtFile("./src/brics_3d/algorithm/segmentation/evaluation/groundTruthData/bureau3/bureau3.txt");
 
 	cout<< "INFO: Current PointCloud Size: " <<cloud.getSize()<<endl;
 

examples/depth_image_stream_test.cpp

@@ -30,7 +30,7 @@
  */
 
 #include <iostream>
-#include <util/DepthImageLoader.h>
+#include <brics_3d/util/DepthImageLoader.h>
 
 using namespace std;
 using namespace brics_3d;

examples/depth_image_transformation.cpp

@@ -30,9 +30,9 @@
 
 
 #include <iostream>
-#include <util/DepthImageLoader.h>
-#include <core/PointCloud3D.h>
-#include <algorithm/depthPerception/DepthImageToPointCloudTransformation.h>
+#include <brics_3d/util/DepthImageLoader.h>
+#include <brics_3d/core/PointCloud3D.h>
+#include <brics_3d/algorithm/depthPerception/DepthImageToPointCloudTransformation.h>
 
 using namespace std;
 using namespace brics_3d;

examples/extract_object_clusters.cpp

@@ -17,16 +17,16 @@
 *
 ******************************************************************************/
 
-#include "util/OSGPointCloudVisualizer.h"
-#include "core/PointCloud3D.h"
-
-#include "util/PCLTypecaster.h"
-#include "algorithm/segmentation/EuclideanClustering.h"
-#include "algorithm/segmentation/EuclideanClusteringPCL.h"
-#include "algorithm/segmentation/RGBColorBasedEuclideanClustering.h"
-#include "algorithm/filtering/ColorBasedROIExtractorHSV.h"
-#include "algorithm/featureExtraction/Centroid3D.h"
-#include "core/ColorSpaceConvertor.h"
+#include "brics_3d/util/OSGPointCloudVisualizer.h"
+#include "brics_3d/core/PointCloud3D.h"
+
+#include "brics_3d/util/PCLTypecaster.h"
+#include "brics_3d/algorithm/segmentation/EuclideanClustering.h"
+#include "brics_3d/algorithm/segmentation/EuclideanClusteringPCL.h"
+#include "brics_3d/algorithm/segmentation/RGBColorBasedEuclideanClustering.h"
+#include "brics_3d/algorithm/filtering/ColorBasedROIExtractorHSV.h"
+#include "brics_3d/algorithm/featureExtraction/Centroid3D.h"
+#include "brics_3d/core/ColorSpaceConvertor.h"
 
 
 #include <iostream>

examples/icp_benchmark.cpp

@@ -23,23 +23,23 @@
 
 #include <iostream>
 #include <sstream>
-#include "util/OSGPointCloudVisualizer.h"
-#include "core/PointCloud3D.h"
-#include "core/HomogeneousMatrix44.h"
-#include "algorithm/nearestNeighbor/NearestNeighborANN.h"
-#include "algorithm/nearestNeighbor/NearestNeighborFLANN.h"
-#include "algorithm/nearestNeighbor/NearestNeighborSTANN.h"
-#include "algorithm/registration/PointCorrespondenceKDTree.h"
-#include "algorithm/registration/PointCorrespondenceGenericNN.h"
-#include "algorithm/registration/RigidTransformationEstimationSVD.h"
-#include "algorithm/registration/RigidTransformationEstimationHELIX.h"
-#include "algorithm/registration/RigidTransformationEstimationAPX.h"
-#include "algorithm/registration/RigidTransformationEstimationORTHO.h"
-#include "algorithm/registration/RigidTransformationEstimationQUAT.h"
-#include "algorithm/registration/IterativeClosestPoint.h"
-#include "algorithm/registration/IIterativeClosestPointSetup.h"
-#include "util/Timer.h"
-#include "util/Benchmark.h"
+#include "brics_3d/util/OSGPointCloudVisualizer.h"
+#include "brics_3d/core/PointCloud3D.h"
+#include "brics_3d/core/HomogeneousMatrix44.h"
+#include "brics_3d/algorithm/nearestNeighbor/NearestNeighborANN.h"
+#include "brics_3d/algorithm/nearestNeighbor/NearestNeighborFLANN.h"
+#include "brics_3d/algorithm/nearestNeighbor/NearestNeighborSTANN.h"
+#include "brics_3d/algorithm/registration/PointCorrespondenceKDTree.h"
+#include "brics_3d/algorithm/registration/PointCorrespondenceGenericNN.h"
+#include "brics_3d/algorithm/registration/RigidTransformationEstimationSVD.h"
+#include "brics_3d/algorithm/registration/RigidTransformationEstimationHELIX.h"
+#include "brics_3d/algorithm/registration/RigidTransformationEstimationAPX.h"
+#include "brics_3d/algorithm/registration/RigidTransformationEstimationORTHO.h"
+#include "brics_3d/algorithm/registration/RigidTransformationEstimationQUAT.h"
+#include "brics_3d/algorithm/registration/IterativeClosestPoint.h"
+#include "brics_3d/algorithm/registration/IIterativeClosestPointSetup.h"
+#include "brics_3d/util/Timer.h"
+#include "brics_3d/util/Benchmark.h"
 
 #include <Eigen/Geometry>
 

examples/icp_test.cpp

@@ -23,19 +23,19 @@
 
 #include <iostream>
 #include <sstream>
-#include "util/OSGPointCloudVisualizer.h"
-#include "core/PointCloud3D.h"
-#include "core/HomogeneousMatrix44.h"
-#include "algorithm/nearestNeighbor/NearestNeighborFLANN.h"
-#include "algorithm/registration/PointCorrespondenceKDTree.h"
-#include "algorithm/registration/PointCorrespondenceGenericNN.h"
-#include "algorithm/registration/RigidTransformationEstimationSVD.h"
-#include "algorithm/registration/RigidTransformationEstimationHELIX.h"
-#include "algorithm/registration/RigidTransformationEstimationAPX.h"
-#include "algorithm/registration/RigidTransformationEstimationORTHO.h"
-#include "algorithm/registration/IterativeClosestPoint.h"
-#include "algorithm/registration/IIterativeClosestPointSetup.h"
-#include "util/Timer.h"
+#include "brics_3d/util/OSGPointCloudVisualizer.h"
+#include "brics_3d/core/PointCloud3D.h"
+#include "brics_3d/core/HomogeneousMatrix44.h"
+#include "brics_3d/algorithm/nearestNeighbor/NearestNeighborFLANN.h"
+#include "brics_3d/algorithm/registration/PointCorrespondenceKDTree.h"
+#include "brics_3d/algorithm/registration/PointCorrespondenceGenericNN.h"
+#include "brics_3d/algorithm/registration/RigidTransformationEstimationSVD.h"
+#include "brics_3d/algorithm/registration/RigidTransformationEstimationHELIX.h"
+#include "brics_3d/algorithm/registration/RigidTransformationEstimationAPX.h"
+#include "brics_3d/algorithm/registration/RigidTransformationEstimationORTHO.h"
+#include "brics_3d/algorithm/registration/IterativeClosestPoint.h"
+#include "brics_3d/algorithm/registration/IIterativeClosestPointSetup.h"
+#include "brics_3d/util/Timer.h"
 
 #include <Eigen/Geometry>
 

examples/kinect_test.cpp

@@ -23,10 +23,10 @@
 #include <pcl/io/openni_grabber.h>
 
 // BRICS_3D includes
-#include <core/PointCloud3D.h>
-#include <core/Logger.h>
-#include <util/PCLTypecaster.h>
-#include <util/OSGPointCloudVisualizer.h>
+#include <brics_3d/core/PointCloud3D.h>
+#include <brics_3d/core/Logger.h>
+#include <brics_3d/util/PCLTypecaster.h>
+#include <brics_3d/util/OSGPointCloudVisualizer.h>
 
 using brics_3d::Logger;
 

examples/osg_point_plotter.cpp

@@ -18,11 +18,11 @@
 ******************************************************************************/
 
 #include <iostream>
-#include <util/DepthImageLoader.h>
-#include <util/OSGPointCloudVisualizer.h>
-#include <core/PointCloud3D.h>
-#include <algorithm/depthPerception/DepthImageToPointCloudTransformation.h>
-#include <algorithm/filtering/Octree.h>
+#include <brics_3d/util/DepthImageLoader.h>
+#include <brics_3d/util/OSGPointCloudVisualizer.h>
+#include <brics_3d/core/PointCloud3D.h>
+#include <brics_3d/algorithm/depthPerception/DepthImageToPointCloudTransformation.h>
+#include <brics_3d/algorithm/filtering/Octree.h>
 
 using namespace std;
 using namespace brics_3d;

examples/osg_triangle_plotter.cpp

@@ -18,9 +18,9 @@
 ******************************************************************************/
 
 #include <iostream>
-#include <core/TriangleMeshImplicit.h>
-#include <core/TriangleMeshExplicit.h>
-#include <util/OSGTriangleMeshVisualizer.h>
+#include <brics_3d/core/TriangleMeshImplicit.h>
+#include <brics_3d/core/TriangleMeshExplicit.h>
+#include <brics_3d/util/OSGTriangleMeshVisualizer.h>
 
 
 

examples/point3D_benchmark.cpp

@@ -20,12 +20,12 @@
 #include <iostream>
 #include <cstdlib>
 
-#include "core/PointCloud3D.h"
-#include "core/ColoredPoint3D.h"
-#include "core/HomogeneousMatrix44.h"
-#include "util/OSGPointCloudVisualizer.h"
-#include "util/Timer.h"
-#include "util/Benchmark.h"
+#include "brics_3d/core/PointCloud3D.h"
+#include "brics_3d/core/ColoredPoint3D.h"
+#include "brics_3d/core/HomogeneousMatrix44.h"
+#include "brics_3d/util/OSGPointCloudVisualizer.h"
+#include "brics_3d/util/Timer.h"
+#include "brics_3d/util/Benchmark.h"
 
 
 using namespace std;