diff --git a/WickedEngine/CommonInclude.h b/WickedEngine/CommonInclude.h index 8aafaddca..c0473e2f1 100644 --- a/WickedEngine/CommonInclude.h +++ b/WickedEngine/CommonInclude.h @@ -4,6 +4,8 @@ // NOTE: // Do not include engine features in this file! + +// Platform specific: #include #include #ifdef WINSTORE_SUPPORT @@ -11,13 +13,10 @@ #endif +// Platform agnostic: #include #include - - - using namespace DirectX; -using namespace std; #define ALIGN_16 void* operator new(size_t i){return _mm_malloc(i, 16);} void operator delete(void* p){_mm_free(p);} #define SAFE_INIT(a) (a) = nullptr; diff --git a/WickedEngine/Editor.cpp b/WickedEngine/Editor.cpp index 8e0be2a8d..2bcaddaa2 100644 --- a/WickedEngine/Editor.cpp +++ b/WickedEngine/Editor.cpp @@ -20,6 +20,7 @@ // This should be written into any archive operation for future bacwards compatibility! int __editorVersion = 0; +using namespace std; using namespace wiGraphicsTypes; using namespace wiRectPacker; @@ -111,7 +112,7 @@ void EditorLoadingScreen::Unload() wiTranslator* translator = nullptr; bool translator_active = false; list selected; -map savedParents; +std::map savedParents; wiRenderer::Picked hovered; void BeginTranslate() { @@ -160,7 +161,7 @@ void EndTranslate() if (x->transform != nullptr) { x->transform->detach(); - map::iterator it = savedParents.find(x->transform); + std::map::iterator it = savedParents.find(x->transform); if (it != savedParents.end()) { x->transform->attachTo(it->second); diff --git a/WickedEngine/LoadingScreenComponent.cpp b/WickedEngine/LoadingScreenComponent.cpp index 372924671..3e163e6e9 100644 --- a/WickedEngine/LoadingScreenComponent.cpp +++ b/WickedEngine/LoadingScreenComponent.cpp @@ -1,6 +1,8 @@ #include "LoadingScreenComponent.h" #include "MainComponent.h" +using namespace std; + LoadingScreenComponent::LoadingScreenComponent() : Renderable2DComponent() { loaders.clear(); @@ -59,7 +61,7 @@ void LoadingScreenComponent::waitForFinish() void LoadingScreenComponent::doLoadingTasks() { - vector loaderThreads(0); + std::vector loaderThreads(0); for (LoaderTask& x : loaders) { diff --git a/WickedEngine/LoadingScreenComponent.h b/WickedEngine/LoadingScreenComponent.h index 9ef8e8bd0..bcdaf88cd 100644 --- a/WickedEngine/LoadingScreenComponent.h +++ b/WickedEngine/LoadingScreenComponent.h @@ -1,5 +1,8 @@ #pragma once #include "Renderable2DComponent.h" + +#include +#include #include class MainComponent; @@ -10,10 +13,10 @@ class LoadingScreenComponent : private: struct LoaderTask { - function< void() > functionBody; - atomic_bool active; + std::function< void() > functionBody; + std::atomic_bool active; - LoaderTask(function< void() > functionBody) :functionBody(functionBody) + LoaderTask(std::function< void() > functionBody) :functionBody(functionBody) { active.store(false); } @@ -23,24 +26,24 @@ private: active.store(l.active.load()); } }; - vector< LoaderTask > loaders; + std::vector< LoaderTask > loaders; void doLoadingTasks(); void waitForFinish(); - function finish; - thread worker; + std::function finish; + std::thread worker; public: LoadingScreenComponent(); virtual ~LoadingScreenComponent(); //Add a loading task which should be executed //use std::bind( YourFunctionPointer ) - void addLoadingFunction(function loadingFunction); + void addLoadingFunction(std::function loadingFunction); //Helper for loading a whole renderable component void addLoadingComponent(RenderableComponent* component, MainComponent* main); //Set a function that should be called when the loading finishes //use std::bind( YourFunctionPointer ) - void onFinished(function finishFunction); + void onFinished(std::function finishFunction); //Get percentage of finished loading tasks (values 0-100) int getPercentageComplete(); //See if the loading is currently running diff --git a/WickedEngine/LoadingScreenComponent_BindLua.cpp b/WickedEngine/LoadingScreenComponent_BindLua.cpp index 4651385c0..221d763d8 100644 --- a/WickedEngine/LoadingScreenComponent_BindLua.cpp +++ b/WickedEngine/LoadingScreenComponent_BindLua.cpp @@ -1,5 +1,7 @@ #include "LoadingScreenComponent_BindLua.h" +using namespace std; + const char LoadingScreenComponent_BindLua::className[] = "LoadingScreenComponent"; Luna::FunctionType LoadingScreenComponent_BindLua::methods[] = { diff --git a/WickedEngine/MainComponent.cpp b/WickedEngine/MainComponent.cpp index 6aa7ffe36..912fece20 100644 --- a/WickedEngine/MainComponent.cpp +++ b/WickedEngine/MainComponent.cpp @@ -13,6 +13,8 @@ #include "wiFrameRate.h" #include "wiProfiler.h" +using namespace std; + MainComponent::MainComponent() { // This call also saves the current working dir as the original one on this first call diff --git a/WickedEngine/MaterialWindow.cpp b/WickedEngine/MaterialWindow.cpp index 00f22cbcf..2e3f5101d 100644 --- a/WickedEngine/MaterialWindow.cpp +++ b/WickedEngine/MaterialWindow.cpp @@ -4,6 +4,7 @@ #include // openfile #include +using namespace std; using namespace wiGraphicsTypes; MaterialWindow::MaterialWindow(wiGUI* gui) : GUI(gui) diff --git a/WickedEngine/Renderable2DComponent.cpp b/WickedEngine/Renderable2DComponent.cpp index ffd00563f..af3dfd419 100644 --- a/WickedEngine/Renderable2DComponent.cpp +++ b/WickedEngine/Renderable2DComponent.cpp @@ -141,7 +141,7 @@ void Renderable2DComponent::Compose() } -void Renderable2DComponent::addSprite(wiSprite* sprite, const string& layer) +void Renderable2DComponent::addSprite(wiSprite* sprite, const std::string& layer) { for (auto& x : layers) { @@ -195,7 +195,7 @@ int Renderable2DComponent::getSpriteOrder(wiSprite* sprite) return 0; } -void Renderable2DComponent::addFont(wiFont* font, const string& layer) +void Renderable2DComponent::addFont(wiFont* font, const std::string& layer) { for (auto& x : layers) { @@ -250,7 +250,7 @@ int Renderable2DComponent::getFontOrder(wiFont* font) } -void Renderable2DComponent::addLayer(const string& name) +void Renderable2DComponent::addLayer(const std::string& name) { for (auto& x : layers) { @@ -262,7 +262,7 @@ void Renderable2DComponent::addLayer(const string& name) layers.push_back(layer); layers.back().entities.clear(); } -void Renderable2DComponent::setLayerOrder(const string& name, int order) +void Renderable2DComponent::setLayerOrder(const std::string& name, int order) { for (auto& x : layers) { @@ -350,7 +350,7 @@ void Renderable2DComponent::CleanLayers() { continue; } - vector cleanEntities(0); + std::vector cleanEntities(0); for (auto& y : x.entities) { if (y.sprite != nullptr || y.font!=nullptr) diff --git a/WickedEngine/Renderable2DComponent.h b/WickedEngine/Renderable2DComponent.h index bd55f8bc0..44278c0b7 100644 --- a/WickedEngine/Renderable2DComponent.h +++ b/WickedEngine/Renderable2DComponent.h @@ -28,11 +28,11 @@ struct LayeredRenderEntity }; struct RenderLayer { - vector entities; - string name; + std::vector entities; + std::string name; int order; - RenderLayer(const string& newName) + RenderLayer(const std::string& newName) { name = newName; order = 0; @@ -62,21 +62,21 @@ public: virtual void Render(); virtual void Compose(); - void addSprite(wiSprite* sprite, const string& layer = DEFAULT_RENDERLAYER); + void addSprite(wiSprite* sprite, const std::string& layer = DEFAULT_RENDERLAYER); void removeSprite(wiSprite* sprite); void clearSprites(); void setSpriteSpeed(float value){ m_spriteSpeed = value; } float getSpriteSpeed(){ return m_spriteSpeed; } int getSpriteOrder(wiSprite* sprite); - void addFont(wiFont* font, const string& layer = DEFAULT_RENDERLAYER); + void addFont(wiFont* font, const std::string& layer = DEFAULT_RENDERLAYER); void removeFont(wiFont* font); void clearFonts(); int getFontOrder(wiFont* font); - vector layers; - void addLayer(const string& name); - void setLayerOrder(const string& name, int order); + std::vector layers; + void addLayer(const std::string& name); + void setLayerOrder(const std::string& name, int order); void SetSpriteOrder(wiSprite* sprite, int order); void SetFontOrder(wiFont* font, int order); void SortLayers(); diff --git a/WickedEngine/Renderable2DComponent_BindLua.cpp b/WickedEngine/Renderable2DComponent_BindLua.cpp index 6629078cf..bbec8cfb4 100644 --- a/WickedEngine/Renderable2DComponent_BindLua.cpp +++ b/WickedEngine/Renderable2DComponent_BindLua.cpp @@ -5,6 +5,8 @@ #include +using namespace std; + const char Renderable2DComponent_BindLua::className[] = "Renderable2DComponent"; Luna::FunctionType Renderable2DComponent_BindLua::methods[] = { diff --git a/WickedEngine/Renderable3DComponent.cpp b/WickedEngine/Renderable3DComponent.cpp index 3d61dd309..2776a3c8c 100644 --- a/WickedEngine/Renderable3DComponent.cpp +++ b/WickedEngine/Renderable3DComponent.cpp @@ -37,7 +37,7 @@ wiRenderTarget , Renderable3DComponent::rtDof[3] , Renderable3DComponent::rtTemporalAA[2] ; -vector Renderable3DComponent::rtSun, Renderable3DComponent::rtBloom, Renderable3DComponent::rtSSAO; +std::vector Renderable3DComponent::rtSun, Renderable3DComponent::rtBloom, Renderable3DComponent::rtSSAO; wiDepthTarget Renderable3DComponent::dtDepthCopy; Texture2D* Renderable3DComponent::smallDepth; void Renderable3DComponent::ResizeBuffers() diff --git a/WickedEngine/Renderable3DComponent.h b/WickedEngine/Renderable3DComponent.h index 10acbe58c..d203dcd52 100644 --- a/WickedEngine/Renderable3DComponent.h +++ b/WickedEngine/Renderable3DComponent.h @@ -63,13 +63,13 @@ protected: , rtDof[3] , rtTemporalAA[2] ; - static vector rtSun, rtBloom, rtSSAO; + static std::vector rtSun, rtBloom, rtSSAO; static wiDepthTarget dtDepthCopy; static wiGraphicsTypes::Texture2D* smallDepth; virtual void ResizeBuffers() override; - vector workerThreads; + std::vector workerThreads; virtual void RenderFrameSetUp(GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE); virtual void RenderReflections(GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE); diff --git a/WickedEngine/RenderableComponent.h b/WickedEngine/RenderableComponent.h index b01a77104..61a8ee9ef 100644 --- a/WickedEngine/RenderableComponent.h +++ b/WickedEngine/RenderableComponent.h @@ -14,8 +14,8 @@ public: wiCVars Params; wiResourceManager Content; - function onStart; - function onStop; + std::function onStart; + std::function onStop; RenderableComponent(){} virtual ~RenderableComponent() { Unload(); } diff --git a/WickedEngine/RenderableComponent_BindLua.cpp b/WickedEngine/RenderableComponent_BindLua.cpp index c1efbdd8a..d27ac8c71 100644 --- a/WickedEngine/RenderableComponent_BindLua.cpp +++ b/WickedEngine/RenderableComponent_BindLua.cpp @@ -1,6 +1,8 @@ #include "RenderableComponent_BindLua.h" #include "wiResourceManager_BindLua.h" +using namespace std; + const char RenderableComponent_BindLua::className[] = "RenderableComponent"; Luna::FunctionType RenderableComponent_BindLua::methods[] = { diff --git a/WickedEngine/WickedEngineEditor.cpp b/WickedEngine/WickedEngineEditor.cpp index 6bbbb5349..65ec0985c 100644 --- a/WickedEngine/WickedEngineEditor.cpp +++ b/WickedEngine/WickedEngineEditor.cpp @@ -4,6 +4,8 @@ #include +using namespace std; + #define MAX_LOADSTRING 100 extern "C" { diff --git a/WickedEngine/wiArchive.cpp b/WickedEngine/wiArchive.cpp index 48a473ed6..11b23eccd 100644 --- a/WickedEngine/wiArchive.cpp +++ b/WickedEngine/wiArchive.cpp @@ -4,6 +4,8 @@ #include #include +using namespace std; + // this should always be only INCREMENTED and only if a new serialization is implemeted somewhere! uint64_t __archiveVersion = 7; // this is the version number of which below the archive is not compatible with the current version @@ -11,7 +13,7 @@ uint64_t __archiveVersionBarrier = 1; // version history is logged in ArchiveVersionHistory.txt file! -wiArchive::wiArchive(const string& fileName, bool readMode):readMode(readMode),pos(0),DATA(nullptr),dataSize(0),fileName(fileName) +wiArchive::wiArchive(const std::string& fileName, bool readMode):readMode(readMode),pos(0),DATA(nullptr),dataSize(0),fileName(fileName) { if (!fileName.empty()) { @@ -74,7 +76,7 @@ void wiArchive::Close() SAFE_DELETE_ARRAY(DATA); } -bool wiArchive::SaveFile(const string& fileName) +bool wiArchive::SaveFile(const std::string& fileName) { if (pos <= 0) { diff --git a/WickedEngine/wiArchive.h b/WickedEngine/wiArchive.h index 8543c49d5..59a22907d 100644 --- a/WickedEngine/wiArchive.h +++ b/WickedEngine/wiArchive.h @@ -13,18 +13,18 @@ private: char* DATA; size_t dataSize; - string fileName; // save to this file on closing if not empty + std::string fileName; // save to this file on closing if not empty public: - wiArchive(const string& fileName, bool readMode = true); + wiArchive(const std::string& fileName, bool readMode = true); ~wiArchive(); uint64_t GetVersion() { return version; } bool IsReadMode() { return readMode; } bool IsOpen(); void Close(); - bool SaveFile(const string& fileName); - string GetSourceDirectory(); - string GetSourceFileName(); + bool SaveFile(const std::string& fileName); + std::string GetSourceDirectory(); + std::string GetSourceFileName(); // It could be templated but we have to be extremely careful of different datasizes on different platforms // because serialized data should be interchangeable! @@ -106,7 +106,7 @@ public: _write(data); return *this; } - wiArchive& operator<<(const string& data) + wiArchive& operator<<(const std::string& data) { uint64_t len = (uint64_t)(data.length() + 1); // +1 for the null-terminator _write(len); @@ -204,14 +204,14 @@ public: _read(data); return *this; } - wiArchive& operator >> (string& data) + wiArchive& operator >> (std::string& data) { uint64_t len; _read(len); char* str = new char[(size_t)len]; memset(str, '\0', (size_t)(sizeof(char)*len)); _read(*str, len); - data = string(str); + data = std::string(str); delete[] str; return *this; } diff --git a/WickedEngine/wiBULLET.cpp b/WickedEngine/wiBULLET.cpp index 337b43a50..bb80d4712 100644 --- a/WickedEngine/wiBULLET.cpp +++ b/WickedEngine/wiBULLET.cpp @@ -316,7 +316,7 @@ void wiBULLET::addCapsule(float rad, float hei, const XMFLOAT4& rot, const XMFLO } -void wiBULLET::addConvexHull(const vector& vertices, const XMFLOAT3& sca, const XMFLOAT4& rot, const XMFLOAT3& pos +void wiBULLET::addConvexHull(const std::vector& vertices, const XMFLOAT3& sca, const XMFLOAT4& rot, const XMFLOAT3& pos , float newMass, float newFriction, float newRestitution, float newDamping, bool kinematic){ btCollisionShape* shape = new btConvexHullShape(); for (unsigned int i = 0; i& vertices, const XMFLOAT3& s } -void wiBULLET::addTriangleMesh(const vector& vertices, const vector& indices, const XMFLOAT3& sca, const XMFLOAT4& rot, const XMFLOAT3& pos +void wiBULLET::addTriangleMesh(const std::vector& vertices, const std::vector& indices, const XMFLOAT3& sca, const XMFLOAT4& rot, const XMFLOAT3& pos , float newMass, float newFriction, float newRestitution, float newDamping, bool kinematic){ int totalVerts = (int)vertices.size(); @@ -532,7 +532,7 @@ void wiBULLET::addSoftBodyTriangleMesh(const Mesh* mesh, const XMFLOAT3& sca, co int mvg = mesh->massVG; if(mvg>=0){ - for(map::const_iterator it=mesh->vertexGroups[mvg].vertices.begin();it!=mesh->vertexGroups[mvg].vertices.end();++it){ + for(std::map::const_iterator it=mesh->vertexGroups[mvg].vertices.begin();it!=mesh->vertexGroups[mvg].vertices.end();++it){ int vi = (*it).first; float wei = (*it).second; int index=mesh->physicalmapGP[vi]; @@ -543,7 +543,7 @@ void wiBULLET::addSoftBodyTriangleMesh(const Mesh* mesh, const XMFLOAT3& sca, co int gvg = mesh->goalVG; if(gvg>=0){ - for(map::const_iterator it=mesh->vertexGroups[gvg].vertices.begin();it!=mesh->vertexGroups[gvg].vertices.end();++it){ + for(std::map::const_iterator it=mesh->vertexGroups[gvg].vertices.begin();it!=mesh->vertexGroups[gvg].vertices.end();++it){ int vi = (*it).first; int index=mesh->physicalmapGP[vi]; float weight = (*it).second; @@ -612,7 +612,7 @@ void wiBULLET::connectSoftBodyToVertices(const Mesh* const mesh, int objectI){ int gvg = mesh->goalVG; if(gvg>=0){ int j=0; - for(map::const_iterator it=mesh->vertexGroups[gvg].vertices.begin();it!=mesh->vertexGroups[gvg].vertices.end();++it){ + for(std::map::const_iterator it=mesh->vertexGroups[gvg].vertices.begin();it!=mesh->vertexGroups[gvg].vertices.end();++it){ int vi = (*it).first; int index=mesh->physicalmapGP[vi]; float weight = (*it).second; diff --git a/WickedEngine/wiBULLET.h b/WickedEngine/wiBULLET.h index 4dd1d4107..a29eb2d05 100644 --- a/WickedEngine/wiBULLET.h +++ b/WickedEngine/wiBULLET.h @@ -43,9 +43,9 @@ public: , float newMass, float newFriction, float newRestitution, float newDamping, bool kinematic); void addCapsule(float rad, float hei, const XMFLOAT4& rot, const XMFLOAT3& pos , float newMass, float newFriction, float newRestitution, float newDamping, bool kinematic); - void addConvexHull(const vector& vertices, const XMFLOAT3& sca, const XMFLOAT4& rot, const XMFLOAT3& pos + void addConvexHull(const std::vector& vertices, const XMFLOAT3& sca, const XMFLOAT4& rot, const XMFLOAT3& pos , float newMass, float newFriction, float newRestitution, float newDamping, bool kinematic); - void addTriangleMesh(const vector& vertices, const vector& indices, const XMFLOAT3& sca, const XMFLOAT4& rot, const XMFLOAT3& pos + void addTriangleMesh(const std::vector& vertices, const std::vector& indices, const XMFLOAT3& sca, const XMFLOAT4& rot, const XMFLOAT3& pos , float newMass, float newFriction, float newRestitution, float newDamping, bool kinematic); void addSoftBodyTriangleMesh(const Mesh* mesh, const XMFLOAT3& sca, const XMFLOAT4& rot, const XMFLOAT3& pos diff --git a/WickedEngine/wiBackLog.cpp b/WickedEngine/wiBackLog.cpp index bae065c00..d39a0cdac 100644 --- a/WickedEngine/wiBackLog.cpp +++ b/WickedEngine/wiBackLog.cpp @@ -5,8 +5,7 @@ #include "wiRenderer.h" #include "wiTextureHelper.h" -#include - +using namespace std; using namespace wiGraphicsTypes; deque wiBackLog::stream; diff --git a/WickedEngine/wiBackLog.h b/WickedEngine/wiBackLog.h index fe8e36ffb..2e4043de1 100644 --- a/WickedEngine/wiBackLog.h +++ b/WickedEngine/wiBackLog.h @@ -5,18 +5,22 @@ #include "wiImage.h" #include "wiLua.h" +#include +#include +#include #include +#include class wiBackLog { private: - static deque stream; + static std::deque stream; static unsigned int deletefromline; - static mutex logMutex; + static std::mutex logMutex; static const float speed; static float pos; static int scroll; - static stringstream inputArea; + static std::stringstream inputArea; enum State{ DISABLED, IDLE, @@ -32,15 +36,15 @@ public: static void Update(); static void Draw(); - static string getText(); + static std::string getText(); static void clear(); static void post(const char* input); static void input(const char& input); static void acceptInput(); static void deletefromInput(); - static void save(ofstream& file); + static void save(std::ofstream& file); - static deque history; + static std::deque history; static int historyPos; static void historyPrev(); static void historyNext(); diff --git a/WickedEngine/wiBackLog_BindLua.cpp b/WickedEngine/wiBackLog_BindLua.cpp index f0464ced4..acd45494b 100644 --- a/WickedEngine/wiBackLog_BindLua.cpp +++ b/WickedEngine/wiBackLog_BindLua.cpp @@ -1,8 +1,7 @@ #include "wiBackLog_BindLua.h" #include "wiBackLog.h" -#include - +using namespace std; namespace wiBackLog_BindLua { diff --git a/WickedEngine/wiCVars.cpp b/WickedEngine/wiCVars.cpp index a7af087a4..13da501b6 100644 --- a/WickedEngine/wiCVars.cpp +++ b/WickedEngine/wiCVars.cpp @@ -1,5 +1,7 @@ #include "wiCVars.h" +using namespace std; + wiCVars* wiCVars::globalVars = nullptr; wiCVars::wiCVars() @@ -23,14 +25,14 @@ wiCVars* wiCVars::GetGlobal() } -const wiCVars::Variable wiCVars::get(const string& name) +const wiCVars::Variable wiCVars::get(const std::string& name) { container::iterator it = variables.find(name); if(it!=variables.end()) return it->second; else return Variable::Invalid(); } -bool wiCVars::set(const string& name, const string& value) +bool wiCVars::set(const std::string& name, const std::string& value) { if (!get(name).isValid()) return false; @@ -43,7 +45,7 @@ bool wiCVars::set(const string& name, const string& value) return true; } -bool wiCVars::add(const string& name, const string& value, Data_Type newType) +bool wiCVars::add(const std::string& name, const std::string& value, Data_Type newType) { if(get(name).isValid()) return false; @@ -52,7 +54,7 @@ bool wiCVars::add(const string& name, const string& value, Data_Type newType) UNLOCK(); return true; } -bool wiCVars::del(const string& name) +bool wiCVars::del(const std::string& name) { if (!get(name).isValid()) return false; diff --git a/WickedEngine/wiCVars.h b/WickedEngine/wiCVars.h index 6e63be8b2..9975a5038 100644 --- a/WickedEngine/wiCVars.h +++ b/WickedEngine/wiCVars.h @@ -3,6 +3,7 @@ #include "wiHelper.h" #include "wiThreadSafeManager.h" +#include #include class wiCVars : public wiThreadSafeManager @@ -18,15 +19,15 @@ public: }; private: struct Variable{ - string data; + std::string data; Data_Type type; - Variable(const string& d = "", Data_Type t = TEXT):data(d),type(t){} + Variable(const std::string& d = "", Data_Type t = TEXT):data(d),type(t){} bool isValid() const { return type != EMPTY && !data.empty(); } - string get() const + std::string get() const { return data; } @@ -77,7 +78,7 @@ private: return Variable("", EMPTY); } }; - typedef map container; + typedef std::map container; container variables; static wiCVars* globalVars; @@ -86,10 +87,10 @@ public: ~wiCVars(); static wiCVars* GetGlobal(); - const Variable get(const string& name); - bool set(const string& name, const string& value); - bool add(const string& name, const string& value, Data_Type newType = Data_Type::TEXT); - bool del(const string& name); + const Variable get(const std::string& name); + bool set(const std::string& name, const std::string& value); + bool add(const std::string& name, const std::string& value, Data_Type newType = Data_Type::TEXT); + bool del(const std::string& name); bool CleanUp(); }; diff --git a/WickedEngine/wiClient.cpp b/WickedEngine/wiClient.cpp index c3f5c406b..52293f7a6 100644 --- a/WickedEngine/wiClient.cpp +++ b/WickedEngine/wiClient.cpp @@ -1,9 +1,10 @@ #include "wiClient.h" +using namespace std; #ifndef WINSTORE_SUPPORT -wiClient::wiClient(const string& newName, const string& ipaddress, int port) +wiClient::wiClient(const std::string& newName, const std::string& ipaddress, int port) { if(ConnectToHost(port,ipaddress.length()<=1?"127.0.0.1":ipaddress.c_str())){ success=true; @@ -31,18 +32,18 @@ wiClient::~wiClient(void) } -bool wiClient::sendText(const string& text){ +bool wiClient::sendText(const std::string& text){ return wiNetwork::sendText(text,s); } bool wiClient::receiveText(string& text){ return wiNetwork::receiveText(text,s); } -bool wiClient::changeName(const string& newName){ +bool wiClient::changeName(const std::string& newName){ wiNetwork::changeName(newName); wiNetwork::sendData(wiNetwork::PACKET_TYPE_CHANGENAME,s); return wiNetwork::sendText(newName,s); } -bool wiClient::sendMessage(const string& text){ +bool wiClient::sendMessage(const std::string& text){ wiNetwork::sendData(wiNetwork::PACKET_TYPE_TEXTMESSAGE,s); return wiNetwork::sendText(text,s); } diff --git a/WickedEngine/wiClient.h b/WickedEngine/wiClient.h index 584001ac3..704be3098 100644 --- a/WickedEngine/wiClient.h +++ b/WickedEngine/wiClient.h @@ -8,14 +8,14 @@ class wiClient : public wiNetwork { #ifndef WINSTORE_SUPPORT public: - wiClient(const string& newName = "CLIENT", const string& ipaddress = "127.0.0.1", int port = PORT); + wiClient(const std::string& newName = "CLIENT", const std::string& ipaddress = "127.0.0.1", int port = PORT); ~wiClient(void); - string serverName; + std::string serverName; - bool sendText(const string& text); - bool receiveText(string& newName); + bool sendText(const std::string& text); + bool receiveText(std::string& newName); template bool sendData(const T& value){ @@ -27,8 +27,8 @@ public: return wiNetwork::receiveData(value,s); } - bool changeName(const string& newName); - bool sendMessage(const string& text); + bool changeName(const std::string& newName); + bool sendMessage(const std::string& text); bool ConnectToHost(int PortNo, const char* IPAddress) { @@ -141,7 +141,7 @@ public: #else public: - wiClient(const string& newName = "CLIENT", const string& ipaddress = "127.0.0.1", int port = PORT) {} + wiClient(const std::string& newName = "CLIENT", const std::string& ipaddress = "127.0.0.1", int port = PORT) {} template void Poll(T& data) {} diff --git a/WickedEngine/wiEmittedParticle.cpp b/WickedEngine/wiEmittedParticle.cpp index 039734fb2..c4cf5c583 100644 --- a/WickedEngine/wiEmittedParticle.cpp +++ b/WickedEngine/wiEmittedParticle.cpp @@ -8,6 +8,7 @@ #include "ResourceMapping.h" #include "wiArchive.h" +using namespace std; using namespace wiGraphicsTypes; VertexLayout *wiEmittedParticle::vertexLayout = nullptr; @@ -33,7 +34,7 @@ wiEmittedParticle::wiEmittedParticle() bounding_box = new AABB(); lightName = ""; } -wiEmittedParticle::wiEmittedParticle(std::string newName, std::string newMat, Object* newObject, float newSize, float newRandomFac, float newNormalFac +wiEmittedParticle::wiEmittedParticle(const std::string& newName, const std::string& newMat, Object* newObject, float newSize, float newRandomFac, float newNormalFac ,float newCount, float newLife, float newRandLife, float newScaleX, float newScaleY, float newRot){ name=newName; object=newObject; @@ -297,7 +298,7 @@ void wiEmittedParticle::UpdateRenderData(GRAPHICSTHREAD threadID) { if (!points.empty()) { - vector renderPoints = vector(points.begin(), points.end()); + std::vector renderPoints = std::vector(points.begin(), points.end()); wiRenderer::GetDevice()->UpdateBuffer(vertexBuffer, renderPoints.data(), threadID, (int)(sizeof(Point)* renderPoints.size())); } } diff --git a/WickedEngine/wiEmittedParticle.h b/WickedEngine/wiEmittedParticle.h index 6c030cd68..78319705c 100644 --- a/WickedEngine/wiEmittedParticle.h +++ b/WickedEngine/wiEmittedParticle.h @@ -43,7 +43,7 @@ private: sizBeginEnd[1] = sizOpaMir.x*scaleX; } }; - deque points; + std::deque points; GFX_STRUCT ConstantBuffer { @@ -72,10 +72,10 @@ private: static void SetUpStates(); void LoadVertexBuffer(); - static set systems; + static std::set systems; - //std::vector emitterVertexList; + //std::std::vector emitterVertexList; float getNewVelocityModifier(){ return 1+((rand()%10001+1)*0.0001f)*random_factor;} float getNewPositionModifier(){ return (rand()%((int)(random_factor*1000)+1))*0.001f - random_factor*0.5f; } @@ -96,7 +96,7 @@ private: void SetupLightInterpolators(); public: wiEmittedParticle(); - wiEmittedParticle(std::string newName, std::string newMat, Object* newObject, float newSize, float newRandomFac, float newNormalFac + wiEmittedParticle(const std::string& newName, const std::string& newMat, Object* newObject, float newSize, float newRandomFac, float newNormalFac ,float newCount, float newLife, float newRandLife, float newScaleX, float newScaleY, float newRot); static void SetUpStatic(); static void CleanUpStatic(); @@ -116,12 +116,12 @@ public: void DrawNonPremul(GRAPHICSTHREAD threadID, int FLAG = DRAW_DEFAULT); void CleanUp(); - string name; + std::string name; Object* object; - string materialName; + std::string materialName; Material* material; Light* light; - string lightName; + std::string lightName; AABB* bounding_box; diff --git a/WickedEngine/wiFadeManager.h b/WickedEngine/wiFadeManager.h index 4384aca06..4c960a8b8 100644 --- a/WickedEngine/wiFadeManager.h +++ b/WickedEngine/wiFadeManager.h @@ -20,14 +20,14 @@ public: FADE_FINISHED, } state; wiColor color; - function onFade; + std::function onFade; wiFadeManager() { Clear(); } void Clear(); - void Start(int targetFrames, const wiColor& color, function onFadeFunction) + void Start(int targetFrames, const wiColor& color, std::function onFadeFunction) { this->targetFrames = targetFrames; this->color = color; diff --git a/WickedEngine/wiFont.cpp b/WickedEngine/wiFont.cpp index fec15a9a4..d740af5b6 100644 --- a/WickedEngine/wiFont.cpp +++ b/WickedEngine/wiFont.cpp @@ -7,6 +7,7 @@ #include +using namespace std; using namespace wiGraphicsTypes; #define WHITESPACE_SIZE 3 @@ -20,14 +21,14 @@ BlendState *wiFont::blendState = nullptr; RasterizerState *wiFont::rasterizerState = nullptr; RasterizerState *wiFont::rasterizerState_Scissor = nullptr; DepthStencilState *wiFont::depthStencilState = nullptr; -vector wiFont::vertexList; -vector wiFont::fontStyles; +std::vector wiFont::vertexList; +std::vector wiFont::fontStyles; -wiFont::wiFont(const string& text, wiFontProps props, int style) : props(props), style(style) +wiFont::wiFont(const std::string& text, wiFontProps props, int style) : props(props), style(style) { this->text = wstring(text.begin(), text.end()); } -wiFont::wiFont(const wstring& text, wiFontProps props, int style) : text(text), props(props), style(style) +wiFont::wiFont(const std::wstring& text, wiFontProps props, int style) : text(text), props(props), style(style) { } @@ -156,7 +157,7 @@ void wiFont::CleanUpStatic() } -void wiFont::ModifyGeo(const wstring& text, wiFontProps props, int style, GRAPHICSTHREAD threadID) +void wiFont::ModifyGeo(const std::wstring& text, wiFontProps props, int style, GRAPHICSTHREAD threadID) { const int lineHeight = (props.size < 0 ? fontStyles[style].lineHeight : props.size); const float relativeSize = (props.size < 0 ? 1 : (float)props.size / (float)fontStyles[style].lineHeight); @@ -374,11 +375,11 @@ int wiFont::textHeight() } -void wiFont::SetText(const string& text) +void wiFont::SetText(const std::string& text) { this->text = wstring(text.begin(), text.end()); } -void wiFont::SetText(const wstring& text) +void wiFont::SetText(const std::wstring& text) { this->text = text; } @@ -391,7 +392,7 @@ string wiFont::GetTextA() return string(text.begin(),text.end()); } -wiFont::wiFontStyle::wiFontStyle(const string& newName) +wiFont::wiFontStyle::wiFontStyle(const std::string& newName) { name=newName; @@ -437,7 +438,7 @@ wiFont::wiFontStyle::wiFontStyle(const string& newName) void wiFont::wiFontStyle::CleanUp(){ SAFE_DELETE(texture); } -void wiFont::addFontStyle( const string& toAdd ){ +void wiFont::addFontStyle( const std::string& toAdd ){ for (auto& x : fontStyles) { if (!x.name.compare(toAdd)) @@ -445,7 +446,7 @@ void wiFont::addFontStyle( const string& toAdd ){ } fontStyles.push_back(wiFontStyle(toAdd)); } -int wiFont::getFontStyleByName( const string& get ){ +int wiFont::getFontStyleByName( const std::string& get ){ for (unsigned int i = 0; i vertexList; + static std::vector vertexList; static wiGraphicsTypes::GPUBuffer *vertexBuffer, *indexBuffer; static wiGraphicsTypes::VertexLayout *vertexLayout; @@ -66,7 +66,7 @@ private: struct wiFontStyle{ - string name; + std::string name; wiGraphicsTypes::Texture2D* texture; struct LookUp{ @@ -81,25 +81,25 @@ private: int lineHeight; wiFontStyle(){} - wiFontStyle(const string& newName); + wiFontStyle(const std::string& newName); void CleanUp(); }; - static vector fontStyles; + static std::vector fontStyles; - static void ModifyGeo(const wstring& text, wiFontProps props, int style, GRAPHICSTHREAD threadID); + static void ModifyGeo(const std::wstring& text, wiFontProps props, int style, GRAPHICSTHREAD threadID); public: static void Initialize(); static void SetUpStaticComponents(); static void CleanUpStatic(); - wstring text; + std::wstring text; wiFontProps props; int style; - wiFont(const string& text = "", wiFontProps props = wiFontProps(), int style = 0); - wiFont(const wstring& text, wiFontProps props = wiFontProps(), int style = 0); + wiFont(const std::string& text = "", wiFontProps props = wiFontProps(), int style = 0); + wiFont(const std::wstring& text, wiFontProps props = wiFontProps(), int style = 0); ~wiFont(); @@ -109,13 +109,13 @@ public: int textWidth(); int textHeight(); - static void addFontStyle( const string& toAdd ); - static int getFontStyleByName( const string& get ); + static void addFontStyle( const std::string& toAdd ); + static int getFontStyleByName( const std::string& get ); - void SetText(const string& text); - void SetText(const wstring& text); - wstring GetText(); - string GetTextA(); + void SetText(const std::string& text); + void SetText(const std::wstring& text); + std::wstring GetText(); + std::string GetTextA(); void CleanUp(); }; diff --git a/WickedEngine/wiFont_BindLua.cpp b/WickedEngine/wiFont_BindLua.cpp index f404c984c..542a31213 100644 --- a/WickedEngine/wiFont_BindLua.cpp +++ b/WickedEngine/wiFont_BindLua.cpp @@ -3,6 +3,8 @@ #include "CommonInclude.h" #include "Vector_BindLua.h" +using namespace std; + const char wiFont_BindLua::className[] = "Font"; Luna::FunctionType wiFont_BindLua::methods[] = { diff --git a/WickedEngine/wiGUI.cpp b/WickedEngine/wiGUI.cpp index cb3b78bb5..1dc66d2a7 100644 --- a/WickedEngine/wiGUI.cpp +++ b/WickedEngine/wiGUI.cpp @@ -4,6 +4,7 @@ #include "wiRenderer.h" #include "wiInputManager.h" +using namespace std; wiGUI::wiGUI(GRAPHICSTHREAD threadID) :threadID(threadID), activeWidget(nullptr), focus(false), pointerpos(XMFLOAT2(0,0)) { diff --git a/WickedEngine/wiGUI.h b/WickedEngine/wiGUI.h index e583fc394..248f0b0ba 100644 --- a/WickedEngine/wiGUI.h +++ b/WickedEngine/wiGUI.h @@ -12,7 +12,7 @@ class wiGUI { friend class wiWidget; private: - list widgets; + std::list widgets; wiWidget* activeWidget; GRAPHICSTHREAD threadID; bool focus; diff --git a/WickedEngine/wiGraphicsDevice.h b/WickedEngine/wiGraphicsDevice.h index 0bf14f473..e806c32be 100644 --- a/WickedEngine/wiGraphicsDevice.h +++ b/WickedEngine/wiGraphicsDevice.h @@ -147,13 +147,13 @@ namespace wiGraphicsTypes virtual void QueryEnd(GPUQuery *query, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) = 0; virtual bool QueryRead(GPUQuery *query, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) = 0; - virtual HRESULT CreateTextureFromFile(const string& fileName, Texture2D **ppTexture, bool mipMaps = true, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) = 0; - virtual HRESULT SaveTexturePNG(const string& fileName, Texture2D *pTexture, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) = 0; - virtual HRESULT SaveTextureDDS(const string& fileName, Texture *pTexture, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) = 0; + virtual HRESULT CreateTextureFromFile(const std::string& fileName, Texture2D **ppTexture, bool mipMaps = true, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) = 0; + virtual HRESULT SaveTexturePNG(const std::string& fileName, Texture2D *pTexture, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) = 0; + virtual HRESULT SaveTextureDDS(const std::string& fileName, Texture *pTexture, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) = 0; - virtual void EventBegin(const string& name, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) = 0; + virtual void EventBegin(const std::string& name, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) = 0; virtual void EventEnd(GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) = 0; - virtual void SetMarker(const string& name, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) = 0; + virtual void SetMarker(const std::string& name, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) = 0; }; } diff --git a/WickedEngine/wiGraphicsDevice_DX11.cpp b/WickedEngine/wiGraphicsDevice_DX11.cpp index d20244d4e..1478afa90 100644 --- a/WickedEngine/wiGraphicsDevice_DX11.cpp +++ b/WickedEngine/wiGraphicsDevice_DX11.cpp @@ -10,6 +10,8 @@ #include #include +using namespace std; + namespace wiGraphicsTypes { // Engine -> Native converters @@ -3295,7 +3297,7 @@ bool GraphicsDevice_DX11::QueryRead(GPUQuery *query, GRAPHICSTHREAD threadID) } -HRESULT GraphicsDevice_DX11::CreateTextureFromFile(const string& fileName, Texture2D **ppTexture, bool mipMaps, GRAPHICSTHREAD threadID) +HRESULT GraphicsDevice_DX11::CreateTextureFromFile(const std::string& fileName, Texture2D **ppTexture, bool mipMaps, GRAPHICSTHREAD threadID) { HRESULT hr = E_FAIL; (*ppTexture) = new Texture2D(); @@ -3326,7 +3328,7 @@ HRESULT GraphicsDevice_DX11::CreateTextureFromFile(const string& fileName, Textu return hr; } -HRESULT GraphicsDevice_DX11::SaveTexturePNG(const string& fileName, Texture2D *pTexture, GRAPHICSTHREAD threadID) +HRESULT GraphicsDevice_DX11::SaveTexturePNG(const std::string& fileName, Texture2D *pTexture, GRAPHICSTHREAD threadID) { Texture2D* tex2D = dynamic_cast(pTexture); if (tex2D != nullptr) @@ -3335,7 +3337,7 @@ HRESULT GraphicsDevice_DX11::SaveTexturePNG(const string& fileName, Texture2D *p } return E_FAIL; } -HRESULT GraphicsDevice_DX11::SaveTextureDDS(const string& fileName, Texture *pTexture, GRAPHICSTHREAD threadID) +HRESULT GraphicsDevice_DX11::SaveTextureDDS(const std::string& fileName, Texture *pTexture, GRAPHICSTHREAD threadID) { Texture2D* tex2D = dynamic_cast(pTexture); if (tex2D != nullptr) @@ -3345,7 +3347,7 @@ HRESULT GraphicsDevice_DX11::SaveTextureDDS(const string& fileName, Texture *pTe return E_FAIL; } -void GraphicsDevice_DX11::EventBegin(const string& name, GRAPHICSTHREAD threadID) +void GraphicsDevice_DX11::EventBegin(const std::string& name, GRAPHICSTHREAD threadID) { userDefinedAnnotations[threadID]->BeginEvent(wstring(name.begin(), name.end()).c_str()); } @@ -3353,7 +3355,7 @@ void GraphicsDevice_DX11::EventEnd(GRAPHICSTHREAD threadID) { userDefinedAnnotations[threadID]->EndEvent(); } -void GraphicsDevice_DX11::SetMarker(const string& name, GRAPHICSTHREAD threadID) +void GraphicsDevice_DX11::SetMarker(const std::string& name, GRAPHICSTHREAD threadID) { userDefinedAnnotations[threadID]->SetMarker(wstring(name.begin(),name.end()).c_str()); } diff --git a/WickedEngine/wiGraphicsDevice_DX11.h b/WickedEngine/wiGraphicsDevice_DX11.h index cc0fc9ef2..bb85e88a9 100644 --- a/WickedEngine/wiGraphicsDevice_DX11.h +++ b/WickedEngine/wiGraphicsDevice_DX11.h @@ -129,13 +129,13 @@ namespace wiGraphicsTypes virtual void QueryEnd(GPUQuery *query, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) override; virtual bool QueryRead(GPUQuery *query, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) override; - virtual HRESULT CreateTextureFromFile(const string& fileName, Texture2D **ppTexture, bool mipMaps = true, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) override; - virtual HRESULT SaveTexturePNG(const string& fileName, Texture2D *pTexture, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) override; - virtual HRESULT SaveTextureDDS(const string& fileName, Texture *pTexture, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) override; + virtual HRESULT CreateTextureFromFile(const std::string& fileName, Texture2D **ppTexture, bool mipMaps = true, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) override; + virtual HRESULT SaveTexturePNG(const std::string& fileName, Texture2D *pTexture, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) override; + virtual HRESULT SaveTextureDDS(const std::string& fileName, Texture *pTexture, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) override; - virtual void EventBegin(const string& name, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) override; + virtual void EventBegin(const std::string& name, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) override; virtual void EventEnd(GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) override; - virtual void SetMarker(const string& name, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) override; + virtual void SetMarker(const std::string& name, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE) override; private: HRESULT CreateShaderResourceView(Texture1D* pTexture); diff --git a/WickedEngine/wiGraphicsResource.h b/WickedEngine/wiGraphicsResource.h index 71261afd0..6c7240d97 100644 --- a/WickedEngine/wiGraphicsResource.h +++ b/WickedEngine/wiGraphicsResource.h @@ -125,7 +125,7 @@ namespace wiGraphicsTypes friend class GraphicsDevice_DX11; private: ID3D11ShaderResourceView* SRV_DX11; // main resource SRV - vector additionalSRVs_DX11; // can be used for sub-resources if requested + std::vector additionalSRVs_DX11; // can be used for sub-resources if requested protected: GPUResource(); @@ -137,7 +137,7 @@ namespace wiGraphicsTypes friend class GraphicsDevice_DX11; private: ID3D11UnorderedAccessView* UAV_DX11; // main resource UAV - vector additionalUAVs_DX11; // can be used for sub-resources if requested + std::vector additionalUAVs_DX11; // can be used for sub-resources if requested protected: GPUUnorderedResource(); @@ -237,7 +237,7 @@ namespace wiGraphicsTypes friend class GraphicsDevice_DX11; private: ID3D11RenderTargetView* RTV_DX11; - vector additionalRTVs_DX11; + std::vector additionalRTVs_DX11; bool independentRTVArraySlices; bool independentRTVCubemapFaces; bool independentSRVMIPs; @@ -275,7 +275,7 @@ namespace wiGraphicsTypes friend class GraphicsDevice_DX11; private: ID3D11DepthStencilView* DSV_DX11; - vector additionalDSVs_DX11; + std::vector additionalDSVs_DX11; ID3D11Texture2D* texture2D_DX11; Texture2DDesc desc; public: @@ -305,8 +305,8 @@ namespace wiGraphicsTypes { friend class GraphicsDevice_DX11; private: - vector resource_DX11; - vector active; + std::vector resource_DX11; + std::vector active; GPUQueryDesc desc; int async_frameshift; public: diff --git a/WickedEngine/wiHairParticle.cpp b/WickedEngine/wiHairParticle.cpp index 4f3ac350c..3531abc02 100644 --- a/WickedEngine/wiHairParticle.cpp +++ b/WickedEngine/wiHairParticle.cpp @@ -8,6 +8,7 @@ #include "ResourceMapping.h" #include "wiArchive.h" +using namespace std; using namespace wiGraphicsTypes; VertexLayout *wiHairParticle::il; @@ -32,8 +33,8 @@ wiHairParticle::wiHairParticle() object = nullptr; materialName = ""; } -wiHairParticle::wiHairParticle(const string& newName, float newLen, int newCount - , const string& newMat, Object* newObject, const string& densityGroup, const string& lengthGroup) +wiHairParticle::wiHairParticle(const std::string& newName, float newLen, int newCount + , const std::string& newMat, Object* newObject, const std::string& densityGroup, const std::string& lengthGroup) { vb = nullptr; name=newName; diff --git a/WickedEngine/wiHairParticle.h b/WickedEngine/wiHairParticle.h index 16918d74e..5619fad95 100644 --- a/WickedEngine/wiHairParticle.h +++ b/WickedEngine/wiHairParticle.h @@ -48,8 +48,8 @@ public: public: wiHairParticle(); - wiHairParticle(const string& newName, float newLen, int newCount - , const string& newMat, Object* newObject, const string& densityGroup, const string& lengthGroup); + wiHairParticle(const std::string& newName, float newLen, int newCount + , const std::string& newMat, Object* newObject, const std::string& densityGroup, const std::string& lengthGroup); void CleanUp(); void Generate(); @@ -61,11 +61,11 @@ public: float length; int count; - string name, densityG, lenG, materialName; + std::string name, densityG, lenG, materialName; Material* material; XMFLOAT4X4 OriginalMatrix_Inverse; Object* object; - vector points; + std::vector points; wiGraphicsTypes::GPUBuffer *vb; void Serialize(wiArchive& archive); diff --git a/WickedEngine/wiHashString.cpp b/WickedEngine/wiHashString.cpp index 824b82cfd..7a55a2dcc 100644 --- a/WickedEngine/wiHashString.cpp +++ b/WickedEngine/wiHashString.cpp @@ -1,12 +1,13 @@ #include "wiHashString.h" +using namespace std; -std::hash hasher; +hash hasher; wiHashString::wiHashString(const char* value):wiHashString(string(value)) { } -wiHashString::wiHashString(const string& value) +wiHashString::wiHashString(const std::string& value) { str = value; hash = hasher(str); diff --git a/WickedEngine/wiHashString.h b/WickedEngine/wiHashString.h index c6c385038..b1d821d6a 100644 --- a/WickedEngine/wiHashString.h +++ b/WickedEngine/wiHashString.h @@ -6,14 +6,14 @@ class wiHashString { private: - string str; + std::string str; size_t hash; public: wiHashString(const char* value = ""); - wiHashString(const string& value); + wiHashString(const std::string& value); ~wiHashString(); - const string& GetString() const { return str; } + const std::string& GetString() const { return str; } size_t GetHash() const { return hash; } }; diff --git a/WickedEngine/wiHelper.cpp b/WickedEngine/wiHelper.cpp index 0e28fa06b..9d691e38a 100644 --- a/WickedEngine/wiHelper.cpp +++ b/WickedEngine/wiHelper.cpp @@ -9,10 +9,12 @@ #include #include +using namespace std; + namespace wiHelper { - string toUpper(const string& s) + string toUpper(const std::string& s) { std::string result; std::locale loc; @@ -23,7 +25,7 @@ namespace wiHelper return result; } - bool readByteData(const string& fileName, BYTE** data, size_t& dataSize){ + bool readByteData(const std::string& fileName, BYTE** data, size_t& dataSize){ ifstream file(fileName, ios::binary | ios::ate); if (file.is_open()){ @@ -41,7 +43,7 @@ namespace wiHelper return false; } - void messageBox(const string& msg, const string& caption){ + void messageBox(const std::string& msg, const std::string& caption){ #ifndef WINSTORE_SUPPORT MessageBoxA(wiWindowRegistration::GetInstance()->GetRegisteredWindow(), msg.c_str(), caption.c_str(), 0); #else @@ -51,7 +53,7 @@ namespace wiHelper #endif } - void screenshot(const string& name) + void screenshot(const std::string& name) { CreateDirectoryA("screenshots", 0); stringstream ss(""); @@ -106,12 +108,12 @@ namespace wiHelper return string(_getcwd(NULL, 0)) + "/"; } - bool SetWorkingDirectory(const string& path) + bool SetWorkingDirectory(const std::string& path) { return _chdir(path.c_str()) == 0; } - void GetFilesInDirectory(vector& out, const string& directory) + void GetFilesInDirectory(std::vector& out, const std::string& directory) { #ifndef WINSTORE_SUPPORT // WINDOWS @@ -165,7 +167,7 @@ namespace wiHelper //closedir(dir); } - void SplitPath(const string& fullPath, string& dir, string& fileName) + void SplitPath(const std::string& fullPath, string& dir, string& fileName) { size_t found; found = fullPath.find_last_of("/\\"); @@ -173,7 +175,7 @@ namespace wiHelper fileName = fullPath.substr(found + 1); } - string GetFileNameFromPath(const string& fullPath) + string GetFileNameFromPath(const std::string& fullPath) { if (fullPath.empty()) { @@ -185,7 +187,7 @@ namespace wiHelper return ret; } - string GetDirectoryFromPath(const string& fullPath) + string GetDirectoryFromPath(const std::string& fullPath) { if (fullPath.empty()) { diff --git a/WickedEngine/wiHelper.h b/WickedEngine/wiHelper.h index f53ebd1e8..1705e9c97 100644 --- a/WickedEngine/wiHelper.h +++ b/WickedEngine/wiHelper.h @@ -8,31 +8,31 @@ namespace wiHelper { - string toUpper(const string& s); + std::string toUpper(const std::string& s); - bool readByteData(const string& fileName, BYTE** data, size_t& dataSize); + bool readByteData(const std::string& fileName, BYTE** data, size_t& dataSize); - void messageBox(const string& msg, const string& caption = "Warning!"); + void messageBox(const std::string& msg, const std::string& caption = "Warning!"); - void screenshot(const string& name = ""); + void screenshot(const std::string& name = ""); - string getCurrentDateTimeAsString(); + std::string getCurrentDateTimeAsString(); - string GetApplicationDirectory(); + std::string GetApplicationDirectory(); - string GetOriginalWorkingDirectory(); + std::string GetOriginalWorkingDirectory(); - string GetWorkingDirectory(); + std::string GetWorkingDirectory(); - bool SetWorkingDirectory(const string& path); + bool SetWorkingDirectory(const std::string& path); - void GetFilesInDirectory(vector &out, const string &directory); + void GetFilesInDirectory(std::vector &out, const std::string &directory); - void SplitPath(const string& fullPath, string& dir, string& fileName); + void SplitPath(const std::string& fullPath, std::string& dir, std::string& fileName); - string GetFileNameFromPath(const string& fullPath); + std::string GetFileNameFromPath(const std::string& fullPath); - string GetDirectoryFromPath(const string& fullPath); + std::string GetDirectoryFromPath(const std::string& fullPath); void Sleep(float milliseconds); }; diff --git a/WickedEngine/wiInitializer.cpp b/WickedEngine/wiInitializer.cpp index 09531d258..83902e380 100644 --- a/WickedEngine/wiInitializer.cpp +++ b/WickedEngine/wiInitializer.cpp @@ -9,6 +9,7 @@ #include "wiSound.h" #include "wiHelper.h" +using namespace std; namespace wiInitializer { diff --git a/WickedEngine/wiInputManager.cpp b/WickedEngine/wiInputManager.cpp index 91def0277..b807f6861 100644 --- a/WickedEngine/wiInputManager.cpp +++ b/WickedEngine/wiInputManager.cpp @@ -5,6 +5,8 @@ #include "wiWindowRegistration.h" #include "wiHelper.h" +using namespace std; + #ifndef WINSTORE_SUPPORT #define KEY_DOWN(vk_code) (GetAsyncKeyState(vk_code) < 0) #define KEY_TOGGLE(vk_code) ((GetAsyncKeyState(vk_code) & 1) != 0) @@ -259,7 +261,7 @@ void _OnPointerMoved(CoreWindow^ window, PointerEventArgs^ pointer) } #endif // WINSTORE_SUPPORT -vector wiInputManager::getTouches() +std::vector wiInputManager::getTouches() { static bool isRegisteredTouch = false; if (!isRegisteredTouch) diff --git a/WickedEngine/wiInputManager.h b/WickedEngine/wiInputManager.h index 98330b695..42ab8b9cd 100644 --- a/WickedEngine/wiInputManager.h +++ b/WickedEngine/wiInputManager.h @@ -54,7 +54,7 @@ public: } }; }; - typedef map InputCollection; + typedef std::map InputCollection; InputCollection inputs; //check if a button is down @@ -82,10 +82,10 @@ public: // current position of touch XMFLOAT2 pos; }; - vector getTouches(); + std::vector getTouches(); private: - vector touches; + std::vector touches; friend void AddTouch(const wiInputManager::Touch& touch); diff --git a/WickedEngine/wiLensFlare.cpp b/WickedEngine/wiLensFlare.cpp index d09ff69da..7958796b3 100644 --- a/WickedEngine/wiLensFlare.cpp +++ b/WickedEngine/wiLensFlare.cpp @@ -29,7 +29,7 @@ void wiLensFlare::CleanUp(){ SAFE_DELETE(depthStencilState); SAFE_DELETE(blendState); } -void wiLensFlare::Draw(GRAPHICSTHREAD threadID, const XMVECTOR& lightPos, vector& rims){ +void wiLensFlare::Draw(GRAPHICSTHREAD threadID, const XMVECTOR& lightPos, std::vector& rims){ if(!rims.empty()) { diff --git a/WickedEngine/wiLensFlare.h b/WickedEngine/wiLensFlare.h index 247ce9354..22f3cfb12 100644 --- a/WickedEngine/wiLensFlare.h +++ b/WickedEngine/wiLensFlare.h @@ -34,7 +34,7 @@ private: public: static void Initialize(); static void CleanUp(); - static void Draw(GRAPHICSTHREAD threadID, const XMVECTOR& lightPos, vector& rims); + static void Draw(GRAPHICSTHREAD threadID, const XMVECTOR& lightPos, std::vector& rims); }; #endif diff --git a/WickedEngine/wiLoader.cpp b/WickedEngine/wiLoader.cpp index ed0e4c29c..85f372189 100644 --- a/WickedEngine/wiLoader.cpp +++ b/WickedEngine/wiLoader.cpp @@ -17,9 +17,10 @@ #include #include +using namespace std; using namespace wiGraphicsTypes; -void LoadWiArmatures(const string& directory, const string& name, const string& identifier, list& armatures) +void LoadWiArmatures(const std::string& directory, const std::string& name, const std::string& identifier, list& armatures) { stringstream filename(""); filename<childrenI[i]); } } -void LoadWiMaterialLibrary(const string& directory, const string& name, const string& identifier, const string& texturesDir,MaterialCollection& materials) +void LoadWiMaterialLibrary(const std::string& directory, const std::string& name, const std::string& identifier, const std::string& texturesDir,MaterialCollection& materials) { int materialI=(int)(materials.size()-1); @@ -285,7 +286,7 @@ void LoadWiMaterialLibrary(const string& directory, const string& name, const st } } -void LoadWiObjects(const string& directory, const string& name, const string& identifier, list& objects +void LoadWiObjects(const std::string& directory, const std::string& name, const std::string& identifier, list& objects , list& armatures , MeshCollection& meshes, const MaterialCollection& materials) { @@ -484,7 +485,7 @@ void LoadWiObjects(const string& directory, const string& name, const string& id //} } -void LoadWiMeshes(const string& directory, const string& name, const string& identifier, MeshCollection& meshes, +void LoadWiMeshes(const std::string& directory, const std::string& name, const std::string& identifier, MeshCollection& meshes, const list& armatures, const MaterialCollection& materials) { int meshI=(int)(meshes.size()-1); @@ -727,7 +728,7 @@ void LoadWiMeshes(const string& directory, const string& name, const string& ide meshes.insert( pair(currentMesh->name,currentMesh) ); } -void LoadWiActions(const string& directory, const string& name, const string& identifier, list& armatures) +void LoadWiActions(const std::string& directory, const std::string& name, const std::string& identifier, list& armatures) { Armature* armatureI=nullptr; Bone* boneI=nullptr; @@ -818,7 +819,7 @@ void LoadWiActions(const string& directory, const string& name, const string& id } file.close(); } -void LoadWiLights(const string& directory, const string& name, const string& identifier, list& lights) +void LoadWiLights(const std::string& directory, const std::string& name, const std::string& identifier, list& lights) { stringstream filename(""); @@ -866,7 +867,7 @@ void LoadWiLights(const string& directory, const string& name, const string& ide stringstream identified_parentName(""); identified_parentName<parentName=identified_parentName.str(); - //for(map::iterator it=transforms.begin();it!=transforms.end();++it){ + //for(std::map::iterator it=transforms.begin();it!=transforms.end();++it){ // if(!it->second->name.compare(lights.back()->parentName)){ // lights.back()->parent=it->second; // lights.back()->attachTo(it->second,1,1,1); @@ -964,7 +965,7 @@ void LoadWiLights(const string& directory, const string& name, const string& ide } file.close(); } -void LoadWiHitSpheres(const string& directory, const string& name, const string& identifier, vector& spheres +void LoadWiHitSpheres(const std::string& directory, const std::string& name, const std::string& identifier, std::vector& spheres ,const list& armatures) { stringstream filename(""); @@ -1065,7 +1066,7 @@ void LoadWiHitSpheres(const string& directory, const string& name, const string& // } //} } -void LoadWiWorldInfo(const string&directory, const string& name, WorldInfo& worldInfo, Wind& wind){ +void LoadWiWorldInfo(const std::string&directory, const std::string& name, WorldInfo& worldInfo, Wind& wind){ stringstream filename(""); filename<& cameras +void LoadWiCameras(const std::string&directory, const std::string& name, const std::string& identifier, std::vector& cameras ,const list& armatures){ stringstream filename(""); filename<& decals){ +void LoadWiDecals(const std::string&directory, const std::string& name, const std::string& texturesDir, list& decals){ stringstream filename(""); filename<& objects, int type){ +void GenerateSPTree(wiSPTree*& tree, std::vector& objects, int type){ if(type==SPTREE_GENERATE_QUADTREE) tree = new QuadTree(); else if(type==SPTREE_GENERATE_OCTREE) @@ -1556,8 +1557,8 @@ void VertexGroup::Serialize(wiArchive& archive) GPUBuffer Mesh::impostorVBs[VPROP_COUNT]; -void Mesh::LoadFromFile(const string& newName, const string& fname - , const MaterialCollection& materialColl, const list& armatures, const string& identifier) { +void Mesh::LoadFromFile(const std::string& newName, const std::string& fname + , const MaterialCollection& materialColl, const list& armatures, const std::string& identifier) { name = newName; BYTE* buffer; @@ -2193,8 +2194,8 @@ void Mesh::CreateVertexArrays() arraysComplete = true; } -vector meshInstances[GRAPHICSTHREAD_COUNT]; -vector meshInstancesPrev[GRAPHICSTHREAD_COUNT]; +std::vector meshInstances[GRAPHICSTHREAD_COUNT]; +std::vector meshInstancesPrev[GRAPHICSTHREAD_COUNT]; void Mesh::AddRenderableInstance(const Instance& instance, int numerator, GRAPHICSTHREAD threadID) { if (numerator >= (int)meshInstances[threadID].size()) @@ -2482,7 +2483,7 @@ void Model::CleanUp() SAFE_DELETE(x); } } -void Model::LoadFromDisk(const string& dir, const string& name, const string& identifier) +void Model::LoadFromDisk(const std::string& dir, const std::string& name, const std::string& identifier) { wiArchive archive(dir + name + ".wimf", true); if (archive.IsOpen()) @@ -2518,7 +2519,7 @@ void Model::LoadFromDisk(const string& dir, const string& name, const string& id } void Model::FinishLoading() { - vector transforms(0); + std::vector transforms(0); transforms.reserve(armatures.size() + objects.size() + lights.size() + decals.size()); for (Armature* x : armatures) @@ -2901,7 +2902,7 @@ GPUBuffer HitSphere::vertexBuffer; void HitSphere::SetUpStatic() { const int numVert = (RESOLUTION+1)*2; - vector verts(0); + std::vector verts(0); for(int i=0;i<=RESOLUTION;++i){ float alpha = (float)i/(float)RESOLUTION*2*3.14159265359f; @@ -3295,7 +3296,7 @@ void Armature::RecursiveBoneTransform(Armature* armature, Bone* bone, const XMMA // Because bones are not updated in the regular Transform fashion, a separate update needs to be called bone->UpdateTransform(); } -XMVECTOR Armature::InterPolateKeyFrames(float cf, const int maxCf, const vector& keyframeList, KeyFrameType type) +XMVECTOR Armature::InterPolateKeyFrames(float cf, const int maxCf, const std::vector& keyframeList, KeyFrameType type) { XMVECTOR result = XMVectorSet(0, 0, 0, 0); @@ -3375,7 +3376,7 @@ XMVECTOR Armature::InterPolateKeyFrames(float cf, const int maxCf, const vector< return result; } -void Armature::ChangeAction(const string& actionName, float blendFrames, const string& animLayer, float weight) +void Armature::ChangeAction(const std::string& actionName, float blendFrames, const std::string& animLayer, float weight) { AnimationLayer* anim = GetPrimaryAnimation(); if (animLayer.length() > 0) @@ -3398,7 +3399,7 @@ void Armature::ChangeAction(const string& actionName, float blendFrames, const s // Fall back to identity action anim->ChangeAction(0, blendFrames, weight); } -AnimationLayer* Armature::GetAnimLayer(const string& name) +AnimationLayer* Armature::GetAnimLayer(const std::string& name) { for (auto& x : animationLayers) { @@ -3411,7 +3412,7 @@ AnimationLayer* Armature::GetAnimLayer(const string& name) animationLayers.back()->name = name; return animationLayers.back(); } -void Armature::AddAnimLayer(const string& name) +void Armature::AddAnimLayer(const std::string& name) { for (auto& x : animationLayers) { @@ -3423,7 +3424,7 @@ void Armature::AddAnimLayer(const string& name) animationLayers.push_back(new AnimationLayer); animationLayers.back()->name = name; } -void Armature::DeleteAnimLayer(const string& name) +void Armature::DeleteAnimLayer(const std::string& name) { auto i = animationLayers.begin(); while (i != animationLayers.end()) @@ -3462,7 +3463,7 @@ void Armature::CreateFamily() RecursiveRest(this, rootbones[i]); } } -Bone* Armature::GetBone(const string& name) +Bone* Armature::GetBone(const std::string& name) { for (auto& x : boneCollection) { @@ -3534,7 +3535,7 @@ void Armature::Serialize(wiArchive& archive) #pragma endregion #pragma region Decals -Decal::Decal(const XMFLOAT3& tra, const XMFLOAT3& sca, const XMFLOAT4& rot, const string& tex, const string& nor):Cullable(),Transform(){ +Decal::Decal(const XMFLOAT3& tra, const XMFLOAT3& sca, const XMFLOAT4& rot, const std::string& tex, const std::string& nor):Cullable(),Transform(){ scale_rest=scale=sca; rotation_rest=rotation=rot; translation_rest=translation=tra; @@ -3557,13 +3558,13 @@ Decal::~Decal() { wiResourceManager::GetGlobal()->del(texName); wiResourceManager::GetGlobal()->del(norName); } -void Decal::addTexture(const string& tex){ +void Decal::addTexture(const std::string& tex){ texName=tex; if(!tex.empty()){ texture = (Texture2D*)wiResourceManager::GetGlobal()->add(tex); } } -void Decal::addNormal(const string& nor){ +void Decal::addNormal(const std::string& nor){ norName=nor; if(!nor.empty()){ normal = (Texture2D*)wiResourceManager::GetGlobal()->add(nor); @@ -3647,7 +3648,7 @@ void Camera::UpdateTransform() #pragma endregion #pragma region OBJECT -Object::Object(const string& name) :Transform() +Object::Object(const std::string& name) :Transform() { this->name = name; init(); diff --git a/WickedEngine/wiLoader.h b/WickedEngine/wiLoader.h index 30ac6f4af..85e4ee9d2 100644 --- a/WickedEngine/wiLoader.h +++ b/WickedEngine/wiLoader.h @@ -27,8 +27,8 @@ struct Mesh; struct Material; struct Object; -typedef map MeshCollection; -typedef map MaterialCollection; +typedef std::map MeshCollection; +typedef std::map MaterialCollection; class wiArchive; @@ -143,24 +143,24 @@ GFX_STRUCT InstancePrev }; struct Material { - string name; + std::string name; XMFLOAT3 diffuseColor; - string refMapName; + std::string refMapName; wiGraphicsTypes::Texture2D* refMap; - string textureName; + std::string textureName; wiGraphicsTypes::Texture2D* texture; bool premultipliedTexture; BLENDMODE blendFlag; - string normalMapName; + std::string normalMapName; wiGraphicsTypes::Texture2D* normalMap; - string displacementMapName; + std::string displacementMapName; wiGraphicsTypes::Texture2D* displacementMap; - string specularMapName; + std::string specularMapName; wiGraphicsTypes::Texture2D* specularMap; bool toonshading; @@ -197,7 +197,7 @@ struct Material { init(); } - Material(string newName){ + Material(const std::string& newName){ name=newName; init(); } @@ -301,13 +301,13 @@ struct VertexRef{ VertexRef(int i, float w){index=i;weight=w;} }; struct VertexGroup{ - string name; - //vector vertices; + std::string name; + //std::vector vertices; //index,weight - map vertices; + std::map vertices; VertexGroup(){name="";} - VertexGroup(string n){name=n;} - void addVertex(const VertexRef& vRef){vertices.insert(pair(vRef.index,vRef.weight));} + VertexGroup(const std::string& n){name=n;} + void addVertex(const VertexRef& vRef){vertices.insert(std::pair(vRef.index,vRef.weight));} void Serialize(wiArchive& archive); }; struct MeshSubset @@ -315,7 +315,7 @@ struct MeshSubset Material* material; wiGraphicsTypes::GPUBuffer indexBuffer; - vector subsetIndices; + std::vector subsetIndices; MeshSubset(); ~MeshSubset(); @@ -323,28 +323,28 @@ struct MeshSubset struct Mesh { public: - string name; - string parent; - vector vertices_Transformed[VPROP_COUNT]; // for CPU skinning / soft body simulation - vector vertices[VPROP_COUNT]; - vector indices; - vector physicsverts; - vector physicsindices; - vector physicalmapGP; - vector subsets; - vector materialNames; + std::string name; + std::string parent; + std::vector vertices_Transformed[VPROP_COUNT]; // for CPU skinning / soft body simulation + std::vector vertices[VPROP_COUNT]; + std::vector indices; + std::vector physicsverts; + std::vector physicsindices; + std::vector physicalmapGP; + std::vector subsets; + std::vector materialNames; - wiGraphicsTypes::GPUBuffer vertexBuffers[VPROP_COUNT]; - wiGraphicsTypes::GPUBuffer streamoutBuffers[VPROP_COUNT]; // omit texcoord, omit weights, change boneindices to posprev - wiGraphicsTypes::GPUBuffer instanceBuffer; - wiGraphicsTypes::GPUBuffer instanceBufferPrev; + wiGraphicsTypes::GPUBuffer vertexBuffers[VPROP_COUNT]; + wiGraphicsTypes::GPUBuffer streamoutBuffers[VPROP_COUNT]; // omit texcoord, omit weights, change boneindices to posprev + wiGraphicsTypes::GPUBuffer instanceBuffer; + wiGraphicsTypes::GPUBuffer instanceBufferPrev; bool renderable,doubleSided; STENCILREF stencilRef; bool calculatedAO; - string armatureName; + std::string armatureName; Armature* armature; AABB aabb; @@ -355,11 +355,11 @@ public: bool isBillboarded; XMFLOAT3 billboardAxis; - vector vertexGroups; + std::vector vertexGroups; bool softBody; float mass, friction; int massVG,goalVG,softVG; //vertexGroupID - vector goalPositions,goalNormals; + std::vector goalPositions,goalNormals; wiRenderTarget impostorTarget; float impostorDistance; @@ -372,13 +372,13 @@ public: Mesh(){ init(); } - Mesh(string newName){ + Mesh(const std::string& newName){ name=newName; init(); } ~Mesh() {} - void LoadFromFile(const string& newName, const string& fname - , const MaterialCollection& materialColl, const list& armatures, const string& identifier=""); + void LoadFromFile(const std::string& newName, const std::string& fname + , const MaterialCollection& materialColl, const std::list& armatures, const std::string& identifier=""); bool buffersComplete; void Optimize(); // Object is needed in CreateBuffers because how else would we know if the mesh needs to be deformed? @@ -435,9 +435,9 @@ struct Streamable : public Cullable { public: Streamable(); - string directory; - string meshfile; - string materialfile; + std::string directory; + std::string meshfile; + std::string materialfile; bool loaded; Mesh* mesh; @@ -454,8 +454,8 @@ struct Object : public Streamable, public Transform EMITTER_INVISIBLE, }; EmitterType emitterType; - vector< wiEmittedParticle* > eParticleSystems; - vector< wiHairParticle* > hParticleSystems; + std::vector< wiEmittedParticle* > eParticleSystems; + std::vector< wiHairParticle* > hParticleSystems; float transparency; @@ -464,12 +464,12 @@ struct Object : public Streamable, public Transform //PHYSICS bool rigidBody, kinematic; - string collisionShape, physicsType; + std::string collisionShape, physicsType; float mass, friction, restitution, damping; //RIBBON TRAIL - deque trail; + std::deque trail; wiGraphicsTypes::GPUBuffer trailBuff; wiGraphicsTypes::Texture2D* trailDistortTex; wiGraphicsTypes::Texture2D* trailTex; @@ -491,7 +491,7 @@ struct Object : public Streamable, public Transform return ((physicsObjectI >= 0 && !kinematic) || mesh->softBody || isArmatureDeformed()); } - Object(const string& newName = ""); + Object(const std::string& newName = ""); Object(const Object& other); virtual ~Object(); void init(); @@ -526,7 +526,7 @@ struct KeyFrame }; struct Action { - string name; + std::string name; int frameCount; Action(){ @@ -536,20 +536,20 @@ struct Action }; struct ActionFrames { - vector< KeyFrame > keyframesRot; - vector< KeyFrame > keyframesPos; - vector< KeyFrame > keyframesSca; + std::vector< KeyFrame > keyframesRot; + std::vector< KeyFrame > keyframesPos; + std::vector< KeyFrame > keyframesSca; ActionFrames(){ } }; struct Bone : public Transform { - vector< string > childrenN; - vector< Bone* > childrenI; + std::vector childrenN; + std::vector childrenI; XMFLOAT4X4 restInv; - vector actionFrames; + std::vector actionFrames; XMFLOAT4X4 recursivePose, recursiveRest, recursiveRestInv; @@ -560,7 +560,7 @@ struct Bone : public Transform bool connected; Bone():length(0),connected(false){}; - Bone(string newName):Transform(){ + Bone(const std::string& newName):Transform(){ name=newName; childrenN.clear(); childrenI.clear(); @@ -580,7 +580,7 @@ struct Bone : public Transform }; struct AnimationLayer { - string name; + std::string name; int activeAction, prevAction; float currentFrame; @@ -620,20 +620,20 @@ struct AnimationLayer struct Armature : public Transform { public: - string unidentified_name; - vector boneCollection; - vector rootbones; + std::string unidentified_name; + std::vector boneCollection; + std::vector rootbones; - list animationLayers; - vector actions; + std::list animationLayers; + std::vector actions; Armature() :Transform(){ init(); }; - Armature(string newName,string identifier):Transform(){ + Armature(const std::string& newName, const std::string& identifier):Transform(){ unidentified_name=newName; - stringstream ss(""); + std::stringstream ss(""); ss<& keyframes, KeyFrameType type); + static XMVECTOR InterPolateKeyFrames(float currentFrame, const int frameCount, const std::vector& keyframes, KeyFrameType type); }; struct SHCAM{ XMFLOAT4X4 View,Projection; @@ -773,17 +773,17 @@ struct Light : public Cullable , public Transform XMFLOAT4 enerDis; bool noHalo; bool shadow; - vector lensFlareRimTextures; - vector lensFlareNames; + std::vector lensFlareRimTextures; + std::vector lensFlareNames; static wiGraphicsTypes::Texture2D* shadowMapArray_2D; static wiGraphicsTypes::Texture2D* shadowMapArray_Cube; int shadowMap_index; int lightArray_index; - vector shadowCam_pointLight; - vector shadowCam_dirLight; - vector shadowCam_spotLight; + std::vector shadowCam_pointLight; + std::vector shadowCam_dirLight; + std::vector shadowCam_spotLight; float shadowBias; @@ -806,7 +806,7 @@ private: }; struct Decal : public Cullable, public Transform { - string texName,norName; + std::string texName,norName; wiGraphicsTypes::Texture2D* texture,*normal; XMFLOAT3 front; float life,fadeStart; @@ -814,11 +814,11 @@ struct Decal : public Cullable, public Transform XMFLOAT4 color; float emissive; - Decal(const XMFLOAT3& tra=XMFLOAT3(0,0,0), const XMFLOAT3& sca=XMFLOAT3(1,1,1), const XMFLOAT4& rot=XMFLOAT4(0,0,0,1), const string& tex="", const string& nor=""); + Decal(const XMFLOAT3& tra=XMFLOAT3(0,0,0), const XMFLOAT3& sca=XMFLOAT3(1,1,1), const XMFLOAT4& rot=XMFLOAT4(0,0,0,1), const std::string& tex="", const std::string& nor=""); virtual ~Decal(); - void addTexture(const string& tex); - void addNormal(const string& nor); + void addTexture(const std::string& tex); + void addNormal(const std::string& nor); virtual void UpdateTransform(); void UpdateDecal(); float GetOpacity() const; @@ -858,7 +858,7 @@ struct Camera:public Transform{ width = height = zNearP = zFarP = fov = 0; } Camera(const XMFLOAT3& newPos, const XMFLOAT4& newRot, - const string& newName):Transform() + const std::string& newName):Transform() { width = height = zNearP = zFarP = fov = 0; translation_rest=newPos; @@ -1021,8 +1021,8 @@ struct HitSphere:public SPHERE, public Transform{ HitSphereType TYPE_SAVED,TYPE; HitSphere():Transform(), SPHERE(), radius_saved(0){} - HitSphere(string newName, float newRadius, const XMFLOAT3& location, - Transform* newParent, string newProperty):Transform(),SPHERE(location,newRadius){ + HitSphere(const std::string& newName, float newRadius, const XMFLOAT3& location, + Transform* newParent, const std::string& newProperty):Transform(),SPHERE(location,newRadius){ name=newName; radius_saved=newRadius; @@ -1032,8 +1032,8 @@ struct HitSphere:public SPHERE, public Transform{ parent=newParent; } TYPE=HitSphereType::HITTYPE; - if(newProperty.find("inv")!=string::npos) TYPE=HitSphereType::INVTYPE; - else if(newProperty.find("atk")!=string::npos) TYPE=HitSphereType::ATKTYPE; + if(newProperty.find("inv") != std::string::npos) TYPE=HitSphereType::INVTYPE; + else if(newProperty.find("atk") != std::string::npos) TYPE=HitSphereType::ATKTYPE; TYPE_SAVED=TYPE; } void Reset(){ @@ -1058,17 +1058,17 @@ struct EnvironmentProbe : public Transform struct Model : public Transform { - list objects; + std::list objects; MeshCollection meshes; MaterialCollection materials; - list armatures; - list lights; - list decals; + std::list armatures; + std::list lights; + std::list decals; Model(); virtual ~Model(); void CleanUp(); - void LoadFromDisk(const string& dir, const string& name, const string& identifier); + void LoadFromDisk(const std::string& dir, const std::string& name, const std::string& identifier); void FinishLoading(); void UpdateModel(); void Add(Object* value); @@ -1083,10 +1083,10 @@ struct Model : public Transform struct Scene { // First is always the world node - vector models; + std::vector models; WorldInfo worldInfo; Wind wind; - list environmentProbes; + std::list environmentProbes; Scene(); ~Scene(); @@ -1102,23 +1102,23 @@ struct Scene // Create rest positions for bone tree void RecursiveRest(Armature* armature, Bone* bone); -void LoadWiArmatures(const string& directory, const string& filename, const string& identifier, list& armatures); -void LoadWiMaterialLibrary(const string& directory, const string& filename, const string& identifier, const string& texturesDir, MaterialCollection& materials); -void LoadWiObjects(const string& directory, const string& filename, const string& identifier, list& objects - , list& armatures, MeshCollection& meshes, const MaterialCollection& materials); -void LoadWiMeshes(const string& directory, const string& filename, const string& identifier, MeshCollection& meshes, const list& armatures, const MaterialCollection& materials); -void LoadWiActions(const string& directory, const string& filename, const string& identifier, list& armatures); -void LoadWiLights(const string& directory, const string& filename, const string& identifier, list& lights); -void LoadWiHitSpheres(const string& directory, const string& name, const string& identifier, vector& spheres - ,const list& armatures); -void LoadWiWorldInfo(const string&directory, const string& name, WorldInfo& worldInfo, Wind& wind); -void LoadWiCameras(const string&directory, const string& name, const string& identifier, vector& cameras - ,const list& armatures); -void LoadWiDecals(const string&directory, const string& name, const string& texturesDir, list& decals); +void LoadWiArmatures(const std::string& directory, const std::string& filename, const std::string& identifier, std::list& armatures); +void LoadWiMaterialLibrary(const std::string& directory, const std::string& filename, const std::string& identifier, const std::string& texturesDir, MaterialCollection& materials); +void LoadWiObjects(const std::string& directory, const std::string& filename, const std::string& identifier, std::list& objects + , std::list& armatures, MeshCollection& meshes, const MaterialCollection& materials); +void LoadWiMeshes(const std::string& directory, const std::string& filename, const std::string& identifier, MeshCollection& meshes, const std::list& armatures, const MaterialCollection& materials); +void LoadWiActions(const std::string& directory, const std::string& filename, const std::string& identifier, std::list& armatures); +void LoadWiLights(const std::string& directory, const std::string& filename, const std::string& identifier, std::list& lights); +void LoadWiHitSpheres(const std::string& directory, const std::string& name, const std::string& identifier, std::vector& spheres + ,const std::list& armatures); +void LoadWiWorldInfo(const std::string&directory, const std::string& name, WorldInfo& worldInfo, Wind& wind); +void LoadWiCameras(const std::string&directory, const std::string& name, const std::string& identifier, std::vector& cameras + ,const std::list& armatures); +void LoadWiDecals(const std::string&directory, const std::string& name, const std::string& texturesDir, std::list& decals); #include "wiSPTree.h" class wiSPTree; #define SPTREE_GENERATE_QUADTREE 0 #define SPTREE_GENERATE_OCTREE 1 -void GenerateSPTree(wiSPTree*& tree, vector& objects, int type = SPTREE_GENERATE_QUADTREE); +void GenerateSPTree(wiSPTree*& tree, std::vector& objects, int type = SPTREE_GENERATE_QUADTREE); diff --git a/WickedEngine/wiLoader_BindLua.cpp b/WickedEngine/wiLoader_BindLua.cpp index 24cd25b7b..55d43e733 100644 --- a/WickedEngine/wiLoader_BindLua.cpp +++ b/WickedEngine/wiLoader_BindLua.cpp @@ -4,6 +4,8 @@ #include "wiEmittedParticle.h" #include "Texture_BindLua.h" +using namespace std; + namespace wiLoader_BindLua { void Bind() diff --git a/WickedEngine/wiLua.cpp b/WickedEngine/wiLua.cpp index 3396c61c2..2fbe716e8 100644 --- a/WickedEngine/wiLua.cpp +++ b/WickedEngine/wiLua.cpp @@ -24,6 +24,8 @@ #include "wiBackLog_BindLua.h" #include "wiNetwork_BindLua.h" +using namespace std; + wiLua *wiLua::globalLua = nullptr; #define WILUA_ERROR_PREFIX "[Lua Error] " @@ -131,7 +133,7 @@ void wiLua::PostErrorMsg(bool todebug, bool tobacklog) UNLOCK(); } } -bool wiLua::RunFile(const string& filename) +bool wiLua::RunFile(const std::string& filename) { LOCK(); m_status = luaL_loadfile(m_luaState, filename.c_str()); @@ -144,7 +146,7 @@ bool wiLua::RunFile(const string& filename) PostErrorMsg(); return false; } -bool wiLua::RunText(const string& script) +bool wiLua::RunText(const std::string& script) { LOCK(); m_status = luaL_loadstring(m_luaState, script.c_str()); @@ -169,7 +171,7 @@ bool wiLua::RunScript() } return true; } -bool wiLua::RegisterFunc(const string& name, lua_CFunction function) +bool wiLua::RegisterFunc(const std::string& name, lua_CFunction function) { LOCK(); lua_register(m_luaState, name.c_str(), function); @@ -179,7 +181,7 @@ bool wiLua::RegisterFunc(const string& name, lua_CFunction function) return Success(); } -void wiLua::RegisterLibrary(const string& tableName, const luaL_Reg* functions) +void wiLua::RegisterLibrary(const std::string& tableName, const luaL_Reg* functions) { LOCK(); if (luaL_newmetatable(m_luaState, tableName.c_str()) != 0) @@ -195,7 +197,7 @@ void wiLua::RegisterLibrary(const string& tableName, const luaL_Reg* functions) UNLOCK(); } } -bool wiLua::RegisterObject(const string& tableName, const string& name, void* object) +bool wiLua::RegisterObject(const std::string& tableName, const std::string& name, void* object) { RegisterLibrary(tableName, nullptr); @@ -210,7 +212,7 @@ bool wiLua::RegisterObject(const string& tableName, const string& name, void* ob UNLOCK(); return true; } -void wiLua::AddFunc(const string& name, lua_CFunction function) +void wiLua::AddFunc(const std::string& name, lua_CFunction function) { LOCK(); @@ -228,7 +230,7 @@ void wiLua::AddFuncArray(const luaL_Reg* functions) UNLOCK(); } } -void wiLua::AddInt(const string& name, int data) +void wiLua::AddInt(const std::string& name, int data) { LOCK(); lua_pushinteger(m_luaState, data); @@ -257,19 +259,19 @@ void wiLua::Render() TrySignal("wickedengine_render_tick"); } -inline void SignalHelper(lua_State* L, const string& name) +inline void SignalHelper(lua_State* L, const std::string& name) { lua_getglobal(L, "signal"); wiLua::SSetString(L, name.c_str()); lua_call(L, 1, 0); } -void wiLua::Signal(const string& name) +void wiLua::Signal(const std::string& name) { LOCK(); SignalHelper(m_luaState, name); UNLOCK(); } -bool wiLua::TrySignal(const string& name) +bool wiLua::TrySignal(const std::string& name) { if (!TRY_LOCK()) return false; @@ -393,7 +395,7 @@ void wiLua::SSetDouble(lua_State* L, double data) { lua_pushnumber(L, (lua_Number)data); } -void wiLua::SSetString(lua_State* L, const string& data) +void wiLua::SSetString(lua_State* L, const std::string& data) { lua_pushstring(L, data.c_str()); } @@ -410,7 +412,7 @@ void wiLua::SSetNull(lua_State* L) lua_pushnil(L); } -void wiLua::SError(lua_State* L, const string& error, bool todebug, bool tobacklog) +void wiLua::SError(lua_State* L, const std::string& error, bool todebug, bool tobacklog) { //retrieve line number for error info lua_Debug ar; @@ -435,7 +437,7 @@ void wiLua::SError(lua_State* L, const string& error, bool todebug, bool tobackl } } -void wiLua::SAddMetatable(lua_State* L, const string& name) +void wiLua::SAddMetatable(lua_State* L, const std::string& name) { luaL_newmetatable(L, name.c_str()); } diff --git a/WickedEngine/wiLua.h b/WickedEngine/wiLua.h index 60d36b982..b5330121a 100644 --- a/WickedEngine/wiLua.h +++ b/WickedEngine/wiLua.h @@ -36,27 +36,27 @@ public: //check if the last call failed bool Failed(); //get error message for the last call - string GetErrorMsg(); + std::string GetErrorMsg(); //remove and get error message from stack - string PopErrorMsg(); + std::string PopErrorMsg(); //post error to backlog and/or debug output void PostErrorMsg(bool todebug = true, bool tobacklog = true); //run a script from file - bool RunFile(const string& filename); + bool RunFile(const std::string& filename); //run a script from param - bool RunText(const string& script); + bool RunText(const std::string& script); //register function to use in scripts - bool RegisterFunc(const string& name, lua_CFunction function); + bool RegisterFunc(const std::string& name, lua_CFunction function); //register class - void RegisterLibrary(const string& tableName, const luaL_Reg* functions); + void RegisterLibrary(const std::string& tableName, const luaL_Reg* functions); //register object - bool RegisterObject(const string& tableName, const string& name, void* object); + bool RegisterObject(const std::string& tableName, const std::string& name, void* object); //add function to the previously registered object - void AddFunc(const string& name, lua_CFunction function); + void AddFunc(const std::string& name, lua_CFunction function); //add function array to the previously registered object void AddFuncArray(const luaL_Reg* functions); //add int member to registered object - void AddInt(const string& name, int data); + void AddInt(const std::string& name, int data); //set delta time to use with lua void SetDeltaTime(double dt); @@ -68,14 +68,14 @@ public: void Render(); //send a signal to lua - void Signal(const string& name); + void Signal(const std::string& name); //try sending a signal to lua, which can fail because of thread conflicts - bool TrySignal(const string& name); + bool TrySignal(const std::string& name); //Static function wrappers from here on //get string from lua on stack position - static string SGetString(lua_State* L, int stackpos); + static std::string SGetString(lua_State* L, int stackpos); //check if a value is string on the stack position static bool SIsString(lua_State* L, int stackpos); //check if a value is number on the stack position @@ -116,7 +116,7 @@ public: //push double to lua stack static void SSetDouble(lua_State* L, double data); //push string to lua stack - static void SSetString(lua_State* L, const string& data); + static void SSetString(lua_State* L, const std::string& data); //push bool to lua stack static void SSetBool(lua_State* L, bool data); //push pointer (light userdata) to lua stack @@ -125,9 +125,9 @@ public: static void SSetNull(lua_State* L); //throw error - static void SError(lua_State* L, const string& error = "", bool todebug = true, bool tobacklog = true); + static void SError(lua_State* L, const std::string& error = "", bool todebug = true, bool tobacklog = true); //add new metatable - static void SAddMetatable(lua_State* L, const string& name); + static void SAddMetatable(lua_State* L, const std::string& name); }; diff --git a/WickedEngine/wiNetwork.h b/WickedEngine/wiNetwork.h index b733ea3d5..cc63a7ee3 100644 --- a/WickedEngine/wiNetwork.h +++ b/WickedEngine/wiNetwork.h @@ -36,7 +36,7 @@ public: wiNetwork(void); ~wiNetwork(void); - virtual bool changeName(const string& newName){ + virtual bool changeName(const std::string& newName){ name=newName; return true; } diff --git a/WickedEngine/wiNetwork_BindLua.cpp b/WickedEngine/wiNetwork_BindLua.cpp index e8876f11e..71db73109 100644 --- a/WickedEngine/wiNetwork_BindLua.cpp +++ b/WickedEngine/wiNetwork_BindLua.cpp @@ -3,6 +3,8 @@ #include "wiServer.h" #include "wiHelper.h" +using namespace std; + const char wiClient_BindLua::className[] = "Client"; Luna::FunctionType wiClient_BindLua::methods[] = { diff --git a/WickedEngine/wiPHYSICS.h b/WickedEngine/wiPHYSICS.h index 24db3763b..203192678 100644 --- a/WickedEngine/wiPHYSICS.h +++ b/WickedEngine/wiPHYSICS.h @@ -24,7 +24,7 @@ public: static int softBodyIterationCount; static bool rigidBodyPhysicsEnabled, softBodyPhysicsEnabled; protected: - vector transforms; + std::vector transforms; bool firstRunWorld; int registeredObjects; public: @@ -48,9 +48,9 @@ public: , float newMass=1, float newFriction=1, float newRestitution=1, float newDamping=1, bool kinematic=false)=0; virtual void addCapsule(float rad, float hei, const XMFLOAT4& rot, const XMFLOAT3& pos , float newMass=1, float newFriction=1, float newRestitution=1, float newDamping=1, bool kinematic=false)=0; - virtual void addConvexHull(const vector& vertices, const XMFLOAT3& sca, const XMFLOAT4& rot, const XMFLOAT3& pos + virtual void addConvexHull(const std::vector& vertices, const XMFLOAT3& sca, const XMFLOAT4& rot, const XMFLOAT3& pos , float newMass=1, float newFriction=1, float newRestitution=1, float newDamping=1, bool kinematic=false)=0; - virtual void addTriangleMesh(const vector& vertices, const vector& indices, const XMFLOAT3& sca, const XMFLOAT4& rot, const XMFLOAT3& pos + virtual void addTriangleMesh(const std::vector& vertices, const std::vector& indices, const XMFLOAT3& sca, const XMFLOAT4& rot, const XMFLOAT3& pos , float newMass=1, float newFriction=1, float newRestitution=1, float newDamping=1, bool kinematic=false)=0; diff --git a/WickedEngine/wiProfiler.cpp b/WickedEngine/wiProfiler.cpp index 65a53928a..66a2f698b 100644 --- a/WickedEngine/wiProfiler.cpp +++ b/WickedEngine/wiProfiler.cpp @@ -3,6 +3,7 @@ #include "wiRenderer.h" #include "wiFont.h" +using namespace std; using namespace wiGraphicsTypes; void wiProfiler::BeginFrame() @@ -107,7 +108,7 @@ void wiProfiler::EndRange(GRAPHICSTHREAD threadID) return; assert(!rangeStack.empty() && "There is no range to end!"); - const string& top = rangeStack.top(); + const std::string& top = rangeStack.top(); auto& it = ranges.find(top); if (it != ranges.end()) diff --git a/WickedEngine/wiProfiler.h b/WickedEngine/wiProfiler.h index d4acdd77a..e1711bd51 100644 --- a/WickedEngine/wiProfiler.h +++ b/WickedEngine/wiProfiler.h @@ -37,7 +37,7 @@ public: void EndRange(GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE); float GetRangeTime(const std::string& name) { return ranges[name]->time; } - const std::unordered_map& GetRanges() { return ranges; } + const std::unordered_map& GetRanges() { return ranges; } // Renders a basic text of the Profiling results to the (x,y) screen coordinate void DrawData(int x, int y, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE); diff --git a/WickedEngine/wiRectPacker.cpp b/WickedEngine/wiRectPacker.cpp index 8d7eb4c07..387d8692e 100644 --- a/WickedEngine/wiRectPacker.cpp +++ b/WickedEngine/wiRectPacker.cpp @@ -132,7 +132,7 @@ namespace wiRectPacker } }; - rect_wh _rect2D(rect_xywhf* const * v, int n, int max_s, vector& succ, vector& unsucc) { + rect_wh _rect2D(rect_xywhf* const * v, int n, int max_s, std::vector& succ, std::vector& unsucc) { node root; const int funcs = (sizeof(cmpf) / sizeof(bool(*)(rect_xywhf*, rect_xywhf*))); @@ -235,13 +235,13 @@ namespace wiRectPacker } - bool pack(rect_xywhf* const * v, int n, int max_s, vector& bins) { + bool pack(rect_xywhf* const * v, int n, int max_s, std::vector& bins) { rect_wh _rect(max_s, max_s); for (int i = 0; i < n; ++i) if (!v[i]->fits(_rect)) return false; - vector vec[2], *p[2] = { vec, vec + 1 }; + std::vector vec[2], *p[2] = { vec, vec + 1 }; vec[0].resize(n); vec[1].clear(); memcpy(&vec[0][0], v, sizeof(rect_xywhf*)*n); diff --git a/WickedEngine/wiRectPacker.h b/WickedEngine/wiRectPacker.h index cfe86baf8..2cfdf7477 100644 --- a/WickedEngine/wiRectPacker.h +++ b/WickedEngine/wiRectPacker.h @@ -12,7 +12,7 @@ int x, y, w, h; bool flipped; 2. bin - structure representing resultant bin object -3. bool pack(rect_xywhf* const * v, int n, int max_side, std::vector& bins) - actual packing function +3. bool pack(rect_xywhf* const * v, int n, int max_side, std::std::vector& bins) - actual packing function Arguments: input/output: v - pointer to array of pointers to your rectangles (const here means that the pointers will point to the same rectangles after the call) input: n - rectangles count diff --git a/WickedEngine/wiRenderTarget.h b/WickedEngine/wiRenderTarget.h index 9c437e5b9..cf6cec141 100644 --- a/WickedEngine/wiRenderTarget.h +++ b/WickedEngine/wiRenderTarget.h @@ -10,9 +10,9 @@ class wiRenderTarget { private: int numViews; - vector renderTargets; - vector renderTargets_resolvedMSAA; - vector resolvedMSAAUptodate; + std::vector renderTargets; + std::vector renderTargets_resolvedMSAA; + std::vector resolvedMSAAUptodate; public: wiGraphicsTypes::ViewPort viewPort; wiDepthTarget* depth; diff --git a/WickedEngine/wiRenderer.cpp b/WickedEngine/wiRenderer.cpp index 3022f4b87..79a1cb195 100644 --- a/WickedEngine/wiRenderer.cpp +++ b/WickedEngine/wiRenderer.cpp @@ -29,6 +29,7 @@ #include +using namespace std; using namespace wiGraphicsTypes; #pragma region STATICS @@ -87,14 +88,14 @@ Scene* wiRenderer::scene = nullptr; unordered_set wiRenderer::objectsWithTrails; unordered_set wiRenderer::emitterSystems; -vector wiRenderer::boneLines; -vector wiRenderer::linesTemp; -vector wiRenderer::cubes; +std::vector wiRenderer::boneLines; +std::vector wiRenderer::linesTemp; +std::vector wiRenderer::cubes; -vector wiRenderer::renderableTranslators; -vector> wiRenderer::renderableBoxes; +std::vector wiRenderer::renderableTranslators; +std::vector> wiRenderer::renderableBoxes; -unordered_map wiRenderer::frameCullings; +std::unordered_map wiRenderer::frameCullings; wiWaterPlane wiRenderer::waterPlane; @@ -472,8 +473,8 @@ void wiRenderer::UpdateBoneLines() } } } -void iterateSPTree2(wiSPTree::Node* n, vector& cubes, const XMFLOAT4A& col); -void iterateSPTree(wiSPTree::Node* n, vector& cubes, const XMFLOAT4A& col){ +void iterateSPTree2(wiSPTree::Node* n, std::vector& cubes, const XMFLOAT4A& col); +void iterateSPTree(wiSPTree::Node* n, std::vector& cubes, const XMFLOAT4A& col){ if(!n) return; if(n->count){ for (unsigned int i = 0; ichildren.size(); ++i) @@ -489,7 +490,7 @@ void iterateSPTree(wiSPTree::Node* n, vector& cubes, const XMFLOAT4A& col) } } } -void iterateSPTree2(wiSPTree::Node* n, vector& cubes, const XMFLOAT4A& col){ +void iterateSPTree2(wiSPTree::Node* n, std::vector& cubes, const XMFLOAT4A& col){ if(!n) return; if(n->count){ for (unsigned int i = 0; ichildren.size(); ++i) @@ -882,7 +883,7 @@ void wiRenderer::LoadShaders() } -void wiRenderer::ReloadShaders(const string& path) +void wiRenderer::ReloadShaders(const std::string& path) { if (path.length() > 0) @@ -1381,7 +1382,7 @@ void wiRenderer::RebindPersistentState(GRAPHICSTHREAD threadID) wiImage::BindPersistentState(threadID); } -Transform* wiRenderer::getTransformByName(const string& get) +Transform* wiRenderer::getTransformByName(const std::string& get) { //auto transf = transforms.find(get); //if (transf != transforms.end()) @@ -1394,7 +1395,7 @@ Transform* wiRenderer::getTransformByID(unsigned long long id) { return GetScene().GetWorldNode()->find(id); } -Armature* wiRenderer::getArmatureByName(const string& get) +Armature* wiRenderer::getArmatureByName(const std::string& get) { for (Model* model : GetScene().models) { @@ -1404,7 +1405,7 @@ Armature* wiRenderer::getArmatureByName(const string& get) } return nullptr; } -int wiRenderer::getActionByName(Armature* armature, const string& get) +int wiRenderer::getActionByName(Armature* armature, const std::string& get) { if(armature==nullptr) return (-1); @@ -1416,14 +1417,14 @@ int wiRenderer::getActionByName(Armature* armature, const string& get) return j; return (-1); } -int wiRenderer::getBoneByName(Armature* armature, const string& get) +int wiRenderer::getBoneByName(Armature* armature, const std::string& get) { for (unsigned int j = 0; jboneCollection.size(); j++) if(!armature->boneCollection[j]->name.compare(get)) return j; return (-1); } -Material* wiRenderer::getMaterialByName(const string& get) +Material* wiRenderer::getMaterialByName(const std::string& get) { for (Model* model : GetScene().models) { @@ -1433,13 +1434,13 @@ Material* wiRenderer::getMaterialByName(const string& get) } return NULL; } -HitSphere* wiRenderer::getSphereByName(const string& get){ +HitSphere* wiRenderer::getSphereByName(const std::string& get){ for(HitSphere* hs : spheres) if(!hs->name.compare(get)) return hs; return nullptr; } -Object* wiRenderer::getObjectByName(const string& name) +Object* wiRenderer::getObjectByName(const std::string& name) { for (Model* model : GetScene().models) { @@ -1454,7 +1455,7 @@ Object* wiRenderer::getObjectByName(const string& name) return nullptr; } -Light* wiRenderer::getLightByName(const string& name) +Light* wiRenderer::getLightByName(const std::string& name) { for (Model* model : GetScene().models) { @@ -2158,7 +2159,7 @@ void wiRenderer::PutDecal(Decal* decal) { GetScene().GetWorldNode()->decals.push_back(decal); } -void wiRenderer::PutWaterRipple(const string& image, const XMFLOAT3& pos) +void wiRenderer::PutWaterRipple(const std::string& image, const XMFLOAT3& pos) { wiSprite* img=new wiSprite("","",image); img->anim.fad=0.01f; @@ -2659,7 +2660,7 @@ void wiRenderer::DrawTrails(GRAPHICSTHREAD threadID, Texture2D* refracRes) GetDevice()->BindResourcePS(o->trailDistortTex, TEXSLOT_ONDEMAND1, threadID); GetDevice()->BindResourcePS(o->trailTex, TEXSLOT_ONDEMAND2, threadID); - vector trails; + std::vector trails; int bounds = (int)o->trail.size(); trails.reserve(bounds * 10); @@ -4237,7 +4238,7 @@ void wiRenderer::RefreshEnvProbes(GRAPHICSTHREAD threadID) probe->cubeMap.Activate(threadID, 0, 0, 0, 1); - vector cameras; + std::vector cameras; { cameras.clear(); @@ -4817,7 +4818,7 @@ void wiRenderer::ManageDecalAtlas(GRAPHICSTHREAD threadID) } using namespace wiRectPacker; - static map storedTextures; + static std::map storedTextures; if (storedTextures.find(decal->texture) == storedTextures.end()) { @@ -4833,7 +4834,7 @@ void wiRenderer::ManageDecalAtlas(GRAPHICSTHREAD threadID) i++; } - vector bins; + std::vector bins; if (pack(out_rects, (int)storedTextures.size(), 16384, bins)) { assert(bins.size() == 1 && "Decal atlas packing into single texture failed!"); @@ -5018,7 +5019,7 @@ Texture2D* wiRenderer::GetLuminance(Texture2D* sourceImage, GRAPHICSTHREAD threa GraphicsDevice* device = wiRenderer::GetDevice(); static Texture2D* luminance_map = nullptr; - static vector luminance_avg(0); + static std::vector luminance_avg(0); if (luminance_map == nullptr) { SAFE_DELETE(luminance_map); @@ -5100,8 +5101,8 @@ wiWaterPlane wiRenderer::GetWaterPlane() return waterPlane; } -wiRenderer::Picked wiRenderer::Pick(RAY& ray, int pickType, const string& layer, - const string& layerDisable) +wiRenderer::Picked wiRenderer::Pick(RAY& ray, int pickType, const std::string& layer, + const std::string& layerDisable) { CulledCollection culledRenderer; CulledList culledObjects; @@ -5110,7 +5111,7 @@ wiRenderer::Picked wiRenderer::Pick(RAY& ray, int pickType, const string& layer, { searchTree->getVisible(ray, culledObjects); - vector pickPoints; + std::vector pickPoints; RayIntersectMeshes(ray, culledObjects, pickPoints, pickType, true, layer, layerDisable, true); @@ -5197,8 +5198,8 @@ wiRenderer::Picked wiRenderer::Pick(RAY& ray, int pickType, const string& layer, return Picked(); } -wiRenderer::Picked wiRenderer::Pick(long cursorX, long cursorY, int pickType, const string& layer, - const string& layerDisable) +wiRenderer::Picked wiRenderer::Pick(long cursorX, long cursorY, int pickType, const std::string& layer, + const std::string& layerDisable) { RAY ray = getPickRay(cursorX, cursorY); @@ -5216,8 +5217,8 @@ RAY wiRenderer::getPickRay(long cursorX, long cursorY){ return RAY(lineStart, rayDirection); } -void wiRenderer::RayIntersectMeshes(const RAY& ray, const CulledList& culledObjects, vector& points, - int pickType, bool dynamicObjects, const string& layer, const string& layerDisable, bool onlyVisible) +void wiRenderer::RayIntersectMeshes(const RAY& ray, const CulledList& culledObjects, std::vector& points, + int pickType, bool dynamicObjects, const std::string& layer, const std::string& layerDisable, bool onlyVisible) { if (culledObjects.empty()) { @@ -5370,7 +5371,7 @@ void wiRenderer::CalculateVertexAO(Object* object) // searchTree->getVisible(ray, culledObjects); - // vector points; + // std::vector points; // RayIntersectMeshes(ray, culledObjects, points, PICK_OPAQUE, false); @@ -5398,7 +5399,7 @@ void wiRenderer::CalculateVertexAO(Object* object) //mesh->calculatedAO = true; } -Model* wiRenderer::LoadModel(const string& dir, const string& name, const XMMATRIX& transform, const string& ident) +Model* wiRenderer::LoadModel(const std::string& dir, const std::string& name, const XMMATRIX& transform, const std::string& ident) { static int unique_identifier = 0; @@ -5418,7 +5419,7 @@ Model* wiRenderer::LoadModel(const string& dir, const string& name, const XMMATR return model; } -void wiRenderer::LoadWorldInfo(const string& dir, const string& name) +void wiRenderer::LoadWorldInfo(const std::string& dir, const std::string& name) { LoadWiWorldInfo(/*dir*/"", name+".wiw", GetScene().worldInfo, GetScene().wind); @@ -5443,11 +5444,11 @@ void wiRenderer::LoadDefaultLighting() GetScene().models.push_back(model); if (spTree_lights) { - spTree_lights->AddObjects(spTree_lights->root, vector(model->lights.begin(), model->lights.end())); + spTree_lights->AddObjects(spTree_lights->root, std::vector(model->lights.begin(), model->lights.end())); } else { - GenerateSPTree(spTree_lights, vector(model->lights.begin(), model->lights.end()), SPTREE_GENERATE_OCTREE); + GenerateSPTree(spTree_lights, std::vector(model->lights.begin(), model->lights.end()), SPTREE_GENERATE_OCTREE); } } Scene& wiRenderer::GetScene() @@ -5481,7 +5482,7 @@ void wiRenderer::SynchronizeWithPhysicsEngine(float dt) { XMMATRIX worldMat = mesh->hasArmature() ? XMMatrixIdentity() : XMLoadFloat4x4(&object->world); int j = 0; - for (map::iterator it = mesh->vertexGroups[gvg].vertices.begin(); it != mesh->vertexGroups[gvg].vertices.end(); ++it) + for (std::map::iterator it = mesh->vertexGroups[gvg].vertices.begin(); it != mesh->vertexGroups[gvg].vertices.end(); ++it) { int vi = (*it).first; Vertex tvert = TransformVertex(mesh, vi, worldMat); @@ -5775,11 +5776,11 @@ void wiRenderer::Add(const list& objects) } } if (spTree) { - spTree->AddObjects(spTree->root, vector(objects.begin(), objects.end())); + spTree->AddObjects(spTree->root, std::vector(objects.begin(), objects.end())); } else { - GenerateSPTree(spTree, vector(objects.begin(), objects.end()), SPTREE_GENERATE_OCTREE); + GenerateSPTree(spTree, std::vector(objects.begin(), objects.end()), SPTREE_GENERATE_OCTREE); } } void wiRenderer::Add(const list& lights) @@ -5792,11 +5793,11 @@ void wiRenderer::Add(const list& lights) } } if (spTree_lights) { - spTree_lights->AddObjects(spTree_lights->root, vector(lights.begin(), lights.end())); + spTree_lights->AddObjects(spTree_lights->root, std::vector(lights.begin(), lights.end())); } else { - GenerateSPTree(spTree_lights, vector(lights.begin(), lights.end()), SPTREE_GENERATE_OCTREE); + GenerateSPTree(spTree_lights, std::vector(lights.begin(), lights.end()), SPTREE_GENERATE_OCTREE); } } diff --git a/WickedEngine/wiRenderer.h b/WickedEngine/wiRenderer.h index 02e911476..25ce757d4 100644 --- a/WickedEngine/wiRenderer.h +++ b/WickedEngine/wiRenderer.h @@ -45,8 +45,8 @@ class PHYSICS; class wiRenderTarget; class wiWaterPlane; -typedef map MeshCollection; -typedef map MaterialCollection; +typedef std::map MeshCollection; +typedef std::map MaterialCollection; #define USE_GPU_SKINNING @@ -59,7 +59,7 @@ public: static void InitDevice(wiWindowRegistration::window_type window, bool fullscreen = false); - static void Present(function drawToScreen1=nullptr,function drawToScreen2=nullptr,function drawToScreen3=nullptr); + static void Present(std::function drawToScreen1=nullptr, std::function drawToScreen2=nullptr, std::function drawToScreen3=nullptr); static wiGraphicsTypes::Sampler *samplers[SSLOT_COUNT]; @@ -337,7 +337,7 @@ protected: } static voxelSceneData; public: - static string SHADERPATH; + static std::string SHADERPATH; wiRenderer(); void CleanUp(); @@ -353,7 +353,7 @@ public: static void UpdateImages(); static void ManageImages(); static void PutDecal(Decal* decal); - static void PutWaterRipple(const string& image, const XMFLOAT3& pos); + static void PutWaterRipple(const std::string& image, const XMFLOAT3& pos); static void ManageWaterRipples(); static void DrawWaterRipples(GRAPHICSTHREAD threadID); static void SetGameSpeed(float value){GameSpeed=value; if(GameSpeed<0) GameSpeed=0;}; @@ -413,17 +413,17 @@ public: static wiGraphicsTypes::Texture2D* GetLuminance(wiGraphicsTypes::Texture2D* sourceImage, GRAPHICSTHREAD threadID = GRAPHICSTHREAD_IMMEDIATE); static wiWaterPlane GetWaterPlane(); - static Transform* getTransformByName(const string& name); + static Transform* getTransformByName(const std::string& name); static Transform* getTransformByID(unsigned long long id); - static Armature* getArmatureByName(const string& get); - static int getActionByName(Armature* armature, const string& get); - static int getBoneByName(Armature* armature, const string& get); - static Material* getMaterialByName(const string& get); - HitSphere* getSphereByName(const string& get); - static Object* getObjectByName(const string& name); - static Light* getLightByName(const string& name); + static Armature* getArmatureByName(const std::string& get); + static int getActionByName(Armature* armature, const std::string& get); + static int getBoneByName(Armature* armature, const std::string& get); + static Material* getMaterialByName(const std::string& get); + HitSphere* getSphereByName(const std::string& get); + static Object* getObjectByName(const std::string& name); + static Light* getLightByName(const std::string& name); - static void ReloadShaders(const string& path = ""); + static void ReloadShaders(const std::string& path = ""); static void BindPersistentState(GRAPHICSTHREAD threadID); static void RebindPersistentState(GRAPHICSTHREAD threadID); @@ -435,11 +435,11 @@ public: CulledCollection culledRenderer; CulledCollection culledRenderer_opaque; CulledCollection culledRenderer_transparent; - vector culledHairParticleSystems; + std::vector culledHairParticleSystems; CulledList culledLights; UINT culledLight_count; // because forward_list doesn't have size() - vector culledEmittedParticleSystems; - list culledDecals; + std::vector culledEmittedParticleSystems; + std::list culledDecals; void Clear() { @@ -453,7 +453,7 @@ public: culledDecals.clear(); } }; - static unordered_map frameCullings; + static std::unordered_map frameCullings; public: @@ -529,17 +529,17 @@ public: // The scene holds all models, world information and wind information static Scene& GetScene(); - vector cameras; - vector spheres; - static vector boneLines; - static vector linesTemp; - static vector cubes; + std::vector cameras; + std::vector spheres; + static std::vector boneLines; + static std::vector linesTemp; + static std::vector cubes; - static unordered_set objectsWithTrails; - static unordered_set emitterSystems; + static std::unordered_set objectsWithTrails; + static std::unordered_set emitterSystems; - static deque images; - static deque waterRipples; + static std::deque images; + static std::deque waterRipples; static void CleanUpStaticTemp(); @@ -551,7 +551,7 @@ public: float getSphereRadius(const int& index); - string DIRECTORY; + std::string DIRECTORY; struct Picked { @@ -596,29 +596,29 @@ public: // pickType: PICKTYPE enum values ocncatenated with | operator // layer : concatenated string of layers to check against, empty string : all layers will be checked // layerDisable : concatenated string of layers to NOT check against - static Picked Pick(long cursorX, long cursorY, int pickType = PICK_OPAQUE, const string& layer = "", const string& layerDisable = ""); - static Picked Pick(RAY& ray, int pickType = PICK_OPAQUE, const string& layer = "", const string& layerDisable = ""); + static Picked Pick(long cursorX, long cursorY, int pickType = PICK_OPAQUE, const std::string& layer = "", const std::string& layerDisable = ""); + static Picked Pick(RAY& ray, int pickType = PICK_OPAQUE, const std::string& layer = "", const std::string& layerDisable = ""); static RAY getPickRay(long cursorX, long cursorY); - static void RayIntersectMeshes(const RAY& ray, const CulledList& culledObjects, vector& points, - int pickType = PICK_OPAQUE, bool dynamicObjects = true, const string& layer = "", const string& layerDisable = "", bool onlyVisible = false); + static void RayIntersectMeshes(const RAY& ray, const CulledList& culledObjects, std::vector& points, + int pickType = PICK_OPAQUE, bool dynamicObjects = true, const std::string& layer = "", const std::string& layerDisable = "", bool onlyVisible = false); static void CalculateVertexAO(Object* object); static PHYSICS* physicsEngine; static void SynchronizeWithPhysicsEngine(float dt = 1.0f / 60.0f); - static Model* LoadModel(const string& dir, const string& name, const XMMATRIX& transform = XMMatrixIdentity(), const string& ident = "common"); - static void LoadWorldInfo(const string& dir, const string& name); + static Model* LoadModel(const std::string& dir, const std::string& name, const XMMATRIX& transform = XMMatrixIdentity(), const std::string& ident = "common"); + static void LoadWorldInfo(const std::string& dir, const std::string& name); static void LoadDefaultLighting(); static void PutEnvProbe(const XMFLOAT3& position, int resolution = 256); static void CreateImpostor(Mesh* mesh); - static vector renderableTranslators; + static std::vector renderableTranslators; // Add translator to render in next frame static void AddRenderableTranslator(wiTranslator* translator); - static vector> renderableBoxes; + static std::vector> renderableBoxes; // Add box to render in next frame static void AddRenderableBox(const XMFLOAT4X4& boxMatrix, const XMFLOAT4& color = XMFLOAT4(1,1,1,1)); @@ -627,10 +627,10 @@ public: // Add Object Instance static void Add(Object* value); - static void Add(const list& objects); + static void Add(const std::list& objects); // Add Light Instance static void Add(Light* value); - static void Add(const list& lights); + static void Add(const std::list& lights); // Remove from the scene static void Remove(Object* value); diff --git a/WickedEngine/wiRenderer_BindLua.cpp b/WickedEngine/wiRenderer_BindLua.cpp index 365d6b024..8fa60c4e4 100644 --- a/WickedEngine/wiRenderer_BindLua.cpp +++ b/WickedEngine/wiRenderer_BindLua.cpp @@ -12,6 +12,7 @@ #include "wiHairParticle.h" #include "wiPHYSICS.h" +using namespace std; using namespace wiGraphicsTypes; namespace wiRenderer_BindLua diff --git a/WickedEngine/wiResourceManager.cpp b/WickedEngine/wiResourceManager.cpp index 368c0adb4..2d8f30ab7 100644 --- a/WickedEngine/wiResourceManager.cpp +++ b/WickedEngine/wiResourceManager.cpp @@ -3,6 +3,7 @@ #include "wiSound.h" #include "wiHelper.h" +using namespace std; using namespace wiGraphicsTypes; wiResourceManager::filetypes wiResourceManager::types; @@ -297,7 +298,7 @@ bool wiResourceManager::del(const wiHashString& name, bool forceDelete) bool wiResourceManager::CleanUp() { - vectorresNames(0); + std::vectorresNames(0); for (auto& x : resources) { resNames.push_back(x.first); diff --git a/WickedEngine/wiResourceManager.h b/WickedEngine/wiResourceManager.h index 9b46ad99b..f14e5a7fa 100644 --- a/WickedEngine/wiResourceManager.h +++ b/WickedEngine/wiResourceManager.h @@ -35,11 +35,11 @@ public: refCount = 1; }; }; - typedef unordered_map container; + typedef std::unordered_map container; container resources; protected: -typedef map filetypes; +typedef std::map filetypes; static filetypes types; static wiResourceManager* globalResources; static void SetUp(); diff --git a/WickedEngine/wiResourceManager_BindLua.cpp b/WickedEngine/wiResourceManager_BindLua.cpp index 9e89828de..d1b42c7f7 100644 --- a/WickedEngine/wiResourceManager_BindLua.cpp +++ b/WickedEngine/wiResourceManager_BindLua.cpp @@ -4,6 +4,7 @@ #include "Texture_BindLua.h" #include "wiRenderer.h" +using namespace std; using namespace wiGraphicsTypes; const char wiResourceManager_BindLua::className[] = "Resource"; diff --git a/WickedEngine/wiSPTree.cpp b/WickedEngine/wiSPTree.cpp index 1fdb785e0..4786a62ab 100644 --- a/WickedEngine/wiSPTree.cpp +++ b/WickedEngine/wiSPTree.cpp @@ -19,11 +19,11 @@ wiSPTree::~wiSPTree() SAFE_DELETE(root); } -void wiSPTree::initialize(const vector& objects){ +void wiSPTree::initialize(const std::vector& objects){ initialize(objects,XMFLOAT3(FLOAT32_MAX,FLOAT32_MAX,FLOAT32_MAX) ,XMFLOAT3(-FLOAT32_MAX,-FLOAT32_MAX,-FLOAT32_MAX)); } -void wiSPTree::initialize(const vector& objects, const XMFLOAT3& newMin, const XMFLOAT3& newMax){ +void wiSPTree::initialize(const std::vector& objects, const XMFLOAT3& newMin, const XMFLOAT3& newMax){ XMFLOAT3 min = newMin; XMFLOAT3 max = newMax; @@ -38,7 +38,7 @@ void wiSPTree::initialize(const vector& objects, const XMFLOAT3& newM AddObjects(this->root,objects); } -void wiSPTree::AddObjects(Node* node, const vector& newObjects) +void wiSPTree::AddObjects(Node* node, const std::vector& newObjects) { for(Cullable* object : newObjects) { @@ -72,7 +72,7 @@ void wiSPTree::AddObjects(Node* node, const vector& newObjects) for(int i=0;icount;++i){ //children[i] = new Node(this,boxes[i],depth+1); - vector o(0); + std::vector o(0); o.reserve(newObjects.size()); for(Cullable* object : newObjects) #ifdef SP_TREE_BOX_CONTAIN @@ -307,7 +307,7 @@ wiSPTree* wiSPTree::updateTree(Node* node) if(node) { - vector bad(0); + std::vector bad(0); for(Cullable* object : node->objects){ #ifdef SP_TREE_BOX_CONTAIN if( node->box.intersects(object->bounds)!=AABB::INSIDE ) diff --git a/WickedEngine/wiSPTree.h b/WickedEngine/wiSPTree.h index c5f012561..588528f86 100644 --- a/WickedEngine/wiSPTree.h +++ b/WickedEngine/wiSPTree.h @@ -7,10 +7,10 @@ class Frustum; -typedef forward_list CulledList; +typedef std::forward_list CulledList; -typedef forward_list CulledObjectList; -typedef unordered_map CulledCollection; +typedef std::forward_list CulledObjectList; +typedef std::unordered_map CulledCollection; class wiSPTree @@ -20,13 +20,13 @@ protected: wiSPTree(); public: ~wiSPTree(); - void initialize(const vector& objects); - void initialize(const vector& objects, const XMFLOAT3& newMin, const XMFLOAT3& newMax); + void initialize(const std::vector& objects); + void initialize(const std::vector& objects, const XMFLOAT3& newMin, const XMFLOAT3& newMax); struct Node{ int depth; AABB box; - vector children; + std::vector children; Node* parent; int count; CulledList objects; @@ -68,7 +68,7 @@ public: // Sort culled list by their distance to the origin point static void Sort(const XMFLOAT3& origin, CulledList& objects, SortType sortType = SP_TREE_SORT_UNIQUE); - void AddObjects(Node* node, const vector& newObjects); + void AddObjects(Node* node, const std::vector& newObjects); void getVisible(Frustum& frustum, CulledList& objects, SortType sortType = SP_TREE_SORT_UNIQUE, CullStrictness type = SP_TREE_STRICT_CULL, Node* node = nullptr); void getVisible(AABB& frustum, CulledList& objects, SortType sortType = SP_TREE_SORT_UNIQUE, CullStrictness type = SP_TREE_STRICT_CULL, Node* node = nullptr); void getVisible(SPHERE& frustum, CulledList& objects, SortType sortType = SP_TREE_SORT_UNIQUE, CullStrictness type = SP_TREE_STRICT_CULL, Node* node = nullptr); diff --git a/WickedEngine/wiServer.cpp b/WickedEngine/wiServer.cpp index 8ae6df67a..57ab4d199 100644 --- a/WickedEngine/wiServer.cpp +++ b/WickedEngine/wiServer.cpp @@ -5,7 +5,7 @@ using namespace std; -wiServer::wiServer(const string& newName, const string& ipaddress, int port) +wiServer::wiServer(const std::string& newName, const std::string& ipaddress, int port) { name=newName; if(ListenOnPort(port,ipaddress.length()<=1?"0.0.0.0":ipaddress.c_str())){ @@ -25,7 +25,7 @@ wiServer::wiServer(const string& newName, const string& ipaddress, int port) wiServer::~wiServer(void) { - for (map::iterator it = clients.begin(); it != clients.end(); ++it) { + for (std::map::iterator it = clients.begin(); it != clients.end(); ++it) { closesocket(it->first); } wiNetwork::~wiNetwork(); @@ -93,10 +93,10 @@ SOCKET wiServer::CreateAccepter(){ -vector wiServer::listClients() +std::vector wiServer::listClients() { - vector ret(0); - for (map::iterator it = clients.begin(); it != clients.end(); ++it) { + std::vector ret(0); + for (std::map::iterator it = clients.begin(); it != clients.end(); ++it) { stringstream ss(""); ss<second<<":"<first; ret.push_back(ss.str()); @@ -104,16 +104,16 @@ vector wiServer::listClients() return ret; } -bool wiServer::sendText(const string& text, int packettype, const string& clientName, int clientID){ +bool wiServer::sendText(const std::string& text, int packettype, const std::string& clientName, int clientID){ int sentTo=0; if(clientName.length()<=0){ //send to everyone - for (map::iterator it = clients.begin(); it != clients.end(); ++it) { + for (std::map::iterator it = clients.begin(); it != clients.end(); ++it) { sentTo += wiNetwork::sendData(packettype,it->first) && wiNetwork::sendText(text,it->first); } } else if(clientID<0){ //send to all of same name - for (map::iterator it = clients.begin(); it != clients.end(); ++it) { + for (std::map::iterator it = clients.begin(); it != clients.end(); ++it) { if(!clientName.compare(it->second)){ sentTo += wiNetwork::sendData(packettype,it->first) && wiNetwork::sendText(text,it->first); } @@ -131,11 +131,11 @@ bool wiServer::sendText(const string& text, int packettype, const string& client return sentTo>0; } -bool wiServer::changeName(const string& newName){ +bool wiServer::changeName(const std::string& newName){ wiNetwork::changeName(newName); return sendText(newName, wiNetwork::PACKET_TYPE_CHANGENAME); } -bool wiServer::sendMessage(const string& text, const string& clientName, int clientID){ +bool wiServer::sendMessage(const std::string& text, const std::string& clientName, int clientID){ return sendText(text, wiNetwork::PACKET_TYPE_TEXTMESSAGE, clientName, clientID); } diff --git a/WickedEngine/wiServer.h b/WickedEngine/wiServer.h index 942588ddf..5399e8568 100644 --- a/WickedEngine/wiServer.h +++ b/WickedEngine/wiServer.h @@ -12,15 +12,15 @@ class wiServer : public wiNetwork { #ifndef WINSTORE_SUPPORT private: - map clients; + std::map clients; public: - wiServer(const string& newName = "SERVER", const string& ipaddress = "0.0.0.0", int port = PORT); + wiServer(const std::string& newName = "SERVER", const std::string& ipaddress = "0.0.0.0", int port = PORT); ~wiServer(void); bool active(){return !clients.empty();} - bool sendText(const string& text, int packettype, const string& clientName = "", int clientID = -1); + bool sendText(const std::string& text, int packettype, const std::string& clientName = "", int clientID = -1); template bool sendData(const T& value){ if(clients.begin()==clients.end()) @@ -36,8 +36,8 @@ public: } - bool changeName(const string& newName); - bool sendMessage(const string& text, const string& clientName = "", int clientID = -1); + bool changeName(const std::string& newName); + bool sendMessage(const std::string& text, const std::string& clientName = "", int clientID = -1); bool ListenOnPort(int portno, const char* ipaddress); SOCKET CreateAccepter(); @@ -55,7 +55,7 @@ public: SOCKET max_sd = s; - for (map::iterator it = clients.begin(); it != clients.end(); ++it) { + for (std::map::iterator it = clients.begin(); it != clients.end(); ++it) { if(it->first>0) FD_SET( it->first, &readfds ); if(it->first>max_sd) @@ -95,7 +95,7 @@ public: } //else its some IO operation on some other socket :) - for (map::iterator it = clients.begin(); it != clients.end(); ) { + for (std::map::iterator it = clients.begin(); it != clients.end(); ) { if (FD_ISSET( it->first , &readfds)) { @@ -149,11 +149,11 @@ public: } - vector listClients(); + std::vector listClients(); #else public: - wiServer(const string& newName = "SERVER", const string& ipaddress = "0.0.0.0", int port = PORT) {} + wiServer(const std::string& newName = "SERVER", const std::string& ipaddress = "0.0.0.0", int port = PORT) {} template void Poll(T& data) {} diff --git a/WickedEngine/wiSprite.cpp b/WickedEngine/wiSprite.cpp index 7da8bcd9a..0ee984909 100644 --- a/WickedEngine/wiSprite.cpp +++ b/WickedEngine/wiSprite.cpp @@ -11,17 +11,17 @@ wiSprite::wiSprite(wiResourceManager* contentHolder) :ContentHolder(contentHolde { Init(); } -wiSprite::wiSprite(const string& newTexture, const string& newMask, const string& newNormal, wiResourceManager* contentHolder) : ContentHolder(contentHolder) +wiSprite::wiSprite(const std::string& newTexture, const std::string& newMask, const std::string& newNormal, wiResourceManager* contentHolder) : ContentHolder(contentHolder) { Init(); CreateReference(newTexture,newMask,newNormal); } -wiSprite::wiSprite(const string& newTexture, const string& newMask, wiResourceManager* contentHolder) : ContentHolder(contentHolder) +wiSprite::wiSprite(const std::string& newTexture, const std::string& newMask, wiResourceManager* contentHolder) : ContentHolder(contentHolder) { Init(); CreateReference(newTexture,newMask,""); } -wiSprite::wiSprite(const string& newTexture, wiResourceManager* contentHolder) : ContentHolder(contentHolder) +wiSprite::wiSprite(const std::string& newTexture, wiResourceManager* contentHolder) : ContentHolder(contentHolder) { Init(); CreateReference(newTexture,"",""); @@ -39,7 +39,7 @@ void wiSprite::Init(){ effects=wiImageEffects(); anim=Anim(); } -void wiSprite::CreateReference(const string& newTexture, const string& newMask, const string& newNormal){ +void wiSprite::CreateReference(const std::string& newTexture, const std::string& newMask, const std::string& newNormal){ if(newTexture.length()) { texture = newTexture; texturePointer = (Texture2D*)ContentHolder->add(newTexture); diff --git a/WickedEngine/wiSprite.h b/WickedEngine/wiSprite.h index 6d2eebd8f..b04b170de 100644 --- a/WickedEngine/wiSprite.h +++ b/WickedEngine/wiSprite.h @@ -8,16 +8,16 @@ class wiResourceManager; class wiSprite : public wiImage { private: - string texture, mask, normal; + std::string texture, mask, normal; wiGraphicsTypes::Texture2D* texturePointer,*normalPointer,*maskPointer; wiResourceManager* ContentHolder; public: wiSprite(wiResourceManager* contentHolder = nullptr); - wiSprite(const string& newTexture, const string& newMask, const string& newNormal, wiResourceManager* contentHolder = nullptr); - wiSprite(const string& newTexture, const string& newMask, wiResourceManager* contentHolder = nullptr); - wiSprite(const string& newTexture, wiResourceManager* contentHolder = nullptr); + wiSprite(const std::string& newTexture, const std::string& newMask, const std::string& newNormal, wiResourceManager* contentHolder = nullptr); + wiSprite(const std::string& newTexture, const std::string& newMask, wiResourceManager* contentHolder = nullptr); + wiSprite(const std::string& newTexture, wiResourceManager* contentHolder = nullptr); void Init(); - void CreateReference(const string& newTexture, const string& newMask, const string& newNormal); + void CreateReference(const std::string& newTexture, const std::string& newMask, const std::string& newNormal); void CleanUp(); void Update(float); @@ -26,7 +26,7 @@ public: void Draw(); void DrawNormal(GRAPHICSTHREAD threadID); - string name; + std::string name; wiImageEffects effects; diff --git a/WickedEngine/wiSprite_BindLua.cpp b/WickedEngine/wiSprite_BindLua.cpp index 0cfef2cb1..440d17ddd 100644 --- a/WickedEngine/wiSprite_BindLua.cpp +++ b/WickedEngine/wiSprite_BindLua.cpp @@ -2,6 +2,8 @@ #include "wiImageEffects_BindLua.h" #include "SpriteAnim_BindLua.h" +using namespace std; + const char wiSprite_BindLua::className[] = "Sprite"; Luna::FunctionType wiSprite_BindLua::methods[] = { diff --git a/WickedEngine/wiTextureHelper.h b/WickedEngine/wiTextureHelper.h index 246571d11..e69a70ef0 100644 --- a/WickedEngine/wiTextureHelper.h +++ b/WickedEngine/wiTextureHelper.h @@ -20,7 +20,7 @@ private: }; wiGraphicsTypes::Texture2D* helperTextures[HELPERTEXTURE_COUNT]; - unordered_map colorTextures; + std::unordered_map colorTextures; public: wiTextureHelperInstance(); ~wiTextureHelperInstance(); diff --git a/WickedEngine/wiThreadSafeManager.cpp b/WickedEngine/wiThreadSafeManager.cpp index 61175aecc..292fb1d01 100644 --- a/WickedEngine/wiThreadSafeManager.cpp +++ b/WickedEngine/wiThreadSafeManager.cpp @@ -1,5 +1,7 @@ #include "wiThreadSafeManager.h" +using namespace std; + mutex wiThreadSafeManager::STATICMUTEX; wiThreadSafeManager::wiThreadSafeManager() diff --git a/WickedEngine/wiThreadSafeManager.h b/WickedEngine/wiThreadSafeManager.h index 986a1b319..ded7ff1d2 100644 --- a/WickedEngine/wiThreadSafeManager.h +++ b/WickedEngine/wiThreadSafeManager.h @@ -8,7 +8,7 @@ class wiThreadSafeManager { protected: //mutex MUTEX; - static mutex STATICMUTEX; + static std::mutex STATICMUTEX; wiSpinLock spinlock; public: wiThreadSafeManager(); diff --git a/WickedEngine/wiTransform.cpp b/WickedEngine/wiTransform.cpp index 9f60118f4..e20a49141 100644 --- a/WickedEngine/wiTransform.cpp +++ b/WickedEngine/wiTransform.cpp @@ -83,7 +83,7 @@ void Transform::attachTo(Transform* newParent, int copyTranslation, int copyRota parent->children.insert(this); } } -Transform* Transform::find(const string& findname) +Transform* Transform::find(const std::string& findname) { if (!name.compare(findname)) { @@ -128,7 +128,7 @@ void Transform::detachChild(Transform* child) { { return; } - vector delChildren(children.begin(), children.end()); + std::vector delChildren(children.begin(), children.end()); for (Transform* c : delChildren) { if (c != nullptr) { c->detach(); diff --git a/WickedEngine/wiTransform.h b/WickedEngine/wiTransform.h index ab95707ee..3d6c465b3 100644 --- a/WickedEngine/wiTransform.h +++ b/WickedEngine/wiTransform.h @@ -13,7 +13,7 @@ struct Node private: unsigned long long ID; public: - string name; + std::string name; Node() { name = ""; @@ -22,10 +22,10 @@ public: } - string GetLayerID() + std::string GetLayerID() { auto x = name.find_last_of('_'); - if (x != string::npos) + if (x != std::string::npos) { return name.substr(x + 1); } @@ -38,16 +38,16 @@ public: struct Transform : public Node { - string parentName; + std::string parentName; Transform* parent; - set children; + std::set children; XMFLOAT3 translation_rest, translation, translationPrev; XMFLOAT4 rotation_rest, rotation, rotationPrev; XMFLOAT3 scale_rest, scale, scalePrev; XMFLOAT4X4 world_rest, world, worldPrev; - string boneParent; //for transforms that are parented to bones (for blender-import compatibility) + std::string boneParent; //for transforms that are parented to bones (for blender-import compatibility) XMFLOAT4X4 parent_inv_rest; int copyParentT, copyParentR, copyParentS; @@ -67,7 +67,7 @@ struct Transform : public Node //attach to parent void attachTo(Transform* newParent, int copyTranslation = 1, int copyRotation = 1, int copyScale = 1); //find transform in tree - Transform* find(const string& name); + Transform* find(const std::string& name); Transform* find(unsigned long long ID); //detach child - detach all if no parameters void detachChild(Transform* child = nullptr); diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 9d5a8ea1c..dde90857f 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -28,9 +28,9 @@ namespace wiVersion { return revision; } - string GetVersionString() + std::string GetVersionString() { - stringstream ss(""); + std::stringstream ss(""); ss << GetMajor() << "." << GetMinor() << "." << GetRevision(); return ss.str(); } diff --git a/WickedEngine/wiVersion.h b/WickedEngine/wiVersion.h index a37818ba0..ff45b15e4 100644 --- a/WickedEngine/wiVersion.h +++ b/WickedEngine/wiVersion.h @@ -14,7 +14,7 @@ namespace wiVersion int GetMinor(); // minor bug fixes, alterations int GetRevision(); - string GetVersionString(); + std::string GetVersionString(); } #endif // WICKEDENGINE_VERSION_DEFINED diff --git a/WickedEngine/wiWidget.cpp b/WickedEngine/wiWidget.cpp index 0089b950a..a7c19ecaa 100644 --- a/WickedEngine/wiWidget.cpp +++ b/WickedEngine/wiWidget.cpp @@ -7,6 +7,7 @@ #include "wiHelper.h" #include "wiInputManager.h" +using namespace std; using namespace wiGraphicsTypes; @@ -92,7 +93,7 @@ wiHashString wiWidget::GetName() { return fastName; } -void wiWidget::SetName(const string& value) +void wiWidget::SetName(const std::string& value) { name = value; if (value.length() <= 0) @@ -110,15 +111,15 @@ string wiWidget::GetText() { return name; } -void wiWidget::SetText(const string& value) +void wiWidget::SetText(const std::string& value) { text = value; } -void wiWidget::SetTooltip(const string& value) +void wiWidget::SetTooltip(const std::string& value) { tooltip = value; } -void wiWidget::SetScriptTip(const string& value) +void wiWidget::SetScriptTip(const std::string& value) { scriptTip = value; } @@ -198,7 +199,7 @@ void wiWidget::SetScissorRect(const wiGraphicsTypes::Rect& rect) } -wiButton::wiButton(const string& name) :wiWidget() +wiButton::wiButton(const std::string& name) :wiWidget() { SetName(name); SetText(fastName.GetString()); @@ -352,7 +353,7 @@ void wiButton::OnDragEnd(function func) -wiLabel::wiLabel(const string& name) :wiWidget() +wiLabel::wiLabel(const std::string& name) :wiWidget() { SetName(name); SetText(fastName.GetString()); @@ -404,7 +405,7 @@ void wiLabel::Render(wiGUI* gui) -wiSlider::wiSlider(float start, float end, float defaultValue, float step, const string& name) :wiWidget() +wiSlider::wiSlider(float start, float end, float defaultValue, float step, const std::string& name) :wiWidget() ,start(start), end(end), value(defaultValue), step(max(step, 1)) { SetName(name); @@ -554,7 +555,7 @@ void wiSlider::OnSlide(function func) -wiCheckBox::wiCheckBox(const string& name) :wiWidget() +wiCheckBox::wiCheckBox(const std::string& name) :wiWidget() ,checked(false) { SetName(name); @@ -687,7 +688,7 @@ bool wiCheckBox::GetCheck() -wiComboBox::wiComboBox(const string& name) :wiWidget() +wiComboBox::wiComboBox(const std::string& name) :wiWidget() , selected(-1), combostate(COMBOSTATE_INACTIVE), hovered(-1) { SetName(name); @@ -896,7 +897,7 @@ void wiComboBox::OnSelect(function func) { onSelect = move(func); } -void wiComboBox::AddItem(const string& item) +void wiComboBox::AddItem(const std::string& item) { items.push_back(item); @@ -907,7 +908,7 @@ void wiComboBox::AddItem(const string& item) } void wiComboBox::RemoveItem(int index) { - vector newItems(0); + std::vector newItems(0); newItems.reserve(items.size()); for (size_t i = 0; i < items.size(); ++i) { @@ -963,7 +964,7 @@ int wiComboBox::GetSelected() static const float windowcontrolSize = 20.0f; -wiWindow::wiWindow(wiGUI* gui, const string& name) :wiWidget() +wiWindow::wiWindow(wiGUI* gui, const std::string& name) :wiWidget() , gui(gui) { assert(gui != nullptr && "Ivalid GUI!"); @@ -1226,7 +1227,7 @@ bool wiWindow::IsMinimized() -wiColorPicker::wiColorPicker(wiGUI* gui, const string& name) :wiWindow(gui, name) +wiColorPicker::wiColorPicker(wiGUI* gui, const std::string& name) :wiWindow(gui, name) { SetSize(XMFLOAT2(300, 260)); SetColor(wiColor::Ghost); @@ -1381,7 +1382,7 @@ void wiColorPicker::Render(wiGUI* gui) HRESULT hr = S_OK; // saturation { - static vector vertices(0); + static std::vector vertices(0); if (vb_saturation.IsValid() && !vertices.empty()) { vertices[0].col = hue_color; @@ -1408,7 +1409,7 @@ void wiColorPicker::Render(wiGUI* gui) } // hue { - vector vertices(0); + std::vector vertices(0); for (float i = 0; i <= 100; i += 1.0f) { float p = i / 100; @@ -1435,7 +1436,7 @@ void wiColorPicker::Render(wiGUI* gui) { float _radius = 3; float _width = 3; - vector vertices(0); + std::vector vertices(0); for (float i = 0; i <= 100; i += 1.0f) { float p = i / 100; @@ -1461,7 +1462,7 @@ void wiColorPicker::Render(wiGUI* gui) { float _width = 20; - vector vertices(0); + std::vector vertices(0); vertices.push_back({ XMFLOAT4(-_width, -_width, 0, 1),XMFLOAT4(1,1,1,1) }); vertices.push_back({ XMFLOAT4(-_width, _width, 0, 1),XMFLOAT4(1,1,1,1) }); vertices.push_back({ XMFLOAT4(_width, _width, 0, 1),XMFLOAT4(1,1,1,1) }); diff --git a/WickedEngine/wiWidget.h b/WickedEngine/wiWidget.h index 5f2af9743..b0b0f794b 100644 --- a/WickedEngine/wiWidget.h +++ b/WickedEngine/wiWidget.h @@ -6,7 +6,9 @@ #include "wiGraphicsAPI.h" #include "wiIntersectables.h" +#include #include +#include class wiGUI; @@ -20,7 +22,7 @@ struct wiEventArgs bool bValue; int iValue; XMFLOAT4 color; - string sValue; + std::string sValue; }; class wiWidget : public Transform @@ -44,9 +46,9 @@ private: int tooltipTimer; protected: wiHashString fastName; - string text; - string tooltip; - string scriptTip; + std::string text; + std::string tooltip; + std::string scriptTip; bool enabled; bool visible; @@ -63,11 +65,11 @@ public: virtual ~wiWidget(); wiHashString GetName(); - void SetName(const string& value); - string GetText(); - void SetText(const string& value); - void SetTooltip(const string& value); - void SetScriptTip(const string& value); + void SetName(const std::string& value); + std::string GetText(); + void SetText(const std::string& value); + void SetTooltip(const std::string& value); + void SetScriptTip(const std::string& value); void SetPos(const XMFLOAT2& value); void SetSize(const XMFLOAT2& value); WIDGETSTATE GetState(); @@ -93,24 +95,24 @@ public: class wiButton : public wiWidget { protected: - function onClick; - function onDragStart; - function onDrag; - function onDragEnd; + std::function onClick; + std::function onDragStart; + std::function onDrag; + std::function onDragEnd; XMFLOAT2 dragStart; XMFLOAT2 prevPos; Hitbox2D hitBox; public: - wiButton(const string& name = ""); + wiButton(const std::string& name = ""); virtual ~wiButton(); virtual void Update(wiGUI* gui, float dt ) override; virtual void Render(wiGUI* gui) override; - void OnClick(function func); - void OnDragStart(function func); - void OnDrag(function func); - void OnDragEnd(function func); + void OnClick(std::function func); + void OnDragStart(std::function func); + void OnDrag(std::function func); + void OnDragEnd(std::function func); }; // Static box that holds text @@ -118,7 +120,7 @@ class wiLabel : public wiWidget { protected: public: - wiLabel(const string& name = ""); + wiLabel(const std::string& name = ""); virtual ~wiLabel(); virtual void Update(wiGUI* gui, float dt ) override; @@ -129,7 +131,7 @@ public: class wiSlider : public wiWidget { protected: - function onSlide; + std::function onSlide; Hitbox2D hitBox; float start, end; float step; @@ -139,7 +141,7 @@ public: // end : slider maximum value // defaultValue : slider default Value // step : slider step size - wiSlider(float start = 0.0f, float end = 1.0f, float defaultValue = 0.5f, float step = 1000.0f, const string& name = ""); + wiSlider(float start = 0.0f, float end = 1.0f, float defaultValue = 0.5f, float step = 1000.0f, const std::string& name = ""); virtual ~wiSlider(); void SetValue(float value); @@ -148,18 +150,18 @@ public: virtual void Update(wiGUI* gui, float dt ) override; virtual void Render(wiGUI* gui) override; - void OnSlide(function func); + void OnSlide(std::function func); }; // Two-state clickable box class wiCheckBox :public wiWidget { protected: - function onClick; + std::function onClick; Hitbox2D hitBox; bool checked; public: - wiCheckBox(const string& name = ""); + wiCheckBox(const std::string& name = ""); virtual ~wiCheckBox(); void SetCheck(bool value); @@ -168,14 +170,14 @@ public: virtual void Update(wiGUI* gui, float dt ) override; virtual void Render(wiGUI* gui) override; - void OnClick(function func); + void OnClick(std::function func); }; // Drop-down list class wiComboBox :public wiWidget { protected: - function onSelect; + std::function onSelect; Hitbox2D hitBox; int selected; int maxVisibleItemCount; @@ -194,26 +196,26 @@ protected: } combostate; int hovered; - vector items; + std::vector items; const float _GetItemOffset(int index) const; public: - wiComboBox(const string& name = ""); + wiComboBox(const std::string& name = ""); virtual ~wiComboBox(); - void AddItem(const string& item); + void AddItem(const std::string& item); void RemoveItem(int index); void ClearItems(); void SetMaxVisibleItemCount(int value); void SetSelected(int index); int GetSelected(); - string GetItemText(int index); + std::string GetItemText(int index); virtual void Update(wiGUI* gui, float dt ) override; virtual void Render(wiGUI* gui) override; - void OnSelect(function func); + void OnSelect(std::function func); }; // Widget container @@ -226,10 +228,10 @@ protected: wiButton* resizeDragger_UpperLeft; wiButton* resizeDragger_BottomRight; wiButton* moveDragger; - list childrenWidgets; + std::list childrenWidgets; bool minimized; public: - wiWindow(wiGUI* gui, const string& name = ""); + wiWindow(wiGUI* gui, const std::string& name = ""); virtual ~wiWindow(); void AddWidget(wiWidget* widget); @@ -249,7 +251,7 @@ public: class wiColorPicker : public wiWindow { protected: - function onColorChanged; + std::function onColorChanged; XMFLOAT2 hue_picker; XMFLOAT2 saturation_picker; XMFLOAT3 saturation_picker_barycentric; @@ -258,7 +260,7 @@ protected: float angle; bool huefocus; // whether the hue is in focus or the saturation public: - wiColorPicker(wiGUI* gui, const string& name = ""); + wiColorPicker(wiGUI* gui, const std::string& name = ""); virtual ~wiColorPicker(); virtual void Update(wiGUI* gui, float dt ) override; @@ -267,6 +269,6 @@ public: XMFLOAT4 GetPickColor(); void SetPickColor(const XMFLOAT4& value); - void OnColorChanged(function func); + void OnColorChanged(std::function func); };