omar
|
9dcc07422e
|
Viewport: Reorganized viewport enable flags. Both user + platform + renderer need to enable a flag. (#1542)
|
2018-03-07 12:35:26 +01:00 |
|
omar
|
52c78820aa
|
Examples: SDL: Fix for pre 2.0.4.
|
2018-03-07 12:19:19 +01:00 |
|
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.
|
2018-03-07 12:05:47 +01:00 |
|
omar
|
f318f2d5ea
|
Examples: Added Makefile for SDL+OpenGL2 example. (#1668)
|
2018-03-07 11:51:41 +01:00 |
|
omar
|
3637193556
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_glfw.h
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# imgui.cpp
|
2018-03-06 20:02:40 +01:00 |
|
omar
|
a2ed3ee2cf
|
Examples: OpenGL3: Added a way to override the glsl version number through the Init call. (#1667, #1466)
|
2018-03-06 19:48:30 +01:00 |
|
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
|
2018-03-03 23:13:31 +01:00 |
|
omar
|
e026c8d3b7
|
Viewport: Give a chance to platform and renderer to actually destroy their data. Otherwise the regular ImplXXX_Shutdown + following by DestroyContext() order fails to fullifl this. (#1542)
|
2018-03-03 22:53:31 +01:00 |
|
omar
|
cab41d954e
|
Examples: Vulkan: Further refactor.
|
2018-03-03 22:38:24 +01:00 |
|
omar
|
69e700f869
|
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
|
2018-03-03 20:15:10 +01:00 |
|
omar
|
e0cbfd74d7
|
Examples: Vulkan: Moved CreateOrResizeWindowData func to imgui_impl_vulkan.h
|
2018-03-02 23:59:21 +01:00 |
|
omar
|
426930e028
|
Examples: Vulkan: Moved main.cpp data structures to imgui_impl_vulkan.h as shared helpers for the benefit of both the example and the platform/viewport renderer interface.
|
2018-03-02 23:05:23 +01:00 |
|
omar
|
e9fa17e1bf
|
Viewport: Replaced UpdatePlatformWindows/RenderPlatformWindows by RenderAdditionalViewports(). The update is always called in EndFrame(). (#1542)
|
2018-03-02 22:44:06 +01:00 |
|
omar
|
7113fc7dee
|
Examples: Vulkan: Moved variables into per-window data, refactored/tweaks to that the bug functions main.cpp for both SDL and GLFW examples match (they'll probably be moved to imgui_impl_vulkan as helpers).
|
2018-03-02 21:37:14 +01:00 |
|
omar
|
e0f283cfcb
|
Examples: Vulkan: Fix 7b968b098e
|
2018-03-02 20:09:21 +01:00 |
|
omar
|
7b968b098e
|
Examples: Vulkan: Reduced duplicate code by skipping present on the first frame. Amend 201d589714 by @ParticlePeter
|
2018-03-02 20:01:18 +01:00 |
|
omar
|
e927a6ac4a
|
Examples: Vulkan: Various tweak. Misc refactor into per-frame data. Duplicate buffer creation code moved to CreateOrResizeBuffer().
|
2018-03-02 19:40:09 +01:00 |
|
omar
|
9da475e4e8
|
Examples: GLFW, Vulkan: GLFW binding viewport tweaks to supports Vulkan better (do not call SwapBuffer, share context etc.). Added DUMMY (empty) platform/viewport interface in the viewport code.
|
2018-03-02 19:24:24 +01:00 |
|
omar
|
5b282bdd48
|
Examples: Renamed glfw error callback so it's more clear what it is.
|
2018-03-02 19:24:23 +01:00 |
|
omar
|
fc80f2b41a
|
Merge branch 'examples_refactor' into viewport
# Conflicts:
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx12_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/sdl_vulkan_example/main.cpp
# examples/vulkan_example/main.cpp
# imgui.h
|
2018-03-01 23:27:11 +01:00 |
|
omar
|
68e9ef9885
|
Examples: Vulkan: SDL: Fixed missing resize handler (not properly merged from #1367) + tweaks.
|
2018-03-01 23:22:02 +01:00 |
|
omar
|
296db2ed33
|
Examples: Vulkan: Moved code into shared helpers: ImGui_ImplVulkan_SelectSurfaceFormat, ImGui_ImplVulkan_SelectPresentMode.
|
2018-03-01 23:22:02 +01:00 |
|
omar
|
3171d61dfc
|
Examples: Vulkan: Various tweaks to name variable more consistently like Vulkan + a few comments + a few imgui style code compaction.
|
2018-03-01 23:22:01 +01:00 |
|
omar
|
57e9f61852
|
Examples: Vulkan: Debug report tweak + always enable in Debug build.
|
2018-03-01 18:59:07 +01:00 |
|
omar
|
cf365ed00b
|
Examples: Fixed enabling IMGUI_VULKAN_DEBUG_REPORT which was broken during refactor because of duplicate 'extensions' local variable.
|
2018-03-01 18:41:19 +01:00 |
|
omar
|
b37ef20c5c
|
Makefile: updated sdl_opengl3_example with all changes from #885.
|
2018-03-01 15:54:12 +01:00 |
|
Sam Hocevar
|
124d8522b1
|
Do not store compiled objects outside the project tree.
|
2018-03-01 15:50:39 +01:00 |
|
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 |
|