BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rendering FIXED :D

Browse Source
This commit is contained in:
sippeangelo
2014-03-09 23:39:54 +01:00
parent 3138eea0c2
commit ce6b570520
10 changed files with 3008 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/Model.cpp
+5 -5
View File
@@ -101,7 +101,7 @@ bool Model::Loadobj(const char* path, std::vector <glm::vec3> & out_vertices, st
else if ( strcmp( lineHeader, "mtllib" ) == 0 )
{
const char* fileName;
char fileName[512];
fscanf(file, "%s\n", &fileName);
@@ -127,7 +127,7 @@ bool Model::Loadobj(const char* path, std::vector <glm::vec3> & out_vertices, st
}
else if ( strcmp( mtllineHeader, "map_Kd" ) == 0 )
{
const char* textureFileName;
char textureFileName[512];
fscanf(mtlfile, "%s", textureFileName);
texture.push_back(std::make_shared<Texture>(textureFileName));
LOG_INFO("Texture Loaded\n");
@@ -170,15 +170,15 @@ void Model::CreateBuffers( std::vector<glm::vec3> _Vertices, std::vector<glm::ve
GLERROR("GLEW: BufferFail4");
glBindBuffer(GL_ARRAY_BUFFER, VertexBuffer);
glVertexAttribPointer(0, 1, GL_FLOAT, GL_FALSE, 0, 0);
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, 0);
GLERROR("GLEW: BufferFail5");
glBindBuffer(GL_ARRAY_BUFFER, NormalBuffer);
glVertexAttribPointer(1, 1, GL_FLOAT, GL_FALSE, 0, 0);
glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 0, 0);
GLERROR("GLEW: BufferFail5");
glBindBuffer(GL_ARRAY_BUFFER, TextureCoordBuffer);
glVertexAttribPointer(2, 1, GL_FLOAT, GL_FALSE, 0, 0);
glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, 0, 0);
GLERROR("GLEW: BufferFail5");
glEnableVertexAttribArray(0);