Initial Macbeth detection implementation

apps/specular_estimation/CMakeFiles/specular_estimation.dir/CXX.includecache

@@ -30,6 +30,16 @@ opencv2/aruco/charuco.hpp
 opencv2/calib3d.hpp
 -
 
+/home/thomas/Documents/Minimisation/apps/specular_estimation/src/Macbeth.h
+stdio.h
+-
+opencv/cv.h
+-
+opencv/highgui.h
+-
+opencv2/calib3d/calib3d.hpp
+-
+
 /home/thomas/Documents/Minimisation/apps/specular_estimation/src/OpenCV.h
 opencv2/opencv.hpp
 -
@@ -175,6 +185,8 @@ OpenGL.h
 /home/thomas/Documents/Minimisation/apps/specular_estimation/src/OpenGL.h
 Ceres.h
 /home/thomas/Documents/Minimisation/apps/specular_estimation/src/Ceres.h
+Macbeth.h
+/home/thomas/Documents/Minimisation/apps/specular_estimation/src/Macbeth.h
 
 /home/thomas/Documents/Minimisation/apps/specular_estimation/src/texture.cpp
 stdio.h
@@ -1726,10 +1738,28 @@ ceres/internal/reenable_warnings.h
 
 /usr/local/include/ceres/version.h
 
+/usr/local/include/opencv/cv.h
+opencv2/core/core_c.h
+/usr/local/include/opencv/opencv2/core/core_c.h
+opencv2/imgproc/imgproc_c.h
+/usr/local/include/opencv/opencv2/imgproc/imgproc_c.h
+opencv2/photo/photo_c.h
+/usr/local/include/opencv/opencv2/photo/photo_c.h
+opencv2/video/tracking_c.h
+/usr/local/include/opencv/opencv2/video/tracking_c.h
+opencv2/objdetect/objdetect_c.h
+/usr/local/include/opencv/opencv2/objdetect/objdetect_c.h
+
 /usr/local/include/opencv/cxcore.h
 opencv2/core/core_c.h
 /usr/local/include/opencv/opencv2/core/core_c.h
 
+/usr/local/include/opencv/highgui.h
+opencv2/core/core_c.h
+/usr/local/include/opencv/opencv2/core/core_c.h
+opencv2/highgui/highgui_c.h
+/usr/local/include/opencv/opencv2/highgui/highgui_c.h
+
 /usr/local/include/opencv2/aruco.hpp
 opencv2/core.hpp
 -
@@ -1760,6 +1790,10 @@ opencv2/core/affine.hpp
 opencv2/calib3d/calib3d_c.h
 /usr/local/include/opencv2/opencv2/calib3d/calib3d_c.h
 
+/usr/local/include/opencv2/calib3d/calib3d.hpp
+opencv2/calib3d.hpp
+/usr/local/include/opencv2/calib3d/opencv2/calib3d.hpp
+
 /usr/local/include/opencv2/calib3d/calib3d_c.h
 opencv2/core/core_c.h
 /usr/local/include/opencv2/calib3d/opencv2/core/core_c.h

apps/specular_estimation/CMakeFiles/specular_estimation.dir/depend.internal

@@ -10,6 +10,7 @@ apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/shader.cpp.o
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o
  /home/thomas/Documents/Minimisation/apps/specular_estimation/src/Ceres.h
  /home/thomas/Documents/Minimisation/apps/specular_estimation/src/Charuco.h
+ /home/thomas/Documents/Minimisation/apps/specular_estimation/src/Macbeth.h
  /home/thomas/Documents/Minimisation/apps/specular_estimation/src/OpenCV.h
  /home/thomas/Documents/Minimisation/apps/specular_estimation/src/OpenGL.h
  /home/thomas/Documents/Minimisation/apps/specular_estimation/src/objloader.h
@@ -271,11 +272,14 @@ apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimat
  /usr/local/include/ceres/solver.h
  /usr/local/include/ceres/types.h
  /usr/local/include/ceres/version.h
+ /usr/local/include/opencv/cv.h
  /usr/local/include/opencv/cxcore.h
+ /usr/local/include/opencv/highgui.h
  /usr/local/include/opencv2/aruco.hpp
  /usr/local/include/opencv2/aruco/charuco.hpp
  /usr/local/include/opencv2/aruco/dictionary.hpp
  /usr/local/include/opencv2/calib3d.hpp
+ /usr/local/include/opencv2/calib3d/calib3d.hpp
  /usr/local/include/opencv2/calib3d/calib3d_c.h
  /usr/local/include/opencv2/core.hpp
  /usr/local/include/opencv2/core/affine.hpp

apps/specular_estimation/CMakeFiles/specular_estimation.dir/depend.make

@@ -9,6 +9,7 @@ apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/shader.cpp.o: ap
 
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: apps/specular_estimation/src/Ceres.h
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: apps/specular_estimation/src/Charuco.h
+apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: apps/specular_estimation/src/Macbeth.h
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: apps/specular_estimation/src/OpenCV.h
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: apps/specular_estimation/src/OpenGL.h
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: apps/specular_estimation/src/objloader.h
@@ -270,11 +271,14 @@ apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimat
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: /usr/local/include/ceres/solver.h
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: /usr/local/include/ceres/types.h
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: /usr/local/include/ceres/version.h
+apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: /usr/local/include/opencv/cv.h
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: /usr/local/include/opencv/cxcore.h
+apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: /usr/local/include/opencv/highgui.h
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: /usr/local/include/opencv2/aruco.hpp
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: /usr/local/include/opencv2/aruco/charuco.hpp
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: /usr/local/include/opencv2/aruco/dictionary.hpp
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: /usr/local/include/opencv2/calib3d.hpp
+apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: /usr/local/include/opencv2/calib3d/calib3d.hpp
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: /usr/local/include/opencv2/calib3d/calib3d_c.h
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: /usr/local/include/opencv2/core.hpp
 apps/specular_estimation/CMakeFiles/specular_estimation.dir/src/specular_estimation.cc.o: /usr/local/include/opencv2/core/affine.hpp

apps/specular_estimation/src/OpenCV.h

@@ -515,7 +515,7 @@ void loadCalibrationImages(std::vector< cv::Mat >& calibrationImages, std::strin
 	std::cout << std::endl;
 }
 
-void loadModelImages(std::vector< cv::Mat >& modelImages, std::vector< cv::Mat >& textureImages, std::string modelPath, int imageScale, int& originalWidth, int& originalHeight, int& width, int& height) {
+void loadModelImages(std::vector<cv::Mat>& modelImages, std::vector<cv::Mat>& textureImages, std::string modelPath, int imageScale, int& originalWidth, int& originalHeight, int& width, int& height) {
 	bool loadedImages = false;
 	int imageNumber = 0;
 

apps/specular_estimation/src/specular_estimation.cc

@@ -53,6 +53,8 @@ int main(int argc, char** argv) {
 	const std::string calibrationPath = imagesPath + folderPath + "/" + calibration + "/" + calibration + ".";
 	const std::string texturePath     = modelPath + "texture.png";
 
+	detectMacbeth("/media/thomas/ESD-USB/2017-12-04/macbeth/macbeth.0.png");
+
 	// A vector of Mats allow multiple images to be allocated to the same object
 	// textureImages are the full colour photographs that are used to create the texture
 	// modelImages are the greyscale version of textureImages which are used to calculate the surface normals

apps/specular_estimation/src/stdafx.h

@@ -42,3 +42,4 @@ using namespace glm;
 #include "Charuco.h"
 #include "OpenGL.h"
 #include "Ceres.h"
+#include "Macbeth.h"