Merge branch 'develop' into 'master'

Author: DanielChappuis

.gitignore

@@ -25,3 +25,21 @@ Thumbs.db
 # vim swap files
 #####################
 *.*sw*
+
+# documentation
+#####################
+documentation/API/html/
+documentation/UserManual/html/
+documentation/UserManual/*.4ct
+documentation/UserManual/*.4tc
+documentation/UserManual/*.aux
+documentation/UserManual/*.dvi
+documentation/UserManual/*.css
+documentation/UserManual/*.html
+documentation/UserManual/*.idv
+documentation/UserManual/*.lg
+documentation/UserManual/*.out
+documentation/UserManual/*.tmp
+documentation/UserManual/*.toc
+documentation/UserManual/*.xref
+documentation/UserManual/*.xref

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "testbed/extern/nanogui"]
+	path = testbed/extern/nanogui
+	url = https://github.com/mitsuba-renderer/nanogui.git

.travis.yml

@@ -9,113 +9,126 @@ matrix:
   # ----- Linux / GCC -----
   include:
     - os: linux
+      name: "Linux / GCC (Debug)"
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-7
+            - g++-8
       env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" BUILD_TYPE="Debug" DOUBLE_PRECISION="False"
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE="Debug" DOUBLE_PRECISION="False"
 
     - os: linux
+      name: "Linux / GCC (Release)"
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-7
+            - g++-8
       env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" BUILD_TYPE="Release" DOUBLE_PRECISION="False"
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE="Release" DOUBLE_PRECISION="False"
 
     - os: linux
+      name: "Linux / GCC (Debug, Double Precision)"
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-7
+            - g++-8
       env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" BUILD_TYPE="Debug" DOUBLE_PRECISION="True"
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE="Debug" DOUBLE_PRECISION="True"
 
     - os: linux
+      name: "Linux / GCC (Release, Double Precision)"
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-7
+            - g++-8
       env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" BUILD_TYPE="Release" DOUBLE_PRECISION="True"
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE="Release" DOUBLE_PRECISION="True"
     - os: linux
+      name: "Linux / GCC (Debug, Profiler)"
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-7
+            - g++-8
       env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" BUILD_TYPE="Debug" DOUBLE_PRECISION="False" LOGGER="True" Profiler="True"
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE="Debug" DOUBLE_PRECISION="False" Profiler="True"
     - os: linux
+      name: "Linux / GCC (Release, Profiler)"
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-7
+            - g++-8
       env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" BUILD_TYPE="Release" DOUBLE_PRECISION="False" LOGGER="True" Profiler="True"
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE="Release" DOUBLE_PRECISION="False" Profiler="True"
     - os: linux
+      name: "Linux / GCC (Debug, Code Coverage)"
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-7
+            - g++-8
             - lcov
       env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" BUILD_TYPE="Release" DOUBLE_PRECISION="False" CODE_COVERAGE="True"
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE="Debug" DOUBLE_PRECISION="False" CODE_COVERAGE="True"
     - os: linux
+      name: "Linux / GCC (Debug, Valgrind)"
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-7
+            - g++-8
             - valgrind
       env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" BUILD_TYPE="Debug" DOUBLE_PRECISION="False" VALGRIND="True"
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE="Debug" DOUBLE_PRECISION="False" VALGRIND="True"
 
-   
-    # This is commented until Travis fixes this issue with GCC install in OSX: https://github.com/travis-ci/travis-ci/issues/8826
     # ----- OS X / GCC -----
-    #- os: osx
-    #- osx_image: xcode9.3
-    #- env:
-    #   - MATRIX_EVAL="brew update && brew install gcc && CC=gcc-7 && CXX=g++-7" BUILD_TYPE="Debug" DOUBLE_PRECISION="False"
-    #- os: osx
-    # osx_image: xcode9.3
-    #  env:
-    #  - MATRIX_EVAL="brew update && brew install gcc && CC=gcc-7 && CXX=g++-7" BUILD_TYPE="Release" DOUBLE_PRECISION="False"
-    #- os: osx
-    #  osx_image: xcode9.3
-    #  env:
-    #  - MATRIX_EVAL="brew update && brew install gcc && CC=gcc-7 && CXX=g++-7" BUILD_TYPE="Debug" DOUBLE_PRECISION="True"
-    #- os: osx
-    #   osx_image: xcode9.3
-    # env:
-    #   - MATRIX_EVAL="brew update && brew install gcc && CC=gcc-7 && CXX=g++-7" BUILD_TYPE="Release" DOUBLE_PRECISION="True"
-    #- os: osx
-    #  osx_image: xcode9.3
-    #  env:
-    #   - MATRIX_EVAL="brew update && brew install gcc && CC=gcc-7 && CXX=g++-7" BUILD_TYPE="Debug" DOUBLE_PRECISION="True" LOGGER="True" PROFILER="True"
-    #- os: osx
-    #  osx_image: xcode9.3
-    #  env:
-    #   - MATRIX_EVAL="brew update && brew install gcc && CC=gcc-7 && CXX=g++-7" BUILD_TYPE="Release" DOUBLE_PRECISION="True" LOGGER="True" PROFILER="True"
+    - os: osx
+      name: "OS X / GCC (Debug)"
+      osx_image: xcode11
+      env:
+       - MATRIX_EVAL="brew install gcc@8 && CC=gcc-8 && CXX=g++-8" BUILD_TYPE="Debug" DOUBLE_PRECISION="False"
+    - os: osx
+      name: "OS X / GCC (Release)"
+      osx_image: xcode11
+      env:
+       - MATRIX_EVAL="brew install gcc@8 && CC=gcc-8 && CXX=g++-8" BUILD_TYPE="Release" DOUBLE_PRECISION="False"
+    - os: osx
+      name: "OS X / GCC (Debug, Double Precision)"
+      osx_image: xcode11
+      env:
+       - MATRIX_EVAL="brew install gcc@8 && CC=gcc-8 && CXX=g++-8" BUILD_TYPE="Debug" DOUBLE_PRECISION="True"
+    - os: osx
+      name: "OS X / GCC (Release, Double Precision)"
+      osx_image: xcode11
+      env:
+       - MATRIX_EVAL="brew install gcc@8 && CC=gcc-8 && CXX=g++-8" BUILD_TYPE="Release" DOUBLE_PRECISION="True"
+    - os: osx
+      name: "OS X / GCC (Debug, Profiler)"
+      osx_image: xcode11
+      env:
+       - MATRIX_EVAL="brew install gcc@8 && CC=gcc-8 && CXX=g++-8" BUILD_TYPE="Debug" DOUBLE_PRECISION="False" PROFILER="True"
+    - os: osx
+      name: "OS X / GCC (Release, Profiler)"
+      osx_image: xcode11
+      env:
+       - MATRIX_EVAL="brew install gcc@8 && CC=gcc-8 && CXX=g++-8" BUILD_TYPE="Release" DOUBLE_PRECISION="False" PROFILER="True"
 
     # ----- Linux / Clang -----
     - os: linux
+      name: "Linux / Clang (Debug)"
       addons:
         apt:
           sources:
@@ -128,6 +141,7 @@ matrix:
         - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8" BUILD_TYPE="Debug" DOUBLE_PRECISION="False"
 
     - os: linux
+      name: "Linux / Clang (Release)"
       addons:
         apt:
           sources:
@@ -140,6 +154,7 @@ matrix:
         - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8" BUILD_TYPE="Release" DOUBLE_PRECISION="False"
 
     - os: linux
+      name: "Linux / Clang (Debug, Double Precision)"
       addons:
         apt:
           sources:
@@ -152,6 +167,7 @@ matrix:
         - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8" BUILD_TYPE="Debug" DOUBLE_PRECISION="True"
 
     - os: linux
+      name: "Linux / Clang (Release, Double Precision)"
       addons:
         apt:
           sources:
@@ -163,6 +179,7 @@ matrix:
       env:
         - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8" BUILD_TYPE="Release" DOUBLE_PRECISION="True"
     - os: linux
+      name: "Linux / Clang (Debug, Double Precision, Profiler)"
       addons:
         apt:
           sources:
@@ -172,8 +189,9 @@ matrix:
             - clang-3.8
             - g++-7
       env:
-        - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8" BUILD_TYPE="Debug" DOUBLE_PRECISION="True" LOGGER="True" PROFILER="True"
+        - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8" BUILD_TYPE="Debug" DOUBLE_PRECISION="True" PROFILER="True"
     - os: linux
+      name: "Linux / Clang (Release, Double Precision, Profiler)"
       addons:
         apt:
           sources:
@@ -183,38 +201,44 @@ matrix:
             - clang-3.8
             - g++-7
       env:
-        - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8" BUILD_TYPE="Release" DOUBLE_PRECISION="True" LOGGER="True" PROFILER="True"
+        - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8" BUILD_TYPE="Release" DOUBLE_PRECISION="True" PROFILER="True"
 
     # ----- OS X / Clang -----
     - os: osx
-      osx_image: xcode8
+      name: "OS X / Clang (Debug)"
+      osx_image: xcode11
       env:
         - BUILD_TYPE="Debug" DOUBLE_PRECISION="False"
 
     - os: osx
-      osx_image: xcode8
+      name: "OS X / Clang (Release)"
+      osx_image: xcode11
       env:
         - BUILD_TYPE="Release" DOUBLE_PRECISION="False"
 
     - os: osx
-      osx_image: xcode8
+      name: "OS X / Clang (Debug, Double Precision)"
+      osx_image: xcode11
       env:
         - BUILD_TYPE="Debug" DOUBLE_PRECISION="True"
 
     - os: osx
-      osx_image: xcode8
+      name: "OS X / Clang (Release, Double Precision)"
+      osx_image: xcode11
       env:
         - BUILD_TYPE="Release" DOUBLE_PRECISION="True"
 
     - os: osx
-      osx_image: xcode8
+      name: "OS X / Clang (Debug, Profiler)"
+      osx_image: xcode11
       env:
-        - BUILD_TYPE="Debug" DOUBLE_PRECISION="True" LOGGER="True" PROFILER="True"
+        - BUILD_TYPE="Debug" DOUBLE_PRECISION="False" PROFILER="True"
 
     - os: osx
-      osx_image: xcode8
+      name: "OS X / Clang (Release, Profiler)"
+      osx_image: xcode11
       env:
-        - BUILD_TYPE="Release" DOUBLE_PRECISION="True" LOGGER="True" PROFILER="True"
+        - BUILD_TYPE="Release" DOUBLE_PRECISION="False" PROFILER="True"
 
 before_install:
   - eval "${MATRIX_EVAL}"
@@ -225,13 +249,22 @@ branches:
     - develop
 
 script:
-    - mkdir build_directory
-    - cd build_directory
-    - cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} —DRP3D_DOUBLE_PRECISION_ENABLED=${DOUBLE_PRECISION} -DRP3D_COMPILE_TESTS=True -DRP3D_LOGS_ENABLE=${LOGGER} -DRP3D_PROFILING_ENABLED=${PROFILER} -DRP3D_CODE_COVERAGE_ENABLED=${CODE_COVERAGE} ../
-    - make && make test ARGS="-V"
+    - mkdir build_rp3d
+    - cd build_rp3d
+    - cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} —DRP3D_DOUBLE_PRECISION_ENABLED=${DOUBLE_PRECISION} -DRP3D_COMPILE_TESTS=True -DRP3D_PROFILING_ENABLED=${PROFILER} -DRP3D_CODE_COVERAGE_ENABLED=${CODE_COVERAGE} ../
+    - make -j2 && make test ARGS="-V"
     - if [ "${VALGRIND}" == "True" ]; then
         valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --verbose --error-exitcode=1 test/tests;
       fi
+    - if [ "${CODE_COVERAGE}" == "False" ]; then
+        sudo make install;
+        cd ../;
+        mkdir build_helloworld;
+        cd build_helloworld;
+        cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ../helloworld/;
+        make -j2;
+      fi
+
 
 after_success: