View difference between Paste ID: 9dJNz2hN and LmPTQtW0

 /////// MODEL.CPP//////////////////
 
-Model::MeshEntry::MeshEntry()
+
 {
-	VB = INVALID_OGL_VALUE;
+
-	IB = INVALID_OGL_VALUE;
+
-	NumIndices = 0;
+
-	MaterialIndex = INVALID_MATERIAL;
+
-};
+
 	{
 		glBindBuffer(GL_ARRAY_BUFFER, m_Entries[i].VB);
-Model::MeshEntry::~MeshEntry()
+
 		glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex), (const GLvoid*) 12);
-	if (VB != INVALID_OGL_VALUE)
+
 
-		glDeleteBuffers(1, &VB);
+
 
 		const unsigned int MaterialIndex = m_Entries[i].MaterialIndex;
-	if (IB != INVALID_OGL_VALUE)
+
 		if (MaterialIndex < m_Textures.size() && m_Textures[MaterialIndex])
-		glDeleteBuffers(1, &IB);
+
 			m_Textures[MaterialIndex]->Bind(GL_TEXTURE0);
 		}
 
 		glDrawElements(GL_TRIANGLES, m_Entries[i].NumIndices, GL_UNSIGNED_INT, 0);
-void Model::MeshEntry::Init(const std::vector<Vertex> &Vertices,
+
-	const std::vector<unsigned int> &Indices)
+
 	glDisableVertexAttribArray(0);
-	NumIndices = Indices.size();
+
 	glDisableVertexAttribArray(2);
-	glGenBuffers(1, &VB);
+
-	glBindBuffer(GL_ARRAY_BUFFER, VB);
+
-	glBufferData(GL_ARRAY_BUFFER, sizeof(Vertex) * Vertices.size(), &Vertices[0], GL_STATIC_DRAW);
+
 
-	glGenBuffers(1, &IB);
+
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, IB);
+
-	glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(unsigned int) * NumIndices, &Indices[0], GL_STATIC_DRAW);
+
 
-Model::Model()
+
 	_shaderPrg = new ShaderProgram();
 
 	_vSource = _shader->readFile("vShader.vert");
 	_vID = _shader->makeVertexShader(_vSource);
-Model::~Model()
+
 	_fID = _shader->makeFragmentShader(_fSource);
 	_shaderProgID = _shaderPrg->makeShaderProgram(_vID, _fID);
 	glUseProgram(_shaderProgID);
 
 	_projectionMatrix = _shaderPrg->getUniformLoc("projection");
-void Model::Clear()
+
 	_modelMatrix = _shaderPrg->getUniformLoc("model");
-	for (unsigned int i = 0; i < m_Textures.size(); i++)
+
 	_texCoordLoc = _shaderPrg->getUniformLoc("texCoord");
-		SAFE_DELETE(m_Textures[i]);
+
 	// Load model
 	m_model = Model();
 	m_model.LoadMesh("earth02.dae");
 	return true;
-bool Model::LoadMesh(const char* Filename)
+
 
-	// Release the previously loaded mesh (if it exists)
+
-	Clear();
+
 {
-	bool Ret = false;
+
-	Assimp::Importer Importer;
+
 	_view = glm::lookAt(Eye, Target, Up);
-	const aiScene* pScene = Importer.ReadFile(Filename, aiProcess_Triangulate | aiProcess_GenSmoothNormals | aiProcess_FlipUVs);
+
 	glUniformMatrix4fv(_projectionMatrix, 1, false, glm::value_ptr(_projection));
-	if (pScene)
+
 
-		Ret = InitFromScene(pScene, Filename);
+
 void Game::OnRender()
-	else
+
 	_cam.setPosition(_camPos);
-		printf("Error parsing '%s': '%s'\n", Filename, Importer.GetErrorString());
+
 
 	Eye = glm::vec3(_cam.getPosition().x, _cam.getPosition().y, _cam.getPosition().z);
-	return Ret;
+
 	Up = glm::vec3(0.0, 1.0, 0.0);
 	glm::mat4 view = glm::lookAt(Eye, Target, Up);
 
-bool Model::InitFromScene(const aiScene* pScene, const char* Filename)
+
 
-	m_Entries.resize(pScene->mNumMeshes);
+
-	m_Textures.resize(pScene->mNumMaterials);
+
 	glClearColor(0.0, 0.0, 0.0, 1.0);
-	// Initialize the meshes in the scene one by one
+
 	glMatrixMode(GL_MODELVIEW);
 
-		const aiMesh* paiMesh = pScene->mMeshes[i];
+
-		InitMesh(i, paiMesh);
+
 }
 
-	return InitMaterials(pScene, Filename);
+
 
 #version 330
 
-void Model::InitMesh(unsigned int Index, const aiMesh* paiMesh)
+
 uniform mat4 view;
-	m_Entries[Index].MaterialIndex = paiMesh->mMaterialIndex;
+
 
-	std::vector<Vertex> Vertices;
+
-	std::vector<unsigned int> Indices;
+
 
-	const aiVector3D Zero3D(0.0f, 0.0f, 0.0f);
+
 
-	for (unsigned int i = 0; i < paiMesh->mNumVertices; i++)
+
 {
-		const aiVector3D* pPos = &(paiMesh->mVertices[i]);
+
-		const aiVector3D* pNormal = &(paiMesh->mNormals[i]);
+
-		const aiVector3D* pTexCoord = paiMesh->HasTextureCoords(0) ? &(paiMesh->mTextureCoords[0][i]) : &Zero3D;
+
 
-		Vertex v(glm::vec3(pPos->x, pPos->y, pPos->z),
+
-			glm::vec2(pTexCoord->x, pTexCoord->y),
+
-			glm::vec3(pNormal->x, pNormal->y, pNormal->z));
+
 
-		Vertices.push_back(v);
+
 uniform sampler2D tex;
 in vec2 TexCoord;
-	for (unsigned int i = 0; i < paiMesh->mNumFaces; i++)
+
 out vec4 fragData;
-		const aiFace& Face = paiMesh->mFaces[i];
+
-		assert(Face.mNumIndices == 3);
+
-		Indices.push_back(Face.mIndices[0]);
+
-		Indices.push_back(Face.mIndices[1]);
+
-		Indices.push_back(Face.mIndices[2]);
+