1
0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-18 04:47:17 +01:00
Commit Graph

65 Commits

Author SHA1 Message Date
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