Skip to content
Snippets Groups Projects

Fix compilation of glow-extrras-glfw without Imgui

Merged Jonathan Kunstwald requested to merge feature/fix-compilation-without-imgui into master
1 file
+ 13
13
Compare changes
  • Side-by-side
  • Inline
@@ -64,17 +64,17 @@ static void TW_CALL GlfwAppTweakCallback(void* clientData)
}
#endif
// static std::string thousandSep(size_t val)
// {
// auto s = std::to_string(val);
// auto l = s.size();
// while (l > 3)
// {
// s = s.substr(0, l - 3) + "'" + s.substr(l - 3);
// l -= 3;
// }
// return s;
// }
static std::string thousandSep(size_t val)
{
auto s = std::to_string(val);
auto l = s.size();
while (l > 3)
{
s = s.substr(0, l - 3) + "'" + s.substr(l - 3);
l -= 3;
}
return s;
}
void GlfwApp::setTitle(const std::string& title)
{
@@ -499,7 +499,7 @@ void GlfwApp::mainLoop()
unsigned frames = 0;
double lastTime = glfwGetTime();
// double lastStatsTime = lastTime;
double lastStatsTime = lastTime;
double lastScheduledUpdateTime = lastTime;
double timeAccum = 0.000001;
mCurrentTime = 0.0;
@@ -870,13 +870,13 @@ void GlfwApp::internalOnMouseButton(double x, double y, int button, int action,
void GlfwApp::internalOnGui()
{
#ifdef GLOW_EXTRAS_HAS_IMGUI
if (mEnableDebugOverlay)
debugging::DebugOverlay::OnGui();
if (mUsePipelineConfigGui)
mPipelineScene->imguiConfigWindow();
#ifdef GLOW_EXTRAS_HAS_IMGUI
if (mProfilingOverlayVisible)
mProfilingOverlay->onGui();
#endif
Loading