lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-05 08:13:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

decoupled assimp from mesh.h

Browse Source
This commit is contained in:
Galfatron
2017-11-27 20:16:05 -08:00
parent 56dfb32615
commit 2178776423
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/learnopengl/mesh.h
View File

@@ -3,8 +3,6 @@
#include <glad/glad.h> // holds all OpenGL type declarations #include <glad/glad.h> // holds all OpenGL type declarations
#include <assimp/Importer.hpp>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
@@ -33,7 +31,7 @@ struct Vertex {
struct Texture { struct Texture {
unsigned int id; unsigned int id;
string type; string type;
aiString path; string path;
}; };
class Mesh { class Mesh {

4
includes/learnopengl/model.h
View File

@@ -179,7 +179,7 @@ private:
bool skip = false; bool skip = false;
for(unsigned int j = 0; j < textures_loaded.size(); j++) for(unsigned int j = 0; j < textures_loaded.size(); j++)
{ {
if(std::strcmp(textures_loaded[j].path.C_Str(), str.C_Str()) == 0) if(std::strcmp(textures_loaded[j].path.data(), str.C_Str()) == 0)
{ {
textures.push_back(textures_loaded[j]); textures.push_back(textures_loaded[j]);
skip = true; // a texture with the same filepath has already been loaded, continue to next one. (optimization) skip = true; // a texture with the same filepath has already been loaded, continue to next one. (optimization)
@@ -191,7 +191,7 @@ private:
Texture texture; Texture texture;
texture.id = TextureFromFile(str.C_Str(), this->directory); texture.id = TextureFromFile(str.C_Str(), this->directory);
texture.type = typeName; texture.type = typeName;
texture.path = str; texture.path = str.C_Str();
textures.push_back(texture); textures.push_back(texture);
textures_loaded.push_back(texture); // store it as texture loaded for entire model, to ensure we won't unnecesery load duplicate textures. textures_loaded.push_back(texture); // store it as texture loaded for entire model, to ensure we won't unnecesery load duplicate textures.
} }