Merge branch 'master' of https://github.com/boxerprogrammer/directx12…

…_samples
boxerprogrammer · Mar 6, 2020 · 30435d3 · 30435d3
2 parents a2dcc6e + 65a1828
commit 30435d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Chapter18/Application.cpp b/Chapter18/Application.cpp
@@ -120,7 +120,7 @@ Application::Initialize() {
 	_heapForSpriteFont = _dx12->CreateDescriptorHeapForSpriteFont();
 	spriteFont = new DirectX::SpriteFont(_dx12->Device(),
 		resUploadBatch,
-		L"font/fonttest.spritefont",
+		L"font/hgpop.spritefont",
 		_heapForSpriteFont->GetCPUDescriptorHandleForHeapStart(),
 		_heapForSpriteFont->GetGPUDescriptorHandleForHeapStart());
 	auto future = resUploadBatch.End(_dx12->CmdQue());
@@ -405,15 +405,16 @@ Application::Run() {
 			_dx12->SetFocusPos(pnt.x, pnt.y);
 		}
 
-		_dx12->CmdList()->SetDescriptorHeaps(1, _heapImgui.GetAddressOf());
-		ImGui_ImplDX12_RenderDrawData(ImGui::GetDrawData(), _dx12->CmdList());
+
 
 		_dx12->CmdList()->SetDescriptorHeaps(1, _heapForSpriteFont.GetAddressOf());
 		_spriteBatch->Begin(_dx12->CmdList());
 		spriteFont->DrawString(_spriteBatch, L"DirectX12の魔導書", DirectX::XMFLOAT2(102, 102), DirectX::Colors::Black);
 		spriteFont->DrawString(_spriteBatch, L"DirectX12の魔導書", DirectX::XMFLOAT2(100, 100), DirectX::Colors::Yellow);
 		_spriteBatch->End();
 
+		_dx12->CmdList()->SetDescriptorHeaps(1, _heapImgui.GetAddressOf());
+		ImGui_ImplDX12_RenderDrawData(ImGui::GetDrawData(), _dx12->CmdList());
 
 		_dx12->Flip();
 	}

diff --git a/Chapter18/font/hgpop.spritefont b/Chapter18/font/hgpop.spritefont