Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update utf82utf16.

Browse Source
This commit is contained in:
Kim Kulling
2023-03-06 19:56:11 +01:00
parent 7916f87404
commit c089f11768
3 changed files with 64 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp
View File

@@ -13,6 +13,8 @@
// Written by IAS. :)
// ---------------------------------------------------------------------------
#include <assimp/types.h>
#include <Windows.h>
#include <shellapi.h>
#include <stdexcept>
@@ -21,11 +23,7 @@
#include <dxgi1_2.h>
#include <DirectXMath.h>
#include <d3dcompiler.h>
#ifdef ASSIMP_USE_HUNTER
#include <utf8.h>
#else
#include "../contrib/utf8cpp/source/utf8.h"
#endif
#include "ModelLoader.h"
#include "SafeRelease.hpp"
@@ -53,10 +51,10 @@ struct ConstantBuffer {
// ------------------------------------------------------------
// Window Variables
// ------------------------------------------------------------
#define SCREEN_WIDTH 800
#define SCREEN_HEIGHT 600
static constexpr uint32_t SCREEN_WIDTH = 800;
static constexpr uint32_t SCREEN_HEIGHT = 600;
const char g_szClassName[] = "directxWindowClass";
constexpr char g_szClassName[] = "directxWindowClass";
static std::string g_ModelPath;