Skip to content

Fix build with ROCKY_HAS_IMGUI=Off #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maysl wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix build with ROCKY_HAS_IMGUI=Off #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/rocky/vsg/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,10 +555,6 @@ Application::about() const
}


#ifndef ROCKY_HAS_IMGUI
using RenderImGuiContext = vsg::Node;
#endif

void
Application::install(vsg::ref_ptr<RenderImGuiContext> group)
{
Expand Down
5 changes: 5 additions & 0 deletions src/rocky/vsg/Application.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@

namespace ROCKY_NAMESPACE
{

#ifdef ROCKY_HAS_IMGUI
class RenderImGuiContext;
#else
using RenderImGuiContext = vsg::Node;
#endif // ROCKY_HAS_IMGUI

class ROCKY_EXPORT Application
{
Expand Down
2 changes: 1 addition & 1 deletion src/rocky/vsg/DisplayManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,8 @@ DisplayManager::addViewToWindow(vsg::ref_ptr<vsg::View> view, vsg::ref_ptr<vsg::

viewdata.guiIdleEventProcessor = std::make_shared<std::function<void()>>(func);
_app->idleFunctions.emplace_front(viewdata.guiIdleEventProcessor);
#endif
}
#endif
}
}

Expand Down