Commit Graph

123 Commits (316555f9de52aebe7741090e26618e0b69fae657)

Author SHA1 Message Date
ocornut f3303fa84f AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API ( )
ocornut 8b4a470e1d Examples: DirectX9: fixed size passed to vertex and index buffer Lock() + readjust default buffer sizes.
ocornut b69d7d9df3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut 2f03511062 Added ImGuiKey_PageUp, ImGuiKey_PageDown for user.
ocornut 71e9f2a3dd Fixed warnings for 64-bits builds
ocornut e3f2ad728a Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
ocornut b6f3c97e3b Examples: DirectX11: explicitly set rasterizer state.
ocornut e9b6e437eb Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
	imgui.h
ocornut 5df542c3c0 ImFontAtlas: doesn't clear input data, left to the application. ()
ocornut f00662a5ad Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
ocornut ad7f600e0d Examples: DirectX9/11: hide os curosr if ImGui is drawing it ()
ocornut 18a00c7060 Examples: DirectX9/11: Fixed key mapping for down arrow.
ocornut 43cb4038c6 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	imgui.cpp
ocornut d809abbe1c Examples: DirectX11: tidying up.
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
ocornut 37f1715bfa Examples: DirectX11: Removed unnecessary vertices conversion and CUSTOMVERTEX types.
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
ocornut d25578efd8 Examples: initializing float + missing comment.
ocornut 3abfb85613 Comments on font loading, fixed commented out paths and added DroidSans in the list
ocornut cb285c4d35 Examples: uses SetNextWindowPos/SetNextWindowSize when applicable
ocornut d3e444dfd9 Examples: DirectX9: fixed duplicate creation of vertex buffer. Size of static vertex buffer at top of the code.
ocornut e97d02a294 Examples: Fixed Clang warnings in DirectX examples
ocornut 7c9bd71512 Examples: MSVC: increase warning level from /W3 to /W4 for OpenGL examples
ocornut 2b0acc128c Examples: MSVC: increase warning level from /W3 to /W4 for DirectX examples
ocornut 8e0f04638d Examples: Fix includes order to avoid conflicts between DXSDK_DIR and Windows SDK
ocornut e2c4ba21bc Examples: Added 64-bit projects for MSVC
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
ocornut d5b7b8398f Examples: reference implementations honors drawlist user callbacks.
ocornut f9c833b4a5 Examples: DirectX9 example cleanup to match DirectX11 structure.
ocornut 66a5837ba8 Examples: DirectX11 example application handles window resizing.
ocornut 866fa95aaa Examples: DirectX9 example application handle window resizing.
ocornut b4165c43ff Examples: Refactored directx11_example to be easier to copy & paste into user application.
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.
ocornut e269125c3a Windows: setup a default handler for ImeSetInputScreenPosFn so IME (Japanese/Chinese) inputs are positioned correctly.
User need to set io.ImeWindowHandle
ocornut 386cfada83 Examples: Windows examples don't link with imm32.lib by default.
ocornut 40b04a3701 Renamed ImGuiSetCondition_*** to ImGuiSetCond_*** and ImGuiCondition_FirstUseThisSession to ImGuiCond_Once
ocornut 9c4972ee9d Examples: msvc: output .exe in project directory (not in solution directory).
ocornut 0d63e0ce60 Examples: DirectX examples applications all have a Console for debugging.
ocornut cb0a4db048 Calculate frame-rate for the user, as a purely luxurious feature
..and to reduce sample code size a little.
ocornut d65e051a07 Minor formatting tweaks, comments
ocornut b623f97d9f Examples: DirectX11: fixed build setting of Release mode.
ocornut 35c0842bcf Examples: DirectX11: fixed handling of unicode character inputs.
ocornut 5834297928 Examples: DirectX11: increasing vertex buffer size (would really need a dynamic buffer size)
+ Delete unused code
ocornut 381c7428c1 Examples: changed default background color.
ocornut edcf2d3bf6 Examples: more comments on loading fonts.
ocornut 1916a0c78c Renamed FontAtlas to Fonts. Further cleanup/comments.
ocornut 2c31599bcc ImFontAtlas allows loading multiple fonts into same texture. Revamped new init API for 1.30
ocornut cb9a3235be Removed PixelCenterOffset, uncesssary
ocornut 43c8b5e0d2 Examples: DirectX11: use linear sampler to be in sync with other examples.
ocornut ab8d2782c6 Merge remote-tracking branch 'upstream/master' into 2015-01-truetype
Conflicts:
	imgui.cpp
	imgui.h
ocornut 62ecdd21a5 Examples: Added a color slider for the background color + tweak first example use of button.s
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.
ocornut 241e8086fa Mde it optional to new() io.Font - however it stills needs to be loaded.
ocornut a09f426b89 TAB to spaces
ocornut 20bb6270bc Examples: all supports TextureID in renderer, added LoadFontTexture() function.
ocornut b3a208901a Loading TTF file with stb_truetype. Broke setup API slightly. Font baked, packed with space for custom data. Embeds compressed ProggyClean.
ocornut dd8a7655f5 Fixed DirectX11 example.
ocornut 1c657564ac Examples: Added STB_IMAGE_STATIC in examples to avoid conflicting implementation. Relate to
omar e9e0e36f98 New and better Set[Next]Window(Pos|Size|Collapsed) API.
Removed rarely useful SetNewWindowDefaultPos() in favor of new API.
omar 2e5b81627f Examples: DirectX11: moved shader to be close to its usage location,
omar b02eed3e49 Examples: adding title to the top of each examples. Cleaning up file headers.
omar 6c9edb6db0 Examples: removed LICENSE file from MSVC project.
ocornut bd762b559c DirectX11 example: fixed projection matrix offset.
ocornut b4fd216bd2 DirectX9/DirectX11 example: fixed window initially showing an hourglass cursor.
ocornut 0730ec7577 Example apps: accumulate mouse wheel to accodomate for slow framerate.
ocornut 0e6f288a2f DirectX11 example: further tweaks/massaging (-15 lines). Syncing example.
ocornut 7f804d3d64 Tab->Spaces :( visual studio can't even be trusted for that, oh thanks.
ocornut de44af5227 DirectX11 example: closing all handler/resources in Cleanup.
ocornut 0f29cd7a14 Removed Microsoft IME handler in examples, too confusing. Moved to imgui.cpp instruction block.
ocornut a5a84a9b69 Tab->Spaces :(
ocornut 197b2763fc Fixed DirectX11 example Release build include
ocornut df00fa8113 Fixed DirectX11 example to compile with whatever Visual Studio version user has
ocornut 9e16317382 Added DirectX11 example application (code is too long!)