omar
|
62cfdceac1
|
Examples: Viewport: Moved the "make current GL context" to reduce the amount of call and hopefully be more explicit about viewport enabled vs disabled requirements. (#1542)
|
2018-12-20 22:40:22 +01:00 |
|
omar
|
12a1e7d04e
|
Viewport: Comment to suggest making WindowBg opaque when viewports are enabled.
|
2018-11-26 19:20:37 +01:00 |
|
omar
|
a3d6554e8e
|
Merge branch 'master' into viewport + specific changes for GLFW callbacks
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_glfw.cpp
|
2018-11-08 16:56:51 +01:00 |
|
omar
|
772354377b
|
Examples: GLFW: User previously installed GLFW callbacks are now saved and chain-called by the default callbacks. (#1759)
|
2018-11-08 16:24:41 +01:00 |
|
omar
|
9d155c73bc
|
Examples: Misc comments mainly related to GLFW callbacks. (#1759)
|
2018-11-08 16:06:22 +01:00 |
|
omar
|
a419d46205
|
Examples: OpenGL3+GLFW/SDL: Made main.cpp compile with IMGUI_IMPL_OPENGL_LOADER_CUSTOM (may be missing init). (#2178)
|
2018-11-08 15:14:09 +01:00 |
|
omar
|
52ca91ca57
|
Merge branch 'master' into viewport
|
2018-11-05 17:29:31 +01:00 |
|
omar
|
f388216ff0
|
Examples: GLFW: VS2015 project link with legacy_stdio_definitions.lib in order to link with the precompiled VS2010 GLFW3.lib we provide. (#2010, #2043, #2091)
|
2018-11-05 17:28:09 +01:00 |
|
Hui
|
e6db078eda
|
gladLoadGL() return 0 to indicate failure (#2157)
|
2018-10-29 15:51:32 +01:00 |
|
omar
|
b57baa5ba0
|
Viewport: Enabled viewports by default in more example apps.
|
2018-09-20 10:31:23 +02:00 |
|
omar
|
b85f345369
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
|
2018-09-14 11:32:55 +02:00 |
|
omar
|
1afd29d382
|
Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.
|
2018-09-13 16:50:13 +02:00 |
|
omar
|
36b2f64051
|
Merge branch 'master' into viewport
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
2018-08-29 17:40:52 +02:00 |
|
omar
|
b127027cbd
|
Examples: OpenGL: Added support for glew and glad OpenGL loaders out of the box. (#2001, #2002). Changelog, tweaks, applied changes to SDL+OpenGL3 example.
|
2018-08-28 16:08:04 +02:00 |
|
Jérémie Dumas
|
e476b7e727
|
WIP on configurable OpenGL loader. (#2001, #2002)
|
2018-08-28 16:07:58 +02:00 |
|
omar
|
352695bc57
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2018-07-24 16:50:49 +02:00 |
|
omar
|
ff83d0e369
|
Examples: Using fully qualified "Dear ImGui" name in window titles.
|
2018-07-23 17:31:13 +02:00 |
|
omar
|
ee98a069f0
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# imgui_demo.cpp
|
2018-07-16 22:25:36 +02:00 |
|
omar
|
73e13a0762
|
Examples: Tweaked the main.cpp example structure for all examples. (There are a few hidden agendas here: 1) I would like to avoid encouraging people from using the implicit "Debug" window, and promote using Begin/End. In spite of my best attempt, there are a few feature of the upcoming docking system that cannot work 100% properly for the implicit Debug window, so future proof let's not put that feature in the spotlight too much for new users. 2) Moved dumb hardcoded positions into a single spot that can be replaced with a viewport relative position and not affect other demo windows. 3) Calling ShowDemoWindow before anything else, also for the benefit of a specific docking demo which will have an ordering constraint which is not really problematic in a real app but shouldn't be put forward in the demo.
|
2018-07-16 22:17:34 +02:00 |
|
omar
|
88df66ec83
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
|
2018-07-12 10:03:18 +02:00 |
|
omar
|
fff014dfed
|
Examples: OpenGL3: Added shaders more versions of GLSL + made the example app default to GL 3.0 + GLSL 130 (instead of GL 3.2 + GLSL 150) unless on Mac. (#1938, #1900, #1513, #1466, etc.)
|
2018-07-10 18:29:57 +02:00 |
|
omar
|
14cef31467
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-09 16:24:01 +02:00 |
|
omar
|
6201cad2b4
|
Examples: Comments, Demo: Log early out, TODO. (#1553)
|
2018-07-09 11:43:53 +02:00 |
|
omar
|
24aeca3d0c
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_vulkan.h
# examples/imgui_impl_win32.cpp
|
2018-06-12 16:24:24 +02:00 |
|
omar
|
cdf51cad2d
|
Comments, documentation
|
2018-06-11 19:52:40 +02:00 |
|
omar
|
9660657e95
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2018-06-10 15:59:35 +02:00 |
|
omar
|
8d58fbb5ed
|
Examples: Renamed example folders. (#1870)
|
2018-06-10 15:42:14 +02:00 |
|