From 2145d23994553481e956294b366bb73892390452 Mon Sep 17 00:00:00 2001 From: Thomas FORGIONE Date: Fri, 13 Mar 2015 18:16:06 +0100 Subject: [PATCH] Corrected license --- Code/include/Animation/AnimatedMesh.hpp | 4 +++- Code/include/Animation/Animation.hpp | 4 +++- Code/include/Animation/Click.hpp | 4 +++- Code/include/Animation/Menu.hpp | 4 +++- Code/include/Calibration/Calibration.hpp | 4 +++- .../include/DetectionAndMatching/DetectionAndMatching.hpp | 8 +++++--- Code/include/Extern/Camera.hpp | 2 ++ Code/include/Extern/ChessboardCameraTracker.hpp | 2 ++ Code/include/Extern/utility.hpp | 2 ++ Code/include/Geometry/Base.hpp | 4 +++- Code/include/Geometry/Circle.hpp | 4 +++- Code/include/Geometry/Geometry.hpp | 4 +++- Code/include/Geometry/MathFunctions.hpp | 4 +++- Code/include/Geometry/MathFunctions.inl | 4 +++- Code/include/Geometry/Mesh.hpp | 4 +++- Code/include/Geometry/Point.hpp | 4 +++- Code/include/Geometry/Rotation.hpp | 4 +++- Code/include/Geometry/Spline.hpp | 4 +++- Code/include/Geometry/Spline.inl | 4 +++- Code/include/Geometry/Tree.hpp | 4 +++- Code/include/Geometry/Vector.hpp | 4 +++- Code/include/Geometry/Vector.inl | 4 +++- Code/include/Meshing/Meshing.hpp | 4 +++- Code/include/Meshing/Skeleton3D.hpp | 4 +++- Code/include/Meshing/Skeleton3D.inl | 4 +++- Code/include/SFMLTools/Camera.hpp | 4 +++- Code/include/SFMLTools/FreeFlyCamera.hpp | 4 +++- Code/include/SFMLTools/JoyCam.hpp | 4 +++- Code/include/SFMLTools/SFMLTools.hpp | 4 +++- Code/include/SFMLTools/VectorFunctions.hpp | 4 +++- Code/include/Skeleton/Box.hpp | 4 +++- Code/include/Skeleton/Branch.hpp | 4 +++- Code/include/Skeleton/Skeleton.hpp | 4 +++- Code/include/Skeleton/VectorFunctions.hpp | 4 +++- Code/include/Utility/TupleFunctions.hpp | 4 +++- Code/include/Utility/TupleFunctions.inl | 4 +++- Code/include/Utility/Utility.hpp | 4 +++- Code/src/Animation/AnimatedMain.cpp | 4 +++- Code/src/Animation/AnimatedMesh.cpp | 4 +++- Code/src/Animation/Click.cpp | 4 +++- Code/src/Animation/MainClick.cpp | 4 +++- Code/src/Animation/Menu.cpp | 4 +++- Code/src/Calibration/Calibration.cpp | 3 +++ Code/src/DetectionAndMatching/DetectionAndMatching.cpp | 4 +++- Code/src/Extern/Camera.cpp | 2 ++ Code/src/Extern/ChessboardCameraTracker.cpp | 2 ++ Code/src/Extern/main.cpp | 2 ++ Code/src/Extern/utility.cpp | 2 ++ Code/src/Geometry/Base.cpp | 4 +++- Code/src/Geometry/Mesh.cpp | 4 +++- Code/src/Geometry/ProjectionTest.cpp | 4 +++- Code/src/Geometry/Rotation.cpp | 4 +++- Code/src/HelloCV/HelloCV.cpp | 4 +++- Code/src/Meshing/CirclePlane.cpp | 4 +++- Code/src/Meshing/Circles.cxx | 4 +++- Code/src/Meshing/Circles1.cxx | 4 +++- Code/src/Meshing/Circles2.cxx | 4 +++- Code/src/Meshing/Circles3.cxx | 4 +++- Code/src/Meshing/MainDisplay.cpp | 4 +++- Code/src/Meshing/TestJunction3.cpp | 4 +++- Code/src/Meshing/TestJunction4.cpp | 4 +++- Code/src/Meshing/main.cpp | 4 +++- Code/src/SFMLTools/FreeFlyCamera.cpp | 4 +++- Code/src/SFMLTools/JoyCam.cpp | 4 +++- Code/src/Skeleton/Box.cpp | 4 +++- Code/src/Skeleton/Branch.cpp | 4 +++- Code/src/Skeleton/Skeleton.cpp | 4 +++- Code/src/Skeleton/draw.cpp | 4 +++- Code/src/Skeleton/init.cxx | 4 +++- Code/src/Skeleton/main.cpp | 4 +++- 70 files changed, 205 insertions(+), 64 deletions(-) diff --git a/Code/include/Animation/AnimatedMesh.hpp b/Code/include/Animation/AnimatedMesh.hpp index 26c5de9..b30b514 100644 --- a/Code/include/Animation/AnimatedMesh.hpp +++ b/Code/include/Animation/AnimatedMesh.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef ANIMATEDMESH_HPP +#define ANIMATEDMESH_HPP #include #include diff --git a/Code/include/Animation/Animation.hpp b/Code/include/Animation/Animation.hpp index 9724a6d..676d1cf 100644 --- a/Code/include/Animation/Animation.hpp +++ b/Code/include/Animation/Animation.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef ANIMATION_HPP +#define ANIMATION_HPP ////////////////////////////////////////////// /// \defgroup animation Animation module diff --git a/Code/include/Animation/Click.hpp b/Code/include/Animation/Click.hpp index 643e467..5e670c1 100644 --- a/Code/include/Animation/Click.hpp +++ b/Code/include/Animation/Click.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef CLICK_HPP +#define CLICK_HPP #include #include diff --git a/Code/include/Animation/Menu.hpp b/Code/include/Animation/Menu.hpp index 804abd7..98a1674 100644 --- a/Code/include/Animation/Menu.hpp +++ b/Code/include/Animation/Menu.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef MENU_HPP +#define MENU_HPP #include diff --git a/Code/include/Calibration/Calibration.hpp b/Code/include/Calibration/Calibration.hpp index 69c7d2f..e2d98a8 100644 --- a/Code/include/Calibration/Calibration.hpp +++ b/Code/include/Calibration/Calibration.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef CALIBRATION_HPP +#define CALIBRATION_HPP ///////////////////////////////////////////////////// /// \defgroup calibration Calibration diff --git a/Code/include/DetectionAndMatching/DetectionAndMatching.hpp b/Code/include/DetectionAndMatching/DetectionAndMatching.hpp index cdaffc7..9454ba4 100644 --- a/Code/include/DetectionAndMatching/DetectionAndMatching.hpp +++ b/Code/include/DetectionAndMatching/DetectionAndMatching.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,14 +27,16 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef DETECTIONANDMATCHING_HPP +#define DETECTIONANDMATCHING_HPP ///////////////////////////////////////////////////////// /// \defgroup detectionandmatching Detection and Matching module /// /// Contains all the functions to compute the keypoints and /// match them on differents images. The algorithm used -/// to detect the keypoints and compute the descriptors is BRISK. -/// The matches are computed with a brute force matcher provided +/// to detect the keypoints and compute the descriptors is BRISK. +/// The matches are computed with a brute force matcher provided /// by OpenCV. /// /// This program is meant to be used like this diff --git a/Code/include/Extern/Camera.hpp b/Code/include/Extern/Camera.hpp index 9cd97a8..e8b696d 100644 --- a/Code/include/Extern/Camera.hpp +++ b/Code/include/Extern/Camera.hpp @@ -28,6 +28,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef _CAMERA_HPP_ +#define _CAMERA_HPP_ #include diff --git a/Code/include/Extern/ChessboardCameraTracker.hpp b/Code/include/Extern/ChessboardCameraTracker.hpp index 731b2aa..2709588 100644 --- a/Code/include/Extern/ChessboardCameraTracker.hpp +++ b/Code/include/Extern/ChessboardCameraTracker.hpp @@ -28,6 +28,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef _CHESSBOARDCAMERATRACKER_HPP_ +#define _CHESSBOARDCAMERATRACKER_HPP_ #include "Camera.hpp" #include "utility.hpp" diff --git a/Code/include/Extern/utility.hpp b/Code/include/Extern/utility.hpp index cbce8c6..9851836 100644 --- a/Code/include/Extern/utility.hpp +++ b/Code/include/Extern/utility.hpp @@ -28,6 +28,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef _UTILITY_HPP_ +#define _UTILITY_HPP_ #include "Camera.hpp" diff --git a/Code/include/Geometry/Base.hpp b/Code/include/Geometry/Base.hpp index 50b7046..da1c784 100644 --- a/Code/include/Geometry/Base.hpp +++ b/Code/include/Geometry/Base.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef BASE_HPP +#define BASE_HPP #include #include diff --git a/Code/include/Geometry/Circle.hpp b/Code/include/Geometry/Circle.hpp index 0c7062d..d5e4dce 100644 --- a/Code/include/Geometry/Circle.hpp +++ b/Code/include/Geometry/Circle.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef CIRCLE_HPP +#define CIRCLE_HPP #include #include diff --git a/Code/include/Geometry/Geometry.hpp b/Code/include/Geometry/Geometry.hpp index 55b0eb9..660dd94 100644 --- a/Code/include/Geometry/Geometry.hpp +++ b/Code/include/Geometry/Geometry.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef GEOMETRY_HPP +#define GEOMETRY_HPP #include diff --git a/Code/include/Geometry/MathFunctions.hpp b/Code/include/Geometry/MathFunctions.hpp index 89e13b3..6a61cbe 100644 --- a/Code/include/Geometry/MathFunctions.hpp +++ b/Code/include/Geometry/MathFunctions.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef MATHFUNCTIONS_HPP +#define MATHFUNCTIONS_HPP #include diff --git a/Code/include/Geometry/MathFunctions.inl b/Code/include/Geometry/MathFunctions.inl index 46fd0b6..45d17b3 100644 --- a/Code/include/Geometry/MathFunctions.inl +++ b/Code/include/Geometry/MathFunctions.inl @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include + #include #include "Geometry/Vector.hpp" diff --git a/Code/include/Geometry/Mesh.hpp b/Code/include/Geometry/Mesh.hpp index 0cd905c..961d63f 100644 --- a/Code/include/Geometry/Mesh.hpp +++ b/Code/include/Geometry/Mesh.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef MESH_HPP +#define MESH_HPP #include #include diff --git a/Code/include/Geometry/Point.hpp b/Code/include/Geometry/Point.hpp index 8d523fa..e24b31f 100644 --- a/Code/include/Geometry/Point.hpp +++ b/Code/include/Geometry/Point.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef POINT_HPP +#define POINT_HPP #include diff --git a/Code/include/Geometry/Rotation.hpp b/Code/include/Geometry/Rotation.hpp index 169f825..a491857 100644 --- a/Code/include/Geometry/Rotation.hpp +++ b/Code/include/Geometry/Rotation.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef ROTATION_HPP +#define ROTATION_HPP #include #include diff --git a/Code/include/Geometry/Spline.hpp b/Code/include/Geometry/Spline.hpp index d8711ad..ece74ac 100644 --- a/Code/include/Geometry/Spline.hpp +++ b/Code/include/Geometry/Spline.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef SPLINE_HPP +#define SPLINE_HPP #include #include diff --git a/Code/include/Geometry/Spline.inl b/Code/include/Geometry/Spline.inl index de754e0..b452396 100644 --- a/Code/include/Geometry/Spline.inl +++ b/Code/include/Geometry/Spline.inl @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include #include "Geometry/Vector.hpp" diff --git a/Code/include/Geometry/Tree.hpp b/Code/include/Geometry/Tree.hpp index 5eee2c4..edf6824 100644 --- a/Code/include/Geometry/Tree.hpp +++ b/Code/include/Geometry/Tree.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef TREE_HPP +#define TREE_HPP #include #include diff --git a/Code/include/Geometry/Vector.hpp b/Code/include/Geometry/Vector.hpp index 61379dc..316c0c3 100644 --- a/Code/include/Geometry/Vector.hpp +++ b/Code/include/Geometry/Vector.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef VECTOR_HPP +#define VECTOR_HPP #include #include diff --git a/Code/include/Geometry/Vector.inl b/Code/include/Geometry/Vector.inl index c945389..c930df5 100644 --- a/Code/include/Geometry/Vector.inl +++ b/Code/include/Geometry/Vector.inl @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include "Geometry/Vector.hpp" namespace geo diff --git a/Code/include/Meshing/Meshing.hpp b/Code/include/Meshing/Meshing.hpp index ce0937a..52660de 100644 --- a/Code/include/Meshing/Meshing.hpp +++ b/Code/include/Meshing/Meshing.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef MESHING_HPP +#define MESHING_HPP ////////////////////////////////////////////////// /// \defgroup meshing Meshing module diff --git a/Code/include/Meshing/Skeleton3D.hpp b/Code/include/Meshing/Skeleton3D.hpp index f71d0cd..d96e864 100644 --- a/Code/include/Meshing/Skeleton3D.hpp +++ b/Code/include/Meshing/Skeleton3D.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef SKELETON3D_HPP +#define SKELETON3D_HPP #include #include diff --git a/Code/include/Meshing/Skeleton3D.inl b/Code/include/Meshing/Skeleton3D.inl index 98bb2fc..7fbc31a 100644 --- a/Code/include/Meshing/Skeleton3D.inl +++ b/Code/include/Meshing/Skeleton3D.inl @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include #include diff --git a/Code/include/SFMLTools/Camera.hpp b/Code/include/SFMLTools/Camera.hpp index f13f7d5..e5726d2 100644 --- a/Code/include/SFMLTools/Camera.hpp +++ b/Code/include/SFMLTools/Camera.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef CAMERA_HPP +#define CAMERA_HPP namespace sft { diff --git a/Code/include/SFMLTools/FreeFlyCamera.hpp b/Code/include/SFMLTools/FreeFlyCamera.hpp index f9a4596..65329ad 100644 --- a/Code/include/SFMLTools/FreeFlyCamera.hpp +++ b/Code/include/SFMLTools/FreeFlyCamera.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef FREE_FLY_CAMERA_HPP +#define FREE_FLY_CAMERA_HPP #include #include diff --git a/Code/include/SFMLTools/JoyCam.hpp b/Code/include/SFMLTools/JoyCam.hpp index e3f2b48..92a3669 100644 --- a/Code/include/SFMLTools/JoyCam.hpp +++ b/Code/include/SFMLTools/JoyCam.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef JOY_CAM_HPP +#define JOY_CAM_HPP #include #include diff --git a/Code/include/SFMLTools/SFMLTools.hpp b/Code/include/SFMLTools/SFMLTools.hpp index 053fb4f..d94aeb0 100644 --- a/Code/include/SFMLTools/SFMLTools.hpp +++ b/Code/include/SFMLTools/SFMLTools.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef SFML_TOOLS_HPP +#define SFML_TOOLS_HPP /////////////////////////////////////////////////////////// /// \defgroup sfmltools SFML Tools diff --git a/Code/include/SFMLTools/VectorFunctions.hpp b/Code/include/SFMLTools/VectorFunctions.hpp index 535ba9d..ab58f88 100644 --- a/Code/include/SFMLTools/VectorFunctions.hpp +++ b/Code/include/SFMLTools/VectorFunctions.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef VECTOR_FUNCTIONS_HPP +#define VECTOR_FUNCTIONS_HPP #include #include diff --git a/Code/include/Skeleton/Box.hpp b/Code/include/Skeleton/Box.hpp index f1f5923..12d42f7 100644 --- a/Code/include/Skeleton/Box.hpp +++ b/Code/include/Skeleton/Box.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef BOX_HPP +#define BOX_HPP class Box { diff --git a/Code/include/Skeleton/Branch.hpp b/Code/include/Skeleton/Branch.hpp index 5ddfef3..5f24539 100644 --- a/Code/include/Skeleton/Branch.hpp +++ b/Code/include/Skeleton/Branch.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef BRANCH_HPP +#define BRANCH_HPP #include diff --git a/Code/include/Skeleton/Skeleton.hpp b/Code/include/Skeleton/Skeleton.hpp index 4128570..05d98c9 100644 --- a/Code/include/Skeleton/Skeleton.hpp +++ b/Code/include/Skeleton/Skeleton.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef SKELETON_HPP +#define SKELETON_HPP #include #include diff --git a/Code/include/Skeleton/VectorFunctions.hpp b/Code/include/Skeleton/VectorFunctions.hpp index 0317c62..875519e 100644 --- a/Code/include/Skeleton/VectorFunctions.hpp +++ b/Code/include/Skeleton/VectorFunctions.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef VECTOR_FUNCTIONS_HPP +#define VECTOR_FUNCTIONS_HPP #include #include diff --git a/Code/include/Utility/TupleFunctions.hpp b/Code/include/Utility/TupleFunctions.hpp index 1371013..4891978 100644 --- a/Code/include/Utility/TupleFunctions.hpp +++ b/Code/include/Utility/TupleFunctions.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef TUPLEFUNCTIONS_HPP +#define TUPLEFUNCTIONS_HPP #include #include diff --git a/Code/include/Utility/TupleFunctions.inl b/Code/include/Utility/TupleFunctions.inl index 5520a90..48931b7 100644 --- a/Code/include/Utility/TupleFunctions.inl +++ b/Code/include/Utility/TupleFunctions.inl @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include + #include "TupleFunctions.hpp" namespace pae diff --git a/Code/include/Utility/Utility.hpp b/Code/include/Utility/Utility.hpp index 568a22d..0c47deb 100644 --- a/Code/include/Utility/Utility.hpp +++ b/Code/include/Utility/Utility.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#ifndef UTILITY_HPP +#define UTILITY_HPP ////////////////////////////////////////////////////// /// \defgroup utility Utility module diff --git a/Code/src/Animation/AnimatedMain.cpp b/Code/src/Animation/AnimatedMain.cpp index 27a8132..4f2224f 100644 --- a/Code/src/Animation/AnimatedMain.cpp +++ b/Code/src/Animation/AnimatedMain.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include #include diff --git a/Code/src/Animation/AnimatedMesh.cpp b/Code/src/Animation/AnimatedMesh.cpp index 9ed1ece..1d16a4c 100644 --- a/Code/src/Animation/AnimatedMesh.cpp +++ b/Code/src/Animation/AnimatedMesh.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include + #include #include diff --git a/Code/src/Animation/Click.cpp b/Code/src/Animation/Click.cpp index 9507269..d9ad95e 100644 --- a/Code/src/Animation/Click.cpp +++ b/Code/src/Animation/Click.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include #include diff --git a/Code/src/Animation/MainClick.cpp b/Code/src/Animation/MainClick.cpp index b0f4a6f..4692316 100644 --- a/Code/src/Animation/MainClick.cpp +++ b/Code/src/Animation/MainClick.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include int main(int argc, char** argv) diff --git a/Code/src/Animation/Menu.cpp b/Code/src/Animation/Menu.cpp index df9afd5..d969c38 100644 --- a/Code/src/Animation/Menu.cpp +++ b/Code/src/Animation/Menu.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include diff --git a/Code/src/Calibration/Calibration.cpp b/Code/src/Calibration/Calibration.cpp index 3a4eac7..0ae626e 100644 --- a/Code/src/Calibration/Calibration.cpp +++ b/Code/src/Calibration/Calibration.cpp @@ -14,6 +14,7 @@ // Marion LENFANT // Thierry MALON // Amandine PAILLOUX +// Simone GASPARINI // // This file is part of the project Paella // This software is provided 'as-is', without any express or implied warranty. @@ -33,6 +34,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// + +#include "opencv2/core/core.hpp" #include "opencv2/imgproc/imgproc.hpp" #include "opencv2/calib3d/calib3d.hpp" #include "opencv2/highgui/highgui.hpp" diff --git a/Code/src/DetectionAndMatching/DetectionAndMatching.cpp b/Code/src/DetectionAndMatching/DetectionAndMatching.cpp index 09abbfa..7f0b933 100644 --- a/Code/src/DetectionAndMatching/DetectionAndMatching.cpp +++ b/Code/src/DetectionAndMatching/DetectionAndMatching.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include diff --git a/Code/src/Extern/Camera.cpp b/Code/src/Extern/Camera.cpp index 0545018..2aa0357 100644 --- a/Code/src/Extern/Camera.cpp +++ b/Code/src/Extern/Camera.cpp @@ -28,6 +28,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include "Extern/Camera.hpp" + #include /** diff --git a/Code/src/Extern/ChessboardCameraTracker.cpp b/Code/src/Extern/ChessboardCameraTracker.cpp index d05cbf7..ab16660 100644 --- a/Code/src/Extern/ChessboardCameraTracker.cpp +++ b/Code/src/Extern/ChessboardCameraTracker.cpp @@ -28,6 +28,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include "Extern/ChessboardCameraTracker.hpp" +#include "Extern/utility.hpp" #include #include diff --git a/Code/src/Extern/main.cpp b/Code/src/Extern/main.cpp index 735f29e..62d19df 100644 --- a/Code/src/Extern/main.cpp +++ b/Code/src/Extern/main.cpp @@ -28,6 +28,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include "Extern/ChessboardCameraTracker.hpp" +#include "Extern/utility.hpp" #include #include diff --git a/Code/src/Extern/utility.cpp b/Code/src/Extern/utility.cpp index 0744319..49dd1b9 100644 --- a/Code/src/Extern/utility.cpp +++ b/Code/src/Extern/utility.cpp @@ -28,6 +28,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include "Extern/utility.hpp" + #include #include diff --git a/Code/src/Geometry/Base.cpp b/Code/src/Geometry/Base.cpp index 82d25fa..dc161ab 100644 --- a/Code/src/Geometry/Base.cpp +++ b/Code/src/Geometry/Base.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include diff --git a/Code/src/Geometry/Mesh.cpp b/Code/src/Geometry/Mesh.cpp index 91886df..b641310 100644 --- a/Code/src/Geometry/Mesh.cpp +++ b/Code/src/Geometry/Mesh.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include diff --git a/Code/src/Geometry/ProjectionTest.cpp b/Code/src/Geometry/ProjectionTest.cpp index 8637ff5..cc77253 100644 --- a/Code/src/Geometry/ProjectionTest.cpp +++ b/Code/src/Geometry/ProjectionTest.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include diff --git a/Code/src/Geometry/Rotation.cpp b/Code/src/Geometry/Rotation.cpp index 418208d..dbd29b6 100644 --- a/Code/src/Geometry/Rotation.cpp +++ b/Code/src/Geometry/Rotation.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include + namespace geo { diff --git a/Code/src/HelloCV/HelloCV.cpp b/Code/src/HelloCV/HelloCV.cpp index d37407e..88ee00f 100644 --- a/Code/src/HelloCV/HelloCV.cpp +++ b/Code/src/HelloCV/HelloCV.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #ifdef _WIN32 #define CV_ESCAPE 27 diff --git a/Code/src/Meshing/CirclePlane.cpp b/Code/src/Meshing/CirclePlane.cpp index 39aa9d4..22fb0ad 100644 --- a/Code/src/Meshing/CirclePlane.cpp +++ b/Code/src/Meshing/CirclePlane.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include #include diff --git a/Code/src/Meshing/Circles.cxx b/Code/src/Meshing/Circles.cxx index bfb3178..7406d12 100644 --- a/Code/src/Meshing/Circles.cxx +++ b/Code/src/Meshing/Circles.cxx @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +auto c1 = geo::Circle{}; +c1.center = geo::Vector3{2.0000f, 0.0000f, 0.0000f}; c1.points.push_back(std::make_pair(0, geo::Vector3{2.0000f, 0.0000f, 1.0000f})); c1.points.push_back(std::make_pair(1, geo::Vector3{2.0000f, 0.5878f, 0.8090f})); c1.points.push_back(std::make_pair(2, geo::Vector3{2.0000f, 0.9511f, 0.3090f})); diff --git a/Code/src/Meshing/Circles1.cxx b/Code/src/Meshing/Circles1.cxx index 03327bf..59b73f8 100644 --- a/Code/src/Meshing/Circles1.cxx +++ b/Code/src/Meshing/Circles1.cxx @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +auto c1 = geo::Circle{}; +c1.center = geo::Vector3{2.0000f, 0.0000f, 0.0000f}; c1.points.push_back(std::make_pair(0, geo::Vector3{2.0000f, 0.0000f, 1.0000f})); c1.points.push_back(std::make_pair(1, geo::Vector3{2.0000f, 0.5878f, 0.8090f})); c1.points.push_back(std::make_pair(2, geo::Vector3{2.0000f, 0.9511f, 0.3090f})); diff --git a/Code/src/Meshing/Circles2.cxx b/Code/src/Meshing/Circles2.cxx index 4edcbc3..d70506a 100644 --- a/Code/src/Meshing/Circles2.cxx +++ b/Code/src/Meshing/Circles2.cxx @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +auto c1 = geo::Circle{}; +c1.center = geo::Vector3{2.0000f, 0.0000f, 0.0000f}; c1.points.push_back(std::make_pair(0, geo::Vector3{2.0000f, 0.0000f, 1.0000f})); c1.points.push_back(std::make_pair(1, geo::Vector3{2.0000f, 0.5878f, 0.8090f})); c1.points.push_back(std::make_pair(2, geo::Vector3{2.0000f, 0.9511f, 0.3090f})); diff --git a/Code/src/Meshing/Circles3.cxx b/Code/src/Meshing/Circles3.cxx index 6dc0e67..9527254 100644 --- a/Code/src/Meshing/Circles3.cxx +++ b/Code/src/Meshing/Circles3.cxx @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +auto c1 = geo::Circle{}; +c1.center = geo::Vector3{2.0000f, 0.0000f, 0.0000f}; c1.points.push_back(std::make_pair(0, geo::Vector3{2.0000f, 0.0000f, 1.0000f})); c1.points.push_back(std::make_pair(1, geo::Vector3{2.0000f, 0.5878f, 0.8090f})); c1.points.push_back(std::make_pair(2, geo::Vector3{2.0000f, 0.9511f, 0.3090f})); diff --git a/Code/src/Meshing/MainDisplay.cpp b/Code/src/Meshing/MainDisplay.cpp index 3a66b4a..846aee3 100644 --- a/Code/src/Meshing/MainDisplay.cpp +++ b/Code/src/Meshing/MainDisplay.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include #include diff --git a/Code/src/Meshing/TestJunction3.cpp b/Code/src/Meshing/TestJunction3.cpp index 6945e80..8bd288b 100644 --- a/Code/src/Meshing/TestJunction3.cpp +++ b/Code/src/Meshing/TestJunction3.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include #include diff --git a/Code/src/Meshing/TestJunction4.cpp b/Code/src/Meshing/TestJunction4.cpp index fdc1c24..332870f 100644 --- a/Code/src/Meshing/TestJunction4.cpp +++ b/Code/src/Meshing/TestJunction4.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include #include diff --git a/Code/src/Meshing/main.cpp b/Code/src/Meshing/main.cpp index 103022d..1e1a280 100644 --- a/Code/src/Meshing/main.cpp +++ b/Code/src/Meshing/main.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include "Geometry/Vector.hpp" #include "Geometry/Spline.hpp" diff --git a/Code/src/SFMLTools/FreeFlyCamera.cpp b/Code/src/SFMLTools/FreeFlyCamera.cpp index 71ed698..0955898 100644 --- a/Code/src/SFMLTools/FreeFlyCamera.cpp +++ b/Code/src/SFMLTools/FreeFlyCamera.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include diff --git a/Code/src/SFMLTools/JoyCam.cpp b/Code/src/SFMLTools/JoyCam.cpp index 81f850b..62e0ded 100644 --- a/Code/src/SFMLTools/JoyCam.cpp +++ b/Code/src/SFMLTools/JoyCam.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include diff --git a/Code/src/Skeleton/Box.cpp b/Code/src/Skeleton/Box.cpp index 57d9fda..58065e7 100644 --- a/Code/src/Skeleton/Box.cpp +++ b/Code/src/Skeleton/Box.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include Box::Box() : m_x_min{}, m_x_max{}, m_y_min{}, m_y_max{} diff --git a/Code/src/Skeleton/Branch.cpp b/Code/src/Skeleton/Branch.cpp index c0173d5..26c30fe 100644 --- a/Code/src/Skeleton/Branch.cpp +++ b/Code/src/Skeleton/Branch.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include "Skeleton/Branch.hpp" + bool Branch::operator==(Branch const& other) { if (size() == 2 && other.size() == 2) diff --git a/Code/src/Skeleton/Skeleton.cpp b/Code/src/Skeleton/Skeleton.cpp index f302cd3..7ca7b53 100644 --- a/Code/src/Skeleton/Skeleton.cpp +++ b/Code/src/Skeleton/Skeleton.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include #include diff --git a/Code/src/Skeleton/draw.cpp b/Code/src/Skeleton/draw.cpp index b7a9d0c..637e7cf 100644 --- a/Code/src/Skeleton/draw.cpp +++ b/Code/src/Skeleton/draw.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include #include diff --git a/Code/src/Skeleton/init.cxx b/Code/src/Skeleton/init.cxx index 9674177..bc47479 100644 --- a/Code/src/Skeleton/init.cxx +++ b/Code/src/Skeleton/init.cxx @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +std::vector> keypoints1 = { + // Pairs of keypoints supposed to be matched with branche[0] {cv::KeyPoint{cv::Point{100,400},0}, cv::KeyPoint{cv::Point{400,400},0}}, {cv::KeyPoint{cv::Point{200,200},0}, cv::KeyPoint{cv::Point{400,300},0}}, {cv::KeyPoint{cv::Point{400,400},0}, cv::KeyPoint{cv::Point{500,300},0}}, diff --git a/Code/src/Skeleton/main.cpp b/Code/src/Skeleton/main.cpp index 64df01a..62272ea 100644 --- a/Code/src/Skeleton/main.cpp +++ b/Code/src/Skeleton/main.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// +// // Paella // Copyright (C) 2015 - Thomas FORGIONE, Emilie JALRAS, Marion LENFANT, Thierry MALON, Amandine PAILLOUX // Authors : @@ -27,6 +27,8 @@ // // 3. This notice may not be removed or altered from any source distribution. //////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include #include