e312363007
Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly ( #2036 )
6 years ago
36b2f64051
Merge branch 'master' into viewport
...
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
6 years ago
1b61b6b208
Examples: Vulkan: Minor tweaks.
6 years ago
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.
6 years ago
e476b7e727
WIP on configurable OpenGL loader. ( #2001 , #2002 )
6 years ago
705ff49400
Examples: Vulkan: Viewport: Tweak to improve framerate on multiple-viewport situations, tho it is still halving the unthrottled framerate on nvidia for some reason.. Followup to 4dea032 ( #1542 )
6 years ago
f81caac459
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
4dea0327e7
Examples: Vulkan: Fixed handling of VkSurfaceCapabilitiesKHR::maxImageCount = 0 case. Tweaked present mode selections.
6 years ago
0ada716184
Examples: Viewport: Disabling swap intervals / vsync on secondary context to match what the DX11 bindings is doing. ( #1542 )
6 years ago
a4191857c1
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_vulkan.h
# imgui.cpp
6 years ago
7268c65d73
Examples: imgui_impl_vulkan: Comments (re)
6 years ago
3fdfac3377
Examples: imgui_impl_vulkan: Comments
6 years ago
5d630c930d
Viewport: DestroyPlatformWindows() checks for the bool CreatedPlatformWindow flag correctly. Note that we set CreatedPlatformWindow=true for the main viewport to allow the back-end to store data in the public Viewport structure (for consistency). ( #1542 )
6 years ago
e5f2295398
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
6 years ago
421dc19798
Examples: Cast to ImTextureID instead of void* when assigning to TexId. Applied to all examples. ( #2015 )
6 years ago
9c0805010f
imgui_impl_dx12: Cast to ImTextureID instead of void* to enable redefinition of ImTextureID ( #2015 , #301 )
6 years ago
d5793102db
imgui_impl_opengl3: Advertised as a ES2/ES3 renderer. Defaults to ES3 on Android. Default on "#version 300 es" on ES 3. ( #2002 , #1873 )
6 years ago
34203d5008
imgui_impl_win32: Don't redefine WIN32_LEAN_AND_MEAN if already defined ( #2014 )
6 years ago
e3eb4111cc
Examples: Fix 'How to build' instructions for SDL2 examples ( #2012 )
6 years ago
35124cdd07
imgui_impl_opengl3.cpp Using GLES3 on IOS instead of gl3w. ( #2002 , #1873 )
...
Not modifying the main.cpp yet because we need to test GL ES 3 context creation on iOS (only imgui_impl_opengl3.cpp was tested).
6 years ago
00e29832d4
Examples: OpenGL2: Disabling/restoring GL_LIGHTING and GL_COLOR_MATERIAL to increase compatibility with legacy OpenGL applications. ( #1996 )
6 years ago
8ef0ca9765
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
6 years ago
d69b2a1c1d
Changelog for #1989
6 years ago
6011ddf1e5
imgui_impl_dx11: Using ID3D11Factory instead of ID3D11Factory1 ( #1989 )
6 years ago
b1fc988c6b
imgui_impl_glfw, imgui_impl_sdl: Workaround for Emscripten which doesn't seem to handle focus related calls. ( #1941 )
6 years ago
b217251a63
Added Visual Studio 2017+ build cruft to Ignore List (.vs/ folder)
6 years ago
9824bf1ba1
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
6 years ago
067edd09f9
imgui_impl_opengl3: Comments. ( #1987 )
6 years ago
81562b2b5a
Examples: imgui_impl_opengl3.cpp Using #ifdef GL_SAMPLER_BINDING instead of if (glBindSampler) ( #1985 )
6 years ago
faa7dad537
Examples: imgui_impl_osx: Fix for incorrect DeltaTime calculation on mac OS. ( #1978 )
6 years ago
544db70852
Examples: OpenGL3: Tweaks, added changelog. ( #1941 )
6 years ago
fc737d2333
Examples; imgui_impl_opengl3.cpp to work with Emscripten ( #1941 )
...
* Add some ifdefs to add emscripten specific params and includes
* Update imgui_impl_opengl3.cpp
* Update imgui_impl_opengl3.cpp
* Update imgui_impl_opengl3.cpp
* replace __EMSCRIPTEN_BUILD__ with __EMSCRIPTEN__
* replace GLFW_INCLUDE_ES3 with direct header
* removing useless glfw include
* Making call to glPolygonMode() optional
6 years ago
352695bc57
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
6 years ago
ff83d0e369
Examples: Using fully qualified "Dear ImGui" name in window titles.
6 years ago
d016ef1825
Examples: SDL: Removed SDL_HAS_WARP_MOUSE_GLOBAL in the non-viewport branch. ( #1954 ) (+1 squashed commits)
6 years ago
7b4fbf4301
Viewport: Removed the need for the back-end to fill io.MousePosViewport, it seems unnecessary at this point. ( #1542 )
6 years ago
ee98a069f0
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# imgui_demo.cpp
6 years ago
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.
6 years ago
abe7b190dc
Examples: DX10, DX11: Fixed unreleased resources in Init and Shutdown functions. ( #1944 )
6 years ago
88df66ec83
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
6 years ago
59fb3274a7
Examples: include for intptr_t on tdm-gcc + mingw32 ( #1936 ) + mouse buttons comments
6 years ago
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.)
6 years ago
de13261f1b
OpenGL3: Added error output when shaders fail to compile / link. ( #1938 )
6 years ago
14cef31467
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
6201cad2b4
Examples: Comments, Demo: Log early out, TODO. ( #1553 )
6 years ago
6277781e83
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
89e2ddf07f
Examples: Comments + shallow coding convention tweak to be consistent across examples and with imgui_impl_osx
6 years ago
569e0f07f1
Examples: Removed old example_apple/ + tweak comments ( #1873 )
6 years ago
839e4d34bd
Merge branch 'warrenm_osx'
6 years ago
c3f9220c15
Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments
6 years ago
omar
Jérémie Dumas
Ryan Crandall
luk1337
Matthias Moulin
Dado
Marcel Smit
Omar Sherif Fathy