Compare commits

...

28 Commits
v1.19 ... v1.20

Author SHA1 Message Date
b0ea57e518 Version number 2015-01-07 19:07:43 +00:00
4260195159 Revert "Reexported proggy_clean_13 in a 256x64 texture (instead of 256x128) and documented exact export parameters"
Correct but cause problems because many people don't have 1 BPP PNG loaders

This reverts commit 98a38e24ab.
2015-01-07 18:59:44 +00:00
26fdf1655c Fixed leak on shutdown (fixes #110) + possible uninitialized member. 2015-01-07 14:55:35 +00:00
c1251d2994 Examples: Fixed warnings for Clang 2015-01-06 17:43:23 +00:00
1c657564ac Examples: Added STB_IMAGE_STATIC in examples to avoid conflicting implementation. Relate to #109 2015-01-06 17:35:36 +00:00
98a38e24ab Reexported proggy_clean_13 in a 256x64 texture (instead of 256x128) and documented exact export parameters 2015-01-05 11:13:02 +00:00
0505995193 Very minor code/comments tweaks. 2015-01-04 22:29:53 +00:00
4905ec46f1 Fixed hovering of child windows / combo boxes that extend beyond the root window limits. 2015-01-04 22:07:37 +00:00
3fe669f547 Failure in LogToFile() treated at an error (assert) in the absence of another type of error handling. 2015-01-04 21:37:49 +00:00
22c1d7eded Renamed some color enums 2015-01-04 19:37:24 +00:00
39373b563b Checkbox and Radio buttons activate on click-release to be consistent with other widgets and most UI 2015-01-04 19:23:36 +00:00
97d34271f8 Fix clipboard pasting into an InputText box not filtering the characters according to input box semantic (number, etc.) 2015-01-04 18:47:08 +00:00
a5f4108781 Activating widget bring parent window to front 2015-01-04 18:36:33 +00:00
3674d30e90 Fixed clicking on Combo box label. 2015-01-04 18:32:15 +00:00
2268b098e0 Avoid marking settings as dirty when window is marked unsaved + minor FocusWindow() optimisation 2015-01-04 18:23:30 +00:00
4bccc06933 Dragging outside area of a widget while it is active doesn't trigger hover on other widgets. 2015-01-04 18:12:30 +00:00
ee49c2288d Todo items. 2015-01-03 17:38:10 +00:00
34664dc28c InputText() consume input characters immediately (fixes #105) 2015-01-03 17:37:39 +00:00
e4f96147de Update README.md 2014-12-31 15:55:34 +00:00
12225abfe2 Version number (fix) 2014-12-31 10:38:36 +00:00
505bd1a66d Fixed text input filtering for character in the 128-255 range. 2014-12-31 09:49:53 +00:00
c9002620c6 Update README.md 2014-12-30 17:13:04 +00:00
f8c58fe328 Fix for Clang 2014-12-30 16:55:32 +00:00
74ab555558 Examples: Console:: added support for History callbacks + cleanup to be self contained. 2014-12-30 16:49:39 +00:00
da5227fa28 Added comment about defining IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT in imconfig.h 2014-12-30 15:44:19 +00:00
3b028c7ebf Fixed InputInt() InputFloat() label not declaring their width, breaking SameLine (bug #100)
+ shallow cleanups
2014-12-30 15:38:28 +00:00
2d111ccb55 crc32 on strings is performed in one pass - removed the strlen() call. 2014-12-30 15:18:21 +00:00
691ca46978 Version number 2014-12-30 15:10:55 +00:00
6 changed files with 361 additions and 230 deletions

View File

@ -8,7 +8,6 @@ ImGui is designed to enable fast iteration and allow programmers to create "cont
ImGui is particularly suited to integration in 3D applications, fullscreen applications, embedded applications, games, or any applications on consoles platforms where operating system features are non-standard.
ImGui is self-contained within 4 files that you can easily copy and compile into your application/engine:
- imgui.cpp
@ -54,7 +53,7 @@ The bulk of example user code is contained within the ImGui::ShowTestWindow() fu
<b>How do you use ImGui on a platform that may not have a mouse or keyboard?</b>
I recommend using [Synergy](http://synergy-project.org). With the uSynergy.c micro client running you can seamlessly use your PC input devices from a video game console or a tablet. ImGui was also designed to function with touch inputs if you increase the padding of widgets to compensate for the lack of precision of touch devices, but it is recommended you use a mouse to allow optimising for screen real-estate.
I recommend using [Synergy](http://synergy-project.org). With the uSynergy.c micro client running on your platform and connecting to your PC, you can seamlessly use your PC input devices from a video game console or a tablet. ImGui allows to increase the hit box of widgets (via the _TouchPadding_ setting) to accomodate a little for the lack of precision of touch inputs, but it is recommended you use a mouse to allow optimising for screen real-estate.
<b>I integrated ImGui in my engine and the text or lines are blurry..</b>
@ -88,13 +87,6 @@ ImGui takes advantage of a few C++ features for convenience but nothing in the r
Shall someone wants to use ImGui from another language, it should be possible to wrap ImGui to be used from a raw C API in the future.
Support
-------
<b>Can you develop features xxxx for ImGui?</b>
Please use GitHub 'Issues' facilities to suggest and discuss improvements. Your questions are often helpul to the community of users.
Donate
------
@ -105,13 +97,23 @@ Yes please! I have setup an [**ImGui Patreon page**](http://www.patreon.com/imgu
Credits
-------
Developed by [Omar Cornut](http://www.miracleworld.net). The library was developed with the support of [Media Molecule](http://www.mediamolecule.com) and first used internally on the game [Tearaway](http://tearaway.mediamolecule.com).
Developed by [Omar Cornut](http://www.miracleworld.net) and every direct or indirect contributors to the GitHub. The early version of this library was developed with the support of [Media Molecule](http://www.mediamolecule.com) and first used internally on the game [Tearaway](http://tearaway.mediamolecule.com).
Embeds [proggy_clean](http://upperbounds.net) font by Tristan Grimmer (MIT license).
Embeds [M+ fonts](http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html) font by Coji Morishita (free software license).
Embeds [stb_textedit.h](https://github.com/nothings/stb/) by Sean Barrett.
Embeds [stb_textedit.h](https://github.com/nothings/stb/) by Sean Barrett (public domain).
Inspiration, feedback, and testing: Casey Muratori, Atman Binstock, Mikko Mononen, Emmanuel Briney, Stefan Kamoda, Anton Mikhailov, Matt Willis. Thanks!
Inspiration, feedback, and testing for early versions: Casey Muratori, Atman Binstock, Mikko Mononen, Emmanuel Briney, Stefan Kamoda, Anton Mikhailov, Matt Willis. And everybody posting feedback, questions and patches on the GitHub.
ImGui is financially supported on [**Patreon**](http://www.patreon.com/imgui).
Special supporters
- Jetha Chan
Supporters
- Michel Courtine
And other supporters; thanks!
License
-------

View File

@ -1,6 +1,7 @@
// ImGui - standalone example application for DirectX 11
#include <windows.h>
#define STB_IMAGE_STATIC
#define STB_IMAGE_IMPLEMENTATION
#include "../shared/stb_image.h" // for .png loading
#include "../../imgui.h"

View File

@ -1,10 +1,14 @@
// ImGui - standalone example application for OpenGL 3, using programmable pipeline
#ifdef _MSC_VER
#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
#endif
#ifdef __clang__
#pragma clang diagnostic ignored "-Wunused-function" // warning: unused function
#endif
#include "../../imgui.h"
#define STB_IMAGE_STATIC
#define STB_IMAGE_IMPLEMENTATION
#include "../shared/stb_image.h" // stb_image.h for PNG loading

View File

@ -1,10 +1,14 @@
// ImGui - standalone example application for OpenGL 2, using fixed pipeline
#ifdef _MSC_VER
#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
#endif
#ifdef __clang__
#pragma clang diagnostic ignored "-Wunused-function" // warning: unused function
#endif
#include "../../imgui.h"
#define STB_IMAGE_STATIC
#define STB_IMAGE_IMPLEMENTATION
#include "../shared/stb_image.h" // stb_image.h for PNG loading

544
imgui.cpp

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
// ImGui library v1.19 wip
// ImGui library v1.20
// See .cpp file for commentary.
// See ImGui::ShowTestWindow() for sample code.
// Read 'Programmer guide' in .cpp for notes on how to setup ImGui in your codebase.
@ -19,6 +19,7 @@ struct ImGuiWindow;
#include <stdarg.h> // va_list
#include <stddef.h> // ptrdiff_t
#include <stdlib.h> // NULL, malloc
#include <string.h> // memset, memmove
#ifndef IM_ASSERT
#include <assert.h>
@ -386,6 +387,7 @@ enum ImGuiCol_
ImGuiCol_ComboBg,
ImGuiCol_CheckHovered,
ImGuiCol_CheckActive,
ImGuiCol_CheckMark,
ImGuiCol_SliderGrab,
ImGuiCol_SliderGrabActive,
ImGuiCol_Button,
@ -685,7 +687,7 @@ struct ImDrawVert
ImU32 col;
};
#else
// You can change the vertex format layout by defining IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT.
// You can change the vertex format layout by defining IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT in imconfig.h
// The code expect ImVec2 pos (8 bytes), ImVec2 uv (8 bytes), ImU32 col (4 bytes), but you can re-order them or add other fields as needed to simplify integration in your engine.
// The type has to be described by the #define (you can either declare the struct or use a typedef)
IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT;
@ -743,7 +745,7 @@ struct ImFont
// Settings
float Scale; // = 1.0f // Base font scale, multiplied by the per-window font scale which you can adjust with SetFontScale()
ImVec2 DisplayOffset; // = (0.0f,0.0f // Offset font rendering by xx pixels
ImVec2 DisplayOffset; // = (0.0f,0.0f) // Offset font rendering by xx pixels
ImVec2 TexUvForWhite; // = (0.0f,0.0f) // Font texture must have a white pixel at this UV coordinate. Adjust if you are using custom texture.
ImWchar FallbackChar; // = '?' // Replacement glyph is one isn't found.