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

Added missing std namespace prefix to std types.

Browse Source
This commit is contained in:
Marc-Antoine Lortie
2020-03-08 10:50:18 -04:00
parent 1e2c3c9c01
commit dda083fa7b
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/ModelLoader.h
+4 -4
View File
@@ -28,14 +28,14 @@ private:
ID3D11Device *dev;
ID3D11DeviceContext *devcon;
std::vector<Mesh> meshes;
string directory;
vector<Texture> textures_loaded;
std::string directory;
std::vector<Texture> textures_loaded;
HWND hwnd;
void processNode(aiNode* node, const aiScene* scene);
Mesh processMesh(aiMesh* mesh, const aiScene* scene);
vector<Texture> loadMaterialTextures(aiMaterial* mat, aiTextureType type, string typeName, const aiScene* scene);
string determineTextureType(const aiScene* scene, aiMaterial* mat);
std::vector<Texture> loadMaterialTextures(aiMaterial* mat, aiTextureType type, std::string typeName, const aiScene* scene);
std::string determineTextureType(const aiScene* scene, aiMaterial* mat);
int getTextureIndex(aiString* str);
ID3D11ShaderResourceView* getTextureFromModel(const aiScene* scene, int textureindex);
};