blender
/
blender
136
409
Fork 592
Code Issues 6.3k Pull Requests 775 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 +28 -8
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a8ee4f93bd - Show all commits

5
source/blender/blenkernel/BKE_simulation_state.hh
View File

@ -191,6 +191,11 @@ class ModifierSimulationCache {
return false;
}
bool has_states() const
{
return !states_at_frames_.is_empty();
}
const ModifierSimulationState *get_state_at_exact_frame(const SubFrame &frame) const
{
for (const auto &item : states_at_frames_) {

31
source/blender/modifiers/intern/MOD_nodes.cc
View File

@ -1213,25 +1213,39 @@ static GeometrySet compute_geometry(const bNodeTree &btree,
nmd_orig->simulation_cache = MEM_new<bke::sim::ModifierSimulationCache>(__func__);
}
if (nmd_orig->simulation_cache->cache_state() != bke::sim::CacheState::Baked) {
nmd_orig->simulation_cache->try_discover_bake(
bke::sim::get_meta_directory(*bmain, *ctx->object, nmd->modifier),
bke::sim::get_bdata_directory(*bmain, *ctx->object, nmd->modifier));
{
/* Try to use baked data. */
if (nmd_orig->simulation_cache->cache_state() != bke::sim::CacheState::Baked) {
nmd_orig->simulation_cache->try_discover_bake(
bke::sim::get_meta_directory(*bmain, *ctx->object, nmd->modifier),
bke::sim::get_bdata_directory(*bmain, *ctx->object, nmd->modifier));
}
}
if (nmd_orig->simulation_cache->cache_state() == bke::sim::CacheState::Invalid &&
current_frame == start_frame) {
nmd_orig->simulation_cache->reset();
{
/* Reset cached data if necessary. */
const bke::sim::StatesAroundFrame sim_states =
nmd_orig->simulation_cache->get_states_around_frame(current_frame);
if (nmd_orig->simulation_cache->cache_state() == bke::sim::CacheState::Invalid &&
(current_frame == start_frame ||
(sim_states.current == nullptr && sim_states.prev == nullptr &&
sim_states.next != nullptr))) {
nmd_orig->simulation_cache->reset();
}
}
HooglyBoogly marked this conversation as resolved Outdated
Hans Goudey commented 2023-04-19 18:02:39 +02:00
Outdated
Review
Copy Link

Decide of -> Decide if

`Decide of` -> `Decide if`
/* Decide of a new simulation state should be created in this evaluation. */
const bke::sim::StatesAroundFrame sim_states =
nmd_orig->simulation_cache->get_states_around_frame(current_frame);
if (nmd_orig->simulation_cache->cache_state() != bke::sim::CacheState::Baked) {
if (sim_states.current == nullptr) {
if (is_start_frame) {
if (is_start_frame || !nmd_orig->simulation_cache->has_states()) {
bke::sim::ModifierSimulationState &current_sim_state =
nmd_orig->simulation_cache->get_state_at_frame_for_write(current_frame);
geo_nodes_modifier_data.current_simulation_state_for_write = &current_sim_state;
geo_nodes_modifier_data.simulation_time_delta = 0.0f;
if (!is_start_frame) {
nmd_orig->simulation_cache->invalidate();
}
}
else if (sim_states.prev != nullptr && sim_states.next == nullptr) {
const float delta_frames = float(current_frame) - float(sim_states.prev->frame);
@ -1246,6 +1260,7 @@ static GeometrySet compute_geometry(const bNodeTree &btree,
}
}
}
/* Load read-only states to give nodes access to cached data. */
const bke::sim::StatesAroundFrame sim_states =
nmd_orig->simulation_cache->get_states_around_frame(current_frame);
if (sim_states.current) {