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
73d493c780
Examples: Organized header files to make available features more visible.
2018-02-05 20:34:11 +01:00
omar
27980d9688
Merge branch 'master' into context
2018-01-31 16:02:26 +01:00
omar
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
cca9c3e3da
Examples: Using Dark theme by default. ( #707 ). Tweaked demo code.
2018-01-31 00:15:47 +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
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
omar
f3776055d6
Merge branch 'master' into context
2018-01-24 19:31:11 +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
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
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
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
407955d9fb
Examples: Using IM_OFFSETOF macro. + Comments
2018-01-05 22:05:02 +01: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
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
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
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
50f5be9266
Examples: GLFW+GL2/GL3: Minor tweaks, comments.
2017-10-23 10:04:38 +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
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
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
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
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
radius
8b6896faf9
add SDL GL3 makefile
2017-07-02 21:38:27 -05:00
radius
e0aac34672
fix compilation on MINGW
2017-07-02 11:21:24 -05: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
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
50b4b29beb
Examples: GLFW+GL3, SDL+GL3: Fixed modifying bound Texture0 ( #1087 , #1088 , #1116 )
2017-04-26 18:16:59 +02:00
ocornut
1396659b72
Examples: Speculative fix for OSX Makefile to make Travis happy (re #812 )
2016-12-21 20:12:43 +01:00
ocornut
a68ac96bc4
Examples: GL3: Comments about gl3w ( #880 )
2016-11-12 12:48:33 +01:00
ocornut
81eefb704b
Minor const fixes for overzealous warnings ( #883 )
2016-11-11 18:40:13 +01: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
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
ocornut
bfb2dc2290
Examples: OpenGL3: Saving/restoring glActiveTexture() state ( #602 )
2016-04-30 19:02:19 +02: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
04396ed7a9
FAQ and comments about the use of ImTextureID ( #562 , #561 , #521 , #510 , #497 , #475 ...)
2016-03-24 11:00:47 +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
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
87a6110994
Examples: OpenGL3: Fix BindVertexArray/BindBuffer order ( #527 )
2016-02-15 10:55:20 +01:00
ocornut
b8f86ec4bd
Examples: OpenGL2/3 Makefile; Added -lGL to Linux build
2016-01-21 22:30:47 +00: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
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
624adb1b23
Tweak build batch files and readmes
2015-11-16 22:03:13 +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
ocornut
5d53f37a5d
Examples: Possibly clarified the intent of imgui_impl_* files.
2015-10-13 17:53:43 +02:00
radius
a465b2b3d8
add msys2/mingw64 target
2015-10-04 15:14:35 -05: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
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
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
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
e58f99179a
Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage ( #287 )
2015-08-27 19:51:02 +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
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
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
52a74701f5
Updated projects to reference new files ( #219 )
...
Didn't update iOS example (#247 )
2015-07-21 17:04:03 -06:00
