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.
|
2018-03-01 15:46:43 +01:00 |
|
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
|
d98a5d54aa
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
2018-02-28 19:03:39 +01:00 |
|
omar
|
8074d56bdd
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
2018-02-28 18:58:34 +01:00 |
|
omar
|
2c9f45bbe7
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
2018-02-28 18:51:40 +01:00 |
|
omar
|
fc3c3de70d
|
Examples: DX10: Multi viewport/platform support (based on DX11 version). (#1542)
|
2018-02-28 18:35:16 +01:00 |
|
omar
|
997d1bd0eb
|
Examples: NULL pointers for consistency.
|
2018-02-27 23:34:28 +01:00 |
|
omar
|
baef79415b
|
Examples: DX12: Empty skeleton toward implementing the multi-viewport api for DirectX12. (WIP/test API) (#1542, #301)
|
2018-02-27 23:34:28 +01:00 |
|
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.
|
2018-02-27 23:34:27 +01:00 |
|
omar
|
4cee46f909
|
Examples: GLFW + OpenGL3: Initial attempt at implementing the viewport/platform api. (WIP/test API) (#1542)
|
2018-02-27 23:27:41 +01:00 |
|
omar
|
25349b31d7
|
Examples: DX11 + Win32: Initial attempt at implementing the viewport/platform api. (WIP/test API) (#1542)
|
2018-02-27 23:26:51 +01:00 |
|
omar
|
29510fcb83
|
Examples: Misc tweaks/fixes.
|
2018-02-27 10:29:37 +01:00 |
|
omar
|
3f335b0d42
|
Merge branch 'master' into examples_refactor
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
|
2018-02-26 18:22:36 +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
|
ffda84cfae
|
Examples: DirectX12: Merged to new example format, imgui_impl_dx12.cpp contains the DX12 stuff, couple with imgui_impl_win32.cpp
|
2018-02-23 10:56:06 +01:00 |
|
omar
|
e6bc840f6f
|
Merge branch 'master' into examples_refactor
|
2018-02-23 10:47:32 +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
|
0b26387a2b
|
Simplified .gitignore list
|
2018-02-21 23:14:55 +01:00 |
|
omar
|
493ec0bc98
|
Simplified .gitignore list
|
2018-02-21 23:13:53 +01:00 |
|
omar
|
f7ef10e547
|
Examples: Titles/comments in headers
|
2018-02-21 23:05:17 +01:00 |
|
omar
|
91cadc1130
|
Merge branch 'master' into examples_refactor
|
2018-02-21 22:47:03 +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
|
47d1360124
|
Examples: Using SDL2_DIR instead of SDL_DIR (more standard).
|
2018-02-21 22:41:46 +01:00 |
|
omar
|
f67699456c
|
Examples: Added SDL+Vulkan example, the abstraction worked here :) (ref #1367)
|
2018-02-21 22:41:04 +01:00 |
|
omar
|
387f724d33
|
Examples: Vulkan: Formatting and tweaks (to match SDL's main).
|
2018-02-21 22:39:49 +01:00 |
|
omar
|
bcdfd5d61c
|
Merge branch 'master' into examples_refactor
|
2018-02-20 16:18:02 +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
|
e660d92fa5
|
Examples: GLFW: Added mouse cursors support (#1495)
|
2018-02-19 22:29:52 +01:00 |
|
omar
|
9fdf72e42b
|
Examples: WIn32: Prefixing every Win32 function calls with :: to denote global namespace in a consistent manner.
|
2018-02-18 21:23:11 +01:00 |
|
omar
|
df9051ded2
|
Examples: Vulkan: Added support for io.DisplayPos.
|
2018-02-18 21:15:51 +01:00 |
|
omar
|
230c5ca735
|
Examples: Vulkan: Fixed GLFW calls.
|
2018-02-18 21:15:41 +01:00 |
|
omar
|
3bd3693fb7
|
Examples: DirectX10, DirectX11, OpenGL2, OpenGL3: Added support for io.DisplayPos.
|
2018-02-18 21:09:28 +01:00 |
|
omar
|
6d0f9244b8
|
Examples: Allegro5, Marmalade: Moved bindings to parent folder. Renamed Allegro stuff from *A5_ to *Allegro5_
|
2018-02-18 20:26:20 +01:00 |
|
omar
|
80a8aea7e3
|
Examples: Added SDL, Vulkan examples to .sln file.
|
2018-02-18 20:26:20 +01:00 |
|
omar
|
4f0db01f7c
|
Examples: DirectX9: Reusing imgui_impl_win32, removed that code from imgui_impl_dx9
|
2018-02-18 20:26:20 +01:00 |
|
omar
|
6cd4e30b58
|
Examples: DirectX10: Reusing imgui_impl_win32, removed that code from imgui_impl_dx10
|
2018-02-18 20:26:20 +01:00 |
|
omar
|
19540479d4
|
Examples: DirectX11: Extracted imgui_impl_dx11.* instead imgui_impl_dx11 and imgui_impl_win32
|
2018-02-18 20:26:20 +01:00 |
|
omar
|
90dffb5a06
|
Examples: Vulkan: Extracted into imgui_impl_vulkan.*, reused imgui_impl_glfw* files.
|
2018-02-18 20:26:20 +01:00 |
|
omar
|
ef521d1e0b
|
Examples: SDL: Extracted into imgui_impl_sdl.*, reused imgui_impl_opengl* files.
|
2018-02-18 20:26:20 +01:00 |
|
omar
|
42c32bf00c
|
Examples: OpenGL2, OpenGL3: Added glPixelStorei() calls borrowed from SDL examples.
|
2018-02-18 20:26:20 +01:00 |
|
omar
|
c8a9969511
|
Examples: GLFW+GL2: Moved glfw, gl2 files to root folder, split imgui_impl_glfw_gl2 into _opengl2 and reused imgui_impl_glfw
|
2018-02-18 20:26:20 +01:00 |
|
omar
|
b0a8734c92
|
Examples: GLFW+GL3: Split imgui_impl_glfw_gl3 into imgui_impl_glfw and imgui_impl_gl3 (wip)
|
2018-02-18 20:26:19 +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 |
|