Bump imgui to 1.84.2 (#78)

This commit is contained in:
Alexander Bondarenko 2021-08-30 19:57:00 +03:00 committed by GitHub
parent 9e5b39850e
commit 5699f64e95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 10 deletions

View File

@ -1,5 +1,9 @@
# Changelog for dear-imgui # Changelog for dear-imgui
## [1.1.0]
- `imgui` updated to 1.84.2.
## [1.0.2] ## [1.0.2]
- Added `withID` and `ToID(..)` to make composable components possible. - Added `withID` and `ToID(..)` to make composable components possible.

View File

@ -57,7 +57,7 @@ loop w checked color slider r pos size' selected tab1Ref tab2Ref = do
quit <- pollEvents quit <- pollEvents
openGL3NewFrame openGL3NewFrame
sdl2NewFrame w sdl2NewFrame
newFrame newFrame
-- showDemoWindow -- showDemoWindow

View File

@ -81,7 +81,7 @@ mainLoop w = do
-- Tell ImGui we're starting a new frame -- Tell ImGui we're starting a new frame
openGL2NewFrame openGL2NewFrame
sdl2NewFrame w sdl2NewFrame
newFrame newFrame
-- Build the GUI -- Build the GUI

View File

@ -1,7 +1,7 @@
cabal-version: 3.0 cabal-version: 3.0
name: dear-imgui name: dear-imgui
version: 1.0.2 version: 1.1.0
author: Oliver Charles author: Oliver Charles
maintainer: ollie@ocharles.org.uk, aenor.realm@gmail.com maintainer: ollie@ocharles.org.uk, aenor.realm@gmail.com
license: BSD-3-Clause license: BSD-3-Clause

View File

@ -51,7 +51,7 @@ mainLoop w = do
-- Tell ImGui we're starting a new frame -- Tell ImGui we're starting a new frame
openGL2NewFrame openGL2NewFrame
sdl2NewFrame w sdl2NewFrame
newFrame newFrame
-- Build the GUI -- Build the GUI

View File

@ -342,7 +342,7 @@ app = do
else else
handleJust vulkanException ( pure . reloadQuit ) do handleJust vulkanException ( pure . reloadQuit ) do
ImGui.Vulkan.vulkanNewFrame ImGui.Vulkan.vulkanNewFrame
ImGui.SDL.sdl2NewFrame window ImGui.SDL.sdl2NewFrame
ImGui.newFrame ImGui.newFrame
ImGui.showDemoWindow ImGui.showDemoWindow
ImGui.render ImGui.render

2
imgui

@ -1 +1 @@
Subproject commit ad5d1a8429ea219d3d34e6a36a48918650402697 Subproject commit e3e1fbcf025cf83413815751f7c33500e1314d57

View File

@ -40,7 +40,6 @@ import qualified Language.C.Inline.Cpp as Cpp
-- sdl2 -- sdl2
import SDL import SDL
import SDL.Internal.Types
import SDL.Raw.Enum as Raw import SDL.Raw.Enum as Raw
import qualified SDL.Raw.Event as Raw import qualified SDL.Raw.Event as Raw
@ -57,9 +56,9 @@ Cpp.using "namespace ImGui"
-- | Wraps @ImGui_ImplSDL2_NewFrame@. -- | Wraps @ImGui_ImplSDL2_NewFrame@.
sdl2NewFrame :: MonadIO m => Window -> m () sdl2NewFrame :: MonadIO m => m ()
sdl2NewFrame (Window windowPtr) = liftIO do sdl2NewFrame = liftIO do
[C.exp| void { ImGui_ImplSDL2_NewFrame((SDL_Window*)($(void* windowPtr))); } |] [C.exp| void { ImGui_ImplSDL2_NewFrame(); } |]
-- | Wraps @ImGui_ImplSDL2_Shutdown@. -- | Wraps @ImGui_ImplSDL2_Shutdown@.