Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.7 release work #1431

Merged
merged 9 commits into from
May 29, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ option (WITH_STUDIO "Build appleseed.studio"
option (WITH_TOOLS "Build appleseed tools" ON)
option (WITH_PYTHON "Build Python bindings" ON)
option (WITH_DISNEY_MATERIAL "Build Disney material" OFF)
option (WITH_PARTIO "Build Partio support (used in unit tests)" OFF)

option (USE_CPP11 "Use C++11" OFF)
option (USE_STATIC_BOOST "Use static Boost libraries" ON)
Expand Down Expand Up @@ -255,11 +254,6 @@ if (WITH_DISNEY_MATERIAL)
endif ()
endif ()

if (WITH_PARTIO)
add_definitions (-DAPPLESEED_WITH_PARTIO)
find_package (Partio REQUIRED)
endif ()


#--------------------------------------------------------------------------------------------------
# Include paths.
Expand Down Expand Up @@ -329,10 +323,6 @@ if (WITH_DISNEY_MATERIAL)
endif ()
endif ()

if (WITH_PARTIO)
include_directories (${PARTIO_INCLUDE_DIRS})
endif ()


#--------------------------------------------------------------------------------------------------
# Preprocessor definitions.
Expand Down
Binary file modified sandbox/tests/test scenes/bssrdf/ref/79 - osl - gaussian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/bssrdf/ref/80 - osl - stddipole.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/bssrdf/ref/81 - osl - betterdipole.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/bssrdf/ref/83 - osl - normalizeddiff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/01 - lambertian osl - ptne.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/02 - simple glass.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/03 - glass absorption.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/04 - transparency.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/05 - object space.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/06 - closure mix.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/08 - point velocity.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/09 - simple texture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/12 - surface area - ptne.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/14 - matrix param.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/15 - bump noise2d.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/16 - rough glass.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/17 - bump texture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/18 - bump noise3d.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/23 - osl derivatives.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sandbox/tests/test scenes/osl/ref/24 - osl bump pt nee.png
40 changes: 0 additions & 40 deletions src/appleseed.shaders/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -138,17 +138,6 @@ source_group ("include\\appleseed\\pattern" FILES
${include_appleseed_pattern_sources}
)

set (include_alshaders_sources
include/alshaders/remap.h
include/alshaders/space.h
)
list (APPEND osl_headers
${include_alshaders_sources}
)
source_group ("include\\alshaders" FILES
${include_alshaders_sources}
)


#--------------------------------------------------------------------------------------------------
# Source files.
Expand Down Expand Up @@ -385,35 +374,6 @@ source_group ("src\\maya" FILES
${src_maya_sources}
)

set (src_alshaders_sources
#src/alshaders/alBlackbody.osl
#src/alshaders/alCellNoise.osl
src/alshaders/alColorSpace.osl
src/alshaders/alCombineColor.osl
src/alshaders/alCombineFloat.osl
#src/alshaders/alCurvature.osl
#src/alshaders/alFlake.osl
src/alshaders/alFlowNoise.osl
src/alshaders/alFractal.osl
src/alshaders/alJitterColor.osl
src/alshaders/alLayerColor.osl
src/alshaders/alLayerFloat.osl
src/alshaders/alLayer.osl
src/alshaders/alPattern.osl
src/alshaders/alRemapColor.osl
src/alshaders/alRemapFloat.osl
src/alshaders/alSurface.osl
src/alshaders/alSwitchColor.osl
src/alshaders/alSwitchFloat.osl
#src/alshaders/alTriplanar.osl
)
list (APPEND osl_sources
${src_alshaders_sources}
)
source_group ("src\\alshaders" FILES
${src_alshaders_sources}
)

set (src_appleseed_sources
src/appleseed/asDisneyMaterial.osl
src/appleseed/asGlass.osl
Expand Down
Loading