mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-09-10 05:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'ocornut/master' into 'jdmo3/master'

Browse Source
This commit is contained in:
Jefferson Montgomery
2017-09-24 14:22:25 -07:00
committed by Jefferson Montgomery
parent 30954b4a88 3dd3d0b248
commit f72b95d73f
47 changed files with 4259 additions and 2296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/directx12_example/main.cpp
View File

@@ -346,16 +346,15 @@ int main(int, char**)
// 2. Show another simple window, this time using an explicit Begin/End pair
if (show_another_window)
{
ImGui::SetNextWindowSize(ImVec2(200,100), ImGuiSetCond_FirstUseEver);
ImGui::Begin("Another Window", &show_another_window);
ImGui::Text("Hello");
ImGui::Text("Hello from another window!");
ImGui::End();
}
// 3. Show the ImGui test window. Most of the sample code is in ImGui::ShowTestWindow()
if (show_test_window)
{
ImGui::SetNextWindowPos(ImVec2(650, 20), ImGuiSetCond_FirstUseEver); // Normally user code doesn't need/want to call it because positions are saved in .ini file anyway. Here we just want to make the demo initial state a bit more friendly!
ImGui::SetNextWindowPos(ImVec2(650, 20), ImGuiCond_FirstUseEver); // Normally user code doesn't need/want to call it because positions are saved in .ini file anyway. Here we just want to make the demo initial state a bit more friendly!
ImGui::ShowTestWindow(&show_test_window);
}
@@ -385,7 +384,8 @@ int main(int, char**)
g_pd3dCommandQueue->ExecuteCommandLists(1, (ID3D12CommandList* const*) &g_pd3dCommandList);
g_pSwapChain->Present(1, 0);
g_pSwapChain->Present(1, 0); // Present with vsync
//g_pSwapChain->Present(0, 0); // Present without vsync
auto fenceValue = g_fenceLastSignalledValue + 1;
g_pd3dCommandQueue->Signal(g_fence, fenceValue);