blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Alembic procedural: move cache building out of object update methods 

This will help support instancing as cache building is now decoupled
from the logic to update the Nodes' sockets as data (and cache) will
need to be shared by different Geometries somehow, and also simplify
implementing different data caching methods by centralizing this
operation.
This commit is contained in:
Kévin Dietrich 2021-03-12 00:15:07 +01:00
parent 7a028d5b99
commit 7017844c5e
2 changed files with 83 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
intern/cycles/render/alembic.cpp
View File

@ -715,7 +715,6 @@ void AlembicObject::read_face_sets(SchemaType &schema,
void AlembicObject::load_all_data(AlembicProcedural *proc,
IPolyMeshSchema &schema,
float scale,
Progress &progress)
{
cached_data.clear();
@ -778,19 +777,10 @@ void AlembicObject::load_all_data(AlembicProcedural *proc,
add_uvs(proc, uvs, cached_data, progress);
}
if (progress.get_cancel()) {
return;
}
setup_transform_cache(scale);
data_loaded = true;
}
void AlembicObject::load_all_data(AlembicProcedural *proc,
ISubDSchema &schema,
float scale,
Progress &progress)
void AlembicObject::load_all_data(AlembicProcedural *proc, ISubDSchema &schema, Progress &progress)
{
cached_data.clear();
@ -918,14 +908,11 @@ void AlembicObject::load_all_data(AlembicProcedural *proc,
return;
}
setup_transform_cache(scale);
data_loaded = true;
}
void AlembicObject::load_all_data(AlembicProcedural *proc,
const ICurvesSchema &schema,
float scale,
Progress &progress,
float default_radius)
{
@ -1005,8 +992,6 @@ void AlembicObject::load_all_data(AlembicProcedural *proc,
// TODO(@kevindietrich): attributes, need example files
setup_transform_cache(scale);
data_loaded = true;
}
@ -1410,6 +1395,8 @@ void AlembicProcedural::generate(Scene *scene, Progress &progress)
const chrono_t frame_time = (chrono_t)((frame - frame_offset) / frame_rate);
build_caches(progress);
foreach (Node *node, objects) {
AlembicObject *object = static_cast<AlembicObject *>(node);
@ -1418,19 +1405,19 @@ void AlembicProcedural::generate(Scene *scene, Progress &progress)
}
/* skip constant objects */
if (object->has_data_loaded() && object->is_constant() && !object->is_modified() &&
!object->need_shader_update && !scale_is_modified()) {
if (object->is_constant() && !object->is_modified() && !object->need_shader_update &&
!scale_is_modified()) {
continue;
}
if (object->schema_type == AlembicObject::POLY_MESH) {
read_mesh(object, frame_time, progress);
read_mesh(object, frame_time);
}
else if (object->schema_type == AlembicObject::CURVES) {
read_curves(object, frame_time, progress);
read_curves(object, frame_time);
}
else if (object->schema_type == AlembicObject::SUBD) {
read_subd(object, frame_time, progress);
read_subd(object, frame_time);
}
object->clear_modified();
@ -1519,29 +1506,9 @@ void AlembicProcedural::load_objects(Progress &progress)
}
}
void AlembicProcedural::read_mesh(AlembicObject *abc_object,
Abc::chrono_t frame_time,
Progress &progress)
void AlembicProcedural::read_mesh(AlembicObject *abc_object, Abc::chrono_t frame_time)
{
IPolyMesh polymesh(abc_object->iobject, Alembic::Abc::kWrapExisting);
Mesh *mesh = static_cast<Mesh *>(abc_object->get_object()->get_geometry());
CachedData &cached_data = abc_object->get_cached_data();
IPolyMeshSchema schema = polymesh.getSchema();
if (!abc_object->has_data_loaded()) {
abc_object->load_all_data(this, schema, scale, progress);
}
else {
if (abc_object->need_shader_update) {
abc_object->update_shader_attributes(schema.getArbGeomParams(), progress);
}
if (scale_is_modified()) {
abc_object->setup_transform_cache(scale);
}
}
/* update sockets */
@ -1552,6 +1519,8 @@ void AlembicProcedural::read_mesh(AlembicObject *abc_object,
object->tag_update(scene_);
}
Mesh *mesh = static_cast<Mesh *>(object->get_geometry());
cached_data.vertices.copy_to_socket(frame_time, mesh, mesh->get_verts_socket());
cached_data.shader.copy_to_socket(frame_time, mesh, mesh->get_shader_socket());
@ -1594,34 +1563,8 @@ void AlembicProcedural::read_mesh(AlembicObject *abc_object,
}
}
void AlembicProcedural::read_subd(AlembicObject *abc_object,
Abc::chrono_t frame_time,
Progress &progress)
void AlembicProcedural::read_subd(AlembicObject *abc_object, Abc::chrono_t frame_time)
{
ISubD subd_mesh(abc_object->iobject, Alembic::Abc::kWrapExisting);
ISubDSchema schema = subd_mesh.getSchema();
Mesh *mesh = static_cast<Mesh *>(abc_object->get_object()->get_geometry());
/* Alembic is OpenSubDiv compliant, there is no option to set another subdivision type. */
mesh->set_subdivision_type(Mesh::SubdivisionType::SUBDIVISION_CATMULL_CLARK);
if (!abc_object->has_data_loaded()) {
abc_object->load_all_data(this, schema, scale, progress);
}
else {
if (abc_object->need_shader_update) {
abc_object->update_shader_attributes(schema.getArbGeomParams(), progress);
}
if (scale_is_modified()) {
abc_object->setup_transform_cache(scale);
}
}
mesh->set_subd_max_level(abc_object->get_subd_max_level());
mesh->set_subd_dicing_rate(abc_object->get_subd_dicing_rate());
CachedData &cached_data = abc_object->get_cached_data();
if (abc_object->subd_max_level_is_modified() || abc_object->subd_dicing_rate_is_modified()) {
@ -1629,6 +1572,17 @@ void AlembicProcedural::read_subd(AlembicObject *abc_object,
cached_data.invalidate_last_loaded_time();
}
/* Update sockets. */
Object *object = abc_object->get_object();
cached_data.transforms.copy_to_socket(frame_time, object, object->get_tfm_socket());
if (object->is_modified()) {
object->tag_update(scene_);
}
Mesh *mesh = static_cast<Mesh *>(object->get_geometry());
/* Cycles overwrites the original triangles when computing displacement, so we always have to
* repass the data if something is animated (vertices most likely) to avoid buffer overflows. */
if (!cached_data.is_constant()) {
@ -1641,14 +1595,10 @@ void AlembicProcedural::read_subd(AlembicObject *abc_object,
mesh->clear_non_sockets();
/* Update sockets. */
Object *object = abc_object->get_object();
cached_data.transforms.copy_to_socket(frame_time, object, object->get_tfm_socket());
if (object->is_modified()) {
object->tag_update(scene_);
}
/* Alembic is OpenSubDiv compliant, there is no option to set another subdivision type. */
mesh->set_subdivision_type(Mesh::SubdivisionType::SUBDIVISION_CATMULL_CLARK);
mesh->set_subd_max_level(abc_object->get_subd_max_level());
mesh->set_subd_dicing_rate(abc_object->get_subd_dicing_rate());
cached_data.vertices.copy_to_socket(frame_time, mesh, mesh->get_verts_socket());
@ -1703,25 +1653,8 @@ void AlembicProcedural::read_subd(AlembicObject *abc_object,
}
}
void AlembicProcedural::read_curves(AlembicObject *abc_object,
Abc::chrono_t frame_time,
Progress &progress)
void AlembicProcedural::read_curves(AlembicObject *abc_object, Abc::chrono_t frame_time)
{
ICurves curves(abc_object->iobject, Alembic::Abc::kWrapExisting);
Hair *hair = static_cast<Hair *>(abc_object->get_object()->get_geometry());
ICurvesSchema schema = curves.getSchema();
if (!abc_object->has_data_loaded() || default_radius_is_modified() ||
abc_object->radius_scale_is_modified()) {
abc_object->load_all_data(this, schema, scale, progress, default_radius);
}
else {
if (scale_is_modified()) {
abc_object->setup_transform_cache(scale);
}
}
CachedData &cached_data = abc_object->get_cached_data();
/* update sockets */
@ -1733,6 +1666,8 @@ void AlembicProcedural::read_curves(AlembicObject *abc_object,
object->tag_update(scene_);
}
Hair *hair = static_cast<Hair *>(object->get_geometry());
cached_data.curve_keys.copy_to_socket(frame_time, hair, hair->get_curve_keys_socket());
cached_data.curve_radius.copy_to_socket(frame_time, hair, hair->get_curve_radius_socket());
@ -1884,6 +1819,54 @@ void AlembicProcedural::walk_hierarchy(
}
}
void AlembicProcedural::build_caches(Progress &progress)
{
for (Node *node : objects) {
AlembicObject *object = static_cast<AlembicObject *>(node);
if (progress.get_cancel()) {
return;
}
if (object->schema_type == AlembicObject::POLY_MESH) {
if (!object->has_data_loaded()) {
IPolyMesh polymesh(object->iobject, Alembic::Abc::kWrapExisting);
IPolyMeshSchema schema = polymesh.getSchema();
object->load_all_data(this, schema, progress);
}
else if (object->need_shader_update) {
IPolyMesh polymesh(object->iobject, Alembic::Abc::kWrapExisting);
IPolyMeshSchema schema = polymesh.getSchema();
object->update_shader_attributes(schema.getArbGeomParams(), progress);
}
}
else if (object->schema_type == AlembicObject::CURVES) {
if (!object->has_data_loaded() || default_radius_is_modified() ||
object->radius_scale_is_modified()) {
ICurves curves(object->iobject, Alembic::Abc::kWrapExisting);
ICurvesSchema schema = curves.getSchema();
object->load_all_data(this, schema, progress, default_radius);
}
}
else if (object->schema_type == AlembicObject::SUBD) {
if (!object->has_data_loaded()) {
ISubD subd_mesh(object->iobject, Alembic::Abc::kWrapExisting);
ISubDSchema schema = subd_mesh.getSchema();
object->load_all_data(this, schema, progress);
}
else if (object->need_shader_update) {
ISubD subd_mesh(object->iobject, Alembic::Abc::kWrapExisting);
ISubDSchema schema = subd_mesh.getSchema();
object->update_shader_attributes(schema.getArbGeomParams(), progress);
}
}
if (scale_is_modified() || object->get_cached_data().transforms.size() == 0) {
object->setup_transform_cache(scale);
}
}
}
CCL_NAMESPACE_END
#endif

17
intern/cycles/render/alembic.h
View File

@ -254,15 +254,12 @@ class AlembicObject : public Node {
void load_all_data(AlembicProcedural *proc,
Alembic::AbcGeom::IPolyMeshSchema &schema,
float scale,
Progress &progress);
void load_all_data(AlembicProcedural *proc,
Alembic::AbcGeom::ISubDSchema &schema,
float scale,
Progress &progress);
void load_all_data(AlembicProcedural *proc,
const Alembic::AbcGeom::ICurvesSchema &schema,
float scale,
Progress &progress,
float default_radius);
@ -396,21 +393,17 @@ class AlembicProcedural : public Procedural {
/* Read the data for an IPolyMesh at the specified frame_time. Creates corresponding Geometry and
* Object Nodes in the Cycles scene if none exist yet. */
void read_mesh(AlembicObject *abc_object,
Alembic::AbcGeom::Abc::chrono_t frame_time,
Progress &progress);
void read_mesh(AlembicObject *abc_object, Alembic::AbcGeom::Abc::chrono_t frame_time);
/* Read the data for an ICurves at the specified frame_time. Creates corresponding Geometry and
* Object Nodes in the Cycles scene if none exist yet. */
void read_curves(AlembicObject *abc_object,
Alembic::AbcGeom::Abc::chrono_t frame_time,
Progress &progress);
void read_curves(AlembicObject *abc_object, Alembic::AbcGeom::Abc::chrono_t frame_time);
/* Read the data for an ISubD at the specified frame_time. Creates corresponding Geometry and
* Object Nodes in the Cycles scene if none exist yet. */
void read_subd(AlembicObject *abc_object,
Alembic::AbcGeom::Abc::chrono_t frame_time,
Progress &progress);
void read_subd(AlembicObject *abc_object, Alembic::AbcGeom::Abc::chrono_t frame_time);
void build_caches(Progress &progress);
};
CCL_NAMESPACE_END