diff --git a/MR-Leo-server.pro b/MR-Leo-server.pro index 85b1a0e910adedcad5828cc7a575581bc992c216..dfe11fef5311c15f707da3713e3df7b483002bb0 100644 --- a/MR-Leo-server.pro +++ b/MR-Leo-server.pro @@ -21,8 +21,8 @@ CONFIG += ENABLE_GUI_SUPPORT # is is available in the lib path. # (https://github.com/stevenlovegrove/Pangolin) # > Uncomment following line: -#CONFIG += USE_PANGOLIN -#CONFIG += SET_PANGOLIN_HEADLESS_MODE +CONFIG += USE_PANGOLIN +CONFIG += SET_PANGOLIN_HEADLESS_MODE # # > No graphics is sent, only limited information # about pointcloud and AR object. diff --git a/README.md b/README.md index 4c91f4bd1098b6181fbaff5bdd6ee5cb5894bde6..dc0bb7d507b23eba6ddf176651e8a01c05b344e6 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,10 @@ This repository contains a Qt C++ project. Tested with Ubuntu 18.04. -### Screenshot - +[Screenshot of the software in action available at GitHub.](https://github.com/johanokl/MREdge-server/blob/media/screenshots/screenshot1.png?raw=true) ### Setting up the build environment on Ubuntu 18.04 -* Install and configure Qt. https://wiki.qt.io/Install_Qt_5_on_Ubuntu +* Install Qt: ```sudo apt install qt5-default``` * Install GStreamer: ```sudo apt install libgstreamer1.0-dev``` @@ -22,10 +21,22 @@ Tested with Ubuntu 18.04. ```sudo apt install libeigen3-dev``` * Install GLEW: ```sudo apt install libglew-dev``` -* Install OSMesa: - ```sudo apt install libosmesa6-dev``` * Install GLU: ```sudo apt install libglu1-mesa-dev``` +* Install OSMesa: + ```sudo apt install libosmesa6-dev``` + + +#### Graphics +For compatability reasons the system supports two different methods for rendering the 3D graphics; _OSMesa_ and _Pangolin_. The default method is _Pangolin_. + +* **Pangolin** +Download Pangolin's source code from the project's [GitHub page](https://github.com/stevenlovegrove/Pangolin). +Follow the instructions on that page for how to build the library. Put the created library file _libpangolin.so_ in a place where it can be found by the linker. On Ubuntu this includes the directory _/usr/lib_. + +* **OSMesa** +Configure the system to use _OSMesa_ by removing the following line in the build configuration file _MR-Leo-server.pro_ before building: +```CONFIG += USE_PANGOLIN``` ### Building 1. Make sure that you have the build environment set up.