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

Basic Marble Model with Textures added.

Browse Source
This commit is contained in:
Fabian Klemp 2014-11-17 14:38:35 +01:00
parent 0b7f8e95d3
commit 48691338ba
3 changed files with 2389 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2387
Levels/Geometry/Marble.obj Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
Levels/Textures/marbleTexture.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 MiB

4
level.cc
View File

@ -21,9 +21,9 @@ 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("Sphere.obj", 0.75f);
Model model = Model("Marble.obj", 0.75f);
// load a texture:
Material material = Material("stoneTexture.png", 0.1f, 0.5f, 0.5f, 3.0f);
Material material = Material("marbleTexture.png", 0.1f, 0.5f, 0.5f, 3.0f);
//Create object
Object object = Object(model, material, glm::vec3(0.0f, 5.0f, 0.0f),
glm::vec3(0.0f, 1.0472f, 0.0f), glm::vec3(0.0f, 0.0f, 0.0f),