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
|
98b66a5fc9
|
Examples: Using draw_data->DisplaySize, followup to c50198debe. Fix Vulkan secondary viewport rendering. SDL+Vulkan: Matched changes. Fix vcprojs. (#1542, #1042)
|
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
|
f318f2d5ea
|
Examples: Added Makefile for SDL+OpenGL2 example. (#1668)
|
7 years ago |
|
omar
|
7fd62baa42
|
Examples: Added Makefile for SDL+OpenGL2 example. (#1668)
|
7 years ago |
|
omar
|
69e700f869
|
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
|
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
|
cb601d79e8
|
Examples: SDL: Initial attempt at implementing the viewport/platform api. (WIP/test API) (#1542)
ImGui_ImplSDL2_Init() now takes a SDL GL context.
|
7 years ago |
|
omar
|
91cadc1130
|
Merge branch 'master' into examples_refactor
|
7 years ago |
|
omar
|
9b9d9321cf
|
Examples: SDL: Using %SDL2_DIR% in the .vcproj instead of %SDL_DIR%, the earlier is more standard.
|
7 years ago |
|
omar
|
47d1360124
|
Examples: Using SDL2_DIR instead of SDL_DIR (more standard).
|
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
|
ef521d1e0b
|
Examples: SDL: Extracted into imgui_impl_sdl.*, reused imgui_impl_opengl* files.
|
7 years ago |
|
omar
|
00b24f27c2
|
Examples: SDL: Added .vcproj files.
|
7 years ago |
|
omar
|
03a44acf6f
|
Examples: SDL: Minor stylistic tweaks. Fixed handling of ImGuiMouseCursor_None so it doesn't underflow array. Fixed harmless uninitialized pointer. (#1626)
|
7 years ago |
|
omar
|
7c75835200
|
Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. (#1626)
|
7 years ago |
Oliver Faircliff
|
ffb6e89f30
|
Use SDL system cursors in SDL examples. (#1626)
(Squashed 4 commits)
|
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
|
41ecebff5a
|
Examples: SDL: Added Changelog at the top of the imgui_impl files. (#1618)
|
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
|
cea8017e0b
|
Merge branch 'master' into context
|
7 years ago |
|
omar
|
7e1496e994
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
fcf1c9d151
|
Examples: SDL: Using SDL_GetPerformanceCounter() / SDL_GetPerformanceFrequency() to handle framerate over 1000 fps properly. Noticed bad inputs artefacts in Nav branch at 2000 fps without this. (#996)
|
7 years ago |
|
omar
|
60fb7d31fd
|
Examples: SDL2: Enabling vsync. Using scancode consistently, fixed keyboard weirdness.
|
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 |
Jérôme Pasquier
|
c226e02ca0
|
Fix sdl_opengl2_example filename in README.md's build instructions
|
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
|
f3e510a9bf
|
Examples: SDL: Using SDL_CaptureMouse() to retrieve coordinates outside of client area when dragging. (#1559)
Digging into sdl window/mouse stuff will also be useful for multi-viewport work.
|
7 years ago |
|
omar
|
00351ee2ab
|
Examples: SDL: Minor renaming.
|
7 years ago |
|
omar
|
79dca9d5e6
|
Examples: SDL+GL2: Renamed imgui_impl_sdl.* to imgui_impl_sdl_gl2.* for consistency and to emphasis on GL2-ness.
|
7 years ago |
|
omar
|
15fd5b6c4c
|
Examples: SDL: Minor renaming.
|
7 years ago |
|
omar
|
ce17e0f274
|
Examples: SDL: Using SDL_WINDOW_INPUT_FOCUS instead of SDL_WINDOW_MOUSE_FOCUS (which is ~~hovered). We should use SDL_CaptureMouse + SDL_WINDOW_MOUSE_CAPTURE_FLAG which requires SDL 2.0.4 will give it a try shortly. (#1559)
|
7 years ago |
|
omar
|
60d5dc7902
|
Examples: SDL: Fixed mapping of Insert key (#1555, fix bug introduced in #1541)
|
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
|
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 |