omar
|
172570acae
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.h
|
7 years ago |
|
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
|
7 years ago |
|
omar
|
74b7dce394
|
Examples: Renamed applications to emphasis on use of GLFW as a platform framework + minor local tweaks
|
7 years ago |
|
omar
|
2fecd332fc
|
Viewport, Platform: Added void* to render/swap buffer functions. Comments. (#1542, #1042)
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
09d8943967
|
Examples Refactor: GLFW: Explicit functions to init GLFW with OpenGL or Vulkan since we cannot read the api hints from glfw.
|
7 years ago |
|
omar
|
1c18d65313
|
Examples: Renamed glfw error callback for clarity.
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
9dcc07422e
|
Viewport: Reorganized viewport enable flags. Both user + platform + renderer need to enable a flag. (#1542)
|
7 years ago |
|
omar
|
e9fa17e1bf
|
Viewport: Replaced UpdatePlatformWindows/RenderPlatformWindows by RenderAdditionalViewports(). The update is always called in EndFrame(). (#1542)
|
7 years ago |
|
omar
|
5b282bdd48
|
Examples: Renamed glfw error callback so it's more clear what it is.
|
7 years ago |
|
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
|
7 years ago |
|
omar
|
d98a5d54aa
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
7 years ago |
|
omar
|
8074d56bdd
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
7 years ago |
|
omar
|
2c9f45bbe7
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
7 years ago |
|
omar
|
4cee46f909
|
Examples: GLFW + OpenGL3: Initial attempt at implementing the viewport/platform api. (WIP/test API) (#1542)
|
7 years ago |
|
omar
|
c8a9969511
|
Examples: GLFW+GL2: Moved glfw, gl2 files to root folder, split imgui_impl_glfw_gl2 into _opengl2 and reused imgui_impl_glfw
|
7 years ago |
|
omar
|
b0a8734c92
|
Examples: GLFW+GL3: Split imgui_impl_glfw_gl3 into imgui_impl_glfw and imgui_impl_gl3 (wip)
|
7 years ago |
|
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.
|
7 years ago |
|
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
|
7 years ago |
|
omar
|
ae30efc0fd
|
Nav: Examples: Added commented out io.NavFlags |= ImGuiNavFlags_EnableKeyboard to all examples. (#787)
|
7 years ago |
|
omar
|
27980d9688
|
Merge branch 'master' into context
|
7 years ago |
|
omar
|
47e81a6194
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
cd3dd886de
|
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569)
|
7 years ago |
|
omar
|
23c11e9764
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
cca9c3e3da
|
Examples: Using Dark theme by default. (#707). Tweaked demo code.
|
7 years ago |
|
omar
|
2933e6765c
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
6a25a8720a
|
Examples: Using #include "imgui.h" instead of <imgui.h> appear correct-er as per standard? xcode+clang are very nitpicky there.
|
7 years ago |
|
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)
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
d3e826c247
|
Examples: Updated for reorganized context functions. Calling CreateContext(), DestroyContext() in example code. Removed Shutdown() from binding code. (#1565, #586, #992, #1007, #1558)
|
7 years ago |
|
omar
|
39cb56c39e
|
Examples: OpenGL3+GLFW: Using 3.2 context + GLSL version 150 (#1466)
|
7 years ago |
|
omar
|
ce13426a1a
|
Examples: Comments, synched some minor drift between examples + stronger suggestion to use StyleColorsDark().
|
7 years ago |
|
omar
|
1b86e7343f
|
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
|
7 years ago |
|
omar
|
fba704bf5d
|
Examples: Added a bunch of comments/referencs related to io.WantCaptureMouse, io.WantCaptureKeyboard (#1262, #1237, #1219, #635, #1058, #1051, #912, #533, #703, #446, #459, #364, #213, #52, and more)
|
7 years ago |
|
omar
|
36f00811b9
|
Examples: Comments to guide people unfamiliar with the librairies used.
|
7 years ago |
|
omar
|
cb38caeda4
|
Examples: Added more comments near the fonts loading section, to catch common questions and errors (e.g. #1397, #1366, #1341, #1222, #1193, #1115, #951, etc.)
|
7 years ago |
|
omar
|
b3099d650c
|
Examples: Adding Roboto to the commented-out font list, and removing the unnecessary ProggyClean from there.
|
7 years ago |
|
omar
|
842e88a8e3
|
Examples: Avoid using ImColor() to not tempt newcomers into looking at it
|
7 years ago |
|
omar
|
b8ade0b94f
|
Examples: Main: Removed call to SetNextWindowSize()
|
7 years ago |
|
omar
|
7e452ec737
|
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
7 years ago |
|
omar
|
645875a240
|
Examples: Enable vsync by default in example applications (#1213, #1151)
|
7 years ago |
|
ocornut
|
a68ac96bc4
|
Examples: GL3: Comments about gl3w (#880)
|
8 years ago |
|
ocornut
|
94ec3d534e
|
Examples: Header comments.
|
9 years ago |
|
ocornut
|
5c52e9ec0d
|
Examples: Clarified comments. Removed font merging example from comments.
|
9 years ago |
|
ocornut
|
f87deff0f3
|
Moving stdlib.h include outside of imgui.h (#405)
|
9 years ago |
|
ocornut
|
e858d229a0
|
Examples: update all examples with same comment (#389)
|
9 years ago |
|
ocornut
|
e58f99179a
|
Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage (#287)
|
9 years ago |
|
ocornut
|
4842ac3bc6
|
Fonts: added Cousine-Regular.ttf
|
9 years ago |
|
ocornut
|
0224d29a35
|
Examples: comments.
|
9 years ago |