f60cffad38
Adds support for linking with some of the dependencies of a USD build instead of the precompiled libraries from Blender, specifically OpenSubdiv, OpenVDB and TBB. Other dependencies keep using the precompiled libraries from Blender, since they are linked statically anyway so it does't matter as much. Plus they have interdependencies that are difficult to resolve when only using selected libraries from the USD build and can't simply assume that USD was built with all of them. This patch also makes building the Hydra render delegate via the standalone repository work and fixes various small issues I ran into in general on Windows (e.g. the use of both fixed paths and `find_package` did not seem to work correctly). Building both the standalone Cycles application and the Hydra render delegate at the same time is supported now as well (the paths in the USD plugin JSON file are updated accordingly). All that needs to be done now to build is to specify a `PXR_ROOT` or `USD_ROOT` CMake variable pointing to the USD installation, everything else is taken care of automatically (CMake targets are loaded from the `pxrTargets.cmake` of USD and linked into the render delegate and OpenSubdiv, OpenVDB and TBB are replaced with those from USD when they exist). Differential Revision: https://developer.blender.org/D14523
91 lines
2.2 KiB
C++
91 lines
2.2 KiB
C++
/* SPDX-License-Identifier: Apache-2.0
|
|
* Copyright 2022 NVIDIA Corporation
|
|
* Copyright 2022 Blender Foundation */
|
|
|
|
#include "hydra/field.h"
|
|
#include "hydra/session.h"
|
|
#include "scene/image_vdb.h"
|
|
#include "scene/scene.h"
|
|
|
|
#include <pxr/imaging/hd/sceneDelegate.h>
|
|
#include <pxr/usd/sdf/assetPath.h>
|
|
|
|
HDCYCLES_NAMESPACE_OPEN_SCOPE
|
|
|
|
#if PXR_VERSION < 2108
|
|
// clang-format off
|
|
TF_DEFINE_PRIVATE_TOKENS(_tokens,
|
|
(fieldName)
|
|
);
|
|
// clang-format on
|
|
#endif
|
|
|
|
#ifdef WITH_OPENVDB
|
|
class HdCyclesVolumeLoader : public VDBImageLoader {
|
|
public:
|
|
HdCyclesVolumeLoader(const std::string &filePath, const std::string &gridName)
|
|
: VDBImageLoader(gridName)
|
|
{
|
|
openvdb::io::File file(filePath);
|
|
file.setCopyMaxBytes(0);
|
|
if (file.open()) {
|
|
grid = file.readGrid(gridName);
|
|
}
|
|
}
|
|
};
|
|
#endif
|
|
|
|
HdCyclesField::HdCyclesField(const SdfPath &bprimId, const TfToken &typeId) : HdField(bprimId)
|
|
{
|
|
}
|
|
|
|
HdCyclesField::~HdCyclesField()
|
|
{
|
|
}
|
|
|
|
HdDirtyBits HdCyclesField::GetInitialDirtyBitsMask() const
|
|
{
|
|
return DirtyBits::DirtyParams;
|
|
}
|
|
|
|
void HdCyclesField::Sync(HdSceneDelegate *sceneDelegate,
|
|
HdRenderParam *renderParam,
|
|
HdDirtyBits *dirtyBits)
|
|
{
|
|
#ifdef WITH_OPENVDB
|
|
VtValue value;
|
|
const SdfPath &id = GetId();
|
|
|
|
if (*dirtyBits & DirtyBits::DirtyParams) {
|
|
value = sceneDelegate->Get(id, HdFieldTokens->filePath);
|
|
if (value.IsHolding<SdfAssetPath>()) {
|
|
std::string filename = value.UncheckedGet<SdfAssetPath>().GetResolvedPath();
|
|
if (filename.empty()) {
|
|
filename = value.UncheckedGet<SdfAssetPath>().GetAssetPath();
|
|
}
|
|
|
|
# if PXR_VERSION >= 2108
|
|
value = sceneDelegate->Get(id, HdFieldTokens->fieldName);
|
|
# else
|
|
value = sceneDelegate->Get(id, _tokens->fieldName);
|
|
# endif
|
|
if (value.IsHolding<TfToken>()) {
|
|
ImageLoader *const loader = new HdCyclesVolumeLoader(
|
|
filename, value.UncheckedGet<TfToken>().GetString());
|
|
|
|
const SceneLock lock(renderParam);
|
|
|
|
ImageParams params;
|
|
params.frame = 0.0f;
|
|
|
|
_handle = lock.scene->image_manager->add_image(loader, params, false);
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
|
|
*dirtyBits = DirtyBits::Clean;
|
|
}
|
|
|
|
HDCYCLES_NAMESPACE_CLOSE_SCOPE
|