blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 780 Projects 19 Wiki Activity

USD Export: New Curves/Hair Support #105375

Merged
Michael Kowalski merged 19 commits from SonnyCampbell_Unity/blender:unity/T102376-USD-Curves-Export into main 2023-05-16 20:04:26 +02:00
Conversation 4 Commits 19 Files Changed 5 +25 -24
3 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c72c159bab - Show all commits

9
source/blender/io/usd/intern/usd_hierarchy_iterator.cc
View File

@ -18,7 +18,6 @@
#include <pxr/base/tf/stringUtils.h>
#include "BKE_curve_legacy_convert.hh"
#include "BKE_duplilist.h"
#include "BLI_assert.h"
@ -108,13 +107,7 @@ AbstractHierarchyWriter *USDHierarchyIterator::create_data_writer(const Hierarch
case OB_MBALL:
data_writer = new USDMetaballWriter(usd_export_context);
break;
case OB_CURVES_LEGACY: {
const Curve *legacy_curve = static_cast<Curve *>(context->object->data);
std::unique_ptr<Curves> curves = std::unique_ptr<Curves>(
bke::curve_legacy_to_curves(*legacy_curve));
data_writer = new USDCurvesWriter(usd_export_context, std::move(curves));
break;
}
case OB_CURVES_LEGACY:
case OB_CURVES:
data_writer = new USDCurvesWriter(usd_export_context);
break;

37
source/blender/io/usd/intern/usd_writer_curves.cc
View File

@ -13,6 +13,7 @@
#include "usd_hierarchy_iterator.h"
#include "usd_writer_curves.h"
#include "BKE_curve_legacy_convert.hh"
#include "BKE_curves.hh"
#include "BKE_lib_id.h"
#include "BKE_material.h"
@ -24,22 +25,12 @@
namespace blender::io::usd {
USDCurvesWriter::USDCurvesWriter(const USDExporterContext &ctx)
: USDAbstractWriter(ctx), converted_curves_(nullptr)
{
}
USDCurvesWriter::USDCurvesWriter(const USDExporterContext &ctx,
std::unique_ptr<Curves> converted_legacy_curves)
: USDAbstractWriter(ctx), converted_curves_(std::move(converted_legacy_curves))
USDCurvesWriter::USDCurvesWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx)
{
}
USDCurvesWriter::~USDCurvesWriter()
{
if (converted_curves_) {
BKE_id_free(nullptr, converted_curves_.release());
}
}
pxr::UsdGeomCurves USDCurvesWriter::DefineUsdGeomBasisCurves(pxr::VtValue curve_basis,
@ -359,11 +350,25 @@ void USDCurvesWriter::set_writer_attributes(pxr::UsdGeomCurves &usd_curves,
void USDCurvesWriter::do_write(HierarchyContext &context)
{
Curves *curves;
std::unique_ptr<Curves> converted_curves;
const Curves *curve = converted_curves_ ? converted_curves_.get() :
static_cast<Curves *>(context.object->data);
switch (context.object->type) {
case OB_CURVES_LEGACY: {
const Curve *legacy_curve = static_cast<Curve *>(context.object->data);
converted_curves = std::unique_ptr<Curves>(bke::curve_legacy_to_curves(*legacy_curve));
curves = converted_curves.get();
break;
}
case OB_CURVES:
curves = static_cast<Curves *>(context.object->data);
break;
default:
BLI_assert_unreachable();
return;
}
const bke::CurvesGeometry &geometry = curve->geometry.wrap();
const bke::CurvesGeometry &geometry = curves->geometry.wrap();
if (geometry.points_num() == 0) {
return;
}
@ -448,6 +453,10 @@ void USDCurvesWriter::do_write(HierarchyContext &context)
set_writer_attributes(usd_curves, verts, control_point_counts, widths, timecode, interpolation);
assign_materials(context, usd_curves);
if (converted_curves) {
BKE_id_free(nullptr, converted_curves.release());
}
}
void USDCurvesWriter::assign_materials(const HierarchyContext &context,

3
source/blender/io/usd/intern/usd_writer_curves.h
View File

@ -23,9 +23,8 @@ class USDCurvesWriter : public USDAbstractWriter {
void assign_materials(const HierarchyContext &context, pxr::UsdGeomCurves usd_curve);
private:
std::unique_ptr<Curves> converted_curves_;
pxr::UsdGeomCurves DefineUsdGeomBasisCurves(pxr::VtValue curve_basis, bool cyclic, bool cubic);
void set_writer_attributes(pxr::UsdGeomCurves &usd_curves,
const pxr::VtArray<pxr::GfVec3f> verts,
const pxr::VtIntArray control_point_counts,