omar
|
c29971cf72
|
Merge branch 'master' into viewport
# Conflicts:
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
|
2018-03-20 16:05:31 +01:00 |
|
omar
|
74b7dce394
|
Examples: Renamed applications to emphasis on use of GLFW as a platform framework + minor local tweaks
|
2018-03-20 16:00:59 +01:00 |
|
omar
|
2fecd332fc
|
Viewport, Platform: Added void* to render/swap buffer functions. Comments. (#1542, #1042)
|
2018-03-19 15:20:47 +01:00 |
|
omar
|
46b61427e1
|
Viewport, Platform: Refactored platform interface. Removed need to use imgui_internal.h in backends. Split viewport into public facing ImGuiViewport and internal structure. Exposing enough data to provide custom tweaked renderers. Renamed handlers, fixed lots of inconsistencies. (#1542, #1042)
|
2018-03-18 18:44:57 +01:00 |
|
omar
|
2e1ac0f683
|
Viewport, Platform: SDL: Makes the CreateViewport function restore current GL context so in theory it is free from side-effect. That said, it seems like there is a bug in SDL because our CreateViewport (currently in Render(), not for long) have affect a jerky side-effect if SDL_GL_MakeCurrent() is called before Render(). (#1542)
|
2018-03-15 19:25:23 +01:00 |
|
omar
|
4d46383100
|
Viewport: Coupling non-main viewport to one window. Viewport name derived from the window. Added ImGuiConfigFlags_PlatformNoTaskBar, off by default (aka re-established task-bars by default for now). (#1542)
|
2018-03-08 20:27:01 +01:00 |
|
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
|
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
|
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
|
69e700f869
|
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
|
2018-03-03 20:15:10 +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
|
b37ef20c5c
|
Makefile: updated sdl_opengl3_example with all changes from #885.
|
2018-03-01 15:54:12 +01:00 |
|
omar
|
d98a5d54aa
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
2018-02-28 19:03:39 +01:00 |
|
omar
|
2c9f45bbe7
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
2018-02-28 18:51:40 +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
|
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
|
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
|
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
|
ef521d1e0b
|
Examples: SDL: Extracted into imgui_impl_sdl.*, reused imgui_impl_opengl* files.
|
2018-02-18 20:26:20 +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
|
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
|
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
|
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
|
27980d9688
|
Merge branch 'master' into context
|
2018-01-31 16:02:26 +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
|
cca9c3e3da
|
Examples: Using Dark theme by default. (#707). Tweaked demo code.
|
2018-01-31 00:15:47 +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
|
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 |
|