v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update FBXConverter.h 

Introduce using instead of typedef.
pull/2391/head
Kim Kulling 2019-03-29 16:24:45 +01:00 committed by GitHub
parent d129259ae4
commit 89b3de9473
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/FBXConverter.h
View File

@ -418,7 +418,6 @@ private:
void TransferDataToScene(); void TransferDataToScene();
private: private:
// 0: not assigned yet, others: index is value - 1 // 0: not assigned yet, others: index is value - 1
unsigned int defaultMaterialIndex; unsigned int defaultMaterialIndex;
@ -429,22 +428,21 @@ private:
std::vector<aiCamera*> cameras; std::vector<aiCamera*> cameras;
std::vector<aiTexture*> textures; std::vector<aiTexture*> textures;
using MaterialMap = std::map<const Material*, unsigned int>;
typedef std::map<const Material*, unsigned int> MaterialMap;
MaterialMap materials_converted; MaterialMap materials_converted;
typedef std::map<const Video*, unsigned int> VideoMap; using VideoMap = std::map<const Video*, unsigned int>;
VideoMap textures_converted; VideoMap textures_converted;
typedef std::map<const Geometry*, std::vector<unsigned int> > MeshMap; using MeshMap = std::map<const Geometry*, std::vector<unsigned int> >;
MeshMap meshes_converted; MeshMap meshes_converted;
// fixed node name -> which trafo chain components have animations? // fixed node name -> which trafo chain components have animations?
typedef std::map<std::string, unsigned int> NodeAnimBitMap; using NodeAnimBitMap = std::map<std::string, unsigned int> ;
NodeAnimBitMap node_anim_chain_bits; NodeAnimBitMap node_anim_chain_bits;
// number of nodes with the same name // number of nodes with the same name
typedef std::unordered_map<std::string, unsigned int> NodeNameMap; using NodeNameMap = std::unordered_map<std::string, unsigned int> ;
NodeNameMap mNodeNameInstances; NodeNameMap mNodeNameInstances;
double anim_fps; double anim_fps;