diff options
Diffstat (limited to 'sample/d3d11')
| -rw-r--r-- | sample/d3d11/ocean_surface.cpp | 4 | ||||
| -rw-r--r-- | sample/d3d11/sample_d3d11.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sample/d3d11/ocean_surface.cpp b/sample/d3d11/ocean_surface.cpp index 3bf11c8..a880db3 100644 --- a/sample/d3d11/ocean_surface.cpp +++ b/sample/d3d11/ocean_surface.cpp @@ -31,7 +31,7 @@ #include "ocean_surface.h" #include "GFSDK_WaveWorks_D3D_Util.h" -#include "../common/Logger.h" +#include "GFSDK_Logger.h" #include "../common/LoggerImpl.h" #pragma warning(disable:4127) @@ -73,7 +73,7 @@ OceanSurface::~OceanSurface() HRESULT OceanSurface::initQuadTree(const GFSDK_WaveWorks_Quadtree_Params& params) { - NV_LOG("Initing the QuadTree"); + NV_LOG(L"Initing the QuadTree"); if(NULL == m_hOceanQuadTree) { diff --git a/sample/d3d11/sample_d3d11.cpp b/sample/d3d11/sample_d3d11.cpp index 929ba11..6383777 100644 --- a/sample/d3d11/sample_d3d11.cpp +++ b/sample/d3d11/sample_d3d11.cpp @@ -46,7 +46,7 @@ #include <locale> #include <codecvt> #include <xlocbuf> -#include "../common/Logger.h" +#include "GFSDK_Logger.h" #include "../common/LoggerImpl.h" //#define DEBUG_VS // Uncomment this line to debug vertex shaders @@ -209,11 +209,11 @@ INT WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR cmdline, int ) _CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); #endif - NV_LOG("Testing!"); + NV_LOG(L"Testing!"); - GFSDK_WaveWorks_SetUserLogger(static_cast<nv::ILogger*>(g_Logger)); + GFSDK_WaveWorks_SetUserLogger(static_cast<nv::ILogger*>(LoggerWWSamples::GetInstance())); - NV_LOG("User logger set!"); + NV_LOG(L"User logger set!"); //TODO: Take from cmdline auto mediaPath = "..\\..\\media\\sample"; |