From 89b3de947366e04c40a1e145356b2c9f0a671c40 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 29 Mar 2019 16:24:45 +0100 Subject: [PATCH] Update FBXConverter.h Introduce using instead of typedef. --- code/FBXConverter.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/code/FBXConverter.h b/code/FBXConverter.h index 1ed88406e..8c31fba31 100644 --- a/code/FBXConverter.h +++ b/code/FBXConverter.h @@ -418,7 +418,6 @@ private: void TransferDataToScene(); private: - // 0: not assigned yet, others: index is value - 1 unsigned int defaultMaterialIndex; @@ -428,23 +427,22 @@ private: std::vector lights; std::vector cameras; std::vector textures; - - typedef std::map MaterialMap; + using MaterialMap = std::map; MaterialMap materials_converted; - typedef std::map VideoMap; + using VideoMap = std::map; VideoMap textures_converted; - typedef std::map > MeshMap; + using MeshMap = std::map >; MeshMap meshes_converted; // fixed node name -> which trafo chain components have animations? - typedef std::map NodeAnimBitMap; + using NodeAnimBitMap = std::map ; NodeAnimBitMap node_anim_chain_bits; // number of nodes with the same name - typedef std::unordered_map NodeNameMap; + using NodeNameMap = std::unordered_map ; NodeNameMap mNodeNameInstances; double anim_fps;