207 Commits

Author SHA1 Message Date
Joonas Javanainen
550b8d1c1c Fix uniform texture naming
The shaders refer to the texture with name "tex", and the name must
match on the Rust code side.

Fixes #17
2016-03-26 18:42:39 +02:00
Cameron Hart
4bfd697e9b Merge branch 'master' into input 2016-01-23 14:04:16 +11:00
Cameron Hart
9e78e86000 Add support for popups and selectable widgets. 2016-01-17 20:05:30 +11:00
fl3
aae56e7bdc update cimgui to 1.47 2016-01-17 03:00:00 +03:00
Cameron Hart
05cb9ccc3f Add this back.
Still don't seem to need the import std::convert::From, maybe it's implicit.
2016-01-17 08:37:02 +11:00
Cameron Hart
2d9f63a1b8 Added support for combo widget 2016-01-17 00:51:46 +11:00
Cameron Hart
4739953a94 Removed unused convert::From 2016-01-17 00:50:56 +11:00
Cameron Hart
9bcb3cb0d5 Added color editing widgets 2016-01-15 08:23:33 +11:00
Cameron Hart
9a288b63f0 Added int array inputs
Also added aliases for input_f32 and input_i32. I don't think this
naming works so well with the arrays.
2016-01-15 07:49:00 +11:00
Cameron Hart
3c1e1e129a Added float array inputs 2016-01-15 00:17:43 +11:00
Cameron Hart
8e2c5640e4 Forgot to expose decimal_precision. 2016-01-14 23:08:12 +11:00
Cameron Hart
c4fdf854ca Added input_float, some change in macros and formatting 2016-01-14 22:55:12 +11:00
Cameron Hart
1c13208c22 Added input for single int. 2016-01-14 00:18:23 +11:00
Joonas Javanainen
53780568d0 Remove legacy ImDrawData state passing
Since 1.45 the current ImDrawData is available using igGetDrawData() so
no callback is needed at all.
2015-12-23 14:56:09 +00:00
Joonas Javanainen
03e24243f2 Upgrade to imgui/cimgui 1.46 2015-12-23 14:51:55 +00:00
Joonas Javanainen
a854953236 Upgrade to imgui/cimgui 1.45 2015-12-23 14:35:45 +00:00
Joonas Javanainen
1ef649900f ImVec2/ImVec4 conversions 2015-10-18 13:33:14 +03:00
Joonas Javanainen
4d378606f1 Preliminary text input stuff 2015-10-18 13:28:11 +03:00
Joonas Javanainen
8ec34e0701 Fix input character passing
escape_default is actually not the right function here, because it is
meant for escaping strings with C-like rules.

For example, character " becomes the string \"

Since Strings are UTF-8, we can just directly allocate a String as an
intermediate buffer.
2015-10-18 12:37:14 +03:00
Will Usher
2fa549bcc9 Wrap ProgramChooserCreationError properly 2015-10-17 14:14:27 -06:00
Will Usher
6eb3ffefdf Encode string of UTF8 chars using encode_default API
Using encode_utf8 will be better when it stabilizes since we won't need
the String intermediate and can go directly to a Vec<u8>.

Update to glium 0.10 to resolve ctrl/shift/etc virtual keycodes on Win10
2015-10-17 13:51:40 -06:00
Will Usher
8520d0e245 Starting to work on keyboard input
Update examples to use keyboard input
2015-10-17 13:51:21 -06:00
Aleksey Kladov
9f38a831c6 add function to get framerate 2015-10-17 15:44:11 +03:00
Joonas Javanainen
32f789ae26 Upgrade to Glium 0.9.0 2015-09-27 16:02:57 +03:00
Joonas Javanainen
05b3067aba Remove SDL2 integration
It's too simple and not worth having in this library
2015-09-27 15:58:04 +03:00
Joonas Javanainen
91eec219f6 Unsafe function to get the "current UI" out of thin air 2015-09-27 15:57:08 +03:00
Joonas Javanainen
f301da3694 Expose more ImGuiIO functionality 2015-08-30 22:17:01 +03:00
Joonas Javanainen
bd2930e758 Simplify igGetIO calls 2015-08-26 13:37:37 +01:00
Joonas Javanainen
5baad7094b Use 'p lifetime (as in Parameter) consistently 2015-08-26 12:46:29 +01:00
Joonas Javanainen
e875305b29 Overhaul ImStr constructors 2015-08-26 12:43:08 +01:00
Joonas Javanainen
1ea468025f Add missing #[inline] 2015-08-26 12:16:18 +01:00
Joonas Javanainen
cca4c17417 Add #[must_use] on builders 2015-08-26 12:16:07 +01:00
Joonas Javanainen
9b2d199d3d Style editor 2015-08-26 12:08:37 +01:00
Joonas Javanainen
b7295ae9ae Small button 2015-08-26 12:00:44 +01:00
Joonas Javanainen
a62e6ac146 ImStr can implement Clone 2015-08-26 11:54:19 +01:00
Joonas Javanainen
b14999b5a2 Trees 2015-08-26 11:54:19 +01:00
Joonas Javanainen
fa5bd75bb3 Fix formatting
I don't know where that 3 spaces nonsense came from... :/
2015-08-25 22:14:30 +01:00
Joonas Javanainen
545c80f309 Split ffi module into imgui-sys 2015-08-23 09:56:13 +03:00
Joonas Javanainen
3a550208c9 Frame -> Ui 2015-08-23 09:41:03 +03:00
Joonas Javanainen
f6f5dc6162 Avoid extra copy when using im_str! formatting 2015-08-21 18:33:12 +03:00
Joonas Javanainen
eef67ddecc Use mutable references instead of return values
It seems to be more ergonomical with the underlying library
2015-08-21 00:08:40 +03:00
Joonas Javanainen
9a37676580 Remove unnecessary casts
On all currently supported platforms c_float = f32, c_int = i32
2015-08-20 23:40:44 +03:00
Joonas Javanainen
b523fe9fb9 Window options 2015-08-20 23:25:57 +03:00
Joonas Javanainen
ca1da00734 Autoresizing window and friends 2015-08-20 22:47:57 +03:00
Joonas Javanainen
8e7ae0327c Manipulating window title 2015-08-20 22:18:56 +03:00
Joonas Javanainen
43e72afe85 Collapsing header + misc 2015-08-20 22:04:22 +03:00
Joonas Javanainen
8bf34e8ced API changes + additions 2015-08-20 18:38:40 +03:00
Joonas Javanainen
e261db71ba Experiments with menus 2015-08-19 00:35:33 +03:00
Joonas Javanainen
35a8324f78 Relax frame lifetime 2015-08-18 21:22:24 +03:00
Joonas Javanainen
822305ef4e No need to have a mutable reference 2015-08-18 20:37:37 +03:00