Sam Hocevar
|
d4f63c3844
|
Use make variables $@ and $^ where appropriate.
|
2018-03-01 15:45:34 +01:00 |
|
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.
|
2018-03-01 15:45:23 +01:00 |
|
omar
|
2c9f45bbe7
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
2018-02-28 18:51:40 +01:00 |
|
omar
|
d7f97922b8
|
Examples: Fix d749d49903 missing the deletion code. (#1217)
|
2018-02-23 22:46:14 +01:00 |
|
omar
|
d749d49903
|
Examples: OpenGL3: Create the VAO in the render function so the setup can more easily be used with multiple shared GL context. (#1217)
|
2018-02-23 12:37:49 +01:00 |
|
omar
|
288351a801
|
Examples: DirectX12: Tweaked assertion to more accurately represent what it wants to say. (#301)
|
2018-02-23 00:00:43 +01:00 |
|
omar
|
63be3e7c82
|
Update README.txt
|
2018-02-22 23:20:37 +01:00 |
|
omar
|
7e24ce0956
|
Examples: DirectX12: Fixed shutdown issue. (#301)
|
2018-02-22 23:04:28 +01:00 |
|
omar
|
9be7d048c8
|
Examples: DirectX12: Merge, various styling tweaks, update for 1.60 wip, synchronized Win32 features with other examples. (#301)
|
2018-02-22 23:03:47 +01:00 |
|
omar
|
913f3692a2
|
Examples: DirectX12: Removed from current solution which is meant to be VS2010 compatible for now (will change soon).
|
2018-02-22 22:38:22 +01:00 |
|
omar
|
0d063585e8
|
Merge branch 'jdm3_master'
|
2018-02-22 17:04:15 +01:00 |
|
omar
|
f43068c543
|
Examples: DirectX10, DirectX11: Simplified main example code.
|
2018-02-22 13:15:16 +01:00 |
|
omar
|
493ec0bc98
|
Simplified .gitignore list
|
2018-02-21 23:13:53 +01:00 |
|
omar
|
9b9d9321cf
|
Examples: SDL: Using %SDL2_DIR% in the .vcproj instead of %SDL_DIR%, the earlier is more standard.
|
2018-02-21 22:46:49 +01:00 |
|
omar
|
9c20a40b36
|
Examples: OpenGL: Cast call to glPolygonMode(). (#1628).
|
2018-02-20 15:49:17 +01:00 |
|
omar
|
daddd09cd5
|
Examples: Mouse cursor handling comments/tweaks to homogenize. (#1495)
|
2018-02-20 14:23:22 +01:00 |
|
omar
|
d534207622
|
Examples: GLFW: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). (#1495)
|
2018-02-20 14:18:02 +01:00 |
|
omar
|
11b12488e8
|
Examples: GLFW*: Renamed GLFW callbacks exposed in .h to not include GL2/GL3/Vulkan in their name.
|
2018-02-20 14:09:46 +01:00 |
|
omar
|
7e2e0535dd
|
Examples: DirectX 9,10,11: Inputs: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). (#1495)
|
2018-02-20 13:55:09 +01:00 |
|
omar
|
f5f3730b16
|
Examples: GLFW+GL2/GL3: Added glPixelStorei() calls borrowed from SDL examples.
|
2018-02-16 23:19:38 +01:00 |
|
omar
|
9e713b115f
|
Examples: Renamed .sln file.
|
2018-02-16 22:38:19 +01:00 |
|
omar
|
243fd67b1c
|
Examples: Vulkan: Fix for empty draw data (init time) + fixed warning.
|
2018-02-16 22:37:46 +01:00 |
|
omar
|
10752423ec
|
Examples: Vulkan: Added .vcproj files.
|
2018-02-16 22:37:41 +01:00 |
|
omar
|
31158e575f
|
Examples: SDL: Fixed minor warning.
|
2018-02-16 22:37:29 +01:00 |
|
omar
|
00b24f27c2
|
Examples: SDL: Added .vcproj files.
|
2018-02-16 22:37:24 +01:00 |
|
omar
|
03a44acf6f
|
Examples: SDL: Minor stylistic tweaks. Fixed handling of ImGuiMouseCursor_None so it doesn't underflow array. Fixed harmless uninitialized pointer. (#1626)
|
2018-02-16 19:55:16 +01:00 |
|
omar
|
7c75835200
|
Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. (#1626)
|
2018-02-16 19:49:33 +01:00 |
|
Oliver Faircliff
|
ffb6e89f30
|
Use SDL system cursors in SDL examples. (#1626)
(Squashed 4 commits)
|
2018-02-16 19:41:27 +01:00 |
|
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.
|
2018-02-16 19:18:16 +01:00 |
|
omar
|
0cefd40888
|
Examples: Added Changelog to make updates easier.
|
2018-02-16 17:20:18 +01:00 |
|
omar
|
41ecebff5a
|
Examples: SDL: Added Changelog at the top of the imgui_impl files. (#1618)
|
2018-02-15 11:11:31 +01:00 |
|
omar
|
7cc1bc7635
|
Added IsAnyMouseDown() helper.
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
|
2018-02-10 16:50:19 +01:00 |
|
omar
|
2493f609ef
|
Examples: Vulkan: Fix (something changed in GLFW not including vulkan.h, was unwillingly relying on that)
|
2018-02-06 20:57:33 +01:00 |
|
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
|
2018-02-06 20:16:03 +01:00 |
|
omar
|
ae30efc0fd
|
Nav: Examples: Added commented out io.NavFlags |= ImGuiNavFlags_EnableKeyboard to all examples. (#787)
|
2018-02-06 19:58:23 +01:00 |
|
omar
|
3171f90a1a
|
Nav: Keyboard is now automatically mapped based on io.KeyDown[]. (#787)
|
2018-02-06 19:54:30 +01:00 |
|
omar
|
057807f4a7
|
Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. (#787)
|
2018-02-06 19:29:31 +01:00 |
|
omar
|
7e32fc7109
|
Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). (#787)
|
2018-02-06 19:23:12 +01:00 |
|
omar
|
cea8017e0b
|
Merge branch 'master' into context
|
2018-02-06 18:04:44 +01:00 |
|
omar
|
4b49f03a40
|
Examples: SDL+GL3: Added Navigation keyboard mapping. (#787)
|
2018-02-05 23:16:40 +01:00 |
|
omar
|
7e1496e994
|
Merge branch 'master' into navigation
|
2018-02-05 23:14:42 +01:00 |
|
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)
|
2018-02-05 23:13:53 +01:00 |
|
omar
|
60fb7d31fd
|
Examples: SDL2: Enabling vsync. Using scancode consistently, fixed keyboard weirdness.
|
2018-02-05 22:35:29 +01:00 |
|
omar
|
73d493c780
|
Examples: Organized header files to make available features more visible.
|
2018-02-05 20:34:11 +01:00 |
|
omar
|
533fe8cb55
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-02-05 14:55:57 +01:00 |
|
Gerry Hernandez
|
4786321754
|
Fix iOS code; fixes entire XCode build for Apple example
|
2018-02-04 21:47:08 -05:00 |
|
omar
|
27980d9688
|
Merge branch 'master' into context
|
2018-01-31 16:02:26 +01:00 |
|
omar
|
47e81a6194
|
Merge branch 'master' into navigation
|
2018-01-31 16:00:25 +01:00 |
|
omar
|
cd3dd886de
|
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569)
|
2018-01-31 16:00:07 +01:00 |
|
omar
|
23c11e9764
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-31 15:43:19 +01:00 |
|
omar
|
6c38aa2dc7
|
Examples: Apple: Tweak code and sync with other examples better (untested).
|
2018-01-31 00:16:44 +01:00 |
|
omar
|
cca9c3e3da
|
Examples: Using Dark theme by default. (#707). Tweaked demo code.
|
2018-01-31 00:15:47 +01:00 |
|
omar
|
955d86199f
|
Examples: Tweaks formatting.
|
2018-01-30 23:55:23 +01:00 |
|
omar
|
2933e6765c
|
Merge branch 'master' into navigation
|
2018-01-29 17:42:39 +01:00 |
|
omar
|
6a25a8720a
|
Examples: Using #include "imgui.h" instead of <imgui.h> appear correct-er as per standard? xcode+clang are very nitpicky there.
|
2018-01-29 14:38:46 +01:00 |
|
omar
|
91d77be36e
|
Examples: Makefile leave CXX alone, instead leave commented out options. (nb: codeship doesn't seem have clang++)
|
2018-01-29 00:55:16 +01:00 |
|
Omar Cornut
|
3cdd2096ec
|
Examples: Use Clang in old Makefile.
|
2018-01-29 00:48:21 +01:00 |
|
omar
|
ddff378daf
|
Examples: Synced Makefile comments. Added build/ folder into git ignore list/
|
2018-01-29 00:38:00 +01:00 |
|
Omar Cornut
|
858d75ab59
|
Examples: Apple: Fixed filenames in OSX xcode project.
|
2018-01-28 23:24:57 +01:00 |
|
omar
|
66d5712a8a
|
Examples: Vulkan: FIxed warnings in 32-bit modes (vulkan uses VkDeviceSize which is always 64-bit long)
|
2018-01-28 20:03:41 +01:00 |
|
omar
|
3ded262776
|
Merge branch 'master' into navigation
|
2018-01-26 16:07:43 +01:00 |
|
omar
|
827f4b17d3
|
Nav: Examples: Glfw+GL3: Added basic gamepad mapping code when io.NavFlags & ImGuiNavFlags_EnableGamepad is set. (will iterate/tweak before spreading to other examples). (#787)
|
2018-01-25 16:18:57 +01:00 |
|
omar
|
3967ff58b2
|
Nav: Examples: DirectX11, Glfw+GL3: Basic code to map keyboard inputs when io.NavFlags & ImGuiNavFlags_EnableKeyboard is set. (will iterate/tweak before spreading to other examples). (#787)
|
2018-01-25 16:02:33 +01:00 |
|
Jérôme Pasquier
|
94ed44b5cb
|
Fix allegro5_example build instructions
|
2018-01-25 13:33:35 +01:00 |
|
Jérôme Pasquier
|
c226e02ca0
|
Fix sdl_opengl2_example filename in README.md's build instructions
|
2018-01-25 13:27:57 +01:00 |
|
omar
|
2c7324da56
|
TODO list, added uSynergy README
|
2018-01-25 12:38:15 +01:00 |
|
omar
|
f3776055d6
|
Merge branch 'master' into context
|
2018-01-24 19:31:11 +01:00 |
|
omar
|
8c57d8cc1e
|
Natvis: Fix ImRect expanded height display being broken and dumb. (#1569)
|
2018-01-24 19:10:09 +01:00 |
|
omar
|
6f27d6b5b8
|
Natvis: Made ImGuiWindow display shorter.
|
2018-01-24 18:52:26 +01:00 |
|
omar
|
c2e92ab61b
|
Added imgui.natvis helper for visual studio users. Added to examples projects.
|
2018-01-24 18:40:54 +01:00 |
|
omar
|
277f6e7842
|
Examples: Comments
|
2018-01-24 18:40:23 +01:00 |
|
omar
|
dd89c9ea59
|
Examples: Made the Win32 proc handlers not assert if there is no active context yet, to be more flexible with creation order. (#1565)
|
2018-01-21 20:58:50 +01:00 |
|
omar
|
d3e826c247
|
Examples: Updated for reorganized context functions. Calling CreateContext(), DestroyContext() in example code. Removed Shutdown() from binding code. (#1565, #586, #992, #1007, #1558)
|
2018-01-21 20:16:55 +01:00 |
|
omar
|
7e7c017b75
|
Examples: Simplified mouse wheel handling. (#1463)
|
2018-01-20 12:45:31 +01:00 |
|
omar
|
7dea158175
|
Examples: Allegro, Apple, DirectX9/10/11, Glfw+Vulkan :Added support for horizontal mouse wheel. (#1463)
|
2018-01-20 12:36:59 +01:00 |
|
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)
|
2018-01-20 12:36:16 +01:00 |
|
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
|
2018-01-20 12:06:06 +01:00 |
|
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.
|
2018-01-19 10:46:54 +01:00 |
|
omar
|
00351ee2ab
|
Examples: SDL: Minor renaming.
|
2018-01-19 09:55:49 +01:00 |
|
omar
|
ba99900023
|
Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness.
|
2018-01-19 09:50:58 +01:00 |
|
omar
|
79dca9d5e6
|
Examples: SDL+GL2: Renamed imgui_impl_sdl.* to imgui_impl_sdl_gl2.* for consistency and to emphasis on GL2-ness.
|
2018-01-19 09:50:58 +01:00 |
|
omar
|
15fd5b6c4c
|
Examples: SDL: Minor renaming.
|
2018-01-19 09:43:28 +01:00 |
|
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)
|
2018-01-19 09:25:31 +01:00 |
|
omar
|
60d5dc7902
|
Examples: SDL: Fixed mapping of Insert key (#1555, fix bug introduced in #1541)
|
2018-01-18 10:01:36 +01:00 |
|
omar
|
ce95b84825
|
Added ImGuiKey_Insert for future use. Setup in all example bindings. (#1541)
|
2018-01-08 15:30:39 +01:00 |
|
omar
|
39cb56c39e
|
Examples: OpenGL3+GLFW: Using 3.2 context + GLSL version 150 (#1466)
|
2018-01-07 19:09:34 +01:00 |
|
omar
|
7484c63449
|
Examples: OpenGL3+SDL: Changed GLSL shader version to 150 (#1466, #1504)
|
2018-01-07 19:09:33 +01:00 |
|
omar
|
3d24a9eb40
|
Examples: DirectX9/10/11: Comments about CS_DBLCLKS + formatting tweaks. (#1538)
|
2018-01-05 22:32:27 +01:00 |
|
omar
|
65dd55cb2b
|
Merge pull request #1538 from ndandoulakis/ndandoulakis-CS_DBLCLKS-patch
Examples: DirectX9,10,10: Support for CS_DBLCLKS by treating double-click down messages are regular down. (#1538, #754)
|
2018-01-05 22:27:40 +01:00 |
|
omar
|
407955d9fb
|
Examples: Using IM_OFFSETOF macro. + Comments
|
2018-01-05 22:05:02 +01:00 |
|
Nick Dandoulakis
|
bfc25bc8a3
|
CS_DBLCLKS support for DirectX 11
|
2018-01-05 22:28:27 +02:00 |
|
Nick Dandoulakis
|
583e97b297
|
CS_DBLCLKS support for DirectX 10
|
2018-01-05 22:25:30 +02:00 |
|
Nick Dandoulakis
|
20ae6439ea
|
CS_DBLCLKS support for Directx9
|
2018-01-05 22:16:35 +02:00 |
|
omar
|
4c90529c62
|
Examples: Visual Studio projects: Disabled extraneous function-level check in Release build.
|
2018-01-04 11:42:05 +01:00 |
|
omar
|
9f8632b131
|
Examples: Comments about invalid mouse pos.
|
2017-12-29 15:03:36 +01:00 |
|
omar
|
78f48bb795
|
Examples: DirectX10,DirectX11: Moved call to OMSetRenderTargets() in main loop so example code can integrate more nicely with other code.
|
2017-12-25 14:54:54 +01:00 |
|
omar
|
3a4a2bb27c
|
Examples: Vulkan: Tweak
|
2017-12-24 18:49:19 +01:00 |
|
omar
|
ce13426a1a
|
Examples: Comments, synched some minor drift between examples + stronger suggestion to use StyleColorsDark().
|
2017-12-24 18:45:11 +01:00 |
|
omar
|
1b86e7343f
|
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
|
2017-12-24 18:16:22 +01:00 |
|
omar
|
b263bc5689
|
Examples: DirectX: Using IM_ARRAYSIZE()
|
2017-12-23 14:07:27 +01:00 |
|