Use make_pair, fix indentation

wg-perception · Feb 22, 2016 · 95a5c4d · 95a5c4d
1 parent 44d502c
commit 95a5c4d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/model.cpp b/src/model.cpp
@@ -83,7 +83,7 @@ Model::recursiveTextureLoad(const struct aiScene *sc, const aiNode* nd)
           TextureAndPath reusedTexture;
           reusedTexture.hTexture = it->second.hTexture;
           reusedTexture.pathName = *str;
-          texturesAndPaths[std::pair<const aiNode*, int>(nd, n)] = reusedTexture;
+          texturesAndPaths[std::make_pair(nd, n)] = reusedTexture;
           newTextureToBeLoaded = false;
 
           std::cout << "Texture reused." << std::endl;
@@ -130,7 +130,7 @@ Model::recursiveTextureLoad(const struct aiScene *sc, const aiNode* nd)
 
         std::cout << "texture loaded." << std::endl;
 
-		texturesAndPaths[std::pair<const aiNode*, int>(nd, n)] = newTexture;
+        texturesAndPaths[std::make_pair(nd, n)] = newTexture;
       }
     }
   }
@@ -203,7 +203,7 @@ Model::recursive_render(const struct aiScene *sc, const aiNode* nd) const
     const struct aiMesh* mesh = sc->mMeshes[nd->mMeshes[n]];
 
     if (n < texturesAndPaths.size())
-      glBindTexture(GL_TEXTURE_2D, texturesAndPaths.at(std::pair<const aiNode*, int>(nd, n)).hTexture);
+      glBindTexture(GL_TEXTURE_2D, texturesAndPaths.at(std::make_pair(nd, n)).hTexture);
 
     apply_material(sc->mMaterials[mesh->mMaterialIndex]);