faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Changing marble model.

Browse Source
This commit is contained in:
sfroitzheim 2014-11-17 18:31:22 +01:00
parent 8f64f75b67
commit c58e4d01b1
2 changed files with 1501 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1500
Levels/Geometry/marblesimple.obj Normal file
View File

File diff suppressed because it is too large Load Diff

2
level.cc
View File

@ -21,7 +21,7 @@ void Level::load(ACGL::OpenGL::SharedShaderProgram shader) {
// currently hard coded should later read this stuff out of a file
this->camera = Camera(glm::vec2(-0.8f, 0.0f), 3.0f);
// load the geometry of the stanford bunny and build a VAO:
Model model = Model("Marble.obj", 0.75f);
Model model = Model("marblesimple.obj", 0.75f);
// load a texture:
Material material = Material("marbleTexture.png", 0.1f, 0.5f, 0.5f, 3.0f);
//Create object