79 Commits (0cad274b873bdfdf27ddbf22186b572f0efd1408)

Author SHA1 Message Date
omar 42ad3c1dd3 Examples: OpenGL2: Added multi-viewport support in the OpenGL2 back-end. (#1542) + Metrics: Fix undisplayed flag. 7 years ago
omar c29971cf72 Merge branch 'master' into viewport
# Conflicts:
#	examples/sdl_opengl2_example/main.cpp
#	examples/sdl_opengl3_example/main.cpp
#	examples/vulkan_example/main.cpp
7 years ago
omar 74b7dce394 Examples: Renamed applications to emphasis on use of GLFW as a platform framework + minor local tweaks 7 years ago
omar 46b61427e1 Viewport, Platform: Refactored platform interface. Removed need to use imgui_internal.h in backends. Split viewport into public facing ImGuiViewport and internal structure. Exposing enough data to provide custom tweaked renderers. Renamed handlers, fixed lots of inconsistencies. (#1542, #1042) 7 years ago
omar 09d8943967 Examples Refactor: GLFW: Explicit functions to init GLFW with OpenGL or Vulkan since we cannot read the api hints from glfw. 7 years ago
omar 1c18d65313 Examples: Renamed glfw error callback for clarity. 7 years ago
omar 19b92751b9 Examples: Updated Makefile and batch files to work with new examples. Using lowercase "gl.h" as it seems this is what Linux wants. 7 years ago
omar c4a158656e Merge branch 'master' into viewport
# Conflicts:
#	examples/allegro5_example/main.cpp
#	examples/directx10_example/main.cpp
#	examples/directx11_example/main.cpp
#	examples/directx12_example/main.cpp
#	examples/directx9_example/main.cpp
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_glfw.h
#	examples/imgui_impl_vulkan.cpp
#	examples/opengl2_example/imgui_impl_glfw_gl2.cpp
#	examples/opengl2_example/main.cpp
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/opengl3_example/main.cpp
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl2_example/main.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	examples/sdl_opengl3_example/main.cpp
#	examples/vulkan_example/main.cpp
#	imgui.cpp
#	imgui.h
7 years ago
omar 69e700f869 Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added 7 years ago
omar 5b282bdd48 Examples: Renamed glfw error callback so it's more clear what it is. 7 years ago
Sam Hocevar 124d8522b1 Do not store compiled objects outside the project tree. 7 years ago
Sam Hocevar b6f251103b Define SOURCES instead of OBJS in Makefiles.
OBJS is still deduced from SOURCES, but this change gives better control
over where the object files get actually written.
7 years ago
Sam Hocevar d4f63c3844 Use make variables $@ and $^ where appropriate. 7 years ago
Sam Hocevar 551932697d Ensure `make clean` is idempotent.
Prior to this, `make clean` would fail if the project was not already
fully built, and a second invokation would always fail.
7 years ago
omar d98a5d54aa Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787) 7 years ago
omar 2c9f45bbe7 Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787) 7 years ago
omar 9c20a40b36 Examples: OpenGL: Cast call to glPolygonMode(). (#1628). 7 years ago
omar daddd09cd5 Examples: Mouse cursor handling comments/tweaks to homogenize. (#1495) 7 years ago
omar d534207622 Examples: GLFW: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). (#1495) 7 years ago
omar 11b12488e8 Examples: GLFW*: Renamed GLFW callbacks exposed in .h to not include GL2/GL3/Vulkan in their name. 7 years ago
omar c8a9969511 Examples: GLFW+GL2: Moved glfw, gl2 files to root folder, split imgui_impl_glfw_gl2 into _opengl2 and reused imgui_impl_glfw 7 years ago
omar f5f3730b16 Examples: GLFW+GL2/GL3: Added glPixelStorei() calls borrowed from SDL examples. 7 years ago
omar 63332d152a Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..(#1599)
Examples: Updated examples.
7 years ago
omar 0cefd40888 Examples: Added Changelog to make updates easier. 7 years ago
omar f0364aa359 Merge branch 'context'
# Conflicts:
#	examples/allegro5_example/main.cpp
#	examples/directx10_example/main.cpp
#	examples/directx11_example/main.cpp
#	examples/directx9_example/main.cpp
#	examples/marmalade_example/main.cpp
#	examples/opengl2_example/main.cpp
#	examples/opengl3_example/main.cpp
#	examples/sdl_opengl2_example/main.cpp
#	examples/sdl_opengl3_example/main.cpp
#	examples/vulkan_example/main.cpp
7 years ago
omar ae30efc0fd Nav: Examples: Added commented out io.NavFlags |= ImGuiNavFlags_EnableKeyboard to all examples. (#787) 7 years ago
omar 057807f4a7 Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. (#787) 7 years ago
omar 73d493c780 Examples: Organized header files to make available features more visible. 7 years ago
omar 27980d9688 Merge branch 'master' into context 7 years ago
omar cd3dd886de Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569) 7 years ago
omar cca9c3e3da Examples: Using Dark theme by default. (#707). Tweaked demo code. 7 years ago
omar 6a25a8720a Examples: Using #include "imgui.h" instead of <imgui.h> appear correct-er as per standard? xcode+clang are very nitpicky there. 7 years ago
omar 91d77be36e Examples: Makefile leave CXX alone, instead leave commented out options. (nb: codeship doesn't seem have clang++) 7 years ago
Omar Cornut 3cdd2096ec Examples: Use Clang in old Makefile. 7 years ago
omar ddff378daf Examples: Synced Makefile comments. Added build/ folder into git ignore list/ 7 years ago
omar f3776055d6 Merge branch 'master' into context 7 years ago
omar c2e92ab61b Added imgui.natvis helper for visual studio users. Added to examples projects. 7 years ago
omar d3e826c247 Examples: Updated for reorganized context functions. Calling CreateContext(), DestroyContext() in example code. Removed Shutdown() from binding code. (#1565, #586, #992, #1007, #1558) 7 years ago
omar 7e7c017b75 Examples: Simplified mouse wheel handling. (#1463) 7 years ago
omar 0b1fecb792 Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. (#1463) 7 years ago
omar 6f6b6194b2 Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel
# Conflicts:
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
7 years ago
omar ba99900023 Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness. 7 years ago
omar ce95b84825 Added ImGuiKey_Insert for future use. Setup in all example bindings. (#1541) 7 years ago
omar 407955d9fb Examples: Using IM_OFFSETOF macro. + Comments 7 years ago
omar 4c90529c62 Examples: Visual Studio projects: Disabled extraneous function-level check in Release build. 7 years ago
omar 9f8632b131 Examples: Comments about invalid mouse pos. 7 years ago
omar ce13426a1a Examples: Comments, synched some minor drift between examples + stronger suggestion to use StyleColorsDark(). 7 years ago
omar 1b86e7343f Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete). 7 years ago
Emmanuel Benoît 77a310736d Horizontal mouse wheel support
This patch adds support for the horizontal mouse wheel in ImGui. It
affects windows that can be scrolled, as long as the Ctrl key is not
being pressed.

The scrolling speed has been set empirically so that it matches the
scrolling speed on the Firefox browser when the horizontal wheel is
used.

Internally, it adds a MouseHorizWheel to ImGuiIO, which is then used in
NewFrame to scroll the current window.

The SDL/GL2, SDL/GL3, GLFW/GL2 and GLFW/GL3 examples has been modified
to use it.
7 years ago
omar ef5dd30625 Sisyphus says: tweaked comments about not using old-style OpenGL examples (#1459, #1394 etc.) 7 years ago