Moved all header files to src

Author: cassinaj

CMakeLists.txt

@@ -181,14 +181,11 @@ target_link_libraries(${dbot_LIBRARY}
 
 # Build dbot GPU library
 if(DBOT_BUILD_GPU)
-    set(dbot_SOURCE_DIR_GPU
-        ${dbot_SOURCE_DIR}/model/observation/gpu)
-
     cuda_add_library(${dbot_LIBRARY_GPU} SHARED
-        ${dbot_SOURCE_DIR}/model/observation/gpu/cuda_likelihood_evaluator.cu
-        ${dbot_SOURCE_DIR}/model/observation/gpu/shader.cpp
-        ${dbot_SOURCE_DIR}/model/observation/gpu/object_rasterizer.cpp
-        ${dbot_SOURCE_DIR}/model/observation/gpu/buffer_configuration.cpp)
+        ${dbot_SOURCE_DIR}/gpu/cuda_likelihood_evaluator.cu
+        ${dbot_SOURCE_DIR}/gpu/shader.cpp
+        ${dbot_SOURCE_DIR}/gpu/object_rasterizer.cpp
+        ${dbot_SOURCE_DIR}/gpu/buffer_configuration.cpp)
 
     target_link_libraries(${dbot_LIBRARY_GPU}
         ${catkin_LIBRARIES}

src/dbot/model/observation/gpu/buffer_configuration.cpp renamed to src/dbot/gpu/buffer_configuration.cpp

@@ -17,7 +17,7 @@
  * \date March 2016
  */
 
-#include <dbot/model/observation/gpu/buffer_configuration.hpp>
+#include <dbot/gpu/buffer_configuration.hpp>
 #include <iostream>
 #include <boost/lexical_cast.hpp>
 

src/dbot/model/observation/gpu/buffer_configuration.hpp renamed to src/dbot/gpu/buffer_configuration.hpp

@@ -21,8 +21,8 @@
 #pragma once
 
 
-#include <dbot/model/observation/gpu/object_rasterizer.hpp>
-#include <dbot/model/observation/gpu/cuda_likelihood_evaluator.hpp>
+#include <dbot/gpu/object_rasterizer.hpp>
+#include <dbot/gpu/cuda_likelihood_evaluator.hpp>
 #include "boost/shared_ptr.hpp"
 
 /**

src/dbot/model/observation/gpu/cuda_likelihood_evaluator.cu renamed to src/dbot/gpu/cuda_likelihood_evaluator.cu

@@ -32,7 +32,7 @@
 #define VECTOR_DIM 3
 #define MATRIX_DIM 9
 
-#include <dbot/model/observation/gpu/cuda_likelihood_evaluator.hpp>
+#include <dbot/gpu/cuda_likelihood_evaluator.hpp>
 #include <GL/glut.h>
 #include <fl/util/profiling.hpp>
 

src/dbot/model/observation/gpu/cuda_likelihood_evaluator.hpp renamed to src/dbot/gpu/cuda_likelihood_evaluator.hpp

@@ -38,13 +38,13 @@
 #include "Eigen/Core"
 
 #include <osr/pose_vector.hpp>
-#include <dbot/model/observation/rao_blackwell_observation_model.hpp>
+#include <dbot/model/rao_blackwell_observation_model.hpp>
 #include <osr/free_floating_rigid_bodies_state.hpp>
 
 #include <dbot/util/traits.hpp>
-#include <dbot/model/observation/gpu/object_rasterizer.hpp>
-#include <dbot/model/observation/gpu/cuda_likelihood_evaluator.hpp>
-#include <dbot/model/observation/gpu/buffer_configuration.hpp>
+#include <dbot/gpu/object_rasterizer.hpp>
+#include <dbot/gpu/cuda_likelihood_evaluator.hpp>
+#include <dbot/gpu/buffer_configuration.hpp>
 
 #include <limits>
 #include <stdio.h>

src/dbot/model/observation/gpu/kinect_image_observation_model_gpu.hpp renamed to src/dbot/gpu/kinect_image_observation_model_gpu.hpp

@@ -21,8 +21,8 @@
 #include <GL/glew.h>
 #include <GL/glx.h>
 #include <dbot/util/helper_functions.hpp>
-#include <dbot/model/observation/gpu/shader.hpp>
-#include <dbot/model/observation/gpu/object_rasterizer.hpp>
+#include <dbot/gpu/shader.hpp>
+#include <dbot/gpu/object_rasterizer.hpp>
 
 using namespace std;
 using namespace Eigen;

src/dbot/model/observation/gpu/object_rasterizer.cpp renamed to src/dbot/gpu/object_rasterizer.cpp

@@ -24,7 +24,7 @@
 #include "GL/glew.h"
 #include <GL/glx.h>
 
-#include <dbot/model/observation/gpu/shader_provider.hpp>
+#include <dbot/gpu/shader_provider.hpp>
 #include <memory>
 
  /**

src/dbot/model/observation/gpu/object_rasterizer.hpp renamed to src/dbot/gpu/object_rasterizer.hpp

@@ -28,7 +28,7 @@
 #include <string.h>
 #include <GL/glew.h>
 
-#include <dbot/model/observation/gpu/shader.hpp>
+#include <dbot/gpu/shader.hpp>
 
 GLuint LoadShaders(const std::shared_ptr<dbot::ShaderProvider>& shaderProvider)
 {

src/dbot/model/observation/gpu/shader.cpp renamed to src/dbot/gpu/shader.cpp

@@ -24,7 +24,7 @@
 #include <memory>
 #include <GL/glew.h>
 
-#include <dbot/model/observation/gpu/shader_provider.hpp>
+#include <dbot/gpu/shader_provider.hpp>
 
 GLuint LoadShaders(const std::shared_ptr<dbot::ShaderProvider> &shaderProvider);
 GLuint CreateShader(GLenum eShaderType, const std::string& shaderCode);