ocornut
|
0a23e2c832
|
Tabs to spaces
|
2015-10-30 15:57:03 +01:00 |
|
ocornut
|
980ca286fe
|
Examples: OpenGL2/3: Save/setup/restore viewport as part of render function. Update SDL example to match GL2 one. (fix #392)
|
2015-10-30 15:44:47 +01:00 |
|
ocornut
|
e858d229a0
|
Examples: update all examples with same comment (#389)
|
2015-10-30 10:45:16 +01:00 |
|
ocornut
|
5d53f37a5d
|
Examples: Possibly clarified the intent of imgui_impl_* files.
|
2015-10-13 17:53:43 +02:00 |
|
radius
|
a465b2b3d8
|
add msys2/mingw64 target
|
2015-10-04 15:14:35 -05:00 |
|
ocornut
|
963f6b782d
|
Examples: OpenGL3: saving more of blend state (#347)
|
2015-09-27 22:21:11 +02:00 |
|
ocornut
|
d5502cdd6d
|
Examples: OpenGL3: Saving/restoring the Enable state, better than nothing (#347)
|
2015-09-23 09:14:27 +02:00 |
|
ocornut
|
ad4c962224
|
Examples: DirectX11: Fixed batch file for VS 2012+, still works for 2008/2010.. Include path order matters...
|
2015-09-10 20:58:43 +01:00 |
|
ocornut
|
853f265025
|
Examples: Added batch files to build Windows examples with VS
|
2015-09-10 20:34:06 +01:00 |
|
ocornut
|
1793c1a991
|
Comments
|
2015-09-09 14:15:17 +01:00 |
|
ocornut
|
7d6ddbe5c8
|
Examples: comment on setting the RenderDrawListsFn function.
|
2015-09-07 14:58:26 +01:00 |
|
ocornut
|
0bb46c824e
|
Examples: OpenGL2/3: save/restore some more state correctly.
Might save an hour of staring at blank-screen to 5% of the population,
worth it.
|
2015-08-29 17:44:52 +01:00 |
|
ocornut
|
da807e55ea
|
Examples: Ignore list a little more friendly to Unix systems.
|
2015-08-28 16:03:05 +01:00 |
|
ocornut
|
e58f99179a
|
Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage (#287)
|
2015-08-27 19:51:02 +01:00 |
|
ocornut
|
9a0650dbd0
|
Examples: imgui_impl* functions declared with IMGUI_API to ease copy & pasting into projects using DLL
|
2015-08-24 14:02:51 +02:00 |
|
ocornut
|
23ce837dc7
|
Revert "Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods (fix #279)"
This reverts commit d80869189a.
|
2015-08-21 00:16:07 +02:00 |
|
ocornut
|
d80869189a
|
Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods (fix #279)
|
2015-08-20 22:32:07 +01:00 |
|
Thomas Pöchtrager
|
3604aecf8f
|
Minor Windows adjustments
|
2015-08-09 17:24:10 +02:00 |
|
Thomas Pöchtrager
|
947cf3434f
|
Added printf attribute to printf like text formatting functions
|
2015-08-08 19:29:11 +02:00 |
|
ocornut
|
52a74701f5
|
Updated projects to reference new files (#219)
Didn't update iOS example (#247)
|
2015-07-21 17:04:03 -06:00 |
|
ocornut
|
0eb196d544
|
Examples: OpenGL3: simplified code using glBufferData for vertices as well (#277, #278)
|
2015-07-19 10:52:51 -06:00 |
|
ocornut
|
dc1cb9e625
|
Tweak
|
2015-07-19 10:49:56 -06:00 |
|
Nik Voss
|
bc9bae6d01
|
To support drivers with strict core profiles, a buffer is used for the indices as well (fixes ocornut/imgui#277).
|
2015-07-19 17:56:14 +02:00 |
|
ocornut
|
4842ac3bc6
|
Fonts: added Cousine-Regular.ttf
|
2015-07-15 14:56:29 -06:00 |
|
ocornut
|
0224d29a35
|
Examples: comments.
|
2015-07-15 09:05:17 -06:00 |
|
ocornut
|
fcec337061
|
Examples: Simplified font examples comments.
|
2015-07-15 07:05:34 -06:00 |
|
ocornut
|
e3b9a61883
|
Examples: OpenGL3: simplified code. Upload each vertex array separately. (cf #264)
|
2015-07-08 08:27:36 -06:00 |
|
ocornut
|
d03b046ef4
|
AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention (#133)
|
2015-07-07 20:17:07 -06:00 |
|
ocornut
|
25882c47a3
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
examples/directx9_example/imgui_impl_dx9.cpp
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
examples/opengl_example/imgui_impl_glfw.cpp
imgui.cpp
|
2015-07-07 12:15:35 -06:00 |
|
ocornut
|
502e360ee5
|
Removed the majority of size_t from the code. ImVector<> now uses int. (#262)
May trigger new compilation warnings?
|
2015-07-07 12:09:25 -06:00 |
|
ocornut
|
6a22835f63
|
AA branch: ImDrawList: rename commands to cmd_buffer
Not strictly necessary but while we're doing minor breakage let's do
them at all once.
|
2015-07-06 21:09:05 -06:00 |
|
ocornut
|
b2b616be00
|
AA branch: ImDrawCmd idx_count -> elem_count
|
2015-07-05 22:09:15 -06:00 |
|
ocornut
|
f3303fa84f
|
AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API (#133 #254)
|
2015-07-05 22:03:46 -06:00 |
|
ocornut
|
61e551e0ee
|
AA branch: fixed warning
|
2015-07-04 13:41:51 -06:00 |
|
ocornut
|
f435e42561
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
examples/opengl_example/imgui_impl_glfw.cpp
|
2015-07-04 12:44:25 -06:00 |
|
ocornut
|
7437b43b2d
|
Fixed warnings for more pedantic settings (#258)
|
2015-07-03 08:15:56 -06:00 |
|
ocornut
|
b69d7d9df3
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
2015-07-02 21:47:48 -06:00 |
|
ocornut
|
2f03511062
|
Added ImGuiKey_PageUp, ImGuiKey_PageDown for user.
|
2015-07-02 21:43:07 -06:00 |
|
ocornut
|
71e9f2a3dd
|
Fixed warnings for 64-bits builds
|
2015-06-29 15:46:18 -06:00 |
|
ocornut
|
e3f2ad728a
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
|
2015-05-21 22:57:29 +01:00 |
|
Gordon McShane
|
6ee65fc5af
|
Add conditional compilation of forward compat. glfw window hint to fix crash on later versions of OSX
|
2015-05-18 18:26:16 -04:00 |
|
ocornut
|
e9b6e437eb
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
imgui.cpp
imgui.h
|
2015-05-15 17:33:04 +01:00 |
|
ocornut
|
5df542c3c0
|
ImFontAtlas: doesn't clear input data, left to the application. (#224)
|
2015-05-12 15:16:12 +01:00 |
|
ocornut
|
f00662a5ad
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
|
2015-05-02 22:20:48 +01:00 |
|
ocornut
|
ad7f600e0d
|
Examples: DirectX9/11: hide os curosr if ImGui is drawing it (#155)
|
2015-05-01 11:25:15 +02:00 |
|
ocornut
|
4f1acf0d4a
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
imgui.cpp
|
2015-04-17 08:42:36 +01:00 |
|
ocornut
|
f400ea4ec8
|
Examples: OpenGL3: backup/restore current program and texture #195
|
2015-04-15 10:14:51 +01:00 |
|
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
|
7ab49f80ca
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
|
2015-04-09 21:22:06 +01:00 |
|
ocornut
|
4f51b77937
|
Examples: OpenGL3: Tweaks (argh, github ui)
|
2015-04-09 21:19:21 +01:00 |
|
ocornut
|
90766141b3
|
Examples: OpenGL3: Tweaks.
|
2015-04-09 21:18:43 +01: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 |
|
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 |
|
biller23
|
2f4271a2b3
|
typo ImGui_ImplGlfwGL3_KeyCallback()
|
2015-03-18 21:02:29 +01: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
|
06fbeed41a
|
Examples: Fixed Makefile
|
2015-03-14 11:29:09 +00:00 |
|
ocornut
|
55edd522c2
|
Examples: Fixed Makefile
|
2015-03-14 11:24:53 +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
|
567184dc9f
|
Examples: Clang warning fix.
|
2015-03-09 13:38:23 +00:00 |
|
ocornut
|
3f86554457
|
Examples: Makefile fixes.
|
2015-03-09 13:22:32 +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
|
4da432bd7b
|
Examples: Makefile
|
2015-03-09 12:03:09 +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
|
5aaf0cd2dc
|
Examples: Fix OpenGL3 example Makefile
|
2015-02-27 11:00:31 +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
|
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
|
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 |
|
ocornut
|
b3febabc30
|
OpenGL3 example: fix growing of VBO
|
2014-12-22 01:47:34 +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 |
|
omar
|
6523fb263d
|
OpenGL3 example: fixed mouse handling.
|
2014-12-08 17:15:08 +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
|
036ed3ea93
|
OpenGL3 example: unregistered mouse callback for mouse click-release faster than frame interval.
|
2014-12-06 20:43:08 +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 |
|
Olivier Chatry
|
2f176033c6
|
fixed indentation mix, removed some unused code, updated different callback using the example_opengl code.
|
2014-12-03 19:11:23 +01:00 |
|
Olivier Chatry
|
a8d2bc69ed
|
added opengl3 sample, mix from @ocornut and @thelinked
|
2014-12-03 18:37:07 +01:00 |
|