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
3171f90a1a
Nav: Keyboard is now automatically mapped based on io.KeyDown[]. ( #787 )
2018-02-06 19:54:30 +01:00
057807f4a7
Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. ( #787 )
2018-02-06 19:29:31 +01:00
cea8017e0b
Merge branch 'master' into context
2018-02-06 18:04:44 +01:00
4b49f03a40
Examples: SDL+GL3: Added Navigation keyboard mapping. ( #787 )
2018-02-05 23:16:40 +01:00
7e1496e994
Merge branch 'master' into navigation
2018-02-05 23:14:42 +01:00
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
60fb7d31fd
Examples: SDL2: Enabling vsync. Using scancode consistently, fixed keyboard weirdness.
2018-02-05 22:35:29 +01:00
73d493c780
Examples: Organized header files to make available features more visible.
2018-02-05 20:34:11 +01:00
27980d9688
Merge branch 'master' into context
2018-01-31 16:02:26 +01:00
cd3dd886de
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ ( #1569 )
2018-01-31 16:00:07 +01:00
cca9c3e3da
Examples: Using Dark theme by default. ( #707 ). Tweaked demo code.
2018-01-31 00:15:47 +01:00
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
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
3cdd2096ec
Examples: Use Clang in old Makefile.
2018-01-29 00:48:21 +01:00
ddff378daf
Examples: Synced Makefile comments. Added build/ folder into git ignore list/
2018-01-29 00:38:00 +01:00
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
7e7c017b75
Examples: Simplified mouse wheel handling. ( #1463 )
2018-01-20 12:45:31 +01:00
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
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
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
15fd5b6c4c
Examples: SDL: Minor renaming.
2018-01-19 09:43:28 +01:00
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
60d5dc7902
Examples: SDL: Fixed mapping of Insert key ( #1555 , fix bug introduced in #1541 )
2018-01-18 10:01:36 +01:00
ce95b84825
Added ImGuiKey_Insert for future use. Setup in all example bindings. ( #1541 )
2018-01-08 15:30:39 +01:00
7484c63449
Examples: OpenGL3+SDL: Changed GLSL shader version to 150 ( #1466 , #1504 )
2018-01-07 19:09:33 +01:00
407955d9fb
Examples: Using IM_OFFSETOF macro. + Comments
2018-01-05 22:05:02 +01:00
9f8632b131
Examples: Comments about invalid mouse pos.
2017-12-29 15:03:36 +01:00
ce13426a1a
Examples: Comments, synched some minor drift between examples + stronger suggestion to use StyleColorsDark().
2017-12-24 18:45:11 +01:00
1b86e7343f
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
2017-12-24 18:16:22 +01:00
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
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
36f00811b9
Examples: Comments to guide people unfamiliar with the librairies used.
2017-10-28 19:28:22 +02:00
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
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
842e88a8e3
Examples: Avoid using ImColor() to not tempt newcomers into looking at it
2017-09-27 15:47:08 +02:00
b8ade0b94f
Examples: Main: Removed call to SetNextWindowSize()
2017-09-01 17:07:19 +02:00
d9016964ad
Examples: GL3: Comments, tweaks ( #1145 )
2017-09-01 16:55:04 +02:00
c47e5fc76a
Merge branch 'master' of https://github.com/nlguillemot/imgui into nlguillemot-master
2017-09-01 16:49:36 +02:00
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
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
b4fe5d36a4
Examples: OpenGL3+SDL: Fix types to uses GlEnum ( #1147 )
2017-08-12 00:46:58 +08:00
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
f3cf5e0322
Examples: SDL+GL3: Fixed old comments ( #1229 )
2017-07-15 17:50:01 +08:00
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
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
0fe5728971
Examples: SDL+GL3: Makefile fix for Linux ( #1229 , #1209 )
2017-07-15 13:07:43 +08:00
8b6896faf9
add SDL GL3 makefile
2017-07-02 21:38:27 -05:00
ad3c1e68ab
save and restore sampler in GL 3 examples
2017-05-16 16:43:59 -07:00
c3d9e0a6eb
Examples: SDL2: Tweaked batch files for Win32.
2017-05-01 15:00:42 +02:00
