blender
/
blender
135
420
Fork 603
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

Simulation Nodes: bake simulation states to disk #106937

Merged
Jacques Lucke merged 116 commits from JacquesLucke/blender:sim-bake into geometry-nodes-simulation 2023-04-22 14:48:56 +02:00
Conversation 3 Commits 116 Files Changed 33 +27 -28
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ad7fdf13d0 - Show all commits

55
source/blender/blenkernel/intern/simulation_state_serialize.cc
View File

@ -259,19 +259,14 @@ static std::shared_ptr<io::serialize::DictionaryValue> write_bdata_simple_gspan(
return false; return false;
} }
template<typename T> static std::shared_ptr<io::serialize::DictionaryValue> write_bdata_shared_simple_gspan(
Hans Goudey commented 2023-04-19 17:01:54 +02:00
Outdated
Review
Copy Link

Maybe replace float here with int32_t or 4?

Maybe replace `float` here with `int32_t` or `4`?
Iliya Katushenock commented 2023-04-19 18:13:39 +02:00
Outdated
Review
Copy Link

Voice against the magic four.

Voice against the magic four.
static std::shared_ptr<io::serialize::DictionaryValue> write_bdata_simple_span( BDataWriter &bdata_writer,
BDataWriter &bdata_writer, const Span<T> data) BDataSharing &bdata_sharing,
const GSpan data,
const ImplicitSharingInfo *sharing_info)
HooglyBoogly marked this conversation as resolved
Hans Goudey commented 2023-04-19 17:03:28 +02:00
Review
Copy Link

Better to add a size_in_bytes() method to GMutableSpan or GSpan IMO

Better to add a `size_in_bytes()` method to `GMutableSpan` or `GSpan` IMO
Hans Goudey commented 2023-04-20 06:03:58 +02:00
Review
Copy Link

Oops, never mind I misunderstood this.

Oops, never mind I misunderstood this.
{ {
return write_bdata_simple_gspan(bdata_writer, data); return bdata_sharing.write_shared(
} sharing_info, [&]() { return write_bdata_simple_gspan(bdata_writer, data); });
template<typename T>
[[nodiscard]] static bool read_bdata_simple_span(const BDataReader &bdata_reader,
const io::serialize::DictionaryValue &io_data,
MutableSpan<T> r_data)
{
return read_bdata_simple_gspan(bdata_reader, io_data, r_data);
} }
static void load_attributes(const io::serialize::ArrayValue &io_attributes, static void load_attributes(const io::serialize::ArrayValue &io_attributes,
@ -381,7 +376,7 @@ static Curves *try_load_curves(const io::serialize::DictionaryValue &io_geometry
if (!io_curve_offsets) { if (!io_curve_offsets) {
return cancel(); return cancel();
} }
if (!read_bdata_simple_span(bdata_reader, *io_curve_offsets, curves.offsets_for_write())) { if (!read_bdata_simple_gspan(bdata_reader, *io_curve_offsets, curves.offsets_for_write())) {
return cancel(); return cancel();
} }
} }
@ -422,7 +417,7 @@ static Mesh *try_load_mesh(const io::serialize::DictionaryValue &io_geometry,
if (!io_poly_offsets) { if (!io_poly_offsets) {
return cancel(); return cancel();
} }
if (!read_bdata_simple_span(bdata_reader, *io_poly_offsets, mesh->poly_offsets_for_write())) { if (!read_bdata_simple_gspan(bdata_reader, *io_poly_offsets, mesh->poly_offsets_for_write())) {
return cancel(); return cancel();
} }
} }
@ -479,7 +474,7 @@ static bke::Instances *try_load_instances(const io::serialize::DictionaryValue &
if (!io_transforms) { if (!io_transforms) {
return cancel(); return cancel();
} }
if (!read_bdata_simple_span(bdata_reader, *io_transforms, instances->transforms())) { if (!read_bdata_simple_gspan(bdata_reader, *io_transforms, instances->transforms())) {
return cancel(); return cancel();
} }
@ -487,7 +482,7 @@ static bke::Instances *try_load_instances(const io::serialize::DictionaryValue &
if (!io_handles) { if (!io_handles) {
return cancel(); return cancel();
} }
if (!read_bdata_simple_span(bdata_reader, *io_handles, instances->reference_handles())) { if (!read_bdata_simple_gspan(bdata_reader, *io_handles, instances->reference_handles())) {
return cancel(); return cancel();
} }
@ -561,10 +556,12 @@ static std::shared_ptr<io::serialize::ArrayValue> serialize_attributes(
const bke::GAttributeReader attribute = attributes.lookup(attribute_id); const bke::GAttributeReader attribute = attributes.lookup(attribute_id);
const GVArraySpan attribute_span(attribute.varray); const GVArraySpan attribute_span(attribute.varray);
io_attribute->append("data", bdata_sharing.write_shared(attribute.sharing_info, [&]() { io_attribute->append("data",
return write_bdata_simple_gspan(bdata_writer, attribute_span); write_bdata_shared_simple_gspan(
})); bdata_writer,
bdata_sharing,
attribute_span,
attribute.varray.is_span() ? attribute.sharing_info : nullptr));
return true; return true;
}); });
return io_attributes; return io_attributes;
@ -585,9 +582,10 @@ static std::shared_ptr<io::serialize::DictionaryValue> serialize_geometry_set(
if (mesh.totpoly > 0) { if (mesh.totpoly > 0) {
io_mesh->append("poly_offsets", io_mesh->append("poly_offsets",
bdata_sharing.write_shared(mesh.runtime->poly_offsets_sharing_info, [&]() { write_bdata_shared_simple_gspan(bdata_writer,
return write_bdata_simple_span(bdata_writer, mesh.poly_offsets()); bdata_sharing,
})); mesh.poly_offsets(),
mesh.runtime->poly_offsets_sharing_info));
} }
auto io_materials = serialize_material_slots({mesh.mat, mesh.totcol}); auto io_materials = serialize_material_slots({mesh.mat, mesh.totcol});
@ -621,9 +619,10 @@ static std::shared_ptr<io::serialize::DictionaryValue> serialize_geometry_set(
if (curves.curve_num > 0) { if (curves.curve_num > 0) {
io_curves->append( io_curves->append(
"curve_offsets", "curve_offsets",
bdata_sharing.write_shared(curves.runtime->curve_offsets_sharing_info, [&]() { write_bdata_shared_simple_gspan(bdata_writer,
return write_bdata_simple_span(bdata_writer, curves.offsets()); bdata_sharing,
})); curves.offsets(),
curves.runtime->curve_offsets_sharing_info));
} }
auto io_materials = serialize_material_slots({curves_id.mat, curves_id.totcol}); auto io_materials = serialize_material_slots({curves_id.mat, curves_id.totcol});
@ -647,9 +646,9 @@ static std::shared_ptr<io::serialize::DictionaryValue> serialize_geometry_set(
} }
io_instances->append("transforms", io_instances->append("transforms",
write_bdata_simple_span(bdata_writer, instances.transforms())); write_bdata_simple_gspan(bdata_writer, instances.transforms()));
io_instances->append("handles", io_instances->append("handles",
write_bdata_simple_span(bdata_writer, instances.reference_handles())); write_bdata_simple_gspan(bdata_writer, instances.reference_handles()));
auto io_attributes = serialize_attributes( auto io_attributes = serialize_attributes(
instances.attributes(), bdata_writer, bdata_sharing, {"position"}); instances.attributes(), bdata_writer, bdata_sharing, {"position"});