Added model loading

This commit is contained in:
Robert 2021-01-30 04:02:15 +01:00
parent 707687b682
commit 8c62929e3c
24 changed files with 199852 additions and 23 deletions

View file

@ -172,8 +172,8 @@ int main(int argc, char** argv)
//cubeMaterial->AddProperty("ambient", oglu::Color::White);
cubeMaterial->AddProperty("shininess", 32.f);
cubeMaterial->AddProperty("diffuse", oglu::MakeTexture("assets/tiles_diffuse.jpg"));
cubeMaterial->AddProperty("specular", oglu::MakeTexture("assets/tiles_bump.jpg"));
cubeMaterial->AddProperty("diffuse", oglu::MakeTexture("assets/tiles_diffuse.jpg", "diffuse"));
cubeMaterial->AddProperty("specular", oglu::MakeTexture("assets/tiles_bump.jpg", "specular"));
oglu::Object cubes[10] = {
oglu::Object(cubeDefault),