blender
/
blender
137
415
Fork 598
Code Issues 6.3k Pull Requests 769 Projects 19 Wiki Activity

Geometry Nodes: Make simulation caching optional #107767

Merged
Hans Goudey merged 13 commits from HooglyBoogly/blender:simulation-use-cache-option into main 2023-05-10 16:01:44 +02:00
Conversation 0 Commits 13 Files Changed 10 +18 -24
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1e210fd1e8 - Show all commits

4
source/blender/blenkernel/intern/simulation_state.cc
View File

@ -93,9 +93,7 @@ bool ModifierSimulationCache::has_state_at_frame(const SubFrame &frame) const
std::lock_guard lock(states_at_frames_mutex_);
for (const auto &item : states_at_frames_) {
if (item->frame == frame) {
if (!item->state.zone_states_.is_empty()) {
return true;
}
return true;
}
}
return false;

38
source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc
View File

@ -57,7 +57,7 @@ class LazyFunctionForSimulationInputNode final : public LazyFunction {
{
const GeoNodesLFUserData &user_data = *static_cast<const GeoNodesLFUserData *>(
context.user_data);
GeoNodesModifierData &modifier_data = *user_data.modifier_data;
const GeoNodesModifierData &modifier_data = *user_data.modifier_data;
if (modifier_data.current_simulation_state == nullptr) {
params.set_default_remaining_outputs();
return;
@ -71,28 +71,13 @@ class LazyFunctionForSimulationInputNode final : public LazyFunction {
const bke::sim::SimulationZoneID zone_id = get_simulation_zone_id(*user_data.compute_context,
output_node_id_);
Array<void *> output_values(simulation_items_.size());
for (const int i : simulation_items_.index_range()) {
output_values[i] = params.get_output_data_ptr(i + 1);
}
const bke::sim::SimulationZoneState *prev_zone_state =
modifier_data.prev_simulation_state == nullptr ?
nullptr :
modifier_data.prev_simulation_state->get_zone_state(zone_id);
if (prev_zone_state) {
simulation_state_to_values(simulation_items_,
*prev_zone_state,
*modifier_data.self_object,
*user_data.compute_context,
node_,
output_values);
for (const int i : inputs_.index_range()) {
params.set_input_unused(i);
}
}
else {
std::optional<bke::sim::SimulationZoneState> initial_prev_zone_state;
if (prev_zone_state == nullptr) {
Array<void *> input_values(simulation_items_.size(), nullptr);
for (const int i : simulation_items_.index_range()) {
input_values[i] = params.try_get_input_data_ptr_or_request(i);
@ -101,11 +86,22 @@ class LazyFunctionForSimulationInputNode final : public LazyFunction {
/* Wait until all inputs are available. */
return;
}
for (const int i : input_values.index_range()) {
inputs_[i].type->move_construct(input_values[i], output_values[i]);
}
initial_prev_zone_state.emplace();
values_to_simulation_state(simulation_items_, input_values, *initial_prev_zone_state);
prev_zone_state = &*initial_prev_zone_state;
}
Array<void *> output_values(simulation_items_.size());
for (const int i : simulation_items_.index_range()) {
output_values[i] = params.get_output_data_ptr(i + 1);
}
simulation_state_to_values(simulation_items_,
*prev_zone_state,
*modifier_data.self_object,
*user_data.compute_context,
Jacques Lucke commented 2023-05-09 13:59:48 +02:00
Outdated
Review
Copy Link

Any reason for removing the zone state here, instead of just removing the entire state for the previous frame in MOD_nodes.cc?

Any reason for removing the zone state here, instead of just removing the entire state for the previous frame in `MOD_nodes.cc`?
node_,
output_values);
for (const int i : simulation_items_.index_range()) {
params.output_set(i + 1);
}