2017-07-25 16:37:55 +02:00
|
|
|
# ***** BEGIN GPL LICENSE BLOCK *****
|
|
|
|
|
#
|
|
|
|
|
# This program is free software; you can redistribute it and/or
|
|
|
|
|
# modify it under the terms of the GNU General Public License
|
|
|
|
|
# as published by the Free Software Foundation; either version 2
|
|
|
|
|
# of the License, or (at your option) any later version.
|
|
|
|
|
#
|
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
|
#
|
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
|
# along with this program; if not, write to the Free Software Foundation,
|
|
|
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
|
#
|
|
|
|
|
# ***** END GPL LICENSE BLOCK *****
|
|
|
|
|
|
|
|
|
|
########################################################################
|
|
|
|
|
# Copy all generated files to the proper strucure as blender prefers
|
|
|
|
|
########################################################################
|
|
|
|
|
|
|
|
|
|
if(NOT DEFINED HARVEST_TARGET)
|
2019-04-17 06:35:54 +02:00
|
|
|
set(HARVEST_TARGET ${CMAKE_CURRENT_SOURCE_DIR}/Harvest)
|
2017-07-25 16:37:55 +02:00
|
|
|
endif()
|
|
|
|
|
message("HARVEST_TARGET = ${HARVEST_TARGET}")
|
|
|
|
|
|
|
|
|
|
if(WIN32)
|
|
|
|
|
if(BUILD_MODE STREQUAL Release)
|
2019-04-17 06:35:54 +02:00
|
|
|
add_custom_target(Harvest_Release_Results
|
|
|
|
|
COMMAND # jpeg rename libfile + copy include
|
|
|
|
|
${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
|
|
|
|
|
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
|
|
|
|
|
# OpenImageIO
|
|
|
|
|
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include &&
|
|
|
|
|
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib &&
|
|
|
|
|
${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe &&
|
|
|
|
|
# png
|
|
|
|
|
${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
|
|
|
|
|
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
|
|
|
|
|
# freeglut-> opengl
|
|
|
|
|
${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
|
|
|
|
|
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ &&
|
|
|
|
|
# glew-> opengl
|
|
|
|
|
${CMAKE_COMMAND} -E copy ${LIBDIR}/glew/lib/libglew32.lib ${HARVEST_TARGET}/opengl/lib/glew.lib &&
|
|
|
|
|
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ &&
|
|
|
|
|
# tiff
|
|
|
|
|
${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
|
|
|
|
|
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/ &&
|
|
|
|
|
# hidapi
|
2019-11-10 15:45:30 -07:00
|
|
|
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/ ${HARVEST_TARGET}/hidapi/
|
2019-04-17 06:35:54 +02:00
|
|
|
DEPENDS
|
|
|
|
|
)
|
2017-11-05 14:50:15 +11:00
|
|
|
endif()
|
2017-07-25 16:37:55 +02:00
|
|
|
|
|
|
|
|
if(BUILD_MODE STREQUAL Debug)
|
2019-04-17 06:35:54 +02:00
|
|
|
add_custom_target(Harvest_Debug_Results
|
|
|
|
|
# OpenImageIO
|
|
|
|
|
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib &&
|
|
|
|
|
${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib &&
|
|
|
|
|
# hdf5
|
|
|
|
|
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib &&
|
|
|
|
|
DEPENDS Package_Python
|
|
|
|
|
)
|
2017-11-05 14:50:15 +11:00
|
|
|
endif()
|
2017-07-25 16:37:55 +02:00
|
|
|
|
|
|
|
|
else(WIN32)
|
|
|
|
|
|
|
|
|
|
function(harvest from to)
|
2019-04-17 06:35:54 +02:00
|
|
|
set(pattern "")
|
|
|
|
|
foreach(f ${ARGN})
|
|
|
|
|
set(pattern ${f})
|
|
|
|
|
endforeach()
|
2017-07-25 16:37:55 +02:00
|
|
|
|
2019-04-17 06:35:54 +02:00
|
|
|
if(pattern STREQUAL "")
|
|
|
|
|
get_filename_component(dirpath ${to} DIRECTORY)
|
|
|
|
|
get_filename_component(filename ${to} NAME)
|
|
|
|
|
install(
|
|
|
|
|
FILES ${LIBDIR}/${from}
|
|
|
|
|
DESTINATION ${HARVEST_TARGET}/${dirpath}
|
|
|
|
|
RENAME ${filename})
|
|
|
|
|
else()
|
|
|
|
|
install(
|
|
|
|
|
DIRECTORY ${LIBDIR}/${from}/
|
|
|
|
|
DESTINATION ${HARVEST_TARGET}/${to}
|
|
|
|
|
USE_SOURCE_PERMISSIONS
|
|
|
|
|
FILES_MATCHING PATTERN ${pattern}
|
|
|
|
|
PATTERN "pkgconfig" EXCLUDE
|
|
|
|
|
PATTERN "cmake" EXCLUDE
|
|
|
|
|
PATTERN "__pycache__" EXCLUDE
|
|
|
|
|
PATTERN "tests" EXCLUDE)
|
|
|
|
|
endif()
|
2017-07-25 16:37:55 +02:00
|
|
|
endfunction()
|
|
|
|
|
|
|
|
|
|
harvest(alembic/include alembic/include "*.h")
|
|
|
|
|
harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a)
|
2018-09-10 14:25:06 +02:00
|
|
|
harvest(alembic/bin alembic/bin "*")
|
2017-07-25 16:37:55 +02:00
|
|
|
harvest(boost/include boost/include "*")
|
|
|
|
|
harvest(boost/lib boost/lib "*.a")
|
|
|
|
|
harvest(ffmpeg/include ffmpeg/include "*.h")
|
|
|
|
|
harvest(ffmpeg/lib ffmpeg/lib "*.a")
|
|
|
|
|
harvest(fftw3/include fftw3/include "*.h")
|
|
|
|
|
harvest(fftw3/lib fftw3/lib "*.a")
|
|
|
|
|
harvest(flac/lib sndfile/lib "libFLAC.a")
|
|
|
|
|
harvest(freetype/include freetype/include "*.h")
|
|
|
|
|
harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a)
|
|
|
|
|
harvest(glew/include glew/include "*.h")
|
|
|
|
|
harvest(glew/lib glew/lib "*.a")
|
|
|
|
|
harvest(jemalloc/include jemalloc/include "*.h")
|
|
|
|
|
harvest(jemalloc/lib jemalloc/lib "*.a")
|
|
|
|
|
harvest(jpg/include jpeg/include "*.h")
|
|
|
|
|
harvest(jpg/lib jpeg/lib "libjpeg.a")
|
|
|
|
|
harvest(lame/lib ffmpeg/lib "*.a")
|
2019-01-09 16:53:57 +01:00
|
|
|
harvest(clang/bin llvm/bin "clang-format")
|
2019-04-03 18:51:42 +02:00
|
|
|
harvest(clang/include llvm/include "*")
|
|
|
|
|
harvest(llvm/include llvm/include "*")
|
2017-07-25 16:37:55 +02:00
|
|
|
harvest(llvm/bin llvm/bin "llvm-config")
|
|
|
|
|
harvest(llvm/lib llvm/lib "libLLVM*.a")
|
2019-01-26 14:14:51 +01:00
|
|
|
if(APPLE)
|
2019-04-17 06:35:54 +02:00
|
|
|
harvest(openmp/lib openmp/lib "*")
|
|
|
|
|
harvest(openmp/include openmp/include "*.h")
|
2019-01-26 14:14:51 +01:00
|
|
|
endif()
|
2017-07-25 16:37:55 +02:00
|
|
|
harvest(ogg/lib ffmpeg/lib "*.a")
|
|
|
|
|
harvest(openal/include openal/include "*.h")
|
|
|
|
|
if(UNIX AND NOT APPLE)
|
2019-04-17 06:35:54 +02:00
|
|
|
harvest(openal/lib openal/lib "*.a")
|
2018-08-30 10:21:51 +02:00
|
|
|
|
2019-04-17 06:35:54 +02:00
|
|
|
harvest(blosc/include blosc/include "*.h")
|
|
|
|
|
harvest(blosc/lib blosc/lib "*.a")
|
2018-08-30 10:21:51 +02:00
|
|
|
|
2019-04-17 06:35:54 +02:00
|
|
|
harvest(zlib/include zlib/include "*.h")
|
|
|
|
|
harvest(zlib/lib zlib/lib "*.a")
|
2018-08-30 10:21:51 +02:00
|
|
|
|
2019-04-17 06:35:54 +02:00
|
|
|
harvest(xml2/include xml2/include "*.h")
|
|
|
|
|
harvest(xml2/lib xml2/lib "*.a")
|
2018-08-30 10:21:51 +02:00
|
|
|
else()
|
2019-04-17 06:35:54 +02:00
|
|
|
harvest(blosc/lib openvdb/lib "*.a")
|
|
|
|
|
harvest(xml2/lib opencollada/lib "*.a")
|
2017-07-25 16:37:55 +02:00
|
|
|
endif()
|
|
|
|
|
harvest(opencollada/include/opencollada opencollada/include "*.h")
|
|
|
|
|
harvest(opencollada/lib/opencollada opencollada/lib "*.a")
|
|
|
|
|
harvest(opencolorio/include opencolorio/include "*.h")
|
|
|
|
|
harvest(opencolorio/lib opencolorio/lib "*.a")
|
2018-08-17 12:40:31 +02:00
|
|
|
harvest(opencolorio/lib/static opencolorio/lib "*.a")
|
2017-07-25 16:37:55 +02:00
|
|
|
harvest(openexr/include openexr/include "*.h")
|
|
|
|
|
harvest(openexr/lib openexr/lib "*.a")
|
|
|
|
|
harvest(openimageio/bin openimageio/bin "idiff")
|
|
|
|
|
harvest(openimageio/bin openimageio/bin "maketx")
|
|
|
|
|
harvest(openimageio/bin openimageio/bin "oiiotool")
|
|
|
|
|
harvest(openimageio/include openimageio/include "*")
|
|
|
|
|
harvest(openimageio/lib openimageio/lib "*.a")
|
Compositor: Added denoising node
This node is built on Intel's OpenImageDenoise library.
Other denoisers could be integrated, for example Lukas' Cycles denoiser.
Compositor: Made OpenImageDenoise optional, added CMake and build_env files to find OIDN
Compositor: Fixed some warnings in the denoising operator
build_environment: Updated OpenImageDenoise to 0.8.1
build_environment: Updated OpenImageDenoise in `make deps` for macOS
Reviewers: sergey, jbakker, brecht
Reviewed By: brecht
Subscribers: YAFU, LazyDodo, Zen_YS, slumber, samgreen, tjvoll, yeus, ponomarovmax, getrad, coder.kalyan, vitos1k, Yegor, DeepBlender, kumaran7, Darkfie9825, aliasguru, aafra, ace_dragon, juang3d, pandrodor, cdog, lordodin, jtheninja, mavek, marcog, 5k1n2, Atair, rawalanche, 0o00o0oo, filibis, poor, lukasstockner97
Tags: #compositing
Differential Revision: https://developer.blender.org/D4304
2019-08-14 15:30:26 +02:00
|
|
|
harvest(openimagedenoise/include openimagedenoise/include "*")
|
|
|
|
|
harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
|
2018-08-10 18:50:15 +03:00
|
|
|
harvest(openjpeg/include/openjpeg-2.3 openjpeg/include "*.h")
|
2017-07-25 16:37:55 +02:00
|
|
|
harvest(openjpeg/lib openjpeg/lib "*.a")
|
|
|
|
|
harvest(opensubdiv/include opensubdiv/include "*.h")
|
|
|
|
|
harvest(opensubdiv/lib opensubdiv/lib "*.a")
|
2018-08-16 14:39:05 +02:00
|
|
|
harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h")
|
2017-07-25 16:37:55 +02:00
|
|
|
harvest(openvdb/lib openvdb/lib "*.a")
|
2020-03-04 16:39:00 +01:00
|
|
|
harvest(xr_openxr_sdk/include/openxr xr_openxr_sdk/include/openxr "*.h")
|
2020-03-17 18:32:50 +01:00
|
|
|
harvest(xr_openxr_sdk/lib xr_openxr_sdk/lib "*.a")
|
2017-07-25 16:37:55 +02:00
|
|
|
harvest(osl/bin osl/bin "oslc")
|
|
|
|
|
harvest(osl/include osl/include "*.h")
|
|
|
|
|
harvest(osl/lib osl/lib "*.a")
|
|
|
|
|
harvest(osl/shaders osl/shaders "*.h")
|
|
|
|
|
harvest(png/include png/include "*.h")
|
|
|
|
|
harvest(png/lib png/lib "*.a")
|
|
|
|
|
harvest(python/bin python/bin "python${PYTHON_SHORT_VERSION}m")
|
|
|
|
|
harvest(python/include python/include "*h")
|
2017-08-15 15:47:48 +02:00
|
|
|
harvest(python/lib python/lib "*")
|
2017-07-25 16:37:55 +02:00
|
|
|
harvest(sdl/include/SDL2 sdl/include "*.h")
|
|
|
|
|
harvest(sdl/lib sdl/lib "libSDL2.a")
|
|
|
|
|
harvest(sndfile/include sndfile/include "*.h")
|
|
|
|
|
harvest(sndfile/lib sndfile/lib "*.a")
|
|
|
|
|
harvest(spnav/include spnav/include "*.h")
|
|
|
|
|
harvest(spnav/lib spnav/lib "*.a")
|
|
|
|
|
harvest(tbb/include tbb/include "*.h")
|
|
|
|
|
harvest(tbb/lib/libtbb_static.a tbb/lib/libtbb.a)
|
|
|
|
|
harvest(theora/lib ffmpeg/lib "*.a")
|
|
|
|
|
harvest(tiff/include tiff/include "*.h")
|
|
|
|
|
harvest(tiff/lib tiff/lib "*.a")
|
|
|
|
|
harvest(vorbis/lib ffmpeg/lib "*.a")
|
2019-10-04 16:29:37 +02:00
|
|
|
harvest(opus/lib ffmpeg/lib "*.a")
|
2017-07-25 16:37:55 +02:00
|
|
|
harvest(vpx/lib ffmpeg/lib "*.a")
|
|
|
|
|
harvest(webp/lib ffmpeg/lib "*.a")
|
|
|
|
|
harvest(x264/lib ffmpeg/lib "*.a")
|
|
|
|
|
harvest(xvidcore/lib ffmpeg/lib "*.a")
|
2018-11-07 12:58:12 +01:00
|
|
|
harvest(embree/include embree/include "*.h")
|
|
|
|
|
harvest(embree/lib embree/lib "*.a")
|
USD: Introducing a simple USD Exporter
This commit introduces the first version of an exporter to Pixar's
Universal Scene Description (USD) format.
Reviewed By: sergey, LazyDodo
Differential Revision: https://developer.blender.org/D6287
- The USD libraries are built by `make deps`, but not yet built by
install_deps.sh.
- Only experimental support for instancing; by default all duplicated
objects are made real in the USD file. This is fine for exporting a
linked-in posed character, not so much for thousands of pebbles etc.
- The way materials and UV coordinates and Normals are exported is going
to change soon.
- This patch contains LazyDodo's fixes for building on Windows in D5359.
== Meshes ==
USD seems to support neither per-material nor per-face-group
double-sidedness, so we just use the flag from the first non-empty
material slot. If there is no material we default to double-sidedness.
Each UV map is stored on the mesh in a separate primvar. Materials can
refer to these UV maps, but this is not yet exported by Blender. The
primvar name is the same as the UV Map name. This is to allow the
standard name "st" for texture coordinates by naming the UV Map as such,
without having to guess which UV Map is the "standard" one.
Face-varying mesh normals are written to USD. When the mesh has custom
loop normals those are written. Otherwise the poly flag `ME_SMOOTH` is
inspected to determine the normals.
The UV maps and mesh normals take up a significant amount of space, so
exporting them is optional. They're still enabled by default, though.
For comparison: a shot of Spring (03_035_A) is 1.2 GiB when exported
with UVs and normals, and 262 MiB without. We probably have room for
optimisation of written UVs and normals.
The mesh subdivision scheme isn't using the default value 'Catmull
Clark', but uses 'None', indicating we're exporting a polygonal mesh.
This is necessary for USD to understand our normals; otherwise the mesh
is always rendered smooth. In the future we may want to expose this
choice of subdivision scheme to the user, or auto-detect it when we
actually support exporting pre-subdivision meshes.
A possible optimisation could be to inspect whether all polygons are
smooth or flat, and mark the USD mesh as such. This can be added when
needed.
== Animation ==
Mesh and transform animation are now written when passing
`animation=True` to the export operator. There is no inspection of
whether an object is actually animated or not; USD can handle
deduplication of static values for us.
The administration of which timecode to use for the export is left to
the file-format-specific concrete subclasses of
`AbstractHierarchyIterator`; the abstract iterator itself doesn't know
anything about the passage of time. This will allow subclasses for the
frame-based USD format and time-based Alembic format.
== Support for simple preview materials ==
Very simple versions of the materials are now exported, using only the
viewport diffuse RGB, metallic, and roughness.
When there are multiple materials, the mesh faces are stored as geometry
subset and each material is assigned to the appropriate subset. If there
is only one material this is skipped.
The first material if any) is always applied to the mesh itself
(regardless of the existence of geometry subsets), because the Hydra
viewport doesn't support materials on subsets. See
https://github.com/PixarAnimationStudios/USD/issues/542 for more info.
Note that the geometry subsets are not yet time-sampled, so it may break
when an animated mesh changes topology.
Materials are exported as a flat list under a top-level '/_materials'
namespace. This inhibits instancing of the objects using those
materials, so this is subject to change.
== Hair ==
Only the parent strands are exported, and only with a constant colour.
No UV coordinates, no information about the normals.
== Camera ==
Only perspective cameras are supported for now.
== Particles ==
Particles are only written when they are alive, which means that they
are always visible (there is currently no code that deals with marking
them as invisible outside their lifespan).
Particle-system-instanced objects are exported by suffixing the object
name with the particle's persistent ID, giving each particle XForm a
unique name.
== Instancing/referencing ==
This exporter has experimental support for instancing/referencing.
Dupli-object meshes are now written to USD as references to the original
mesh. This is still very limited in correctness, as there are issues
referencing to materials from a referenced mesh.
I am still committing this, as it gives us a place to start when
continuing the quest for proper instancing in USD.
== Lights ==
USD does not directly support spot lights, so those aren't exported yet.
It's possible to add this in the future via the UsdLuxShapingAPI. The
units used for the light intensity are also still a bit of a mystery.
== Fluid vertex velocities ==
Currently only fluid simulations (not meshes in general) have explicit
vertex velocities. This is the most important case for exporting
velocities, though, as the baked mesh changes topology all the time, and
thus computing the velocities at import time in a post-processing step
is hard.
== The Building Process ==
- USD is built as monolithic library, instead of 25 smaller libraries.
We were linking all of them as 'whole archive' anyway, so this doesn't
affect the final file size. It does, however, make life easier with
respect to linking order, and handling upstream changes.
- The JSON files required by USD are installed into datafiles/usd; they
are required on every platform. Set the `PXR_PATH_DEBUG` to any value
to have the USD library print the paths it uses to find those files.
- USD is patched so that it finds the aforementioned JSON files in a path
that we pass to it from Blender.
- USD is patched to have a `PXR_BUILD_USD_TOOLS` CMake option to disable
building the tools in its `bin` directory. This is sent as a pull
request at https://github.com/PixarAnimationStudios/USD/pull/1048
2019-12-13 10:27:40 +01:00
|
|
|
harvest(usd/include usd/include "*.h")
|
|
|
|
|
harvest(usd/lib/usd usd/lib/usd "*")
|
|
|
|
|
harvest(usd/plugin usd/plugin "*")
|
2017-07-25 16:37:55 +02:00
|
|
|
|
2019-10-09 12:36:40 +02:00
|
|
|
if(UNIX AND NOT APPLE)
|
|
|
|
|
harvest(libglu/lib mesa/lib "*.so*")
|
|
|
|
|
harvest(mesa/lib mesa/lib "*.so*")
|
|
|
|
|
endif()
|
|
|
|
|
|
2017-11-05 14:50:15 +11:00
|
|
|
endif()
|