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
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
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
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
7c9bd71512
Examples: MSVC: increase warning level from /W3 to /W4 for OpenGL examples
2015-03-14 10:41:42 +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
5879f3f5ac
Examples: OpenGL 2/3 examples cleanup to match DirectX9/11 structure.
2015-03-09 15:02:22 +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
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
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
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
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
381c7428c1
Examples: changed default background color.
2015-01-31 20:08:43 +00:00
ocornut
edcf2d3bf6
Examples: more comments on loading fonts.
2015-01-18 11:38:14 +00:00
ocornut
1916a0c78c
Renamed FontAtlas to Fonts. Further cleanup/comments.
2015-01-18 10:46:49 +00:00
ocornut
2c31599bcc
ImFontAtlas allows loading multiple fonts into same texture. Revamped new init API for 1.30
2015-01-17 22:15:29 +00:00
ocornut
cb9a3235be
Removed PixelCenterOffset, uncesssary
2015-01-17 17:17:18 +00:00
ocornut
ab8d2782c6
Merge remote-tracking branch 'upstream/master' into 2015-01-truetype
...
Conflicts:
imgui.cpp
imgui.h
2015-01-15 18:07:44 +00:00
ocornut
62ecdd21a5
Examples: Added a color slider for the background color + tweak first example use of button.s
2015-01-15 09:59:18 +00:00
ocornut
0f4d74d614
ImFont::GetTextureData API allow to retrieve 8/32 bits data + lazily load defaults font
...
Examples: OpenGL3 and DirectX11 back to using 32-bits texture solely for
ease of integration.
2015-01-11 21:06:57 +00:00
ocornut
241e8086fa
Mde it optional to new() io.Font - however it stills needs to be loaded.
2015-01-11 18:27:05 +00:00
ocornut
51df5874a6
Examples' Says "OpenGL2" vs "OpenGL3" in title bar.
2015-01-11 18:03:40 +00:00
ocornut
a09f426b89
TAB to spaces
2015-01-11 17:56:43 +00:00
ocornut
5ca563b5a5
Speculative fix for warnings for GCC/Clang
2015-01-11 17:22:04 +00:00
ocornut
20bb6270bc
Examples: all supports TextureID in renderer, added LoadFontTexture() function.
2015-01-11 17:17:43 +00:00
ocornut
b3a208901a
Loading TTF file with stb_truetype. Broke setup API slightly. Font baked, packed with space for custom data. Embeds compressed ProggyClean.
2015-01-08 23:35:01 +00:00
ocornut
c1251d2994
Examples: Fixed warnings for Clang
2015-01-06 17:43:23 +00:00
ocornut
1c657564ac
Examples: Added STB_IMAGE_STATIC in examples to avoid conflicting implementation. Relate to #109
2015-01-06 17:35:36 +00:00
omar
e9e0e36f98
New and better Set[Next]Window(Pos|Size|Collapsed) API.
...
Removed rarely useful SetNewWindowDefaultPos() in favor of new API.
2014-12-10 19:22:30 +00:00
omar
09bacfbe18
OpenGL example: allow resizing window.
2014-12-10 15:27:40 +00:00
ocornut
987188d437
Fix Clang warning with offsetof() macro? Added -Wall in OpenGL 3 example.
2014-12-07 09:58:45 +00:00
ocornut
71e20680db
Setup Travis CI integration with Clang + -Wall in Makefiles
2014-12-07 09:48:01 +00:00
omar
2e5b81627f
Examples: DirectX11: moved shader to be close to its usage location,
2014-12-03 18:46:13 +00:00
omar
52b5376d9b
Examples: OpenGL3: cleaned up to match features of OpenGL2 example
2014-12-03 18:40:28 +00:00
omar
b02eed3e49
Examples: adding title to the top of each examples. Cleaning up file headers.
2014-12-03 18:29:46 +00:00
omar
6c9edb6db0
Examples: removed LICENSE file from MSVC project.
2014-12-03 18:19:05 +00:00
omar
63ff0ad0ff
Examples: OpenGL: fix accessing libraries via ProjectDir instead of SolutionDir
2014-12-03 12:00:03 +00:00
ocornut
0730ec7577
Example apps: accumulate mouse wheel to accodomate for slow framerate.
2014-11-30 17:41:08 +00:00
ocornut
0e6f288a2f
DirectX11 example: further tweaks/massaging (-15 lines). Syncing example.
2014-11-30 17:26:44 +00:00
ocornut
0f29cd7a14
Removed Microsoft IME handler in examples, too confusing. Moved to imgui.cpp instruction block.
2014-11-30 15:54:58 +00:00
ocornut
a5a84a9b69
Tab->Spaces :(
2014-11-30 15:53:47 +00:00
ocornut
9e16317382
Added DirectX11 example application (code is too long!)
2014-11-30 14:59:21 +00:00
ocornut
b5acb16378
Examples: created single .sln solution for all example projects.
2014-11-30 12:54:27 +00:00
ocornut
214c967df8
Example code: warning fix + comments.
2014-11-30 12:28:21 +00:00
Mikko Mononen
54ea495207
Updated example code.
2014-11-30 12:24:27 +02:00
ocornut
e4a79e9fc8
Moved IO.Font*** options to inside the IO.Font-> structure.. Added IO.FontGlobalScale setting (vs Font->Scale)
2014-11-29 00:02:46 +00:00
ocornut
df2ad5e899
Renamed ImBitmapFont -> ImFont, removed abstraction-pretend typedef
2014-11-28 22:38:41 +00:00
ocornut
2aee4419e3
Fixed compatibility with std::vector if user decide to #define ImVector
2014-11-20 08:15:21 +00:00
ocornut
616668dac3
OpenGL example: uses offsetof() macros for vertice definition instead of hardcoded offsets
2014-11-15 13:10:15 +00:00
ocornut
36e52167da
OpenGL example: made the render function save/restore OpenGL state properly-ish
2014-11-15 12:56:41 +00:00
ocornut
ec625b7c49
OpenGL/DirextX examples: comments and tweaks.
2014-09-30 10:09:44 +01:00
ocornut
f86286548e
OpenGL example: Tentative fix for missed tap-to-click events on MacBook trackpad
2014-09-30 09:58:02 +01:00
Tomoki SHISHIKURA (RTX-M7)
9bb95db68a
opengl_example makefile cross platform supported.
2014-09-30 10:21:39 +09:00
ocornut
22fe7f23b1
OpenGL example: minor tweak for non-default font.
2014-09-26 01:04:31 +01:00
ocornut
b756510f21
Fix stb_image to load 1/2/4 bpp PNG (unofficial fix, submitted as PR)
2014-09-26 01:02:03 +01:00
ocornut
b9d9f62ae3
OpenGL example: updated stb_image to 1.46
2014-09-25 19:01:50 +01:00
ocornut
4b94454fb4
OpenGL/DirectX examples: support for international text input in UTF-8 + implement ImeSetInputScreenPosFn on Windows.
2014-09-25 14:54:19 +01:00
ocornut
df1c056c88
OpenGL example: added commented code to load custom font from filesystem
2014-09-25 11:41:18 +01:00
ocornut
eb1b9d4521
Revert erroneous commit
2014-09-25 11:38:45 +01:00
ocornut
d35ceb793e
OpenGL example: added commented code to load custom font from filesystem
2014-09-25 11:35:23 +01:00
ocornut
da2ccf0a78
OpenGL example: comments on glfw window size vs frame buffer size.
2014-09-24 13:47:55 +01:00
Yaroslav Bunyak
0e0cd5e705
Add support for Retina displays on MacOSX.
2014-09-20 01:48:10 +03:00
Yaroslav Bunyak
8d32fcb7d4
Add missing framework for MacOSX builds.
2014-09-20 00:28:44 +03:00
ocornut
88c33ecc29
Fixes to allow clean 1-pixel thick lines in more use cases. PixelCenterOffset not the same as previously!
2014-08-28 14:52:10 +01:00
ocornut
b90d0c558d
Minor text alignment
2014-08-26 19:22:09 +01:00
ocornut
80dd1e1065
Added comments
2014-08-26 18:27:10 +01:00
Dale Kim
7bd507d266
Disable client state in OpenGL example after rendering.
...
Using the example code in another application that has other rendering
code can cause rendering bugs or memory access errors if client state
is not disabled.
2014-08-22 16:00:38 -05:00
ocornut
42d4b4be6a
Converted all Tabs to Spaces (git diff -w shows an empty diff)
2014-08-19 12:09:13 +01:00
