Commit 2b457e7c authored by Sadman Kazi's avatar Sadman Kazi 🎸

Fix resource loading, closes #5

parent b10a3dd2
Pipeline #75 passed with stage
in 3 minutes and 37 seconds
......@@ -30,11 +30,11 @@ Game::Game()
2, 1, 0,
0, 2, 3};
m_shader = new Shader("./res/basicShader");
m_shader = new Shader("../res/basicShader");
//mesh = new Mesh(data, sizeof(data)/sizeof(data[0]), indices, sizeof(indices)/sizeof(indices[0]));
m_mesh = new Mesh("./res/monkeyNoUV.obj");
m_mesh = new Mesh("../res/monkeyNoUV.obj");
m_transform = new Transform();
m_camera = new Camera(glm::vec3(0.0f, 0.0f, -2.0f), 70.0f, (float)WIDTH/HEIGHT, 1.0f, 100.0f);
......@@ -88,4 +88,4 @@ void Game::update() {
//transform->GetRot().z = sinCounter;
m_shader->setUniformMat4("transform", m_transform->getProjectedModel(m_camera));
}
\ No newline at end of file
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment