Commit Graph

205 Commits

Author SHA1 Message Date
omar
fe2972e8b2 Merge pull request #420 from RaptorFactor/master
Examples: DX11: Compile shaders with lower features levels.
2015-11-30 19:36:06 +00:00
Joshua Boyce
6adf644448 Allow DX11 renderer to be used with devices with lower feature levels. 2015-12-01 05:08:30 +11:00
ocornut
1b7aee7b9d Examples: DX11: Remove debug flag (#415) 2015-11-30 10:22:46 +00:00
ocornut
6cee2fca94 Examples: Not clearing input data/tex data in atlas (will be required for dynamic atlas anyway). Effectively fix resizing in DX examples.
+ Standardized comments.
2015-11-29 14:54:05 +00:00
ocornut
94ec3d534e Examples: Header comments. 2015-11-29 11:25:15 +00:00
ocornut
6800939e73 Examples: Header comments. 2015-11-29 11:19:30 +00:00
ocornut
5c52e9ec0d Examples: Clarified comments. Removed font merging example from comments. 2015-11-29 11:11:03 +00:00
ocornut
d673db3092 Examples: Added README into the Visual Studio solution to people are less likely to miss it. 2015-11-29 11:01:50 +00:00
ocornut
83e6cfbec0 Examples: DirectX9/11: Removed assumption about Unicode build in example main.cpp (#399) 2015-11-22 21:23:56 +00:00
ocornut
3b2fdf27a8 Examples: Added /Zi (output debug information) in build_win32.bat files 2015-11-11 09:45:18 +00:00
ocornut
e46c7b70eb Examples: Most examples apps detect if ImDrawIdx was changed to 32-bits instead of 16 2015-11-08 11:00:31 +00: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
Nicolas Guillemot
509ac33abe fix POSITION format (ImDrawVert::pos is 2D, not 4D)
the inputlayout incorrectly described the POSITION attribute as being
4D, while ImDrawVert::pos is 2D. This went unnoticed because the buffer
binding has a stride of sizeof(ImDrawVert) and the POSITION is treated
as a float2 in the vertex shader. If you switch POSITION to float4 in
the vertex shader (and actually use the z/w in the matrix
multiplication) then everything become wacky-looking since it's
interpreting the texture coordinates as z/w. On a similar note: It's
weird that the projection matrix takes z and w into consideration when
those don't exist in the shader due to positions being float2s.
2015-10-11 16:42:22 -07: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
7d6ddbe5c8 Examples: comment on setting the RenderDrawListsFn function. 2015-09-07 14:58:26 +01:00
ocornut
77bcb7152b Examples: DirectX11: fixed vertex shader which breaks with VS2015 somehow (DX11 version?) (#313) 2015-09-01 10:47:36 +01:00
ocornut
822eaf1751 Examples: DX9, DX11: mapping missing middle mouse button. 2015-08-25 16:54:47 +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
215747635d Examples: DirectX11: resizing buffers dynamically (#299) 2015-08-13 23:13:20 -06:00
ocornut
8be4d41540 Merge remote-tracking branch 'origin' into 2015-07-cleanup 2015-08-05 09:32:29 -06:00
Chris Maughan
d667de9490 Clear font texture view to ensure Release() doesn't get called twice 2015-08-04 14:22:05 +01: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
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
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
8b4a470e1d Examples: DirectX9: fixed size passed to vertex and index buffer Lock() + readjust default buffer sizes. 2015-07-05 19:24:26 -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
ocornut
b6f3c97e3b Examples: DirectX11: explicitly set rasterizer state. 2015-05-18 21:38:17 +01: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
18a00c7060 Examples: DirectX9/11: Fixed key mapping for down arrow. 2015-04-24 09:18:56 +02: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
d809abbe1c Examples: DirectX11: tidying up. 2015-04-09 23:32:36 +01: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
37f1715bfa Examples: DirectX11: Removed unnecessary vertices conversion and CUSTOMVERTEX types. 2015-04-09 21:14:52 +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
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
cb285c4d35 Examples: uses SetNextWindowPos/SetNextWindowSize when applicable 2015-03-16 11:53:36 +00:00
ocornut
d3e444dfd9 Examples: DirectX9: fixed duplicate creation of vertex buffer. Size of static vertex buffer at top of the code. 2015-03-16 10:02:10 +00:00
ocornut
e97d02a294 Examples: Fixed Clang warnings in DirectX examples 2015-03-14 10:49:26 +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
2b0acc128c Examples: MSVC: increase warning level from /W3 to /W4 for DirectX examples 2015-03-14 10:32:29 +00:00
ocornut
8e0f04638d Examples: Fix includes order to avoid conflicts between DXSDK_DIR and Windows SDK 2015-03-14 10:24:35 +00:00
ocornut
e2c4ba21bc Examples: Added 64-bit projects for MSVC 2015-03-14 10:09:53 +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
f9c833b4a5 Examples: DirectX9 example cleanup to match DirectX11 structure. 2015-03-09 14:55:46 +00:00
ocornut
66a5837ba8 Examples: DirectX11 example application handles window resizing. 2015-03-09 14:51:10 +00:00
ocornut
866fa95aaa Examples: DirectX9 example application handle window resizing. 2015-03-09 14:13:29 +00:00
ocornut
b4165c43ff Examples: Refactored directx11_example to be easier to copy & paste into user application. 2015-03-09 13:45:23 +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
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
b623f97d9f Examples: DirectX11: fixed build setting of Release mode. 2015-02-01 09:33:51 +00:00
ocornut
35c0842bcf Examples: DirectX11: fixed handling of unicode character inputs. 2015-01-31 23:26:53 +00:00
ocornut
5834297928 Examples: DirectX11: increasing vertex buffer size (would really need a dynamic buffer size)
+ Delete unused code
2015-01-31 21:12:59 +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
43c8b5e0d2 Examples: DirectX11: use linear sampler to be in sync with other examples. 2015-01-17 16:52:21 +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
a09f426b89 TAB to spaces 2015-01-11 17:56:43 +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
dd8a7655f5 Fixed DirectX11 example. 2015-01-08 18:56:47 +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
2e5b81627f Examples: DirectX11: moved shader to be close to its usage location, 2014-12-03 18:46:13 +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
ocornut
bd762b559c DirectX11 example: fixed projection matrix offset. 2014-12-01 09:34:17 +00:00
ocornut
b4fd216bd2 DirectX9/DirectX11 example: fixed window initially showing an hourglass cursor. 2014-11-30 18:02:08 +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
7f804d3d64 Tab->Spaces :( visual studio can't even be trusted for that, oh thanks. 2014-11-30 16:56:35 +00:00
ocornut
de44af5227 DirectX11 example: closing all handler/resources in Cleanup. 2014-11-30 16:53:33 +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
197b2763fc Fixed DirectX11 example Release build include 2014-11-30 15:51:42 +00:00
ocornut
df00fa8113 Fixed DirectX11 example to compile with whatever Visual Studio version user has 2014-11-30 15:33:57 +00:00
ocornut
9e16317382 Added DirectX11 example application (code is too long!) 2014-11-30 14:59:21 +00:00