Skip to content
Snippets Groups Projects

removed std variant

Merged Philip Trettner requested to merge f/remove-variant into develop
2 files
+ 33
32
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -112,17 +112,17 @@ void glow::viewer::detail::create_layout_tree(glow::viewer::layout::tree_node& r
if (cmd.instr == cmd_t::instruction::AddRenderjob)
{
TG_ASSERT(currentNode != nullptr);
const auto renderable = std::get_if<SharedRenderable>(&cmd.data);
const auto renderable = cmd.data_renderable;
TG_ASSERT(renderable);
(*renderable)->runLazyInit();
currentNode->scene.add(*renderable);
renderable->runLazyInit();
currentNode->scene.add(renderable);
}
else if (cmd.instr == cmd_t::instruction::ModifyScene)
{
TG_ASSERT(currentNode != nullptr);
const auto funcp = std::get_if<cmd_t::scene_modifier_func_t>(&cmd.data);
const auto funcp = cmd.data_scene;
TG_ASSERT(funcp);
(*funcp)(currentNode->scene);
funcp(currentNode->scene);
}
else if (cmd.instr == cmd_t::instruction::BeginSubview)
{
@@ -155,9 +155,8 @@ void glow::viewer::detail::create_layout_tree(glow::viewer::layout::tree_node& r
else if (cmd.instr == cmd_t::instruction::ModifyLayout)
{
TG_ASSERT(currentNode != nullptr);
const auto layoutSettings = std::get_if<layout::settings>(&cmd.data);
TG_ASSERT(layoutSettings);
currentNode->layoutSettings = *layoutSettings;
const auto layoutSettings = cmd.data_settings;
currentNode->layoutSettings = layoutSettings;
}
else if (TG_LIKELY(cmd.instr == cmd_t::instruction::InteractiveSubview && allowInteractiveExecute))
{
@@ -170,9 +169,9 @@ void glow::viewer::detail::create_layout_tree(glow::viewer::layout::tree_node& r
// Run the interactive lambda to fill innerCommandQueue
{
sCommandQueueStack.push_back(innerCommandQueue);
const auto funcp = std::get_if<cmd_t::interactive_func_t>(&cmd.data);
const auto funcp = cmd.data_interactive;
TG_ASSERT(funcp);
(*funcp)(deltaTime);
funcp(deltaTime);
sCommandQueueStack.pop_back();
}
Loading