fun with pointers

hw3d/App.h

@@ -25,5 +25,5 @@ private:
 	float speed_factor = 1.0f;
 	Camera cam;
 	PointLight light;
-	Model nano{ wnd.Gfx(),"Models\\nano_hierarchy.gltf" };
+	Model nano{ wnd.Gfx(),"Models\\nano_textured\\nanosuit.obj" };
 };
\ No newline at end of file

hw3d/Mesh.cpp

@@ -212,7 +212,7 @@ Model::Model( Graphics& gfx,const std::string fileName )
 
 	for( size_t i = 0; i < pScene->mNumMeshes; i++ )
 	{
-		meshPtrs.push_back( ParseMesh( gfx,*pScene->mMeshes[i] ) );
+		meshPtrs.push_back( ParseMesh( gfx,*pScene->mMeshes[i],pScene->mMaterials ) );
 	}
 
 	int nextId = 0;
@@ -236,7 +236,7 @@ void Model::ShowWindow( const char* windowName ) noexcept
 Model::~Model() noexcept
 {}
 
-std::unique_ptr<Mesh> Model::ParseMesh( Graphics& gfx,const aiMesh& mesh )
+std::unique_ptr<Mesh> Model::ParseMesh( Graphics& gfx,const aiMesh& mesh,const aiMaterial* const* pMaterials )
 {
 	using Dvtx::VertexLayout;
 
@@ -246,6 +246,8 @@ std::unique_ptr<Mesh> Model::ParseMesh( Graphics& gfx,const aiMesh& mesh )
 		.Append( VertexLayout::Normal )
 	) );
 
+	auto& material = *pMaterials[mesh.mMaterialIndex];
+
 	for( unsigned int i = 0; i < mesh.mNumVertices; i++ )
 	{
 		vbuf.EmplaceBack(

hw3d/Mesh.h

@@ -58,7 +58,7 @@ public:
 	void ShowWindow( const char* windowName = nullptr ) noexcept;
 	~Model() noexcept;
 private:
-	static std::unique_ptr<Mesh> ParseMesh( Graphics& gfx,const aiMesh& mesh );
+	static std::unique_ptr<Mesh> ParseMesh( Graphics& gfx,const aiMesh& mesh,const aiMaterial* const* pMaterials );
 	std::unique_ptr<Node> ParseNode( int& nextId,const aiNode& node ) noexcept;
 private:
 	std::unique_ptr<Node> pRoot;