blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 770 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 +15 -11
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 79bf67a8dc - Show all commits

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

@ -104,10 +104,7 @@ void set_curve_width_interpolation(const pxr::VtArray<float> &widths,
else if (widths.size() == expectedVaryingSize)
interpolation = pxr::UsdGeomTokens->varying;
else {
/*TF_WARN(
"MFnNurbsCurve has unsupported width size "
"for standard interpolation metadata: %s",
GetDagPath().fullPathName().asChar());*/
WM_reportf(RPT_WARNING, "Curve width size not supported for standard USD interpolation.");
}
}
@ -259,6 +256,18 @@ void populate_curve_props_for_nurbs(const bke::CurvesGeometry &geometry,
for (int i_knot = 0; i_knot < knots_num; i_knot++) {
knots[i_knot] = (double)temp_knots[i_knot];
}
/* Set end knots according to the USD spec for periodic curves
https://graphics.pixar.com/usd/dev/api/class_usd_geom_nurbs_curves.html#details */
if (cyclic) {
knots[0] = knots[1] - (knots[knots.size() - 2] - knots[knots.size() - 3]);
knots[knots.size() - 1] = knots[knots.size() - 2] + (knots[2] - knots[1]);
}
else {
// Set end knots according to the USD spec for non-periodic curves
knots[0] = knots[1];
knots[knots.size() - 1] = knots[knots.size() - 2];
}
}
populate_curve_widths(geometry, widths);
@ -370,6 +379,8 @@ void USDCurvesWriter::do_write(HierarchyContext &context)
usd_curves.SetWidthsInterpolation(interpolation);
}
assign_materials(context, usd_curves);
}
SonnyCampbell_Unity marked this conversation as resolved Outdated
Hans Goudey commented 2023-03-09 13:39:36 +01:00
Outdated
Review
Copy Link

Small thing, but Curve should be Curves here, same with below.

Small thing, but `Curve` should be `Curves` here, same with below.
bool USDCurvesWriter::check_is_animated(const HierarchyContext &) const
@ -408,13 +419,6 @@ void USDCurvesWriter::assign_materials(const HierarchyContext &context,
/* Blender defaults to double-sided, but USD to single-sided. */
usd_curve.CreateDoubleSidedAttr(pxr::VtValue(true));
}
if (!curve_material_bound) {
/* Either all material slots were empty or there is only one material in use. As geometry
* subsets are only written when actually used to assign a material, and the mesh already has
* the material assigned, there is no need to continue. */
return;
}
}
SonnyCampbell_Unity marked this conversation as resolved Outdated
Hans Goudey commented 2023-03-09 13:42:09 +01:00
Outdated
Review
Copy Link

If you want this to be extra pretty, you could use rna_enum_curves_types and IFACE_(RNA_enum_name_from_value(..) to print the UI name instead of the integer value.

If you want this to be extra pretty, you could use `rna_enum_curves_types` and `IFACE_(RNA_enum_name_from_value(..)` to print the UI name instead of the integer value.
} // namespace blender::io::usd