Merge branch 'release-2.0.x'

.clang-format

@@ -2,16 +2,18 @@
 Language:        Cpp
 # BasedOnStyle:  Google
 AccessModifierOffset: -1
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: true
+AlignAfterOpenBracket: DontAlign
+AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
-AlignEscapedNewlinesLeft: true
-AlignOperands:   true
-AlignTrailingComments: true
+#EscapedNewlineAlignmentStyle: Right
+AlignEscapedNewlines: Right
+AlignOperands:   false
+AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: Empty
+#AllowShortLambdasOnASingleLine: Empty
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
@@ -31,11 +33,13 @@ BraceWrapping:
   BeforeCatch:           false
   BeforeElse:            false
   IndentBraces:          false
-BreakBeforeBinaryOperators: None
+  SplitEmptyFunction:    false
+BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
-BreakStringLiterals: true
+#BreakConstructorInitializersStyle: BeforeComma
+BreakStringLiterals: false
 ColumnLimit:     80
 CommentPragmas:  '^ IWYU pragma:'
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
@@ -45,9 +49,10 @@ Cpp11BracedListStyle: true
 DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+FixNamespaceComments: true
+ForEachMacros:   [ foreach, foreach_active, foreach_tiled, foreach_unique, cdo, cfor, cif, cwhile ]
 IncludeCategories:
-  - Regex:           '^<.*\.h>'
+  - Regex:           '^<.*\.i?h>'
     Priority:        1
   - Regex:           '^<.*'
     Priority:        2
@@ -61,13 +66,14 @@ KeepEmptyLinesAtTheStartOfBlocks: false
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
-NamespaceIndentation: All
+NamespaceIndentation: None
 PenaltyBreakBeforeFirstCallParameter: 1
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
+#PPDirectiveIndentStyle: AfterHash
 PointerAlignment: Right
 ReflowComments:  true
 SortIncludes:    true
@@ -76,7 +82,7 @@ SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 2
+SpacesBeforeTrailingComments: 1
 SpacesInAngles:  false
 SpacesInContainerLiterals: false
 SpacesInCStyleCastParentheses: false

.gitignore

@@ -3,6 +3,7 @@
 bin
 *.user*
 ./build*
+install*
 *.sw?
 tags
 .ycm_extra_conf.pyc

.gitlab-ci.yml

@@ -40,7 +40,7 @@ variables:
   only:
     - devel
     - master
-    - /^release-.*$/
+    - /release/
 
 .job_template: &test_job
   stage: test-build
@@ -161,17 +161,17 @@ build-windows-msvc14:
       - build/install
     expire_in: 3 day
 
-#build-windows-msvc15:
-#  <<: *build_job_shell
-#  script:
-#    - scripts\build_gitlab\win.ps1 "Visual Studio 15 2017 Win64" "v141"
-#  tags:
-#    - msvc15
-#    - win
-#  artifacts:
-#    paths:
-#      - build/install
-#    expire_in: 3 day
+build-windows-msvc15:
+  <<: *build_job_shell
+  script:
+    - scripts\build_gitlab\win.ps1 "Visual Studio 15 2017 Win64" "v141"
+  tags:
+    - msvc15
+    - win
+  artifacts:
+    paths:
+      - build/install
+    expire_in: 3 day
 
 #build-windows-icc:
 #  <<: *build_job_shell
@@ -255,13 +255,13 @@ test-tutorials:
 #  dependencies:
 #    - build-windows-icc
 
-#test-windows-msvc15:
-#  <<: *test_job_windows
-#  tags:
-#    - win
-#    - msvc14
-#  dependencies:
-#    - build-windows-msvc15
+test-windows-msvc15:
+  <<: *test_job_windows
+  tags:
+    - win
+    - msvc15
+  dependencies:
+    - build-windows-msvc15
 
 test-windows-msvc14:
   <<: *test_job_windows
@@ -334,19 +334,12 @@ release-linux-icc:
   image: ospray/docker-images:centos7-mod
   script:
     - module load cmake
-    - module load intel
-    - export CC=icc
-    - export CXX=icpc
     - scripts/release/linux.sh
