91 Commits

Author SHA1 Message Date
Brendan Zabarauskas
3548542ca5 Make hidpi implementation consistent with upstream 2016-06-13 22:22:47 +10:00
Brendan Zabarauskas
ce45b81e8e Pass Ui struct to render closure instead of raw hidpi factor 2016-06-13 20:20:14 +10:00
Brendan Zabarauskas
f075dde395 Move hidpi_factor into ImGui struct 2016-06-13 14:43:51 +10:00
Brendan Zabarauskas
734eda2d57 Add hidpi support 2016-06-13 14:31:49 +10:00
Joonas Javanainen
b903f65def Upgrade to imgui/cimgui 1.49 2016-06-12 01:32:19 +03:00
Joonas Javanainen
56f1cb964d Add rustfmt configuration and reformat 2016-06-10 22:58:50 +03:00
orhanbalci
e89c3b3186 blank lines removed 2016-06-09 14:14:39 +03:00
orhanbalci
63a6184729 plothistogram api wrapper added 2016-06-09 14:13:00 +03:00
Joonas Javanainen
3d3709bd73 Merge pull request #15 from bitshifter/input
Exposed more input functionality
2016-06-09 09:14:34 +03:00
Cameron Hart
bbb46c7446 Removed i32 and f32 variants of input and slider. 2016-06-09 08:12:40 +10:00
orhanbalci
2f2fc759c2 typo fixed ofset -> offset
stride parameter removed from struct
values_offset type updated to usize
2016-06-08 22:05:10 +03:00
Cameron Hart
27bbe10107 Expose parameters to igSelectable. 2016-06-05 09:51:49 +10:00
Cameron Hart
2a82d19eff Merge branch 'upstream' into input 2016-06-04 10:44:33 +10:00
orhanbalci
0119c50169 plotlines api added 2016-06-03 21:36:47 +03:00
Joonas Javanainen
2be842968e Merge pull request #25 from orhanbalci/master
combo and list_box api wrapper
2016-05-29 22:47:44 +03:00
Miguel Michelson
7a7de21135 rename args on columns methods in order to be consitent with ig* arg methods 2016-05-28 20:36:47 -03:00
Miguel Michelson
a4dba71d1a more on formatting 2016-05-28 20:09:05 -03:00
orhanbalci
9e6bf3948c backup files removed 2016-05-28 14:41:11 +03:00
orhanbalci
6e184ad4d5 formatting fixed, unnecessary functions removed 2016-05-28 14:37:38 +03:00
Miguel Michelson
5ad669e9c0 remove extra breaklines 2016-05-27 21:51:27 -03:00
Miguel Michelson
a1ba49af43 remove tree_pop method 2016-05-27 21:41:35 -03:00
Miguel Michelson
cdb7a929ee rename args and declare return types 2016-05-27 21:29:31 -03:00
orhanbalci
50b63304d4 as_ptr visibility fix 2016-05-27 22:30:28 +03:00
orhanbalci
58e59810ac test file reverted
callback combo interface removed
2016-05-27 22:26:29 +03:00
orhanbalci
bd7e418878 combo with callback function added 2016-05-27 01:19:35 +03:00
orhanbalci
7d56866c86 combo and listbox functions added 2016-05-26 00:21:53 +03:00
Miguel Michelson
e7dfdd2518 use ImguiString 2016-05-25 02:06:14 -03:00
Miguel Michelson
3019f15b92 implement columns 2016-05-25 01:55:50 -03:00
Joonas Javanainen
ac5d8cfcd1 Merge pull request #21 from mneumann/pub_as_ptr
Make ImStr#as_ptr public
2016-05-06 15:46:50 +03:00
Michael Neumann
620c7215f0 Make ImStr#as_ptr public 2016-05-06 10:04:01 +02:00
Joonas Javanainen
19a838104f Pass texture id to imgui, and assert during rendering 2016-03-26 19:18:05 +02:00
Joonas Javanainen
775bcbc04e Add some basic debug markers 2016-03-26 18:58:32 +02:00
Joonas Javanainen
83b949b1ad Hoist uniforms out of the draw list loop 2016-03-26 18:44:06 +02:00
Joonas Javanainen
69e9dd1537 No need to use sampled() 2016-03-26 18:43:34 +02:00
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