Michael Kowalski
ef228d92f2
Fix provided by Piotr Makal in patch D14204. This patch fixes volume grid duplication which was occurring during importing USD files. This was caused by calling BKE_volume_grid_add twice per grid (excluding 'density' grid) for the same Volume object: (1) in USDVolumeReader::read_object_data and (2) later in BKE_volume_load. Differential Revision: https://developer.blender.org/D14204
87 lines
2.1 KiB
C++
87 lines
2.1 KiB
C++
/* SPDX-License-Identifier: GPL-2.0-or-later
|
|
* Copyright 2021 Tangent Animation. All rights reserved. */
|
|
|
|
#include "usd_reader_volume.h"
|
|
|
|
#include "BKE_object.h"
|
|
#include "BKE_volume.h"
|
|
|
|
#include "DNA_object_types.h"
|
|
#include "DNA_volume_types.h"
|
|
|
|
#include <pxr/usd/usdVol/openVDBAsset.h>
|
|
#include <pxr/usd/usdVol/volume.h>
|
|
|
|
#include <iostream>
|
|
|
|
namespace usdtokens {
|
|
|
|
static const pxr::TfToken density("density", pxr::TfToken::Immortal);
|
|
|
|
}
|
|
|
|
namespace blender::io::usd {
|
|
|
|
void USDVolumeReader::create_object(Main *bmain, const double /* motionSampleTime */)
|
|
{
|
|
Volume *volume = (Volume *)BKE_volume_add(bmain, name_.c_str());
|
|
|
|
object_ = BKE_object_add_only_object(bmain, OB_VOLUME, name_.c_str());
|
|
object_->data = volume;
|
|
}
|
|
|
|
void USDVolumeReader::read_object_data(Main *bmain, const double motionSampleTime)
|
|
{
|
|
if (!volume_) {
|
|
return;
|
|
}
|
|
|
|
Volume *volume = static_cast<Volume *>(object_->data);
|
|
|
|
if (!volume) {
|
|
return;
|
|
}
|
|
|
|
pxr::UsdVolVolume::FieldMap fields = volume_.GetFieldPaths();
|
|
|
|
for (pxr::UsdVolVolume::FieldMap::const_iterator it = fields.begin(); it != fields.end(); ++it) {
|
|
|
|
pxr::UsdPrim fieldPrim = prim_.GetStage()->GetPrimAtPath(it->second);
|
|
|
|
if (!fieldPrim.IsA<pxr::UsdVolOpenVDBAsset>()) {
|
|
continue;
|
|
}
|
|
|
|
pxr::UsdVolOpenVDBAsset fieldBase(fieldPrim);
|
|
|
|
pxr::UsdAttribute filepathAttr = fieldBase.GetFilePathAttr();
|
|
|
|
if (filepathAttr.IsAuthored()) {
|
|
pxr::SdfAssetPath fp;
|
|
filepathAttr.Get(&fp, motionSampleTime);
|
|
|
|
if (filepathAttr.ValueMightBeTimeVarying()) {
|
|
std::vector<double> filePathTimes;
|
|
filepathAttr.GetTimeSamples(&filePathTimes);
|
|
|
|
if (!filePathTimes.empty()) {
|
|
int start = static_cast<int>(filePathTimes.front());
|
|
int end = static_cast<int>(filePathTimes.back());
|
|
|
|
volume->is_sequence = static_cast<char>(true);
|
|
volume->frame_start = start;
|
|
volume->frame_duration = (end - start) + 1;
|
|
}
|
|
}
|
|
|
|
std::string filepath = fp.GetResolvedPath();
|
|
|
|
strcpy(volume->filepath, filepath.c_str());
|
|
}
|
|
}
|
|
|
|
USDXformReader::read_object_data(bmain, motionSampleTime);
|
|
}
|
|
|
|
} // namespace blender::io::usd
|