-    - cd build_release
-    - OSPRAY_VERSION=`sed -n 's/#define OSPRAY_VERSION "\(.*\)"/\1/p' ospray/version.h`
-    - $SIGN_FILE_LINUX ospray-*-${OSPRAY_VERSION}-*.rpm
-    - tar czf ospray-${OSPRAY_VERSION}.x86_64.rpm.tar.gz ospray-*-${OSPRAY_VERSION}-*.rpm
   tags:
     - modules
   artifacts:
     paths:
-      - build_release/*.gz
+      - ./*.gz
 
 release-osx-clang:
   <<: *release_job

CHANGELOG.md

@@ -1,12 +1,34 @@
 Version History
 ---------------
 
+### Changes in v2.0.1:
+
+-   Fix bug where Embree user-defined geometries were not indexed correctly
+    in the scene, which now requires Embree v3.8.0+
+-   Fix crash when the path tracer encounters geometric models that do not
+    have a material
+-   Fix crash when some path tracer materials generated NULL bsdfs
+-   Fix bug where `ospGetBounds` returned incorrect values
+-   Fix missing symbol in denoiser module
+-   Fix missing symbol exports on Windows for all OSPRay built modules
+-   Add the option to specify a single color for geometric models
+-   The `scivis` renderer now respects the opacity component of `color` on
+    geometric models
+-   Fix various inconsistent handling of frame buffer alpha between renderers
+-   `ospGetCurrentDevice` now increments the ref count of the returned
+    `OSPDevice` handle, so applications will need to release the handle when
+    finished by using `ospDeviceRelease` accordingly
+-   Added denoiser to `ospExamples` app
+-   Added `module_mpi` to superbuild (disabled by default)
+-   The superbuild now will emit a CMake error when using any 32-bit CMake
+    generator, as 32-bit builds are not supported
+
 ### Changes in v2.0.0:
 
 -   New major revision of OSPRay brings API breaking improvements over
-    v1.x. See `doc/ospray2_porting_guide.md` for a deeper description of
-    migrating from v1.x to v2.0 and `doc/api.md` for the latest API
-    documentation
+    v1.x. See [doc/ospray2_porting_guide.md] for a deeper description of
+    migrating from v1.x to v2.0 and the latest
+    [API documentation](README.md#ospray-api)
     -   `ospRenderFrame` now takes all participating objects as
         function parameters instead of setting some as renderer params
     -   `ospRenderFrame` is now asynchronous, where the task is managed
@@ -21,8 +43,8 @@ Version History
         to use `ospRelease` (or the new `ospRetain`) with them: see
         usage example in `apps/tutorials/ospTutorial.cpp`
     -   Unused parameters are reported as status messages when
-        `logLevel` is >= 1 (most easily set by enabling OSPRay debug on
-        initialization)
+        `logLevel` is at least `warning` (most easily set by enabling
+        OSPRay debug on initialization)
 -   New utility library which adds functions to help with new API
     migration and reduction of boilerplate code
     -   Use `ospray_util.h` to access these additional functions

CMakeLists.txt

@@ -1,18 +1,5 @@
-## ======================================================================== ##
-## Copyright 2009-2019 Intel Corporation                                    ##
-##                                                                          ##
-## Licensed under the Apache License, Version 2.0 (the "License");          ##
-## you may not use this file except in compliance with the License.         ##
-## You may obtain a copy of the License at                                  ##
-##                                                                          ##
-##     http://www.apache.org/licenses/LICENSE-2.0                           ##
-##                                                                          ##
-## Unless required by applicable law or agreed to in writing, software      ##
-## distributed under the License is distributed on an "AS IS" BASIS,        ##
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
-## See the License for the specific language governing permissions and      ##
-## limitations under the License.                                           ##
-## ======================================================================== ##
+## Copyright 2009-2019 Intel Corporation
+## SPDX-License-Identifier: Apache-2.0
 
 cmake_minimum_required(VERSION 3.1)
 

LICENSE.txt

@@ -200,3 +200,34 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+-------------------------------------------------------------------------------
+
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.