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
3171f90a1a
Nav: Keyboard is now automatically mapped based on io.KeyDown[]. ( #787 )
7 years ago
057807f4a7
Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. ( #787 )
7 years ago
cea8017e0b
Merge branch 'master' into context
7 years ago
4b49f03a40
Examples: SDL+GL3: Added Navigation keyboard mapping. ( #787 )
7 years ago
7e1496e994
Merge branch 'master' into navigation
7 years ago
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 )
7 years ago
60fb7d31fd
Examples: SDL2: Enabling vsync. Using scancode consistently, fixed keyboard weirdness.
7 years ago
73d493c780
Examples: Organized header files to make available features more visible.
7 years ago
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
7e7c017b75
Examples: Simplified mouse wheel handling. ( #1463 )
7 years ago
0b1fecb792
Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. ( #1463 )
7 years ago
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
7 years ago
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.
7 years ago
15fd5b6c4c
Examples: SDL: Minor renaming.
7 years ago
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 )
7 years ago
60d5dc7902
Examples: SDL: Fixed mapping of Insert key ( #1555 , fix bug introduced in #1541 )
7 years ago
ce95b84825
Added ImGuiKey_Insert for future use. Setup in all example bindings. ( #1541 )
7 years ago
7484c63449
Examples: OpenGL3+SDL: Changed GLSL shader version to 150 ( #1466 , #1504 )
7 years ago
407955d9fb
Examples: Using IM_OFFSETOF macro. + Comments
7 years ago
9f8632b131
Examples: Comments about invalid mouse pos.
7 years ago
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.
7 years ago
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
36f00811b9
Examples: Comments to guide people unfamiliar with the librairies used.
7 years ago
d9016964ad
Examples: GL3: Comments, tweaks ( #1145 )
7 years ago
c47e5fc76a
Merge branch 'master' of https://github.com/nlguillemot/imgui into nlguillemot-master
7 years ago
cf48e28932
Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes #798
7 years ago
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.
7 years ago
b4fe5d36a4
Examples: OpenGL3+SDL: Fix types to uses GlEnum ( #1147 )
8 years ago
ad3c1e68ab
save and restore sampler in GL 3 examples
8 years ago
9fdd66330f
Examples: SDL2+GL3: Fix blend func state save/restore ( #1120 )
8 years ago
50b4b29beb
Examples: GLFW+GL3, SDL+GL3: Fixed modifying bound Texture0 ( #1087 , #1088 , #1116 )
8 years ago
a68ac96bc4
Examples: GL3: Comments about gl3w ( #880 )
8 years ago
0d3f8807c7
Added a void* user_data parameter to Clipboard function handlers. ( #875 )
8 years ago
b96471143f
Merge branch 'master' of https://github.com/madeso/imgui into madeso-master
8 years ago
bc57fd5d1d
Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness ( #807 )
8 years ago
2825eaa0be
Examples: Accessing ImVector fields directly, feel less stl-ey and fix renderer side assert when render list only contains a callback ( #810 )
8 years ago
08a9e78da5
fixed space issues
8 years ago
5def10c3a0
Fixed OpenGL error when calling Shutdown without calling NewFrame
8 years ago
0a1d456de1
Fix compile warnings in SDL examples
9 years ago
d8dacd729b
Examples: SDL+OpenGL: explicitly setting GL_UNPACK_ROW_LENGTH to reduce issues because SDL changes it ( #752 )
9 years ago
c1da3e354e
Examples: SDL: Fixed unused variable warning on non-Windows platforms ( #626 )
9 years ago
bfb2dc2290
Examples: OpenGL3: Saving/restoring glActiveTexture() state ( #602 )
9 years ago
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.
9 years ago
fdc4299c6c
Examples: SDL: Made ImGui_ImplSdlGL3_NewFrame() signature match GL2 one
9 years ago
e6c2c1fcfd
Examples: SDL: Minor fixes to follow syntax of other examples ( #495 )
9 years ago
8a61c0afea
Applying same fix to OpenGL 3 example. Fixing spaces/tabs.
9 years ago
04396ed7a9
FAQ and comments about the use of ImTextureID ( #562 , #561 , #521 , #510 , #497 , #475 ...)
9 years ago
1dcb9c877d
Examples: OpenGL: Fix early return on zero-sized framebuffer breaking GL state ( #486 , #547 )
9 years ago
2813a44dcc
Examples: OpenGL: skip rendering and calling glViewport() if we have a zero-fixed buffer ( #486 )
9 years ago
omar
Emmanuel Benoît
unknown
Nicolas Guillemot
Gustav
Jamie Seward
Nick Gravelyn