Skip to content

Commit

Permalink
Yeah, I'm an idiot, std::min is the correct one
Browse files Browse the repository at this point in the history
  • Loading branch information
Antidote committed Jul 3, 2021
1 parent 7a7af73 commit cfb7e01
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Runtime/CMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ struct Application : boo::IApplicationCallback {
using delta_duration = std::chrono::duration<float, std::ratio<1>>;
realDt = std::chrono::duration_cast<delta_duration>(now - m_prevFrameTime).count();
if (m_cvarCommons.m_variableDt->toBoolean()) {
dt = std::max(realDt, 1 / 30.f);
dt = std::min(realDt, 1 / 30.f);
}
}
m_prevFrameTime = now;
Expand Down
2 changes: 1 addition & 1 deletion extern/boo
2 changes: 1 addition & 1 deletion extern/imgui
Submodule imgui updated 72 files
+4 −1 .github/workflows/build.yml
+1 −1 .github/workflows/static-analysis.yml
+77 −48 backends/imgui_impl_allegro5.cpp
+2 −1 backends/imgui_impl_allegro5.h
+4 −4 backends/imgui_impl_android.cpp
+4 −3 backends/imgui_impl_android.h
+108 −76 backends/imgui_impl_dx10.cpp
+2 −1 backends/imgui_impl_dx10.h
+113 −80 backends/imgui_impl_dx11.cpp
+2 −1 backends/imgui_impl_dx11.h
+103 −66 backends/imgui_impl_dx12.cpp
+2 −1 backends/imgui_impl_dx12.h
+122 −84 backends/imgui_impl_dx9.cpp
+2 −1 backends/imgui_impl_dx9.h
+109 −78 backends/imgui_impl_glfw.cpp
+2 −1 backends/imgui_impl_glfw.h
+2 −1 backends/imgui_impl_glut.cpp
+2 −1 backends/imgui_impl_glut.h
+2 −1 backends/imgui_impl_marmalade.cpp
+2 −1 backends/imgui_impl_marmalade.h
+2 −1 backends/imgui_impl_metal.h
+2 −1 backends/imgui_impl_metal.mm
+39 −12 backends/imgui_impl_opengl2.cpp
+2 −1 backends/imgui_impl_opengl2.h
+169 −90 backends/imgui_impl_opengl3.cpp
+2 −1 backends/imgui_impl_opengl3.h
+2 −1 backends/imgui_impl_osx.h
+5 −3 backends/imgui_impl_osx.mm
+81 −49 backends/imgui_impl_sdl.cpp
+2 −1 backends/imgui_impl_sdl.h
+164 −117 backends/imgui_impl_vulkan.cpp
+2 −1 backends/imgui_impl_vulkan.h
+10 −7 backends/imgui_impl_wgpu.cpp
+2 −1 backends/imgui_impl_wgpu.h
+117 −77 backends/imgui_impl_win32.cpp
+2 −1 backends/imgui_impl_win32.h
+55 −3 docs/CHANGELOG.txt
+32 −9 docs/FONTS.md
+1 −1 docs/README.md
+1 −1 docs/TODO.txt
+3 −1 examples/README.txt
+4 −3 examples/example_allegro5/README.md
+6 −6 examples/example_allegro5/example_allegro5.vcxproj
+8 −0 examples/example_allegro5/main.cpp
+132 −170 examples/example_apple_metal/main.mm
+94 −102 examples/example_apple_opengl2/main.mm
+6 −6 examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj
+6 −6 examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj
+6 −6 examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj
+10 −10 examples/example_glut_opengl2/example_glut_opengl2.vcxproj
+8 −0 examples/example_glut_opengl2/main.cpp
+10 −10 examples/example_sdl_directx11/example_sdl_directx11.vcxproj
+4 −0 examples/example_sdl_opengl2/README.md
+10 −10 examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj
+4 −0 examples/example_sdl_opengl3/README.md
+10 −10 examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj
+10 −10 examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj
+4 −1 examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj.filters
+6 −6 examples/example_win32_directx10/example_win32_directx10.vcxproj
+6 −6 examples/example_win32_directx11/example_win32_directx11.vcxproj
+2 −2 examples/example_win32_directx12/example_win32_directx12.vcxproj
+6 −6 examples/example_win32_directx9/example_win32_directx9.vcxproj
+2 −1 imconfig.h
+252 −79 imgui.cpp
+64 −44 imgui.h
+47 −127 imgui_demo.cpp
+71 −42 imgui_draw.cpp
+83 −44 imgui_internal.h
+74 −54 imgui_tables.cpp
+155 −62 imgui_widgets.cpp
+8 −1 misc/freetype/README.md
+25 −23 misc/freetype/imgui_freetype.cpp

0 comments on commit cfb7e01

Please sign in to comment.