omar
aa3fe81c87
Examples: DPI: Hacked in a quick compile-and-run-everywhere call to SetProcessDpiAwareness(), will need to revisit.
2018-03-08 18:46:30 +01:00
omar
9ea16e344a
Viewport: Disable extra viewports from hosting other windows. ( #1542 )
2018-03-07 16:34:18 +01:00
omar
d8719cf59b
Fixed warnings.
2018-03-07 14:46:53 +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
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
7fd62baa42
Examples: Added Makefile for SDL+OpenGL2 example. ( #1668 )
2018-03-07 11:50:56 +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
omar
0d063585e8
Merge branch 'jdm3_master'
2018-02-22 17:04:15 +01:00
omar
f43068c543
Examples: DirectX10, DirectX11: Simplified main example code.
2018-02-22 13:15:16 +01:00
omar
0b26387a2b
Simplified .gitignore list
2018-02-21 23:14:55 +01:00
omar
493ec0bc98
Simplified .gitignore list
2018-02-21 23:13:53 +01:00
omar
f7ef10e547
Examples: Titles/comments in headers
2018-02-21 23:05:17 +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
f67699456c
Examples: Added SDL+Vulkan example, the abstraction worked here :) (ref #1367 )
2018-02-21 22:41:04 +01:00
omar
387f724d33
Examples: Vulkan: Formatting and tweaks (to match SDL's main).
2018-02-21 22:39:49 +01:00
omar
bcdfd5d61c
Merge branch 'master' into examples_refactor
2018-02-20 16:18:02 +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
d534207622
Examples: GLFW: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). ( #1495 )
2018-02-20 14:18:02 +01:00
omar
11b12488e8
Examples: GLFW*: Renamed GLFW callbacks exposed in .h to not include GL2/GL3/Vulkan in their name.
2018-02-20 14:09:46 +01:00
omar
7e2e0535dd
Examples: DirectX 9,10,11: Inputs: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). ( #1495 )
2018-02-20 13:55:09 +01:00
omar
e660d92fa5
Examples: GLFW: Added mouse cursors support ( #1495 )
2018-02-19 22:29:52 +01:00
omar
9fdf72e42b
Examples: WIn32: Prefixing every Win32 function calls with :: to denote global namespace in a consistent manner.
2018-02-18 21:23:11 +01:00
omar
df9051ded2
Examples: Vulkan: Added support for io.DisplayPos.
2018-02-18 21:15:51 +01:00
omar
230c5ca735
Examples: Vulkan: Fixed GLFW calls.
2018-02-18 21:15:41 +01:00
omar
3bd3693fb7
Examples: DirectX10, DirectX11, OpenGL2, OpenGL3: Added support for io.DisplayPos.
2018-02-18 21:09:28 +01:00
omar
6d0f9244b8
Examples: Allegro5, Marmalade: Moved bindings to parent folder. Renamed Allegro stuff from *A5_ to *Allegro5_
2018-02-18 20:26:20 +01:00
omar
80a8aea7e3
Examples: Added SDL, Vulkan examples to .sln file.
2018-02-18 20:26:20 +01:00
omar
4f0db01f7c
Examples: DirectX9: Reusing imgui_impl_win32, removed that code from imgui_impl_dx9
2018-02-18 20:26:20 +01:00
omar
6cd4e30b58
Examples: DirectX10: Reusing imgui_impl_win32, removed that code from imgui_impl_dx10
2018-02-18 20:26:20 +01:00
omar
19540479d4
Examples: DirectX11: Extracted imgui_impl_dx11.* instead imgui_impl_dx11 and imgui_impl_win32
2018-02-18 20:26:20 +01:00
omar
90dffb5a06
Examples: Vulkan: Extracted into imgui_impl_vulkan.*, reused imgui_impl_glfw* files.
2018-02-18 20:26:20 +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
42c32bf00c
Examples: OpenGL2, OpenGL3: Added glPixelStorei() calls borrowed from SDL examples.
2018-02-18 20:26:20 +01:00
omar
c8a9969511
Examples: GLFW+GL2: Moved glfw, gl2 files to root folder, split imgui_impl_glfw_gl2 into _opengl2 and reused imgui_impl_glfw
2018-02-18 20:26:20 +01:00
omar
b0a8734c92
Examples: GLFW+GL3: Split imgui_impl_glfw_gl3 into imgui_impl_glfw and imgui_impl_gl3 (wip)
2018-02-18 20:26:19 +01:00
omar
f5f3730b16
Examples: GLFW+GL2/GL3: Added glPixelStorei() calls borrowed from SDL examples.
2018-02-16 23:19:38 +01:00
omar
9e713b115f
Examples: Renamed .sln file.
2018-02-16 22:38:19 +01:00
omar
243fd67b1c
Examples: Vulkan: Fix for empty draw data (init time) + fixed warning.
2018-02-16 22:37:46 +01:00
omar
10752423ec
Examples: Vulkan: Added .vcproj files.
2018-02-16 22:37:41 +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
7cc1bc7635
Added IsAnyMouseDown() helper.
...
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
2018-02-10 16:50:19 +01:00
omar
2493f609ef
Examples: Vulkan: Fix (something changed in GLFW not including vulkan.h, was unwillingly relying on that)
2018-02-06 20:57:33 +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
ae30efc0fd
Nav: Examples: Added commented out io.NavFlags |= ImGuiNavFlags_EnableKeyboard to all examples. ( #787 )
2018-02-06 19:58:23 +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
7e32fc7109
Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). ( #787 )
2018-02-06 19:23:12 +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
533fe8cb55
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-02-05 14:55:57 +01:00
Gerry Hernandez
4786321754
Fix iOS code; fixes entire XCode build for Apple example
2018-02-04 21:47:08 -05:00
omar
27980d9688
Merge branch 'master' into context
2018-01-31 16:02:26 +01:00
omar
47e81a6194
Merge branch 'master' into navigation
2018-01-31 16:00:25 +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
23c11e9764
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-31 15:43:19 +01:00
omar
6c38aa2dc7
Examples: Apple: Tweak code and sync with other examples better (untested).
2018-01-31 00:16:44 +01:00
omar
cca9c3e3da
Examples: Using Dark theme by default. ( #707 ). Tweaked demo code.
2018-01-31 00:15:47 +01:00
omar
955d86199f
Examples: Tweaks formatting.
2018-01-30 23:55:23 +01:00
omar
2933e6765c
Merge branch 'master' into navigation
2018-01-29 17:42:39 +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 Cornut
858d75ab59
Examples: Apple: Fixed filenames in OSX xcode project.
2018-01-28 23:24:57 +01:00
omar
66d5712a8a
Examples: Vulkan: FIxed warnings in 32-bit modes (vulkan uses VkDeviceSize which is always 64-bit long)
2018-01-28 20:03:41 +01:00
omar
3ded262776
Merge branch 'master' into navigation
2018-01-26 16:07:43 +01:00
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 )
2018-01-25 16:18:57 +01:00
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 )
2018-01-25 16:02:33 +01:00
Jérôme Pasquier
94ed44b5cb
Fix allegro5_example build instructions
2018-01-25 13:33:35 +01:00
Jérôme Pasquier
c226e02ca0
Fix sdl_opengl2_example filename in README.md's build instructions
2018-01-25 13:27:57 +01:00
omar
2c7324da56
TODO list, added uSynergy README
2018-01-25 12:38:15 +01:00
omar
f3776055d6
Merge branch 'master' into context
2018-01-24 19:31:11 +01:00
omar
8c57d8cc1e
Natvis: Fix ImRect expanded height display being broken and dumb. ( #1569 )
2018-01-24 19:10:09 +01:00
omar
6f27d6b5b8
Natvis: Made ImGuiWindow display shorter.
2018-01-24 18:52:26 +01:00
omar
c2e92ab61b
Added imgui.natvis helper for visual studio users. Added to examples projects.
2018-01-24 18:40:54 +01:00
omar
277f6e7842
Examples: Comments
2018-01-24 18:40:23 +01:00
omar
dd89c9ea59
Examples: Made the Win32 proc handlers not assert if there is no active context yet, to be more flexible with creation order. ( #1565 )
2018-01-21 20:58:50 +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
omar
7dea158175
Examples: Allegro, Apple, DirectX9/10/11, Glfw+Vulkan :Added support for horizontal mouse wheel. ( #1463 )
2018-01-20 12:36:59 +01:00
omar
0b1fecb792
Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. ( #1463 )
2018-01-20 12:36:16 +01:00
omar
6f6b6194b2
Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel
...
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
2018-01-20 12:06:06 +01:00
omar
f3e510a9bf
Examples: SDL: Using SDL_CaptureMouse() to retrieve coordinates outside of client area when dragging. ( #1559 )
...
Digging into sdl window/mouse stuff will also be useful for multi-viewport work.
2018-01-19 10:46:54 +01:00
omar
00351ee2ab
Examples: SDL: Minor renaming.
2018-01-19 09:55:49 +01:00
omar
ba99900023
Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness.
2018-01-19 09:50:58 +01:00
omar
79dca9d5e6
Examples: SDL+GL2: Renamed imgui_impl_sdl.* to imgui_impl_sdl_gl2.* for consistency and to emphasis on GL2-ness.
2018-01-19 09:50:58 +01:00
omar
15fd5b6c4c
Examples: SDL: Minor renaming.
2018-01-19 09:43:28 +01:00
omar
ce17e0f274
Examples: SDL: Using SDL_WINDOW_INPUT_FOCUS instead of SDL_WINDOW_MOUSE_FOCUS (which is ~~hovered). We should use SDL_CaptureMouse + SDL_WINDOW_MOUSE_CAPTURE_FLAG which requires SDL 2.0.4 will give it a try shortly. ( #1559 )
2018-01-19 09:25:31 +01:00
omar
60d5dc7902
Examples: SDL: Fixed mapping of Insert key ( #1555 , fix bug introduced in #1541 )
2018-01-18 10:01:36 +01:00
omar
ce95b84825
Added ImGuiKey_Insert for future use. Setup in all example bindings. ( #1541 )
2018-01-08 15:30:39 +01:00
omar
39cb56c39e
Examples: OpenGL3+GLFW: Using 3.2 context + GLSL version 150 ( #1466 )
2018-01-07 19:09:34 +01:00
omar
7484c63449
Examples: OpenGL3+SDL: Changed GLSL shader version to 150 ( #1466 , #1504 )
2018-01-07 19:09:33 +01:00
omar
3d24a9eb40
Examples: DirectX9/10/11: Comments about CS_DBLCLKS + formatting tweaks. ( #1538 )
2018-01-05 22:32:27 +01:00
omar
65dd55cb2b
Merge pull request #1538 from ndandoulakis/ndandoulakis-CS_DBLCLKS-patch
...
Examples: DirectX9,10,10: Support for CS_DBLCLKS by treating double-click down messages are regular down. (#1538 , #754 )
2018-01-05 22:27:40 +01:00
omar
407955d9fb
Examples: Using IM_OFFSETOF macro. + Comments
2018-01-05 22:05:02 +01:00
Nick Dandoulakis
bfc25bc8a3
CS_DBLCLKS support for DirectX 11
2018-01-05 22:28:27 +02:00
Nick Dandoulakis
583e97b297
CS_DBLCLKS support for DirectX 10
2018-01-05 22:25:30 +02:00
Nick Dandoulakis
20ae6439ea
CS_DBLCLKS support for Directx9
2018-01-05 22:16:35 +02:00
omar
4c90529c62
Examples: Visual Studio projects: Disabled extraneous function-level check in Release build.
2018-01-04 11:42:05 +01:00
omar
9f8632b131
Examples: Comments about invalid mouse pos.
2017-12-29 15:03:36 +01:00
omar
78f48bb795
Examples: DirectX10,DirectX11: Moved call to OMSetRenderTargets() in main loop so example code can integrate more nicely with other code.
2017-12-25 14:54:54 +01:00
omar
3a4a2bb27c
Examples: Vulkan: Tweak
2017-12-24 18:49:19 +01:00
omar
ce13426a1a
Examples: Comments, synched some minor drift between examples + stronger suggestion to use StyleColorsDark().
2017-12-24 18:45:11 +01:00
omar
1b86e7343f
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
2017-12-24 18:16:22 +01:00
omar
b263bc5689
Examples: DirectX: Using IM_ARRAYSIZE()
2017-12-23 14:07:27 +01:00
omar
cf9b893841
Examples: Added null_example/ which is helpful for quick testing on multiple compilers/settings without relyong on graphics library.
2017-12-23 13:40:01 +01:00
omar
c8b5b569da
Examples: DirectX9: Call EndFrame(), fix for assert added in 9a44d447cd
2017-11-28 11:26:14 +01:00
omar
e000ee0116
Examples: DirectX9: Handle loss of D3D9 device (D3DERR_DEVICELOST). ( #1464 )
2017-11-28 10:48:01 +01:00
Emmanuel Benoît
77a310736d
Horizontal mouse wheel support
...
This patch adds support for the horizontal mouse wheel in ImGui. It
affects windows that can be scrolled, as long as the Ctrl key is not
being pressed.
The scrolling speed has been set empirically so that it matches the
scrolling speed on the Firefox browser when the horizontal wheel is
used.
Internally, it adds a MouseHorizWheel to ImGuiIO, which is then used in
NewFrame to scroll the current window.
The SDL/GL2, SDL/GL3, GLFW/GL2 and GLFW/GL3 examples has been modified
to use it.
2017-11-27 20:59:05 +01:00
omar
ef5dd30625
Sisyphus says: tweaked comments about not using old-style OpenGL examples ( #1459 , #1394 etc.)
2017-11-24 09:27:45 +01:00
omar
6bd3b45b34
Sisyphus says: tweaked comments about not using old-style OpenGL examples ( #1459 , #1394 etc.)
2017-11-24 09:23:17 +01:00
Codecat
979fe30a6f
Fix wrong comment in dx implementation headers
2017-11-18 13:56:59 +01:00
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)
2017-11-01 14:24:09 +01:00
omar
36f00811b9
Examples: Comments to guide people unfamiliar with the librairies used.
2017-10-28 19:28:22 +02:00
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.)
2017-10-28 18:21:44 +02:00
omar
c5027d4fa1
Examples: Extra clarification for the 100th person who insist on using the OpenGL2 code in spite of existing documentation leaning against it. ( #1394 )
2017-10-25 20:55:15 +02:00
omar
d2c65aa3e8
Examples: DirectX9/10/11: Tweak usage of SetCapture/ReleaseCapture. ( #1375 )
...
ps: DirectX 12 example (#302 ) may want to adopt that as well.
2017-10-24 14:48:00 +02:00
omar
50f5be9266
Examples: GLFW+GL2/GL3: Minor tweaks, comments.
2017-10-23 10:04:38 +02:00
omar
d6a9956781
Examples: DirectX9/10/11: Added WM_SYSKEYDOWN / WM_SYSKEYUP handlers so e.g. VK_MENU can be read.
2017-10-23 10:01:18 +02:00
omar
c14a66970b
Examples: DirectX9/10/11: Renamed WndProc handler to use a generic Win32 name + returning 0 to all messages is more correct.
2017-10-23 09:57:59 +02:00
omar
a96f095deb
Examples: DirectX10, DirectX11: Using SetCapture/ReleaseCapture to get correct behavior ( #1375 )
...
ps: DirectX 12 example (#302 ) may want to adopt that as well.
2017-10-23 09:46:49 +02:00
omar
3e0765ee22
Examples: DirectX9: Using SetCapture/ReleaseCapture to get correct behavior ( #1375 )
2017-10-23 09:43:30 +02:00
omar
e03198bb0f
Fixed compilation for #1375 + coding style fixes.
2017-10-23 09:43:30 +02:00
Gargaj
839067fda9
Capture/release window in DX9 implementation
...
This helps a lot when the user drags a slider but carries the cursor offscreen before releasing the button - without the capturing, the slider will "stick" to the mouse cursor even after the button has been released. (This should generally be added to all Windows implementations - I won't mind doing it if you think it's a good idea.)
2017-10-17 12:37:21 +02:00
omar
b3099d650c
Examples: Adding Roboto to the commented-out font list, and removing the unnecessary ProggyClean from there.
2017-10-04 19:28:04 -07:00
omar
842e88a8e3
Examples: Avoid using ImColor() to not tempt newcomers into looking at it
2017-09-27 15:47:08 +02:00
Jefferson Montgomery
3fd5790814
Pass render target format in ImGui_ImplDX12_Init() instead of hard-coded.
2017-09-24 14:57:46 -07:00
Jefferson Montgomery
f6b6dace9e
Pass command list in using ImGui_ImplDX12_NewFrame() instead of ImGui_ImplDX12_Init()
2017-09-24 14:43:46 -07:00
Jefferson Montgomery
f72b95d73f
Merge 'ocornut/master' into 'jdmo3/master'
2017-09-24 14:43:11 -07:00
omar
3dd3d0b248
Examples: DirectX11: allow creating device with feature level 10 sinec we don't really need much for that example. ( #1333 )
2017-09-24 12:54:49 +02:00
ocornut
d5d825debb
Nav/Examples: honoring the io.WantMoveMouse flag in most common examples ( #323 )
...
Missing support Vulkan (#549 ), Apple (#575 , #247 ), SDL (#58 , #356 ),
Allegro, Marmalade (#368 , #375 )
2017-09-18 16:04:44 +02:00
omar
b8ade0b94f
Examples: Main: Removed call to SetNextWindowSize()
2017-09-01 17:07:19 +02:00
omar
4abce8af58
Examples: GL2: Renaming, comments.
2017-09-01 17:07:19 +02:00
omar
d9016964ad
Examples: GL3: Comments, tweaks ( #1145 )
2017-09-01 16:55:04 +02:00
omar
c47e5fc76a
Merge branch 'master' of https://github.com/nlguillemot/imgui into nlguillemot-master
2017-09-01 16:49:36 +02:00
omar
7d1f2c0dc5
Examples: GL2: rename functions to include GL2 in name
2017-09-01 16:45:31 +02:00
unknown
cf48e28932
Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes #798
2017-09-01 20:39:12 +12:00
omar
92a6faca6f
IO: io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we'll now accept negative mouse coordinates.
2017-08-25 16:43:25 +08:00
omar
3b11e73333
Examples: gitignore added patterns for modern MSVC versions
2017-08-20 15:17:37 +08:00
omar
b4fe5d36a4
Examples: OpenGL3+SDL: Fix types to uses GlEnum ( #1147 )
2017-08-12 00:46:58 +08:00
omar
048322f3fd
Merge pull request #1147 from TinyTinni/master
...
Examples: OpenGL3+GLFW3: Fix types to uses GlEnum (#1147 )
2017-08-12 00:43:34 +08:00
omar
7e452ec737
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
2017-08-11 13:36:28 +08:00
omar
645875a240
Examples: Enable vsync by default in example applications ( #1213 , #1151 )
2017-07-23 16:13:17 +08:00
omar
166e8f6261
Examples: OpenGL2+GLFW/SDL: Added commented out glUseProgram(0) in main.cpp for visibility ( #1116 )
2017-07-23 15:57:39 +08:00
omar
c8794c246e
Examples: Vulkan: Batch file builds both debug and release
2017-07-23 15:22:21 +08:00
omar
f3cf5e0322
Examples: SDL+GL3: Fixed old comments ( #1229 )
2017-07-15 17:50:01 +08:00
omar
52df0032a5
Travis: Blind fix for SDL+GL3 project on the Travis build setup.
...
Examples: SDL+GL3: Makefile blind fix for OSX (untested) (#1229 , #1209 )
2017-07-15 13:19:13 +08:00
omar
358e667b7a
Travis: Adding the SDL+GL3 project on the Travis build setup (for both Linux and OSX).
...
Examples: SDL+GL3: Makefile blind fix for OSX (untested) (#1229 , #1209 )
2017-07-15 13:13:09 +08:00
omar
0fe5728971
Examples: SDL+GL3: Makefile fix for Linux ( #1229 , #1209 )
2017-07-15 13:07:43 +08:00
radius
8b6896faf9
add SDL GL3 makefile
2017-07-02 21:38:27 -05:00
radius
d43695b748
fix gl2 sample too
2017-07-02 21:28:56 -05:00
radius
e0aac34672
fix compilation on MINGW
2017-07-02 11:21:24 -05:00
omar
99ff2ec6fb
Examples: DirectX9/10/11: Comments
2017-06-02 11:28:48 +02:00
omar
51c200ac0d
Examples: DirectX9: Clarified texture release code ( #1163 )
2017-06-02 11:25:45 +02:00
TinyTinni
3a7111cfcd
casting to GLint on init
2017-05-17 21:42:34 +02:00
Nicolas Guillemot
ad3c1e68ab
save and restore sampler in GL 3 examples
2017-05-16 16:43:59 -07:00
TinyTinni
0981d8e381
fixes types
2017-05-16 12:49:47 +02:00
omar
b0db625cab
Examples: Vulkan: Fixed an extra validation (tested on Windows with VulkanSDK 1.0.46.0) ( #1042 )
2017-05-01 17:07:53 +02:00
omar
f87b152522
Examples: Vulkan: Various very minor stylistic fixes, fixing typos in comments, etc. ( #1042 #1043 )
2017-05-01 17:07:05 +02:00
Peter Particle
201d589714
Image presentation now depends on the completeness of command buffer submission through semaphores.
...
To maintain maximum frame rate we render to the last acquired swapchain image but present the last but one drawn image. This behavior is optional through conditional compilation macros.
2017-05-01 16:54:49 +02:00
Peter Particle
a9add1ce63
Removed redundant VkResult plugged into VkPresentInfoKHR pResults attribute. This is only meaningful when we present directly to multiple swapchains. In that case we can an VkResult per swapchain.
2017-05-01 16:53:54 +02:00
Peter Particle
eaae754211
Removed redundant barrier.
...
The transition of the swapchain image(s) can happen implicitly in the renderpass. This approach has been stated to be more efficient than using an explicit barrier.
See "Vulkan Programming Guide", Chapter 7: "Graphics Pipelines", section "Renderpasses".
2017-05-01 16:52:52 +02:00
Peter Particle
33874073dc
Fixed all issues found by vulkan debug report. Reasons for the major design changes are commented.
2017-05-01 16:48:16 +02:00
omar
89d03d5cca
Examples: Vulkan: Disable IMGUI_VULKAN_DEBUG_REPORT by default. Update .bat files for newer VulkanSDK.
2017-05-01 16:46:57 +02:00
Peter Particle
56dff3a080
Vulkan backend: optionally enabling vulkan validation layers and debug report callback
...
Additional layer, extension and the callback itself are used/created when IMGUI_VULKAN_DEBUG_REPORT is defined. The callback reports seven (potential!) errors which will be fixed with another pull request.
2017-05-01 16:32:45 +02:00
omar
9fd3ba871b
Merge branch 'g_FrameIndex_not_used_fix' of https://github.com/ParticlePeter/imgui into ParticlePeter-g_FrameIndex_not_used_fix
2017-05-01 16:21:43 +02:00
omar
5418bb19ff
Examples: Vulkan: windows batch file for 64-bits.
2017-05-01 16:14:13 +02:00
omar
ac2eb4b960
Merge branch 'vk_small_fix' of https://github.com/martty/imgui into martty-vk_small_fix
2017-05-01 15:26:29 +02:00
omar
c3d9e0a6eb
Examples: SDL2: Tweaked batch files for Win32.
2017-05-01 15:00:42 +02:00
omar
475446b8b9
Merge pull request #1080 from SaschaWillems/master
...
Examples: Vulkan: Small changes to be in line with specs and fix validation layer errors/warnings
2017-05-01 14:50:34 +02:00
omar
b3d237a5ce
Examples: SDL2: Added build .bat files for win32.
2017-05-01 13:47:59 +02:00
omar
9fdd66330f
Examples: SDL2+GL3: Fix blend func state save/restore ( #1120 )
2017-05-01 12:20:51 +02:00
Gregg Tavares
01286f6636
Fix blend func state save/restore
...
AFAIK there's no such enum as `GL_BLEND_SRC` or `GL_BLEND_DST` in OpenGL3 and OpenGL4.
Maybe they're left over from previous versions? They don't even seem to exist in OpenGL 2.1. In fact checking they were deprecated in OpenGL 1.5 (they exist in 1.3)
2017-05-01 16:05:45 +09:00
omar
f030087f8e
Comments to redirect people to OpenGL3 examples ( #1116 )
2017-04-26 18:27:10 +02:00
omar
50b4b29beb
Examples: GLFW+GL3, SDL+GL3: Fixed modifying bound Texture0 ( #1087 , #1088 , #1116 )
2017-04-26 18:16:59 +02:00
saschawillems
4da26d85cd
Clip negative scissor offsets to zero
2017-03-26 19:54:59 +02:00
saschawillems
12deb53b11
Set required depth member for buffer image copy
2017-03-26 19:38:05 +02:00
Jefferson Montgomery
30954b4a88
Merge latest from ocornut/imgui
2017-03-13 13:26:55 -07:00
Peter Particle
337019a68f
typo, #elif instead of #else, fixed
2017-02-26 17:16:37 +01:00
Peter Particle
fd90da38e1
Vulkan backend: g_FrameIndex not used fix -> huge perf gain
...
Added a macro to switch between unlimited frame rate (VK_PRESENT_MODE_IMMEDIATE_KHR) and limited to 60 fps (VK_PRESENT_MODE_FIFO_KHR). Only the latter mode is guaranteed to be available, but the former one most likely is.
2017-02-26 13:25:54 +01:00
Marcell Kiss
e0244c8f62
Fix scissor offset being negative
2017-02-11 12:20:12 +01:00
Marcell Kiss
509df3e279
Fix new Vulkan validation warnings
2017-02-11 12:19:44 +01:00
ocornut
1396659b72
Examples: Speculative fix for OSX Makefile to make Travis happy (re #812 )
2016-12-21 20:12:43 +01:00
ocornut
d74a3349e9
Examples: DirectX9: Explicitely setting viewport to match that other examples are doing ( #937 )
2016-12-19 23:15:38 +01:00
ocornut
127dd7c88c
Examples: Vulkan: Coding style fixes ( #910 )
2016-11-13 17:57:43 +01:00
Håvard Mathisen
a5600b6e59
Vulkan example: Proper surface format search.
2016-11-13 05:23:33 +01:00
Håvard Mathisen
b447a71cf6
Vulkan example: Fix gamma for some implementations.
2016-11-13 04:28:26 +01:00
Håvard Mathisen
08ef9819c8
Vulkan example: Fix validation layer warnings and errors and redeclare gl_PerVertex.
2016-11-13 03:00:36 +01:00
ocornut
7c2b35704d
Examples: DirectX9-10-11: Only call Windows' SetCursor(NULL) when io.MouseDrawCursor is set ( #585 , #909 )
2016-11-12 19:46:52 +01:00
ocornut
55863dd274
Examples: Vulkan: Shallow stylistic changes (following #879 )
2016-11-12 17:49:59 +01:00
ocornut
0449bb98e2
Merge branch 'master' of https://github.com/martty/imgui into martty-master
2016-11-12 17:36:46 +01:00
ocornut
a68ac96bc4
Examples: GL3: Comments about gl3w ( #880 )
2016-11-12 12:48:33 +01:00
ocornut
775ac24d45
Fixed overzealous GCC warnings ( #883 ) + partly undo 8553bab241
2016-11-12 11:14:37 +01:00
omar
89d033aba3
Merge pull request #898 from tinnnysu/master
...
Examples: SDL+OpenGL2: Update cmdline syntax in Windows compilation.
2016-11-12 11:08:51 +01:00
ocornut
81eefb704b
Minor const fixes for overzealous warnings ( #883 )
2016-11-11 18:40:13 +01:00
sushitao
833ed760ae
update cmdline syntax in windows compilation
2016-11-09 14:53:23 +08:00
Marcell Kiss
53126cd713
Add location decorators & change to use structs as in/out in glsl, update embedded spv (produced with glslangValidator -x)
2016-10-18 22:43:20 +02:00
Marcell Kiss
44250caf50
Null the released resources
2016-10-18 22:07:51 +02:00
ocornut
0d3f8807c7
Added a void* user_data parameter to Clipboard function handlers. ( #875 )
2016-10-15 11:36:43 +02:00
ocornut
2919c77bee
Examples: GLFW+OpenGL3: Fixed Shutdown() calling GL functions with NULL parameters if NewFrame was never called ( #800 )
2016-10-01 14:59:28 +02:00
ocornut
b96471143f
Merge branch 'master' of https://github.com/madeso/imgui into madeso-master
2016-10-01 14:56:24 +02:00
ocornut
612b17ef57
Fixing minor english typos ( #827 )
2016-09-11 22:02:35 +02:00
ocornut
02399852fe
Examples: OpenGL2: Uploading font texture as RGBA32 to increase compatibility with users shaders for beginners ( #824 )
2016-09-10 17:43:17 +02:00
Felipe Oliveira Carvalho
6e6f04f513
Fix Mac OS X build and remove cruft from Makefile
2016-09-10 11:22:40 +02:00
ocornut
bc57fd5d1d
Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness ( #807 )
2016-09-05 23:39:52 +02:00
ocornut
031d4e689d
Examples: OpenGL3: Revert Makefile change for OSX for now ( #812 )
2016-09-05 22:52:45 +02:00
ocornut
2825eaa0be
Examples: Accessing ImVector fields directly, feel less stl-ey and fix renderer side assert when render list only contains a callback ( #810 )
2016-09-03 19:24:57 +02:00
Kun Lin
aa0cb13aa4
Correct name for linking opengl3_example
...
According to glfw offcial site, linking `libglfw.3.dylib` etc should
use `-lglfw`.
Changed this made the compilation on my Mac successfully.
2016-09-02 21:57:31 +09:00
Gustav
08a9e78da5
fixed space issues
2016-08-29 23:35:56 +02:00
Håvard Mathisen
99b4f951b9
Fix Vulkan example for use when a depth buffer is active.
2016-08-27 19:08:24 +02:00
Gustav
5def10c3a0
Fixed OpenGL error when calling Shutdown without calling NewFrame
2016-08-27 00:32:20 +02:00
ocornut
5ae71aa04a
Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)
2016-08-25 10:25:51 +02:00
ocornut
3c384c2f10
Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)
2016-08-25 10:18:09 +02:00
ocornut
82768e05f3
Ignore list for Visual Studio
2016-08-20 13:30:42 +02:00
Marcell Kiss
4bc6a951fe
tabs to space, remove braces
2016-08-20 13:27:03 +02:00
Marcell Kiss
3234f81cb1
maxImageCount may be 0; add missing sType; change to 1 push constant range
2016-08-20 13:08:34 +02:00
Jamie Seward
0a1d456de1
Fix compile warnings in SDL examples
2016-07-30 15:26:49 -07:00
ocornut
d8dacd729b
Examples: SDL+OpenGL: explicitly setting GL_UNPACK_ROW_LENGTH to reduce issues because SDL changes it ( #752 )
2016-07-29 10:10:41 +02:00
Jeongseok Lee
47911d92b2
Fix minor typo in examples/README.txt
2016-05-20 07:04:54 -04:00
ocornut
1349d0aacf
Examples: DirectX9: Removing spaces ( #663 )
2016-05-16 10:54:52 +02:00
Trezanik
790275eae2
Example: DirectX9: Backup and restore all state
2016-05-16 01:02:09 +01:00
ocornut
8a0d3b9628
Examples; DirectX10/11: Added comments about removing dependency on d3dcompiler DLL ( #638 )
2016-05-08 11:49:21 +02:00
ocornut
2ef766a1ce
Examples: DirectX10: Apply depth-stencil state like DirectX11 example ( #640 , #636 )
2016-05-07 20:57:38 +02:00
ocornut
656b1e848c
Examples: DirectX11: Fixed uninitialized fields. Disabling depth-write ( #640 , #636 )
2016-05-07 20:53:55 +02:00
ocornut
f4633d09ac
Examples: DirectX10, DirectX11: Removed seemingly unnecessary bunch of rasterizer state creation code.
2016-05-07 20:19:04 +02:00
ocornut
834bfe4af5
Examples: DirectX11: Fixed handle leak + minor coding style fix for #640
2016-05-07 20:11:14 +02:00
josiahmanson
5fe2cacd4d
DX11 example depth test
2016-05-07 10:42:48 -07:00
ocornut
c1da3e354e
Examples: SDL: Fixed unused variable warning on non-Windows platforms ( #626 )
2016-05-04 23:20:41 +02:00
ocornut
79ad22e1f2
Fixed various Clang -Weverything warnings ( #626 )
2016-05-04 23:17:53 +02:00
ocornut
f46c91f5ad
Examples: DirectX9: Removed dependency on dxguid.lib + remainder of d3dx9.lib ( #611 )
2016-05-03 11:30:43 +02:00
ocornut
731ff3d3f5
Examples: DirectX9: Removed dependency on dx3x9 (remainder) ( #611 )
2016-05-03 11:12:59 +02:00
ocornut
50df86985d
Examples: DirectX9: Removed dependency on dx3x9.h so it can be used in a DirectXMath.h only environment ( #611 )
2016-05-03 10:47:42 +02:00
ocornut
bfb2dc2290
Examples: OpenGL3: Saving/restoring glActiveTexture() state ( #602 )
2016-04-30 19:02:19 +02:00
ocornut
c2c0b57e5e
Examples: OpenGL2: Extra comments ( #606 )
2016-04-24 18:11:54 +02:00
ocornut
559963e832
Examples: Apple/iOS: lowered xcode project deployment target from 10.7 to 10.11 ( #598 , #575 )
2016-04-20 20:49:49 +02:00
ocornut
1612ca071b
Examples: SDL: Initialize video+timer subsystem only.
2016-04-13 00:15:58 +02:00
ocornut
4466a7b3b0
Examples: DirectX9: save/restore some more device state.
2016-04-11 18:33:16 +02:00
omar
319e288eef
Update README.md
2016-04-05 23:08:21 +02:00
ocornut
71b981d05f
Examples: Apple: Readme tweaks ( #575 #247 )
2016-04-05 22:50:23 +02:00
James Chen
67b604412b
Remove local glfw3 lib for osx. (+1 squashed commit)
...
Squashed commits:
[34cc3b7] Adds osx example. (+6 squashed commits)
Squashed commits:
[20330f2] Uses glfw by brew install.
[0427861] Renames imguiex folder name to imguiex-ios
[f9e27e5] Renames ios_example to apple_example.
[44f8fe3] Updates the glfw header/library path.
[919f279] Renames target from imguiex to imguiex-ios since there is already a imguiex-osx target now.
[24395f5] Adds osx example.
2016-04-05 18:13:48 +08:00
ocornut
c1427de5b6
Examples: Libs: Update glfw binaries to glfw master.
2016-04-03 17:41:59 +02:00
ocornut
0e7b9b8284
Examples: Vulkan: Coding style tweaks.
2016-04-03 17:32:53 +02:00
ocornut
9c513d4443
Merge branch 'master' of https://github.com/Loftilus/imgui into Loftilus-master
2016-04-03 16:42:56 +02:00
ocornut
552246feed
Examples: DirectX10,DirectX11 : Minor renaming
2016-04-03 13:02:04 +02:00
ocornut
518f32ccfe
Examples: DirectX10: Save/restore state + minor cleanups ( #570 )
2016-04-03 12:59:56 +02:00
ocornut
90493f8add
Examples: DirectX11: Shallow massaging to make the code more consistent/readable (following #570 )
2016-04-03 12:48:38 +02:00
ocornut
2942240072
Examples: DX11: Cleanup state backup/restore code ( #570 )
2016-04-03 12:43:17 +02:00
Nicolas Guillemot
d4d51a7802
capture and restore all state
2016-04-02 19:08:27 -07:00
ocornut
a6399f120f
IO: Added "Super" keyboard modifiers (corresponding to Cmd on Mac and Windows key in theory although the later is hard to read) ( #473 )
...
NB: Value not used.
2016-04-02 18:22:40 +02:00
ocornut
ae0c33c983
Examples: Links
2016-03-29 11:33:23 +02:00
ocornut
7661b1e778
Trim trailing spaces
2016-03-26 15:43:45 +01:00
ocornut
fdc4299c6c
Examples: SDL: Made ImGui_ImplSdlGL3_NewFrame() signature match GL2 one
2016-03-25 22:27:43 +01:00
ocornut
e6c2c1fcfd
Examples: SDL: Minor fixes to follow syntax of other examples ( #495 )
2016-03-25 22:25:20 +01:00
Nick Gravelyn
8a61c0afea
Applying same fix to OpenGL 3 example. Fixing spaces/tabs.
2016-03-25 22:20:57 +01:00
Nick Gravelyn
a9b0abe493
Automatically updating DisplayFrameBufferScale by reading the OpenGL drawable size and comparing with the window size. This fixed dear imgui which was rendering only to 1/4 of my window.
2016-03-25 22:19:07 +01:00
ocornut
04396ed7a9
FAQ and comments about the use of ImTextureID ( #562 , #561 , #521 , #510 , #497 , #475 ...)
2016-03-24 11:00:47 +01:00
Håvard Mathisen
1394616d9c
Vulkan Example: Some code layout changes.
2016-03-10 12:30:38 +01:00
Håvard Mathisen
4ea4fa3e73
Vulkan Example: Fix synchronization.
2016-03-10 11:59:42 +01:00
Håvard Mathisen
0ceddc29ff
Vulkan Example: Fix windows build.
2016-03-09 17:01:38 +01:00
Håvard Mathisen
4cbd316f01
Vulkan example.
2016-03-09 16:39:54 +01:00
ocornut
1dcb9c877d
Examples: OpenGL: Fix early return on zero-sized framebuffer breaking GL state ( #486 , #547 )
2016-03-06 10:46:57 +01:00
Jefferson Montgomery
f6181b3428
Examples: DirectX12: Add directx12_example
2016-02-22 15:22:48 -08:00
ocornut
2813a44dcc
Examples: OpenGL: skip rendering and calling glViewport() if we have a zero-fixed buffer ( #486 )
2016-02-16 09:14:38 +01:00
ocornut
9e86d0e225
Examples: SDL/OpenGL: Tabs to spaces
2016-02-15 10:56:37 +01:00
ocornut
87a6110994
Examples: OpenGL3: Fix BindVertexArray/BindBuffer order ( #527 )
2016-02-15 10:55:20 +01:00
ocornut
07e379a950
Examples: DirectX9: Wastefully use a RGBA8 texture for the font texture to make compability more evident with user's textures ( #521 )
2016-02-08 09:03:43 +01:00
ocornut
b8f86ec4bd
Examples: OpenGL2/3 Makefile; Added -lGL to Linux build
2016-01-21 22:30:47 +00:00
ocornut
a81a5e5235
Commented Clang warning that's not compatible with all versions. Comments.
2016-01-21 21:40:22 +00:00
ocornut
9e8795f4e2
Examples: Added extra comments
2016-01-21 18:51:42 +00:00
ocornut
31fe006c85
Examples: DirectX10 fixed ImGui_ImplDX10_NewFrame() from recreating device objects if render isn't called (g_pVB not set)
2016-01-11 10:29:03 +00:00
ocornut
6277ffe00f
Examples: DirectX11: fixed ImGui_ImplDX11_NewFrame() from recreating device objects if render isn't called (g_pVB not set)
2016-01-11 10:19:38 +00:00
ocornut
49fb7364b5
Examples: SDL2+OpenGL3: Fix context creation options ( #468 , #463 )
2016-01-05 10:23:43 +01:00
ocornut
3aa4a108ed
Examples: SDL/OpenGL3: Fixed linking documentation for MacOSX ( #463 )
2015-12-30 11:27:39 +01:00
ocornut
217a6c875a
Examples: OpenGL: Tentative fix for miscaled call to glViewport on high-DPI screens ( #441 )
...
Fix for 980ca286fe
2015-12-19 20:54:23 +01:00
ocornut
bf83ac8b55
Examples: Fixed msvc batch files from warning.
2015-12-07 21:27:25 +00:00
ocornut
9596e6f794
Examples: DirectX10: Minor tweaks, updated to latest example changes ( #424 )
2015-12-03 18:32:01 +00:00
ocornut
dadd03fc11
Examples: DirectX10: Fix warning, disable debug device, add ignore list ( #424 )
2015-12-03 18:20:48 +00:00
Julian Bosch
32c1a3e46c
Removed d3d11 references
2015-12-03 13:39:03 +01:00
Julian Bosch
1f3a0e78cc
Ported d3d11 renderer to d3d10
2015-12-03 13:18:35 +01:00
omar
fe2972e8b2
Merge pull request #420 from RaptorFactor/master
...
Examples: DX11: Compile shaders with lower features levels.
2015-11-30 19:36:06 +00:00
Joshua Boyce
6adf644448
Allow DX11 renderer to be used with devices with lower feature levels.
2015-12-01 05:08:30 +11:00
ocornut
1b7aee7b9d
Examples: DX11: Remove debug flag ( #415 )
2015-11-30 10:22:46 +00:00
ocornut
6cee2fca94
Examples: Not clearing input data/tex data in atlas (will be required for dynamic atlas anyway). Effectively fix resizing in DX examples.
...
+ Standardized comments.
2015-11-29 14:54:05 +00:00
ocornut
94ec3d534e
Examples: Header comments.
2015-11-29 11:25:15 +00:00
ocornut
6800939e73
Examples: Header comments.
2015-11-29 11:19:30 +00:00
ocornut
5c52e9ec0d
Examples: Clarified comments. Removed font merging example from comments.
2015-11-29 11:11:03 +00:00
ocornut
d673db3092
Examples: Added README into the Visual Studio solution to people are less likely to miss it.
2015-11-29 11:01:50 +00:00
ocornut
9735563b65
Additional comments for new users
2015-11-29 10:53:03 +00:00
zryan3
aa6cb32bd4
fixed text referencing GLFW library in SDL examples
2015-11-27 23:04:35 -07:00
ocornut
83e6cfbec0
Examples: DirectX9/11: Removed assumption about Unicode build in example main.cpp ( #399 )
2015-11-22 21:23:56 +00:00
ocornut
dc86a8a0bf
Examples: OpenGL3: Fixed gl3w.c for Linux when compiled with C++ compiler ( #411 )
2015-11-22 17:16:55 +00:00
ocornut
38cfdafbaf
Examples: SDL/OpenGL3: Added -ldl to Linux command-line ( #411 )
2015-11-22 17:09:03 +01:00
ocornut
e2ecc02e02
Examples: Updated README
2015-11-16 22:17:10 +01:00
ocornut
899cb3b4e9
Examples: SDL+OpenGL3: Fixed readme ( #356 )
2015-11-16 22:13:06 +01:00
ocornut
ab7e91b65e
Examples: SDL+OpenGL3: Various fixes to example to make it matches current GL3 example ( #356 )
2015-11-16 22:12:18 +01:00
ocornut
9d0caa2e66
Examples: SDL+OpenGL3: Using glew like existing example + renaming ( #356 )
2015-11-16 22:05:22 +01:00
ocornut
624adb1b23
Tweak build batch files and readmes
2015-11-16 22:03:13 +01:00
ocornut
9a8cbf128d
Merge branch 'SDL_OpenGL3_Implementation' of https://github.com/zach2good/imgui into zach2good-SDL_OpenGL3_Implementation
2015-11-16 21:35:49 +01:00
ocornut
f87deff0f3
Moving stdlib.h include outside of imgui.h ( #405 )
2015-11-13 17:08:54 +01:00
ocornut
3b2fdf27a8
Examples: Added /Zi (output debug information) in build_win32.bat files
2015-11-11 09:45:18 +00:00
ocornut
1d76890526
Examples: OpenGL3: Implement ImGui_ImplGlfwGL3_InvalidateDeviceObjects() like other examples.
2015-11-08 22:52:25 +00:00
ocornut
e46c7b70eb
Examples: Most examples apps detect if ImDrawIdx was changed to 32-bits instead of 16
2015-11-08 11:00:31 +00:00
ocornut
0a23e2c832
Tabs to spaces
2015-10-30 15:57:03 +01:00
ocornut
980ca286fe
Examples: OpenGL2/3: Save/setup/restore viewport as part of render function. Update SDL example to match GL2 one. ( fix #392 )
2015-10-30 15:44:47 +01:00
ocornut
e858d229a0
Examples: update all examples with same comment ( #389 )
2015-10-30 10:45:16 +01:00
Doug Binks
e1bc0dd7d5
Font merge demo and documentation minor additions.
...
Clarifies the lifetime requirements for the ranges parameter for AddFont* functions.
2015-10-25 16:06:42 +00:00
Gargaj
e4d916a4b3
NULL out font texture on invalidate
...
If this isn't done, NewFrame won't re-create the font.
2015-10-18 19:05:04 +02:00
ocornut
2b3fb5c0f7
Example: Marmalade: shallow tweaks and cleanups to match ImGui coding style ( #375 )
2015-10-15 12:44:30 +02:00
gzito
ba9c469ff0
no message
2015-10-14 23:13:02 +02:00
gzito
ebf4f1fa02
no message
2015-10-14 23:05:01 +02:00
gzito
79ca203850
Merge branch 'master' of https://github.com/ocornut/imgui
2015-10-14 23:01:52 +02:00
ocornut
5d53f37a5d
Examples: Possibly clarified the intent of imgui_impl_* files.
2015-10-13 17:53:43 +02:00
Nicolas Guillemot
509ac33abe
fix POSITION format (ImDrawVert::pos is 2D, not 4D)
...
the inputlayout incorrectly described the POSITION attribute as being
4D, while ImDrawVert::pos is 2D. This went unnoticed because the buffer
binding has a stride of sizeof(ImDrawVert) and the POSITION is treated
as a float2 in the vertex shader. If you switch POSITION to float4 in
the vertex shader (and actually use the z/w in the matrix
multiplication) then everything become wacky-looking since it's
interpreting the texture coordinates as z/w. On a similar note: It's
weird that the projection matrix takes z and w into consideration when
those don't exist in the shader due to positions being float2s.
2015-10-11 16:42:22 -07:00
gzito
50b25b6c75
Added example for the Marmalade platform
2015-10-08 22:38:37 +02:00
ocornut
a77e534ded
Examples: OpenGL2: Add msys2/mingw64 target ( #361 )
2015-10-08 20:48:50 +02:00
radius
a465b2b3d8
add msys2/mingw64 target
2015-10-04 15:14:35 -05:00
Zach Toogood
e130b09d91
Previous SDL implementation didn't work with my OpenGL 3.3 project, spliced the GLFW OpenGL examples on top of the SDL example to create an option that works for me. Could be useful for others.
2015-09-30 15:12:00 +01:00
ocornut
963f6b782d
Examples: OpenGL3: saving more of blend state ( #347 )
2015-09-27 22:21:11 +02:00
ocornut
d5502cdd6d
Examples: OpenGL3: Saving/restoring the Enable state, better than nothing ( #347 )
2015-09-23 09:14:27 +02:00
ocornut
25b4b88a7a
Examples: Update readme.
2015-09-10 21:10:01 +01:00
ocornut
ad4c962224
Examples: DirectX11: Fixed batch file for VS 2012+, still works for 2008/2010.. Include path order matters...
2015-09-10 20:58:43 +01:00
ocornut
853f265025
Examples: Added batch files to build Windows examples with VS
2015-09-10 20:34:06 +01:00
ocornut
167c02d502
Better Git ignore list for quick compilations in same folder
2015-09-10 20:09:29 +01:00
ocornut
1793c1a991
Comments
2015-09-09 14:15:17 +01:00
ocornut
7d6ddbe5c8
Examples: comment on setting the RenderDrawListsFn function.
2015-09-07 14:58:26 +01:00
ocornut
77bcb7152b
Examples: DirectX11: fixed vertex shader which breaks with VS2015 somehow (DX11 version?) ( #313 )
2015-09-01 10:47:36 +01:00
ocornut
0bb46c824e
Examples: OpenGL2/3: save/restore some more state correctly.
...
Might save an hour of staring at blank-screen to 5% of the population,
worth it.
2015-08-29 17:44:52 +01:00
ocornut
da807e55ea
Examples: Ignore list a little more friendly to Unix systems.
2015-08-28 16:03:05 +01:00
ocornut
5ebd61f89c
Ignore list a little more friendly to Unix systems
2015-08-28 15:55:22 +01:00
ocornut
e58f99179a
Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage ( #287 )
2015-08-27 19:51:02 +01:00
ocornut
62671ef96e
Examples: update readme
2015-08-25 22:14:31 +01:00
ocornut
822eaf1751
Examples: DX9, DX11: mapping missing middle mouse button.
2015-08-25 16:54:47 +01:00
ocornut
9a0650dbd0
Examples: imgui_impl* functions declared with IMGUI_API to ease copy & pasting into projects using DLL
2015-08-24 14:02:51 +02:00
yinjimmy
01a17aa78e
fix ios compile error
2015-08-23 08:03:21 +08:00
ocornut
23ce837dc7
Revert "Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods ( fix #279 )"
...
This reverts commit d80869189a
.
2015-08-21 00:16:07 +02:00
ocornut
d80869189a
Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods ( fix #279 )
2015-08-20 22:32:07 +01:00
Andres Vahter
ccbc72e98b
add mac os x build instructions for sdl_opengl_example
2015-08-18 10:16:16 +03:00
ocornut
215747635d
Examples: DirectX11: resizing buffers dynamically ( #299 )
2015-08-13 23:13:20 -06:00
ocornut
c016f6c171
Examples: DirectX9: tweaks.
2015-08-13 23:07:53 -06:00
ocornut
698c7cae85
Examples: DirectX9: resizing vertex and index buffers dynamically ( #299 )
2015-08-13 23:06:11 -06:00
Thomas Pöchtrager
3604aecf8f
Minor Windows adjustments
2015-08-09 17:24:10 +02:00
Thomas Pöchtrager
947cf3434f
Added printf attribute to printf like text formatting functions
2015-08-08 19:29:11 +02:00
ocornut
470200ee5c
Update documentation
2015-08-05 21:59:07 -06:00
ocornut
85dab1a680
Fixed documentation
2015-08-05 19:19:12 -06:00
ocornut
8be4d41540
Merge remote-tracking branch 'origin' into 2015-07-cleanup
2015-08-05 09:32:29 -06:00
Chris Maughan
d667de9490
Clear font texture view to ensure Release() doesn't get called twice
2015-08-04 14:22:05 +01:00
ocornut
e099798c97
Merge remote-tracking branch 'origin' into 2015-07-cleanup
2015-08-01 22:12:51 -06:00
ocornut
11d91a27a4
Carriage return ( #289 )
2015-08-01 17:18:01 -06:00
Jonathan Adamczewski
f158617551
Show SDL error message on init failure
2015-08-02 01:35:43 -07:00
ocornut
52a74701f5
Updated projects to reference new files ( #219 )
...
Didn't update iOS example (#247 )
2015-07-21 17:04:03 -06:00
ocornut
0eb196d544
Examples: OpenGL3: simplified code using glBufferData for vertices as well ( #277 , #278 )
2015-07-19 10:52:51 -06:00
ocornut
dc1cb9e625
Tweak
2015-07-19 10:49:56 -06:00
Nik Voss
bc9bae6d01
To support drivers with strict core profiles, a buffer is used for the indices as well ( fixes ocornut/imgui#277 ).
2015-07-19 17:56:14 +02:00
omar
98047b1b65
Update README.txt
2015-07-16 14:28:16 -06:00
omar
f53d5da0f8
Update README.txt
2015-07-16 14:27:35 -06:00
Daniel Gibson
b7d1b91e4b
Use ImGuiIO::AddInputCharactersUTF8() in SDL2 example
...
Now Unicode text input works in this example.
2015-07-16 05:16:22 +02:00
Daniel Gibson
02a0967243
Fix SDL2-example for Linux
...
The header is called "SDL_opengl.h" - case matters on Linux.
The main() function must indeed be called main(), on Windows it'll be
renamed to SDL_main (for SDL2main.lib) by #define in SDL_main.h
(which is included by SDL.h)
I added an entry to the example's README that describes how to build
it on Linux.
2015-07-16 03:54:44 +02:00
ocornut
4842ac3bc6
Fonts: added Cousine-Regular.ttf
2015-07-15 14:56:29 -06:00
ocornut
0224d29a35
Examples: comments.
2015-07-15 09:05:17 -06:00
ocornut
fcec337061
Examples: Simplified font examples comments.
2015-07-15 07:05:34 -06:00
ocornut
fd44b9440b
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-07-10 21:45:25 -06:00
ocornut
f2bed00d80
Examples: README
2015-07-09 08:39:44 -06:00
ocornut
5ab23ab1c0
Allegro 5 example: removed public domain mark, MIT as the rest, with @bggd approval
2015-07-08 17:25:56 -06:00
ocornut
2f574ef952
Allegro 5 example: converted for indexed rendering.
2015-07-08 12:55:40 -06:00
ocornut
60dd221737
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-08 12:49:18 -06:00
ocornut
bbaaab7537
Allegro 5 example: fixed uv coordinate of non-default texture.
2015-07-08 12:41:09 -06:00
ocornut
4d2d0ce5cd
Allegro 5 example: handling of hardware and software mouse cursor rendering.
2015-07-08 12:16:50 -06:00
ocornut
8db229b96f
Allegro 5 example: fixed key modifiers, keyboard input, clipping, added pagedown/pageup.
2015-07-08 12:04:13 -06:00
ocornut
c58d61dfd1
Allegro 5 example: formatting, match other example structure, fixed mouse buttons.
2015-07-08 11:53:30 -06:00
ocornut
489e28ec11
Allegro 5 example: main.cpp matches other examples. added window title.
2015-07-08 11:46:18 -06:00
ocornut
1845ff4690
SDL example: tweaks ( #233 #226 )
2015-07-08 11:42:43 -06:00
ocornut
19e3c1506f
Allegro5 example: added example from https://github.com/bggd/a5imgui_example
2015-07-08 11:34:36 -06:00
ocornut
e49977a913
SDL example: hasty readme.
2015-07-08 11:08:58 -06:00
ocornut
d041ebc6d4
Merge branch '2015-03-antialiased-primitives' of https://github.com/ocornut/imgui into 2015-03-antialiased-primitives
2015-07-08 10:33:25 -06:00
ocornut
b7e63c163c
SDL example: update for indexed rendering.
2015-07-08 10:32:55 -06:00
ocornut
b36ff2fec3
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-08 10:30:30 -06:00
omar
12aba576fb
Merge pull request #264 from joeld42/antialias-ios-fix
...
AA branch: iOS Example: update for API changes and index rendering
2015-07-08 10:29:39 -06:00
ocornut
a14f6696a3
SDL example: more cleanup to match other examples ( #233 #226 )
2015-07-08 10:27:25 -06:00
ocornut
22e099366f
SDL example: further cleanup to match other examples ( #233 #226 )
2015-07-08 10:20:08 -06:00
ocornut
4167528001
SDL example: moved event loop to main.cpp , adding page up/page down. ( #226 )
2015-07-08 10:10:54 -06:00
Joel Davis
81cebb9c85
Simplified to not combine vert buffers like the opengl3 example
2015-07-08 09:01:10 -07:00
ocornut
b7a2a6b23f
SDL example: renamed folder, added in README
2015-07-08 09:49:32 -06:00
ocornut
b3ae2976c5
SDL example: tweaks and fixes.
2015-07-08 09:46:55 -06:00
ocornut
046dbf502c
Merge branch 'SampleSDL2' of https://github.com/CedricGuillemet/imgui into CedricGuillemet-SampleSDL2
2015-07-08 09:01:04 -06:00
ocornut
e3b9a61883
Examples: OpenGL3: simplified code. Upload each vertex array separately. (cf #264 )
2015-07-08 08:27:36 -06:00
Joel Davis
ca042134ae
Update ios example for API changes and index rendering
2015-07-07 23:43:27 -07:00
ocornut
1cd391146d
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-07 21:48:28 -06:00
ocornut
7d144eb899
iOS Example: Optimise PNG files size
2015-07-07 21:37:50 -06:00
ocornut
fb27360ea8
iOS example: shallow tweaks and fixes (untested)
2015-07-07 21:35:09 -06:00
Joel Davis
eee6dab226
iOS example working based on modified OpenGL3 example + Synergy
2015-07-07 21:17:48 -06:00
ocornut
d03b046ef4
AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention ( #133 )
2015-07-07 20:17:07 -06:00
ocornut
25882c47a3
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
examples/directx9_example/imgui_impl_dx9.cpp
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
examples/opengl_example/imgui_impl_glfw.cpp
imgui.cpp
2015-07-07 12:15:35 -06:00
ocornut
502e360ee5
Removed the majority of size_t from the code. ImVector<> now uses int. ( #262 )
...
May trigger new compilation warnings?
2015-07-07 12:09:25 -06:00
ocornut
6a22835f63
AA branch: ImDrawList: rename commands to cmd_buffer
...
Not strictly necessary but while we're doing minor breakage let's do
them at all once.
2015-07-06 21:09:05 -06:00
ocornut
b2b616be00
AA branch: ImDrawCmd idx_count -> elem_count
2015-07-05 22:09:15 -06:00
ocornut
f3303fa84f
AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API ( #133 #254 )
2015-07-05 22:03:46 -06:00
ocornut
8b4a470e1d
Examples: DirectX9: fixed size passed to vertex and index buffer Lock() + readjust default buffer sizes.
2015-07-05 19:24:26 -06:00
ocornut
61e551e0ee
AA branch: fixed warning
2015-07-04 13:41:51 -06:00
ocornut
f435e42561
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
examples/opengl_example/imgui_impl_glfw.cpp
2015-07-04 12:44:25 -06:00
ocornut
7437b43b2d
Fixed warnings for more pedantic settings ( #258 )
2015-07-03 08:15:56 -06:00
ocornut
b69d7d9df3
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-02 21:47:48 -06:00
ocornut
2f03511062
Added ImGuiKey_PageUp, ImGuiKey_PageDown for user.
2015-07-02 21:43:07 -06:00
ocornut
71e9f2a3dd
Fixed warnings for 64-bits builds
2015-06-29 15:46:18 -06:00
Cedric Guillemet
2acdafe4f2
imgui_impl_sdl and main sample
2015-05-25 09:40:58 +02:00
ocornut
e3f2ad728a
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
2015-05-21 22:57:29 +01:00
Gordon McShane
6ee65fc5af
Add conditional compilation of forward compat. glfw window hint to fix crash on later versions of OSX
2015-05-18 18:26:16 -04:00
ocornut
b6f3c97e3b
Examples: DirectX11: explicitly set rasterizer state.
2015-05-18 21:38:17 +01:00
ocornut
e9b6e437eb
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
imgui.cpp
imgui.h
2015-05-15 17:33:04 +01:00
ocornut
5df542c3c0
ImFontAtlas: doesn't clear input data, left to the application. ( #224 )
2015-05-12 15:16:12 +01:00
ocornut
f00662a5ad
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
2015-05-02 22:20:48 +01:00
ocornut
ad7f600e0d
Examples: DirectX9/11: hide os curosr if ImGui is drawing it ( #155 )
2015-05-01 11:25:15 +02:00
ocornut
18a00c7060
Examples: DirectX9/11: Fixed key mapping for down arrow.
2015-04-24 09:18:56 +02:00
ocornut
4f1acf0d4a
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
imgui.cpp
2015-04-17 08:42:36 +01:00
ocornut
f400ea4ec8
Examples: OpenGL3: backup/restore current program and texture #195
2015-04-15 10:14:51 +01:00
Dale Kim
ac518a1d3e
Set modifier key state by inspecting imgui's io.KeysDown array.
2015-04-14 14:09:26 -05:00
ocornut
43cb4038c6
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
imgui.cpp
2015-04-14 09:51:28 +01:00
ocornut
71429d306e
Examples: Simplified GLFW keyboard callbacks
2015-04-14 09:45:27 +01:00
ocornut
c735d3066b
Merge branch 'master' of https://github.com/Roflraging/imgui into Roflraging-master
2015-04-14 09:37:10 +01:00
Dale Kim
fe15756129
Simplified glfw keyboard callbacks.
2015-04-13 20:04:53 -05:00
ocornut
d809abbe1c
Examples: DirectX11: tidying up.
2015-04-09 23:32:36 +01:00
ocornut
7ab49f80ca
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
2015-04-09 21:22:06 +01:00
ocornut
4f51b77937
Examples: OpenGL3: Tweaks (argh, github ui)
2015-04-09 21:19:21 +01:00
ocornut
90766141b3
Examples: OpenGL3: Tweaks.
2015-04-09 21:18:43 +01:00
ocornut
37f1715bfa
Examples: DirectX11: Removed unnecessary vertices conversion and CUSTOMVERTEX types.
2015-04-09 21:14:52 +01:00
ocornut
1746b04065
Indexed rendering. Not in main branch because breaks rendering code too much. Will merge in trunk along with more major graphics changes lat
2015-04-09 21:05:35 +01:00
ocornut
d9ff617ff8
Examples: Formatting #187
2015-04-07 12:56:52 +01:00
heroboy
e09e2cbd28
set pixel shader and vertex shader to NULL
...
Previous graphic render may use shaders,so set pixel shader and vertex shader to NULL to force use fixed pipeline.
2015-04-07 19:36:58 +08:00
omar
46769406dc
Update README.txt
2015-04-07 10:59:49 +01:00
ocornut
73e2d56acc
Examples: OpenGL fixed-pipeline: added glBindTexture(0), via Anton M
2015-04-06 10:45:10 +01:00
Dale Kim
4b7be31197
Fixed modifier key state setting in GLFW callbacks.
2015-04-03 09:01:48 -05:00
ocornut
d25578efd8
Examples: initializing float + missing comment.
2015-04-03 12:11:41 +01:00
ocornut
3abfb85613
Comments on font loading, fixed commented out paths and added DroidSans in the list
2015-03-28 11:48:42 +00:00
ocornut
ed94edfd8e
Examples: Terser code + added commented out glUseProgram(0( suggestion in OpenGL2 sample.
2015-03-22 14:14:23 +00:00
Adam D. Moss
c1766c95ed
OpenGL/GLFW: hide system cursor if imgui is soft-rendering cursor
2015-03-22 13:49:36 +00:00
biller23
2f4271a2b3
typo ImGui_ImplGlfwGL3_KeyCallback()
2015-03-18 21:02:29 +01:00
ocornut
cb285c4d35
Examples: uses SetNextWindowPos/SetNextWindowSize when applicable
2015-03-16 11:53:36 +00:00
ocornut
04358c301e
Removed extraneous spaces
2015-03-16 11:49:18 +00:00
Adam D. Moss
f2ff88b03a
opengl3+opengl example: if content window doesn't have focus, tell ImGui we don't have a mouse position. e.g. avoids tooltips popping up in imgui app when you're interacting with a different app window that overlaps it.
2015-03-16 10:47:14 +00:00
ocornut
d3e444dfd9
Examples: DirectX9: fixed duplicate creation of vertex buffer. Size of static vertex buffer at top of the code.
2015-03-16 10:02:10 +00:00
ocornut
06fbeed41a
Examples: Fixed Makefile
2015-03-14 11:29:09 +00:00
ocornut
55edd522c2
Examples: Fixed Makefile
2015-03-14 11:24:53 +00:00
ocornut
e97d02a294
Examples: Fixed Clang warnings in DirectX examples
2015-03-14 10:49:26 +00:00
ocornut
7c9bd71512
Examples: MSVC: increase warning level from /W3 to /W4 for OpenGL examples
2015-03-14 10:41:42 +00:00
ocornut
2b0acc128c
Examples: MSVC: increase warning level from /W3 to /W4 for DirectX examples
2015-03-14 10:32:29 +00:00
ocornut
8e0f04638d
Examples: Fix includes order to avoid conflicts between DXSDK_DIR and Windows SDK
2015-03-14 10:24:35 +00:00
ocornut
e2c4ba21bc
Examples: Added 64-bit projects for MSVC
2015-03-14 10:09:53 +00:00
ocornut
ef957b7878
Examples: Moved GLFW/GL3W to a common libs/ folder
2015-03-14 10:04:30 +00:00
ocornut
834085c90c
Examples: Updated to GLFW 3.1
2015-03-14 10:00:11 +00:00
ocornut
0911526424
Added io.KeyAlt + support in examples apps
...
Currently unused but supported by sample so that more people will have
it set up when menus needs them
2015-03-13 09:49:38 +00:00
ocornut
d5b7b8398f
Examples: reference implementations honors drawlist user callbacks.
2015-03-09 15:26:58 +00:00
ocornut
db5fc8a265
Examples: README direct the user to the opengl_example
2015-03-09 15:09:24 +00:00
ocornut
5879f3f5ac
Examples: OpenGL 2/3 examples cleanup to match DirectX9/11 structure.
2015-03-09 15:02:22 +00:00
ocornut
f9c833b4a5
Examples: DirectX9 example cleanup to match DirectX11 structure.
2015-03-09 14:55:46 +00:00
ocornut
66a5837ba8
Examples: DirectX11 example application handles window resizing.
2015-03-09 14:51:10 +00:00
ocornut
866fa95aaa
Examples: DirectX9 example application handle window resizing.
2015-03-09 14:13:29 +00:00
ocornut
25765e4bfc
Examples: Fixed readme file.
2015-03-09 13:49:52 +00:00
ocornut
b4165c43ff
Examples: Refactored directx11_example to be easier to copy & paste into user application.
2015-03-09 13:45:23 +00:00
ocornut
567184dc9f
Examples: Clang warning fix.
2015-03-09 13:38:23 +00:00
ocornut
3f86554457
Examples: Makefile fixes.
2015-03-09 13:22:32 +00:00
ocornut
2dd92e3eed
Examples: Clang/Linux warning fixes.
2015-03-09 13:08:27 +00:00
ocornut
a3f3793cb6
Examples: Tweaks.
2015-03-09 13:05:18 +00:00
ocornut
7397425097
Examples: Refactored directx9_example to be eaasier to copy & paste into user application.
2015-03-09 13:03:46 +00:00
ocornut
b87ec205a9
Examples: shallow tweaks to match upcoming other examples.
2015-03-09 13:02:32 +00:00
ocornut
b227b0f8cd
Examples: Rename globals again
2015-03-09 12:16:29 +00:00
ocornut
4f27bd6ed3
Examples: Moved gl3w to opengl3_example directory + fixed msvc project paths
2015-03-09 12:11:24 +00:00
ocornut
4da432bd7b
Examples: Makefile
2015-03-09 12:03:09 +00:00
ocornut
99ed567577
Examples: Rename global to be more consistent
2015-03-09 12:02:34 +00:00
ocornut
d829852391
Examples: Refactored opengl3_exapmle into a glfw specific file that can be copied and pasted
2015-03-09 11:59:23 +00:00
ocornut
545a57d253
Examples: Refactored opengl_example into a glfw specific file that can be copied and pasted.
...
Other examples will follow.
2015-03-09 11:25:15 +00:00
ocornut
be9fe9489c
Examples: DirectX examples uses WM_KEYDOWN/WM_KEYUP
...
Fixes pressing Enter in IME being caught by application right after
validating an IME input.
2015-03-06 21:39:55 +00:00
ocornut
e269125c3a
Windows: setup a default handler for ImeSetInputScreenPosFn so IME (Japanese/Chinese) inputs are positioned correctly.
...
User need to set io.ImeWindowHandle
2015-03-06 21:11:14 +00:00
ocornut
386cfada83
Examples: Windows examples don't link with imm32.lib by default.
2015-03-06 18:19:21 +00:00
ocornut
b911f96a56
Examples: Speculative Makefile fix. I should get a Linux box instead on relying on Jenkins, this is pretty embarrassing.
2015-02-27 11:19:50 +00:00
ocornut
dc7cdb3025
Examples: Fix Makefile
2015-02-27 11:07:23 +00:00
ocornut
5aaf0cd2dc
Examples: Fix OpenGL3 example Makefile
2015-02-27 11:00:31 +00:00
ocornut
3ed38f3313
Replaced dependency on glew (inc. prebuilt one for Windows) by gl3w in source form
...
Expecting something to break now.
2015-02-27 10:53:17 +00:00
ocornut
00270b837f
Examples: Desperate attempts removing link warnings under Windows. Screw standard librairies.
2015-02-27 10:14:20 +00:00
ocornut
37d8d5c5be
Examples: OpenGL2 example doesn't need Glew
2015-02-27 10:05:06 +00:00
ocornut
40b04a3701
Renamed ImGuiSetCondition_*** to ImGuiSetCond_*** and ImGuiCondition_FirstUseThisSession to ImGuiCond_Once
2015-02-27 09:51:11 +00:00
ocornut
9c4972ee9d
Examples: msvc: output .exe in project directory (not in solution directory).
2015-02-24 10:06:13 +00:00
ocornut
fc322fde0f
Examples: added README file
2015-02-24 09:59:56 +00:00
ocornut
546460cd26
Examples: Removed unused file
2015-02-24 09:49:26 +00:00
ocornut
0d63e0ce60
Examples: DirectX examples applications all have a Console for debugging.
2015-02-22 13:45:07 +00:00
ocornut
cb0a4db048
Calculate frame-rate for the user, as a purely luxurious feature
...
..and to reduce sample code size a little.
2015-02-11 18:28:17 +00:00
ocornut
d65e051a07
Minor formatting tweaks, comments
2015-02-11 18:14:39 +00:00
ocornut
b623f97d9f
Examples: DirectX11: fixed build setting of Release mode.
2015-02-01 09:33:51 +00:00
ocornut
35c0842bcf
Examples: DirectX11: fixed handling of unicode character inputs.
2015-01-31 23:26:53 +00:00
ocornut
5834297928
Examples: DirectX11: increasing vertex buffer size (would really need a dynamic buffer size)
...
+ Delete unused code
2015-01-31 21:12:59 +00:00
ocornut
381c7428c1
Examples: changed default background color.
2015-01-31 20:08:43 +00:00