mirror of
https://github.com/blender/blender
synced 2026-10-25 03:07:01 +03:00
The 1.0 API is deprecated (though not yet removed) in OpenUSD 26.xx releases. So it's time to migrate. Use of the HdSceneDelegate is mostly removed, except for retrieving the prims. Specific properties of prims are retrieved through schemas rather than querying the scene delegate. The full replacement of HdSceneDelegate is still ongoing in USD itself. In the very latest 26.05 only HdPrman has an experimental option for using the scene index directly, but for example HdStorm does not use it yet. So removing it's use with the current 25.08 in Blender is not expected to be stable enough. Additionally HdRenderer is supposed to replace HdRenderDelegate and its handling of tasks. However even in 26.05 that is only a stub implementation so there is no actual alternative to migrate to. Note that OpenUSD provides a compatibility layer so 1.0 and 2.0 hosts and render delegates can work together. Which means ideally everything keeps working the same, but there are likely some differences anyway. Support for OpenUSD version 23.xx and older was dropped. Pull Request: https://projects.blender.org/blender/blender/pulls/158456
164 lines
4.7 KiB
C++
164 lines
4.7 KiB
C++
/* SPDX-FileCopyrightText: 2022 NVIDIA Corporation
|
|
* SPDX-FileCopyrightText: 2022 Blender Foundation
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0 */
|
|
|
|
#include "hydra/util.h"
|
|
#include "scene/attribute.h"
|
|
|
|
#include <pxr/base/gf/vec2f.h>
|
|
#include <pxr/base/gf/vec3f.h>
|
|
#include <pxr/base/gf/vec4f.h>
|
|
#include <pxr/base/vt/array.h>
|
|
#include <pxr/imaging/hd/primvarSchema.h>
|
|
#include <pxr/imaging/hd/renderIndex.h>
|
|
#include <pxr/imaging/hd/sceneDelegate.h>
|
|
#include <pxr/imaging/hd/tokens.h>
|
|
|
|
HDCYCLES_NAMESPACE_OPEN_SCOPE
|
|
|
|
HdSceneIndexPrim GetPrim(HdSceneDelegate *delegate, const SdfPath &id)
|
|
{
|
|
if (!delegate) {
|
|
return {};
|
|
}
|
|
HdSceneIndexBaseRefPtr si = delegate->GetRenderIndex().GetTerminalSceneIndex();
|
|
if (!si) {
|
|
return {};
|
|
}
|
|
return si->GetPrim(id);
|
|
}
|
|
|
|
VtValue ReadPrimvar(const HdPrimvarsSchema &primvars, const TfToken &name)
|
|
{
|
|
if (!primvars) {
|
|
return {};
|
|
}
|
|
HdSampledDataSourceHandle ds = primvars.GetPrimvar(name).GetPrimvarValue();
|
|
return ds ? ds->GetValue(0.0f) : VtValue();
|
|
}
|
|
|
|
HdInterpolation ReadPrimvarInterpolation(const HdPrimvarsSchema &primvars, const TfToken &name)
|
|
{
|
|
if (!primvars) {
|
|
return HdInterpolationCount;
|
|
}
|
|
HdTokenDataSourceHandle ds = primvars.GetPrimvar(name).GetInterpolation();
|
|
if (!ds) {
|
|
return HdInterpolationCount;
|
|
}
|
|
const TfToken token = ds->GetTypedValue(0.0f);
|
|
if (token == HdPrimvarSchemaTokens->constant) {
|
|
return HdInterpolationConstant;
|
|
}
|
|
if (token == HdPrimvarSchemaTokens->uniform) {
|
|
return HdInterpolationUniform;
|
|
}
|
|
if (token == HdPrimvarSchemaTokens->varying) {
|
|
return HdInterpolationVarying;
|
|
}
|
|
if (token == HdPrimvarSchemaTokens->vertex) {
|
|
return HdInterpolationVertex;
|
|
}
|
|
if (token == HdPrimvarSchemaTokens->faceVarying) {
|
|
return HdInterpolationFaceVarying;
|
|
}
|
|
if (token == HdPrimvarSchemaTokens->instance) {
|
|
return HdInterpolationInstance;
|
|
}
|
|
return HdInterpolationCount;
|
|
}
|
|
|
|
TfToken ReadPrimvarRole(const HdPrimvarsSchema &primvars, const TfToken &name)
|
|
{
|
|
if (!primvars) {
|
|
return {};
|
|
}
|
|
HdTokenDataSourceHandle ds = primvars.GetPrimvar(name).GetRole();
|
|
return ds ? ds->GetTypedValue(0.0f) : TfToken();
|
|
}
|
|
|
|
TfTokenVector PrimvarNamesAtInterpolation(const HdPrimvarsSchema &primvars,
|
|
HdInterpolation interpolation)
|
|
{
|
|
TfTokenVector result;
|
|
if (!primvars) {
|
|
return result;
|
|
}
|
|
for (const TfToken &name : primvars.GetPrimvarNames()) {
|
|
if (ReadPrimvarInterpolation(primvars, name) == interpolation) {
|
|
result.push_back(name);
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
void ApplyPrimvars(AttributeSet &attributes,
|
|
const ustring &name,
|
|
VtValue value,
|
|
AttributeElement elem,
|
|
AttributeStandard std)
|
|
{
|
|
const void *data = HdGetValueData(value);
|
|
size_t size = value.GetArraySize();
|
|
|
|
const HdType valueType = HdGetValueTupleType(value).type;
|
|
|
|
TypeDesc attrType = CCL_NS::TypeUnknown;
|
|
switch (valueType) {
|
|
case HdTypeFloat:
|
|
attrType = CCL_NS::TypeFloat;
|
|
size *= sizeof(float);
|
|
break;
|
|
case HdTypeFloatVec2:
|
|
attrType = CCL_NS::TypeFloat2;
|
|
size *= sizeof(float2);
|
|
static_assert(sizeof(GfVec2f) == sizeof(float2));
|
|
break;
|
|
case HdTypeFloatVec3: {
|
|
const auto &valueData = value.Get<VtVec3fArray>();
|
|
|
|
if (elem & ATTR_ELEMENT_IS_NORMAL) {
|
|
attrType = CCL_NS::TypeNormal;
|
|
size = valueData.size() * sizeof(packed_normal);
|
|
|
|
VtArray<packed_normal> valueConverted;
|
|
valueConverted.reserve(valueData.size());
|
|
for (const GfVec3f &vec : valueData) {
|
|
valueConverted.push_back(packed_normal(make_float3(vec[0], vec[1], vec[2])));
|
|
}
|
|
data = valueConverted.data();
|
|
value = std::move(valueConverted);
|
|
}
|
|
else {
|
|
attrType = CCL_NS::TypeVector;
|
|
size = valueData.size() * sizeof(float3);
|
|
// The Cycles "float3" data type is padded to "float4", so need to convert the array
|
|
VtArray<float3> valueConverted;
|
|
valueConverted.reserve(valueData.size());
|
|
for (const GfVec3f &vec : valueData) {
|
|
valueConverted.push_back(make_float3(vec[0], vec[1], vec[2]));
|
|
}
|
|
data = valueConverted.data();
|
|
value = std::move(valueConverted);
|
|
}
|
|
break;
|
|
}
|
|
case HdTypeFloatVec4:
|
|
attrType = CCL_NS::TypeFloat4;
|
|
size *= sizeof(float4);
|
|
static_assert(sizeof(GfVec4f) == sizeof(float4));
|
|
break;
|
|
default:
|
|
TF_WARN("Unsupported attribute type %d", static_cast<int>(valueType));
|
|
return;
|
|
}
|
|
|
|
Attribute *const attr = attributes.add(name, attrType, elem);
|
|
attr->std = std;
|
|
|
|
assert(size == attr->data_sizeof() * attr->size);
|
|
std::memcpy(attr->data_for_write(), data, size);
|
|
}
|
|
|
|
HDCYCLES_NAMESPACE_CLOSE_SCOPE
|