diff --git a/CMakeLists.txt b/CMakeLists.txt index bbb74803f6b269793ddebb93c1f215759cbffc12..6b58bcc283aedc9afc995c39bc8791d5c528e96c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -205,7 +205,7 @@ if (UNIX AND NOT APPLE) option(WITH_CERES "Add Ceres support for advanced 3-D reconstruction." OFF) endif (UNIX AND NOT APPLE) option(WITH_FLIR_CAMERA "Add FLIR (formerly Point Grey) camera code (requires Spinnaker SDK already installed)." OFF) -option(WITH_3D_ADAM_MODEL "Add 3-D Adam model (requires OpenGL, Ceres, Eigen, OpenMP, FreeImage, GLEW, and IGL already installed)." OFF) +# option(WITH_3D_ADAM_MODEL "Add 3-D Adam model (requires OpenGL, Ceres, Eigen, OpenMP, FreeImage, GLEW, and IGL already installed)." OFF) # Set the acceleration library if (WIN32 OR APPLE) @@ -229,7 +229,7 @@ option(DOWNLOAD_FACE_MODEL "Download face model." ON) option(DOWNLOAD_HAND_MODEL "Download hand model." ON) # Asio -option(USE_ASIO "Include Asio header-only library." OFF) +# option(USE_ASIO "Include Asio header-only library." OFF) # More options option(BUILD_EXAMPLES "Build OpenPose examples." ON) diff --git a/README.md b/README.md index 124a9eaf97f547f3147c0bb5a2bc67dd93af5c1c..43f52ab8be793694639dbc49bbf81ff9d90b3f22 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ ## Features - **Functionality**: - **2D real-time multi-person keypoint detection**: - - 15 or **18-keypoint body keypoint estimation**. **Running time invariant to number of detected people**. + - 15 or 18 or **25-keypoint body/foot keypoint estimation**. **Running time invariant to number of detected people**. - **2x21-keypoint hand keypoint estimation**. Currently, **running time depends** on **number of detected people**. - **70-keypoint face keypoint estimation**. Currently, **running time depends** on **number of detected people**. - **3D real-time multi-person keypoint detection**: @@ -36,9 +36,13 @@ ## Latest Features -- Jun 2018: [**Mac OSX version (CPU)**](doc/installation.md)! +- Jun 2018: [**Combined body-foot model released! Faster and more accurate.**](doc/installation.md)! +- Jun 2018: [**Python version**](doc/calibration_demo.md) released! +- Jun 2018: [**AMD graphic card version**](doc/calibration_demo.md) released! +- Jun 2018: [**Calibration toolbox**](doc/calibration_demo.md) released! +- Jun 2018: [**Mac OSX version (CPU)**](doc/installation.md) released! - Mar 2018: [**CPU version**](doc/installation.md#cpu-version)! -- Mar 2018: Improved [**3-D keypoint reconstruction module**](doc/3d_reconstruction_demo.md) (from multiple camera views)! +- Mar 2018: [**3-D keypoint reconstruction module**](doc/3d_reconstruction_demo.md) (from multiple camera views)! - Sep 2017: [**CMake**](doc/installation.md) installer and **IP camera** support! - Jul 2017: [**Windows portable binaries and demo**](https://github.com/CMU-Perceptual-Computing-Lab/openpose/releases)! - Jul 2017: **Hands** released! diff --git a/doc/released_features.md b/doc/released_features.md index 70f1088548f3b06ba5122ca4fc7d666527adf533..f375950824d0ea53f0b15928ef4c136c49594202 100644 --- a/doc/released_features.md +++ b/doc/released_features.md @@ -1,9 +1,12 @@ OpenPose Library - Latest Released Features ==================================== -- Jun 2018: [**Mac OSX version (CPU)**](./installation.md)! +- Jun 2018: [**Combined body-foot model released! Faster and more accurate.**](./installation.md)! +- Jun 2018: [**AMD graphic card version**](./calibration_demo.md) released! +- Jun 2018: [**Calibration toolbox**](./calibration_demo.md) released! +- Jun 2018: [**Mac OSX version (CPU)**](./installation.md) released! - Mar 2018: [**CPU version**](./installation.md#cpu-version)! -- Mar 2018: Improved [**3-D keypoint reconstruction module**](./3d_reconstruction_demo.md) (from multiple camera views)! +- Mar 2018: [**3-D keypoint reconstruction module**](./3d_reconstruction_demo.md) (from multiple camera views)! - Sep 2017: [**CMake**](./installation.md) installer and **IP camera** support! - Jul 2017: [**Windows portable binaries and demo**](https://github.com/CMU-Perceptual-Computing-Lab/openpose/releases)! - Jul 2017: **Hands** released! diff --git a/src/openpose/3d/poseTriangulation.cpp b/src/openpose/3d/poseTriangulation.cpp index 0a87c9af1e943e3b7672ed5365693596bca806b0..d5cfd385e64e7751875b131ca0a2efe88a59b356 100644 --- a/src/openpose/3d/poseTriangulation.cpp +++ b/src/openpose/3d/poseTriangulation.cpp @@ -165,9 +165,9 @@ namespace op // Basic triangulation triangulate(reconstructedPoint, cameraMatrices, pointsOnEachCamera); - const auto projectionErrorLinear = calcReprojectionError(reconstructedPoint, cameraMatrices, pointsOnEachCamera); #ifdef USE_CERES + const auto projectionErrorLinear = calcReprojectionError(reconstructedPoint, cameraMatrices, pointsOnEachCamera); // Empirically detected that reprojection error (for 4 cameras) only minimizes the error if initial // project error > ~2.5, and that it improves more the higher that error actually is // Therefore, we disable it for already accurate samples in order to get both: @@ -227,6 +227,8 @@ namespace op // / double(cameraMatrices.size())); // return reprojectionErrorDecrease; } + #else + UNUSED(reprojectionMaxAcceptable); #endif // assert(reconstructedPoint.at(3) == 1.); diff --git a/src/openpose/gui/gui.cpp b/src/openpose/gui/gui.cpp index bd17b733ee738fed411ebe0706676a4ac7c3c013..ca515670a3084bd30994b00ce79f072bd940f8c9 100644 --- a/src/openpose/gui/gui.cpp +++ b/src/openpose/gui/gui.cpp @@ -164,7 +164,10 @@ namespace op else if (castedKey=='4') elementToRender = ElementToRender::AddPAFs; else + { error("Unknown ElementToRender value.", __LINE__, __FUNCTION__, __FILE__); + elementToRender = ElementToRender::Skeleton; + } for (auto& renderer : renderers) renderer->setElementToRender(elementToRender); }