Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-18 06:06:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Examples: DirectX9/11: Removed assumption about Unicode build in example main.cpp (#399)

Browse Source
This commit is contained in:
ocornut 2015-11-22 21:23:56 +00:00
parent dc86a8a0bf
commit 83e6cfbec0
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/directx11_example/main.cpp
View File

@ -6,6 +6,7 @@
#include <d3dcompiler.h> #include <d3dcompiler.h>
#define DIRECTINPUT_VERSION 0x0800 #define DIRECTINPUT_VERSION 0x0800
#include <dinput.h> #include <dinput.h>
#include <tchar.h>
// Data // Data
static ID3D11Device* g_pd3dDevice = NULL; static ID3D11Device* g_pd3dDevice = NULL;
@ -131,15 +132,15 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
int main(int, char**) int main(int, char**)
{ {
// Create application window // Create application window
WNDCLASSEX wc = { sizeof(WNDCLASSEX), CS_CLASSDC, WndProc, 0L, 0L, GetModuleHandle(NULL), NULL, LoadCursor(NULL, IDC_ARROW), NULL, NULL, L"ImGui Example", NULL }; WNDCLASSEX wc = { sizeof(WNDCLASSEX), CS_CLASSDC, WndProc, 0L, 0L, GetModuleHandle(NULL), NULL, LoadCursor(NULL, IDC_ARROW), NULL, NULL, _T("ImGui Example"), NULL };
RegisterClassEx(&wc); RegisterClassEx(&wc);
HWND hwnd = CreateWindow(L"ImGui Example", L"ImGui DirectX11 Example", WS_OVERLAPPEDWINDOW, 100, 100, 1280, 800, NULL, NULL, wc.hInstance, NULL); HWND hwnd = CreateWindow(_T("ImGui Example"), _T("ImGui DirectX11 Example"), WS_OVERLAPPEDWINDOW, 100, 100, 1280, 800, NULL, NULL, wc.hInstance, NULL);
// Initialize Direct3D // Initialize Direct3D
if (CreateDeviceD3D(hwnd) < 0) if (CreateDeviceD3D(hwnd) < 0)
{ {
CleanupDeviceD3D(); CleanupDeviceD3D();
UnregisterClass(L"ImGui Example", wc.hInstance); UnregisterClass(_T("ImGui Example"), wc.hInstance);
return 1; return 1;
} }
@ -219,7 +220,7 @@ int main(int, char**)
ImGui_ImplDX11_Shutdown(); ImGui_ImplDX11_Shutdown();
CleanupDeviceD3D(); CleanupDeviceD3D();
UnregisterClass(L"ImGui Example", wc.hInstance); UnregisterClass(_T("ImGui Example"), wc.hInstance);
return 0; return 0;
} }

11
examples/directx9_example/main.cpp
View File

@ -5,6 +5,7 @@
#include <d3dx9.h> #include <d3dx9.h>
#define DIRECTINPUT_VERSION 0x0800 #define DIRECTINPUT_VERSION 0x0800
#include <dinput.h> #include <dinput.h>
#include <tchar.h>
// Data // Data
static LPDIRECT3DDEVICE9 g_pd3dDevice = NULL; static LPDIRECT3DDEVICE9 g_pd3dDevice = NULL;
@ -44,15 +45,15 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
int main(int, char**) int main(int, char**)
{ {
// Create application window // Create application window
WNDCLASSEX wc = { sizeof(WNDCLASSEX), CS_CLASSDC, WndProc, 0L, 0L, GetModuleHandle(NULL), NULL, LoadCursor(NULL, IDC_ARROW), NULL, NULL, L"ImGui Example", NULL }; WNDCLASSEX wc = { sizeof(WNDCLASSEX), CS_CLASSDC, WndProc, 0L, 0L, GetModuleHandle(NULL), NULL, LoadCursor(NULL, IDC_ARROW), NULL, NULL, _T("ImGui Example"), NULL };
RegisterClassEx(&wc); RegisterClassEx(&wc);
HWND hwnd = CreateWindow(L"ImGui Example", L"ImGui DirectX9 Example", WS_OVERLAPPEDWINDOW, 100, 100, 1280, 800, NULL, NULL, wc.hInstance, NULL); HWND hwnd = CreateWindow(_T("ImGui Example"), _T("ImGui DirectX9 Example"), WS_OVERLAPPEDWINDOW, 100, 100, 1280, 800, NULL, NULL, wc.hInstance, NULL);
// Initialize Direct3D // Initialize Direct3D
LPDIRECT3D9 pD3D; LPDIRECT3D9 pD3D;
if ((pD3D = Direct3DCreate9(D3D_SDK_VERSION)) == NULL) if ((pD3D = Direct3DCreate9(D3D_SDK_VERSION)) == NULL)
{ {
UnregisterClass(L"ImGui Example", wc.hInstance); UnregisterClass(_T("ImGui Example"), wc.hInstance);
return 0; return 0;
} }
ZeroMemory(&g_d3dpp, sizeof(g_d3dpp)); ZeroMemory(&g_d3dpp, sizeof(g_d3dpp));
@ -67,7 +68,7 @@ int main(int, char**)
if (pD3D->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_HARDWARE_VERTEXPROCESSING, &g_d3dpp, &g_pd3dDevice) < 0) if (pD3D->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_HARDWARE_VERTEXPROCESSING, &g_d3dpp, &g_pd3dDevice) < 0)
{ {
pD3D->Release(); pD3D->Release();
UnregisterClass(L"ImGui Example", wc.hInstance); UnregisterClass(_T("ImGui Example"), wc.hInstance);
return 0; return 0;
} }
@ -154,7 +155,7 @@ int main(int, char**)
ImGui_ImplDX9_Shutdown(); ImGui_ImplDX9_Shutdown();
if (g_pd3dDevice) g_pd3dDevice->Release(); if (g_pd3dDevice) g_pd3dDevice->Release();
if (pD3D) pD3D->Release(); if (pD3D) pD3D->Release();
UnregisterClass(L"ImGui Example", wc.hInstance); UnregisterClass(_T("ImGui Example"), wc.hInstance);
return 0; return 0;
} }