diff --git a/WickedEngine/LoadingScreenComponent.h b/WickedEngine/LoadingScreenComponent.h index 1450359f4..246a1bc3d 100644 --- a/WickedEngine/LoadingScreenComponent.h +++ b/WickedEngine/LoadingScreenComponent.h @@ -15,6 +15,11 @@ private: { active.store(false); } + LoaderTask(const LoaderTask& l) + { + functionBody = l.functionBody; + active.store(l.active.load()); + } }; vector< LoaderTask > loaders; void doLoadingTasks(); diff --git a/WickedEngine/Renderable3DComponent.h b/WickedEngine/Renderable3DComponent.h index 919eb705e..dec852d0b 100644 --- a/WickedEngine/Renderable3DComponent.h +++ b/WickedEngine/Renderable3DComponent.h @@ -101,7 +101,7 @@ public: bool getSSSEnabled(){ return sssEnabled; } bool getDepthOfFieldEnabled(){ return depthOfFieldEnabled; } - unsigned short getThreadingCount(){ return workerThreads.size(); } + unsigned short getThreadingCount(){ return (unsigned short)workerThreads.size(); } void setLightShaftQuality(float value){ lightShaftQuality = value; } void setBloomDownSample(float value){ bloomDownSample = value; } diff --git a/WickedEngine/WickedEngine.vcxproj b/WickedEngine/WickedEngine.vcxproj index ec406e5c5..f5f9026f8 100644 --- a/WickedEngine/WickedEngine.vcxproj +++ b/WickedEngine/WickedEngine.vcxproj @@ -1,5 +1,5 @@  - + WinRT @@ -27,27 +27,27 @@ StaticLibrary true - v120 + v140 Unicode StaticLibrary true - v120 + v140 Unicode true StaticLibrary true - v120 + v140 Unicode true StaticLibrary false - v120 + v140 false Unicode diff --git a/WickedEngine/wiInitializer.cpp b/WickedEngine/wiInitializer.cpp index 84327ff68..bf8ee910b 100644 --- a/WickedEngine/wiInitializer.cpp +++ b/WickedEngine/wiInitializer.cpp @@ -7,6 +7,7 @@ #include "wiBackLog.h" #include "wiCpuInfo.h" #include "wiSound.h" +#include "wiHelper.h" namespace wiInitializer @@ -40,8 +41,17 @@ namespace wiInitializer if (requestedFeautures & WICKEDENGINE_INITIALIZE_SOUND) { - wiSoundEffect::Initialize(); - wiMusic::Initialize(); + if (FAILED(wiSoundEffect::Initialize()) || FAILED(wiMusic::Initialize())) + { + stringstream ss(""); + ss << "Failed to Initialize Audio Device!"; +#if (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/) + // +#else + ss << " Install June 2010 DirectX Redistributable!"; +#endif + wiHelper::messageBox(ss.str()); + } } } diff --git a/readme.txt b/readme.txt index 174d01ce3..8bf6578b8 100644 --- a/readme.txt +++ b/readme.txt @@ -20,6 +20,7 @@ _____________________________________________________________________ Visual Studio 2013+ (earlier versions may be compatible) WindowsSDK DirectX11 SDK (included in Windows SDK)(legacy SDK not supported) +DirectX11 June 2010 Redist (Only if you want to support Windows 7 because it uses Xaudio 2.7!) _____________________________________________________________________ ___________