0d063585e8
Merge branch 'jdm3_master'
7 years ago
f43068c543
Examples: DirectX10, DirectX11: Simplified main example code.
7 years ago
493ec0bc98
Simplified .gitignore list
7 years ago
9b9d9321cf
Examples: SDL: Using %SDL2_DIR% in the .vcproj instead of %SDL_DIR%, the earlier is more standard.
7 years ago
9c20a40b36
Examples: OpenGL: Cast call to glPolygonMode(). ( #1628 ).
7 years ago
daddd09cd5
Examples: Mouse cursor handling comments/tweaks to homogenize. ( #1495 )
7 years ago
d534207622
Examples: GLFW: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). ( #1495 )
7 years ago
11b12488e8
Examples: GLFW*: Renamed GLFW callbacks exposed in .h to not include GL2/GL3/Vulkan in their name.
7 years ago
7e2e0535dd
Examples: DirectX 9,10,11: Inputs: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). ( #1495 )
7 years ago
f5f3730b16
Examples: GLFW+GL2/GL3: Added glPixelStorei() calls borrowed from SDL examples.
7 years ago
9e713b115f
Examples: Renamed .sln file.
7 years ago
243fd67b1c
Examples: Vulkan: Fix for empty draw data (init time) + fixed warning.
7 years ago
10752423ec
Examples: Vulkan: Added .vcproj files.
7 years ago
31158e575f
Examples: SDL: Fixed minor warning.
7 years ago
00b24f27c2
Examples: SDL: Added .vcproj files.
7 years ago
03a44acf6f
Examples: SDL: Minor stylistic tweaks. Fixed handling of ImGuiMouseCursor_None so it doesn't underflow array. Fixed harmless uninitialized pointer. ( #1626 )
7 years ago
7c75835200
Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. ( #1626 )
7 years ago
ffb6e89f30
Use SDL system cursors in SDL examples. ( #1626 )
...
(Squashed 4 commits)
7 years ago
63332d152a
Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..( #1599 )
...
Examples: Updated examples.
7 years ago
0cefd40888
Examples: Added Changelog to make updates easier.
7 years ago
41ecebff5a
Examples: SDL: Added Changelog at the top of the imgui_impl files. ( #1618 )
7 years ago
7cc1bc7635
Added IsAnyMouseDown() helper.
...
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
7 years ago
2493f609ef
Examples: Vulkan: Fix (something changed in GLFW not including vulkan.h, was unwillingly relying on that)
7 years ago
f0364aa359
Merge branch 'context'
...
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx9_example/main.cpp
# examples/marmalade_example/main.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
7 years ago
ae30efc0fd
Nav: Examples: Added commented out io.NavFlags |= ImGuiNavFlags_EnableKeyboard to all examples. ( #787 )
7 years ago
3171f90a1a
Nav: Keyboard is now automatically mapped based on io.KeyDown[]. ( #787 )
7 years ago
057807f4a7
Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. ( #787 )
7 years ago
7e32fc7109
Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). ( #787 )
7 years ago
cea8017e0b
Merge branch 'master' into context
7 years ago
4b49f03a40
Examples: SDL+GL3: Added Navigation keyboard mapping. ( #787 )
7 years ago
7e1496e994
Merge branch 'master' into navigation
7 years ago
fcf1c9d151
Examples: SDL: Using SDL_GetPerformanceCounter() / SDL_GetPerformanceFrequency() to handle framerate over 1000 fps properly. Noticed bad inputs artefacts in Nav branch at 2000 fps without this. ( #996 )
7 years ago
60fb7d31fd
Examples: SDL2: Enabling vsync. Using scancode consistently, fixed keyboard weirdness.
7 years ago
73d493c780
Examples: Organized header files to make available features more visible.
7 years ago
533fe8cb55
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
4786321754
Fix iOS code; fixes entire XCode build for Apple example
7 years ago
27980d9688
Merge branch 'master' into context
7 years ago
47e81a6194
Merge branch 'master' into navigation
7 years ago
cd3dd886de
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ ( #1569 )
7 years ago
23c11e9764
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
6c38aa2dc7
Examples: Apple: Tweak code and sync with other examples better (untested).
7 years ago
cca9c3e3da
Examples: Using Dark theme by default. ( #707 ). Tweaked demo code.
7 years ago
955d86199f
Examples: Tweaks formatting.
7 years ago
2933e6765c
Merge branch 'master' into navigation
7 years ago
6a25a8720a
Examples: Using #include "imgui.h" instead of <imgui.h> appear correct-er as per standard? xcode+clang are very nitpicky there.
7 years ago
91d77be36e
Examples: Makefile leave CXX alone, instead leave commented out options. (nb: codeship doesn't seem have clang++)
7 years ago
3cdd2096ec
Examples: Use Clang in old Makefile.
7 years ago
ddff378daf
Examples: Synced Makefile comments. Added build/ folder into git ignore list/
7 years ago
858d75ab59
Examples: Apple: Fixed filenames in OSX xcode project.
7 years ago
66d5712a8a
Examples: Vulkan: FIxed warnings in 32-bit modes (vulkan uses VkDeviceSize which is always 64-bit long)
7 years ago
3ded262776
Merge branch 'master' into navigation
7 years ago
827f4b17d3
Nav: Examples: Glfw+GL3: Added basic gamepad mapping code when io.NavFlags & ImGuiNavFlags_EnableGamepad is set. (will iterate/tweak before spreading to other examples). ( #787 )
7 years ago
3967ff58b2
Nav: Examples: DirectX11, Glfw+GL3: Basic code to map keyboard inputs when io.NavFlags & ImGuiNavFlags_EnableKeyboard is set. (will iterate/tweak before spreading to other examples). ( #787 )
7 years ago
94ed44b5cb
Fix allegro5_example build instructions
7 years ago
c226e02ca0
Fix sdl_opengl2_example filename in README.md's build instructions
7 years ago
2c7324da56
TODO list, added uSynergy README
7 years ago
f3776055d6
Merge branch 'master' into context
7 years ago
8c57d8cc1e
Natvis: Fix ImRect expanded height display being broken and dumb. ( #1569 )
7 years ago
6f27d6b5b8
Natvis: Made ImGuiWindow display shorter.
7 years ago
c2e92ab61b
Added imgui.natvis helper for visual studio users. Added to examples projects.
7 years ago
277f6e7842
Examples: Comments
7 years ago
dd89c9ea59
Examples: Made the Win32 proc handlers not assert if there is no active context yet, to be more flexible with creation order. ( #1565 )
7 years ago
d3e826c247
Examples: Updated for reorganized context functions. Calling CreateContext(), DestroyContext() in example code. Removed Shutdown() from binding code. ( #1565 , #586 , #992 , #1007 , #1558 )
7 years ago
7e7c017b75
Examples: Simplified mouse wheel handling. ( #1463 )
7 years ago
7dea158175
Examples: Allegro, Apple, DirectX9/10/11, Glfw+Vulkan :Added support for horizontal mouse wheel. ( #1463 )
7 years ago
0b1fecb792
Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. ( #1463 )
7 years ago
6f6b6194b2
Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel
...
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
7 years ago
f3e510a9bf
Examples: SDL: Using SDL_CaptureMouse() to retrieve coordinates outside of client area when dragging. ( #1559 )
...
Digging into sdl window/mouse stuff will also be useful for multi-viewport work.
7 years ago
00351ee2ab
Examples: SDL: Minor renaming.
7 years ago
ba99900023
Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness.
7 years ago
79dca9d5e6
Examples: SDL+GL2: Renamed imgui_impl_sdl.* to imgui_impl_sdl_gl2.* for consistency and to emphasis on GL2-ness.
7 years ago
15fd5b6c4c
Examples: SDL: Minor renaming.
7 years ago
ce17e0f274
Examples: SDL: Using SDL_WINDOW_INPUT_FOCUS instead of SDL_WINDOW_MOUSE_FOCUS (which is ~~hovered). We should use SDL_CaptureMouse + SDL_WINDOW_MOUSE_CAPTURE_FLAG which requires SDL 2.0.4 will give it a try shortly. ( #1559 )
7 years ago
60d5dc7902
Examples: SDL: Fixed mapping of Insert key ( #1555 , fix bug introduced in #1541 )
7 years ago
ce95b84825
Added ImGuiKey_Insert for future use. Setup in all example bindings. ( #1541 )
7 years ago
39cb56c39e
Examples: OpenGL3+GLFW: Using 3.2 context + GLSL version 150 ( #1466 )
7 years ago
7484c63449
Examples: OpenGL3+SDL: Changed GLSL shader version to 150 ( #1466 , #1504 )
7 years ago
3d24a9eb40
Examples: DirectX9/10/11: Comments about CS_DBLCLKS + formatting tweaks. ( #1538 )
7 years ago
65dd55cb2b
Merge pull request #1538 from ndandoulakis/ndandoulakis-CS_DBLCLKS-patch
...
Examples: DirectX9,10,10: Support for CS_DBLCLKS by treating double-click down messages are regular down. (#1538 , #754 )
7 years ago
407955d9fb
Examples: Using IM_OFFSETOF macro. + Comments
7 years ago
bfc25bc8a3
CS_DBLCLKS support for DirectX 11
7 years ago
583e97b297
CS_DBLCLKS support for DirectX 10
7 years ago
20ae6439ea
CS_DBLCLKS support for Directx9
7 years ago
4c90529c62
Examples: Visual Studio projects: Disabled extraneous function-level check in Release build.
7 years ago
9f8632b131
Examples: Comments about invalid mouse pos.
7 years ago
78f48bb795
Examples: DirectX10,DirectX11: Moved call to OMSetRenderTargets() in main loop so example code can integrate more nicely with other code.
7 years ago
3a4a2bb27c
Examples: Vulkan: Tweak
7 years ago
ce13426a1a
Examples: Comments, synched some minor drift between examples + stronger suggestion to use StyleColorsDark().
7 years ago
1b86e7343f
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
7 years ago
b263bc5689
Examples: DirectX: Using IM_ARRAYSIZE()
7 years ago
cf9b893841
Examples: Added null_example/ which is helpful for quick testing on multiple compilers/settings without relyong on graphics library.
7 years ago
c8b5b569da
Examples: DirectX9: Call EndFrame(), fix for assert added in 9a44d447cd
7 years ago
e000ee0116
Examples: DirectX9: Handle loss of D3D9 device (D3DERR_DEVICELOST). ( #1464 )
7 years ago
77a310736d
Horizontal mouse wheel support
...
This patch adds support for the horizontal mouse wheel in ImGui. It
affects windows that can be scrolled, as long as the Ctrl key is not
being pressed.
The scrolling speed has been set empirically so that it matches the
scrolling speed on the Firefox browser when the horizontal wheel is
used.
Internally, it adds a MouseHorizWheel to ImGuiIO, which is then used in
NewFrame to scroll the current window.
The SDL/GL2, SDL/GL3, GLFW/GL2 and GLFW/GL3 examples has been modified
to use it.
7 years ago
ef5dd30625
Sisyphus says: tweaked comments about not using old-style OpenGL examples ( #1459 , #1394 etc.)
7 years ago
6bd3b45b34
Sisyphus says: tweaked comments about not using old-style OpenGL examples ( #1459 , #1394 etc.)
7 years ago
979fe30a6f
Fix wrong comment in dx implementation headers
7 years ago
fba704bf5d
Examples: Added a bunch of comments/referencs related to io.WantCaptureMouse, io.WantCaptureKeyboard ( #1262 , #1237 , #1219 , #635 , #1058 , #1051 , #912 , #533 , #703 , #446 , #459 , #364 , #213 , #52 , and more)
7 years ago
36f00811b9
Examples: Comments to guide people unfamiliar with the librairies used.
7 years ago
cb38caeda4
Examples: Added more comments near the fonts loading section, to catch common questions and errors (e.g. #1397 , #1366 , #1341 , #1222 , #1193 , #1115 , #951 , etc.)
7 years ago
c5027d4fa1
Examples: Extra clarification for the 100th person who insist on using the OpenGL2 code in spite of existing documentation leaning against it. ( #1394 )
7 years ago
d2c65aa3e8
Examples: DirectX9/10/11: Tweak usage of SetCapture/ReleaseCapture. ( #1375 )
...
ps: DirectX 12 example (#302 ) may want to adopt that as well.
7 years ago
50f5be9266
Examples: GLFW+GL2/GL3: Minor tweaks, comments.
7 years ago
d6a9956781
Examples: DirectX9/10/11: Added WM_SYSKEYDOWN / WM_SYSKEYUP handlers so e.g. VK_MENU can be read.
7 years ago
c14a66970b
Examples: DirectX9/10/11: Renamed WndProc handler to use a generic Win32 name + returning 0 to all messages is more correct.
7 years ago
a96f095deb
Examples: DirectX10, DirectX11: Using SetCapture/ReleaseCapture to get correct behavior ( #1375 )
...
ps: DirectX 12 example (#302 ) may want to adopt that as well.
7 years ago
3e0765ee22
Examples: DirectX9: Using SetCapture/ReleaseCapture to get correct behavior ( #1375 )
7 years ago
e03198bb0f
Fixed compilation for #1375 + coding style fixes.
7 years ago
839067fda9
Capture/release window in DX9 implementation
...
This helps a lot when the user drags a slider but carries the cursor offscreen before releasing the button - without the capturing, the slider will "stick" to the mouse cursor even after the button has been released. (This should generally be added to all Windows implementations - I won't mind doing it if you think it's a good idea.)
7 years ago
b3099d650c
Examples: Adding Roboto to the commented-out font list, and removing the unnecessary ProggyClean from there.
7 years ago
842e88a8e3
Examples: Avoid using ImColor() to not tempt newcomers into looking at it
7 years ago
3fd5790814
Pass render target format in ImGui_ImplDX12_Init() instead of hard-coded.
7 years ago
f6b6dace9e
Pass command list in using ImGui_ImplDX12_NewFrame() instead of ImGui_ImplDX12_Init()
7 years ago
f72b95d73f
Merge 'ocornut/master' into 'jdmo3/master'
7 years ago
3dd3d0b248
Examples: DirectX11: allow creating device with feature level 10 sinec we don't really need much for that example. ( #1333 )
7 years ago
d5d825debb
Nav/Examples: honoring the io.WantMoveMouse flag in most common examples ( #323 )
...
Missing support Vulkan (#549 ), Apple (#575 , #247 ), SDL (#58 , #356 ),
Allegro, Marmalade (#368 , #375 )
7 years ago
b8ade0b94f
Examples: Main: Removed call to SetNextWindowSize()
7 years ago
4abce8af58
Examples: GL2: Renaming, comments.
7 years ago
d9016964ad
Examples: GL3: Comments, tweaks ( #1145 )
7 years ago
c47e5fc76a
Merge branch 'master' of https://github.com/nlguillemot/imgui into nlguillemot-master
7 years ago
7d1f2c0dc5
Examples: GL2: rename functions to include GL2 in name
7 years ago
cf48e28932
Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes #798
7 years ago
92a6faca6f
IO: io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we'll now accept negative mouse coordinates.
7 years ago
3b11e73333
Examples: gitignore added patterns for modern MSVC versions
8 years ago
b4fe5d36a4
Examples: OpenGL3+SDL: Fix types to uses GlEnum ( #1147 )
8 years ago
048322f3fd
Merge pull request #1147 from TinyTinni/master
...
Examples: OpenGL3+GLFW3: Fix types to uses GlEnum (#1147 )
8 years ago
7e452ec737
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
8 years ago
645875a240
Examples: Enable vsync by default in example applications ( #1213 , #1151 )
8 years ago
166e8f6261
Examples: OpenGL2+GLFW/SDL: Added commented out glUseProgram(0) in main.cpp for visibility ( #1116 )
8 years ago
c8794c246e
Examples: Vulkan: Batch file builds both debug and release
8 years ago
f3cf5e0322
Examples: SDL+GL3: Fixed old comments ( #1229 )
8 years ago
52df0032a5
Travis: Blind fix for SDL+GL3 project on the Travis build setup.
...
Examples: SDL+GL3: Makefile blind fix for OSX (untested) (#1229 , #1209 )
8 years ago
358e667b7a
Travis: Adding the SDL+GL3 project on the Travis build setup (for both Linux and OSX).
...
Examples: SDL+GL3: Makefile blind fix for OSX (untested) (#1229 , #1209 )
8 years ago
0fe5728971
Examples: SDL+GL3: Makefile fix for Linux ( #1229 , #1209 )
8 years ago
8b6896faf9
add SDL GL3 makefile
8 years ago
d43695b748
fix gl2 sample too
8 years ago
e0aac34672
fix compilation on MINGW
8 years ago
99ff2ec6fb
Examples: DirectX9/10/11: Comments
8 years ago
51c200ac0d
Examples: DirectX9: Clarified texture release code ( #1163 )
8 years ago
3a7111cfcd
casting to GLint on init
8 years ago
ad3c1e68ab
save and restore sampler in GL 3 examples
8 years ago
0981d8e381
fixes types
8 years ago
b0db625cab
Examples: Vulkan: Fixed an extra validation (tested on Windows with VulkanSDK 1.0.46.0) ( #1042 )
8 years ago
f87b152522
Examples: Vulkan: Various very minor stylistic fixes, fixing typos in comments, etc. ( #1042 #1043 )
8 years ago
201d589714
Image presentation now depends on the completeness of command buffer submission through semaphores.
...
To maintain maximum frame rate we render to the last acquired swapchain image but present the last but one drawn image. This behavior is optional through conditional compilation macros.
8 years ago
a9add1ce63
Removed redundant VkResult plugged into VkPresentInfoKHR pResults attribute. This is only meaningful when we present directly to multiple swapchains. In that case we can an VkResult per swapchain.
8 years ago
eaae754211
Removed redundant barrier.
...
The transition of the swapchain image(s) can happen implicitly in the renderpass. This approach has been stated to be more efficient than using an explicit barrier.
See "Vulkan Programming Guide", Chapter 7: "Graphics Pipelines", section "Renderpasses".
8 years ago
33874073dc
Fixed all issues found by vulkan debug report. Reasons for the major design changes are commented.
8 years ago
89d03d5cca
Examples: Vulkan: Disable IMGUI_VULKAN_DEBUG_REPORT by default. Update .bat files for newer VulkanSDK.
8 years ago
56dff3a080
Vulkan backend: optionally enabling vulkan validation layers and debug report callback
...
Additional layer, extension and the callback itself are used/created when IMGUI_VULKAN_DEBUG_REPORT is defined. The callback reports seven (potential!) errors which will be fixed with another pull request.
8 years ago
9fd3ba871b
Merge branch 'g_FrameIndex_not_used_fix' of https://github.com/ParticlePeter/imgui into ParticlePeter-g_FrameIndex_not_used_fix
8 years ago
5418bb19ff
Examples: Vulkan: windows batch file for 64-bits.
8 years ago
ac2eb4b960
Merge branch 'vk_small_fix' of https://github.com/martty/imgui into martty-vk_small_fix
8 years ago
c3d9e0a6eb
Examples: SDL2: Tweaked batch files for Win32.
8 years ago
475446b8b9
Merge pull request #1080 from SaschaWillems/master
...
Examples: Vulkan: Small changes to be in line with specs and fix validation layer errors/warnings
8 years ago
b3d237a5ce
Examples: SDL2: Added build .bat files for win32.
8 years ago
9fdd66330f
Examples: SDL2+GL3: Fix blend func state save/restore ( #1120 )
8 years ago
01286f6636
Fix blend func state save/restore
...
AFAIK there's no such enum as `GL_BLEND_SRC` or `GL_BLEND_DST` in OpenGL3 and OpenGL4.
Maybe they're left over from previous versions? They don't even seem to exist in OpenGL 2.1. In fact checking they were deprecated in OpenGL 1.5 (they exist in 1.3)
8 years ago
f030087f8e
Comments to redirect people to OpenGL3 examples ( #1116 )
8 years ago
50b4b29beb
Examples: GLFW+GL3, SDL+GL3: Fixed modifying bound Texture0 ( #1087 , #1088 , #1116 )
8 years ago
4da26d85cd
Clip negative scissor offsets to zero
8 years ago
12deb53b11
Set required depth member for buffer image copy
8 years ago
30954b4a88
Merge latest from ocornut/imgui
8 years ago
337019a68f
typo, #elif instead of #else, fixed
8 years ago
fd90da38e1
Vulkan backend: g_FrameIndex not used fix -> huge perf gain
...
Added a macro to switch between unlimited frame rate (VK_PRESENT_MODE_IMMEDIATE_KHR) and limited to 60 fps (VK_PRESENT_MODE_FIFO_KHR). Only the latter mode is guaranteed to be available, but the former one most likely is.
8 years ago
e0244c8f62
Fix scissor offset being negative
8 years ago
509df3e279
Fix new Vulkan validation warnings
8 years ago
1396659b72
Examples: Speculative fix for OSX Makefile to make Travis happy (re #812 )
8 years ago
d74a3349e9
Examples: DirectX9: Explicitely setting viewport to match that other examples are doing ( #937 )
8 years ago
127dd7c88c
Examples: Vulkan: Coding style fixes ( #910 )
8 years ago
a5600b6e59
Vulkan example: Proper surface format search.
8 years ago
b447a71cf6
Vulkan example: Fix gamma for some implementations.
8 years ago
08ef9819c8
Vulkan example: Fix validation layer warnings and errors and redeclare gl_PerVertex.
8 years ago
7c2b35704d
Examples: DirectX9-10-11: Only call Windows' SetCursor(NULL) when io.MouseDrawCursor is set ( #585 , #909 )
8 years ago
55863dd274
Examples: Vulkan: Shallow stylistic changes (following #879 )
8 years ago
0449bb98e2
Merge branch 'master' of https://github.com/martty/imgui into martty-master
8 years ago
a68ac96bc4
Examples: GL3: Comments about gl3w ( #880 )
8 years ago
775ac24d45
Fixed overzealous GCC warnings ( #883 ) + partly undo 8553bab241
8 years ago
89d033aba3
Merge pull request #898 from tinnnysu/master
...
Examples: SDL+OpenGL2: Update cmdline syntax in Windows compilation.
8 years ago
81eefb704b
Minor const fixes for overzealous warnings ( #883 )
8 years ago
833ed760ae
update cmdline syntax in windows compilation
8 years ago
53126cd713
Add location decorators & change to use structs as in/out in glsl, update embedded spv (produced with glslangValidator -x)
8 years ago
44250caf50
Null the released resources
8 years ago
0d3f8807c7
Added a void* user_data parameter to Clipboard function handlers. ( #875 )
8 years ago
2919c77bee
Examples: GLFW+OpenGL3: Fixed Shutdown() calling GL functions with NULL parameters if NewFrame was never called ( #800 )
8 years ago
b96471143f
Merge branch 'master' of https://github.com/madeso/imgui into madeso-master
8 years ago
612b17ef57
Fixing minor english typos ( #827 )
8 years ago
02399852fe
Examples: OpenGL2: Uploading font texture as RGBA32 to increase compatibility with users shaders for beginners ( #824 )
8 years ago
6e6f04f513
Fix Mac OS X build and remove cruft from Makefile
8 years ago
bc57fd5d1d
Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness ( #807 )
8 years ago
031d4e689d
Examples: OpenGL3: Revert Makefile change for OSX for now ( #812 )
8 years ago
2825eaa0be
Examples: Accessing ImVector fields directly, feel less stl-ey and fix renderer side assert when render list only contains a callback ( #810 )
8 years ago
aa0cb13aa4
Correct name for linking opengl3_example
...
According to glfw offcial site, linking `libglfw.3.dylib` etc should
use `-lglfw`.
Changed this made the compilation on my Mac successfully.
8 years ago
08a9e78da5
fixed space issues
8 years ago
99b4f951b9
Fix Vulkan example for use when a depth buffer is active.
8 years ago
5def10c3a0
Fixed OpenGL error when calling Shutdown without calling NewFrame
8 years ago
5ae71aa04a
Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)
9 years ago
3c384c2f10
Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)
9 years ago
82768e05f3
Ignore list for Visual Studio
9 years ago
4bc6a951fe
tabs to space, remove braces
9 years ago
3234f81cb1
maxImageCount may be 0; add missing sType; change to 1 push constant range
9 years ago
0a1d456de1
Fix compile warnings in SDL examples
9 years ago
d8dacd729b
Examples: SDL+OpenGL: explicitly setting GL_UNPACK_ROW_LENGTH to reduce issues because SDL changes it ( #752 )
9 years ago
47911d92b2
Fix minor typo in examples/README.txt
9 years ago
1349d0aacf
Examples: DirectX9: Removing spaces ( #663 )
9 years ago
790275eae2
Example: DirectX9: Backup and restore all state
9 years ago
8a0d3b9628
Examples; DirectX10/11: Added comments about removing dependency on d3dcompiler DLL ( #638 )
9 years ago
2ef766a1ce
Examples: DirectX10: Apply depth-stencil state like DirectX11 example ( #640 , #636 )
9 years ago
656b1e848c
Examples: DirectX11: Fixed uninitialized fields. Disabling depth-write ( #640 , #636 )
9 years ago
f4633d09ac
Examples: DirectX10, DirectX11: Removed seemingly unnecessary bunch of rasterizer state creation code.
9 years ago
834bfe4af5
Examples: DirectX11: Fixed handle leak + minor coding style fix for #640
9 years ago
5fe2cacd4d
DX11 example depth test
9 years ago
c1da3e354e
Examples: SDL: Fixed unused variable warning on non-Windows platforms ( #626 )
9 years ago
79ad22e1f2
Fixed various Clang -Weverything warnings ( #626 )
9 years ago
f46c91f5ad
Examples: DirectX9: Removed dependency on dxguid.lib + remainder of d3dx9.lib ( #611 )
9 years ago
731ff3d3f5
Examples: DirectX9: Removed dependency on dx3x9 (remainder) ( #611 )
9 years ago
50df86985d
Examples: DirectX9: Removed dependency on dx3x9.h so it can be used in a DirectXMath.h only environment ( #611 )
9 years ago
bfb2dc2290
Examples: OpenGL3: Saving/restoring glActiveTexture() state ( #602 )
9 years ago
c2c0b57e5e
Examples: OpenGL2: Extra comments ( #606 )
9 years ago
559963e832
Examples: Apple/iOS: lowered xcode project deployment target from 10.7 to 10.11 ( #598 , #575 )
9 years ago
1612ca071b
Examples: SDL: Initialize video+timer subsystem only.
9 years ago
4466a7b3b0
Examples: DirectX9: save/restore some more device state.
9 years ago
319e288eef
Update README.md
9 years ago
71b981d05f
Examples: Apple: Readme tweaks ( #575 #247 )
9 years ago
67b604412b
Remove local glfw3 lib for osx. (+1 squashed commit)
...
Squashed commits:
[34cc3b7] Adds osx example. (+6 squashed commits)
Squashed commits:
[20330f2] Uses glfw by brew install.
[0427861] Renames imguiex folder name to imguiex-ios
[f9e27e5] Renames ios_example to apple_example.
[44f8fe3] Updates the glfw header/library path.
[919f279] Renames target from imguiex to imguiex-ios since there is already a imguiex-osx target now.
[24395f5] Adds osx example.
9 years ago
c1427de5b6
Examples: Libs: Update glfw binaries to glfw master.
9 years ago
0e7b9b8284
Examples: Vulkan: Coding style tweaks.
9 years ago
9c513d4443
Merge branch 'master' of https://github.com/Loftilus/imgui into Loftilus-master
9 years ago
552246feed
Examples: DirectX10,DirectX11 : Minor renaming
9 years ago
518f32ccfe
Examples: DirectX10: Save/restore state + minor cleanups ( #570 )
9 years ago
90493f8add
Examples: DirectX11: Shallow massaging to make the code more consistent/readable (following #570 )
9 years ago
2942240072
Examples: DX11: Cleanup state backup/restore code ( #570 )
9 years ago
d4d51a7802
capture and restore all state
9 years ago
a6399f120f
IO: Added "Super" keyboard modifiers (corresponding to Cmd on Mac and Windows key in theory although the later is hard to read) ( #473 )
...
NB: Value not used.
9 years ago
ae0c33c983
Examples: Links
9 years ago
7661b1e778
Trim trailing spaces
9 years ago
fdc4299c6c
Examples: SDL: Made ImGui_ImplSdlGL3_NewFrame() signature match GL2 one
9 years ago
e6c2c1fcfd
Examples: SDL: Minor fixes to follow syntax of other examples ( #495 )
9 years ago
8a61c0afea
Applying same fix to OpenGL 3 example. Fixing spaces/tabs.
9 years ago
a9b0abe493
Automatically updating DisplayFrameBufferScale by reading the OpenGL drawable size and comparing with the window size. This fixed dear imgui which was rendering only to 1/4 of my window.
9 years ago
04396ed7a9
FAQ and comments about the use of ImTextureID ( #562 , #561 , #521 , #510 , #497 , #475 ...)
9 years ago
1394616d9c
Vulkan Example: Some code layout changes.
9 years ago
4ea4fa3e73
Vulkan Example: Fix synchronization.
9 years ago
0ceddc29ff
Vulkan Example: Fix windows build.
9 years ago
4cbd316f01
Vulkan example.
9 years ago
1dcb9c877d
Examples: OpenGL: Fix early return on zero-sized framebuffer breaking GL state ( #486 , #547 )
9 years ago
f6181b3428
Examples: DirectX12: Add directx12_example
9 years ago
2813a44dcc
Examples: OpenGL: skip rendering and calling glViewport() if we have a zero-fixed buffer ( #486 )
9 years ago
9e86d0e225
Examples: SDL/OpenGL: Tabs to spaces
9 years ago
87a6110994
Examples: OpenGL3: Fix BindVertexArray/BindBuffer order ( #527 )
9 years ago
07e379a950
Examples: DirectX9: Wastefully use a RGBA8 texture for the font texture to make compability more evident with user's textures ( #521 )
9 years ago
b8f86ec4bd
Examples: OpenGL2/3 Makefile; Added -lGL to Linux build
9 years ago
a81a5e5235
Commented Clang warning that's not compatible with all versions. Comments.
9 years ago
9e8795f4e2
Examples: Added extra comments
9 years ago
31fe006c85
Examples: DirectX10 fixed ImGui_ImplDX10_NewFrame() from recreating device objects if render isn't called (g_pVB not set)
9 years ago
6277ffe00f
Examples: DirectX11: fixed ImGui_ImplDX11_NewFrame() from recreating device objects if render isn't called (g_pVB not set)
9 years ago
49fb7364b5
Examples: SDL2+OpenGL3: Fix context creation options ( #468 , #463 )
9 years ago
3aa4a108ed
Examples: SDL/OpenGL3: Fixed linking documentation for MacOSX ( #463 )
9 years ago
217a6c875a
Examples: OpenGL: Tentative fix for miscaled call to glViewport on high-DPI screens ( #441 )
...
Fix for 980ca286fe
9 years ago
bf83ac8b55
Examples: Fixed msvc batch files from warning.
9 years ago
9596e6f794
Examples: DirectX10: Minor tweaks, updated to latest example changes ( #424 )
9 years ago
dadd03fc11
Examples: DirectX10: Fix warning, disable debug device, add ignore list ( #424 )
9 years ago
32c1a3e46c
Removed d3d11 references
9 years ago
1f3a0e78cc
Ported d3d11 renderer to d3d10
9 years ago
fe2972e8b2
Merge pull request #420 from RaptorFactor/master
...
Examples: DX11: Compile shaders with lower features levels.
9 years ago
6adf644448
Allow DX11 renderer to be used with devices with lower feature levels.
9 years ago
1b7aee7b9d
Examples: DX11: Remove debug flag ( #415 )
9 years ago
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.
9 years ago
94ec3d534e
Examples: Header comments.
9 years ago
6800939e73
Examples: Header comments.
9 years ago
5c52e9ec0d
Examples: Clarified comments. Removed font merging example from comments.
9 years ago
d673db3092
Examples: Added README into the Visual Studio solution to people are less likely to miss it.
9 years ago
9735563b65
Additional comments for new users
9 years ago
aa6cb32bd4
fixed text referencing GLFW library in SDL examples
9 years ago
83e6cfbec0
Examples: DirectX9/11: Removed assumption about Unicode build in example main.cpp ( #399 )
9 years ago
dc86a8a0bf
Examples: OpenGL3: Fixed gl3w.c for Linux when compiled with C++ compiler ( #411 )
9 years ago
38cfdafbaf
Examples: SDL/OpenGL3: Added -ldl to Linux command-line ( #411 )
9 years ago
e2ecc02e02
Examples: Updated README
9 years ago
899cb3b4e9
Examples: SDL+OpenGL3: Fixed readme ( #356 )
9 years ago
ab7e91b65e
Examples: SDL+OpenGL3: Various fixes to example to make it matches current GL3 example ( #356 )
9 years ago
9d0caa2e66
Examples: SDL+OpenGL3: Using glew like existing example + renaming ( #356 )
9 years ago
624adb1b23
Tweak build batch files and readmes
9 years ago
9a8cbf128d
Merge branch 'SDL_OpenGL3_Implementation' of https://github.com/zach2good/imgui into zach2good-SDL_OpenGL3_Implementation
9 years ago
f87deff0f3
Moving stdlib.h include outside of imgui.h ( #405 )
9 years ago
3b2fdf27a8
Examples: Added /Zi (output debug information) in build_win32.bat files
9 years ago
1d76890526
Examples: OpenGL3: Implement ImGui_ImplGlfwGL3_InvalidateDeviceObjects() like other examples.
9 years ago
e46c7b70eb
Examples: Most examples apps detect if ImDrawIdx was changed to 32-bits instead of 16
9 years ago
0a23e2c832
Tabs to spaces
9 years ago
980ca286fe
Examples: OpenGL2/3: Save/setup/restore viewport as part of render function. Update SDL example to match GL2 one. ( fix #392 )
9 years ago
e858d229a0
Examples: update all examples with same comment ( #389 )
9 years ago
e1bc0dd7d5
Font merge demo and documentation minor additions.
...
Clarifies the lifetime requirements for the ranges parameter for AddFont* functions.
9 years ago
e4d916a4b3
NULL out font texture on invalidate
...
If this isn't done, NewFrame won't re-create the font.
9 years ago
2b3fb5c0f7
Example: Marmalade: shallow tweaks and cleanups to match ImGui coding style ( #375 )
9 years ago
ba9c469ff0
no message
9 years ago
ebf4f1fa02
no message
9 years ago
79ca203850
Merge branch 'master' of https://github.com/ocornut/imgui
9 years ago
5d53f37a5d
Examples: Possibly clarified the intent of imgui_impl_* files.
9 years ago
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.
9 years ago
50b25b6c75
Added example for the Marmalade platform
9 years ago
a77e534ded
Examples: OpenGL2: Add msys2/mingw64 target ( #361 )
9 years ago
a465b2b3d8
add msys2/mingw64 target
9 years ago
e130b09d91
Previous SDL implementation didn't work with my OpenGL 3.3 project, spliced the GLFW OpenGL examples on top of the SDL example to create an option that works for me. Could be useful for others.
9 years ago
963f6b782d
Examples: OpenGL3: saving more of blend state ( #347 )
9 years ago
d5502cdd6d
Examples: OpenGL3: Saving/restoring the Enable state, better than nothing ( #347 )
9 years ago
25b4b88a7a
Examples: Update readme.
9 years ago
ad4c962224
Examples: DirectX11: Fixed batch file for VS 2012+, still works for 2008/2010.. Include path order matters...
9 years ago
853f265025
Examples: Added batch files to build Windows examples with VS
9 years ago
167c02d502
Better Git ignore list for quick compilations in same folder
9 years ago
1793c1a991
Comments
9 years ago
7d6ddbe5c8
Examples: comment on setting the RenderDrawListsFn function.
9 years ago
77bcb7152b
Examples: DirectX11: fixed vertex shader which breaks with VS2015 somehow (DX11 version?) ( #313 )
9 years ago
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.
10 years ago
da807e55ea
Examples: Ignore list a little more friendly to Unix systems.
10 years ago
5ebd61f89c
Ignore list a little more friendly to Unix systems
10 years ago
e58f99179a
Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage ( #287 )
10 years ago
62671ef96e
Examples: update readme
10 years ago
822eaf1751
Examples: DX9, DX11: mapping missing middle mouse button.
10 years ago
9a0650dbd0
Examples: imgui_impl* functions declared with IMGUI_API to ease copy & pasting into projects using DLL
10 years ago
01a17aa78e
fix ios compile error
10 years ago
23ce837dc7
Revert "Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods ( fix #279 )"
...
This reverts commit d80869189a
10 years ago
d80869189a
Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods ( fix #279 )
10 years ago
ccbc72e98b
add mac os x build instructions for sdl_opengl_example
10 years ago
215747635d
Examples: DirectX11: resizing buffers dynamically ( #299 )
10 years ago
c016f6c171
Examples: DirectX9: tweaks.
10 years ago
698c7cae85
Examples: DirectX9: resizing vertex and index buffers dynamically ( #299 )
10 years ago
3604aecf8f
Minor Windows adjustments
10 years ago
947cf3434f
Added printf attribute to printf like text formatting functions
10 years ago
470200ee5c
Update documentation
10 years ago
85dab1a680
Fixed documentation
10 years ago
8be4d41540
Merge remote-tracking branch 'origin' into 2015-07-cleanup
10 years ago
d667de9490
Clear font texture view to ensure Release() doesn't get called twice
10 years ago
e099798c97
Merge remote-tracking branch 'origin' into 2015-07-cleanup
10 years ago
11d91a27a4
Carriage return ( #289 )
10 years ago
f158617551
Show SDL error message on init failure
10 years ago
52a74701f5
Updated projects to reference new files ( #219 )
...
Didn't update iOS example (#247 )
10 years ago
0eb196d544
Examples: OpenGL3: simplified code using glBufferData for vertices as well ( #277 , #278 )
10 years ago
dc1cb9e625
Tweak
10 years ago
bc9bae6d01
To support drivers with strict core profiles, a buffer is used for the indices as well ( fixes ocornut/imgui#277 ).
10 years ago
98047b1b65
Update README.txt
10 years ago
f53d5da0f8
Update README.txt
10 years ago
b7d1b91e4b
Use ImGuiIO::AddInputCharactersUTF8() in SDL2 example
...
Now Unicode text input works in this example.
10 years ago
02a0967243
Fix SDL2-example for Linux
...
The header is called "SDL_opengl.h" - case matters on Linux.
The main() function must indeed be called main(), on Windows it'll be
renamed to SDL_main (for SDL2main.lib) by #define in SDL_main.h
(which is included by SDL.h)
I added an entry to the example's README that describes how to build
it on Linux.
10 years ago
4842ac3bc6
Fonts: added Cousine-Regular.ttf
10 years ago
0224d29a35
Examples: comments.
10 years ago
fcec337061
Examples: Simplified font examples comments.
10 years ago
fd44b9440b
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
10 years ago
f2bed00d80
Examples: README
10 years ago
5ab23ab1c0
Allegro 5 example: removed public domain mark, MIT as the rest, with @bggd approval
10 years ago
2f574ef952
Allegro 5 example: converted for indexed rendering.
10 years ago
60dd221737
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
10 years ago
omar
Oliver Faircliff
Gerry Hernandez
Jérôme Pasquier
omar
Nick Dandoulakis
Emmanuel Benoît
Codecat
Gargaj
Jefferson Montgomery
unknown
radius
TinyTinni
Nicolas Guillemot
Peter Particle
Gregg Tavares
saschawillems
Marcell Kiss
Håvard Mathisen
sushitao
Felipe Oliveira Carvalho
Kun Lin
Gustav
Jamie Seward
Jeongseok Lee
Trezanik
josiahmanson
James Chen
Nick Gravelyn
Julian Bosch
Joshua Boyce
zryan3
Doug Binks
gzito
Zach Toogood
yinjimmy
Andres Vahter
Thomas Pöchtrager
Chris Maughan
Jonathan Adamczewski
Nik Voss
Daniel Gibson