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

Adding simple test sphere.

Browse Source
This commit is contained in:
Faerbit 2014-11-15 14:19:34 +01:00
parent 213a936fbb
commit 53ca8caf56
3 changed files with 2072 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2069
Geometry/Sphere.obj Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
Geometry/stoneTexture.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 MiB

6
level.cc
View File

@ -15,11 +15,11 @@ 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("Bunny.obj", 0.25f);
Model model = Model("Sphere.obj", 0.75f);
// load a texture:
Material material = Material("clownfishBunny.png", 0.1f, 0.5f, 0.5f, 3.0f);
Material material = Material("stoneTexture.png", 0.1f, 0.5f, 0.5f, 3.0f);
//Create object
Object object = Object(model, material, glm::vec3(0.0f, 0.0f, -2.0f),
Object object = Object(model, material, glm::vec3(0.0f, 1.0f, -2.0f),
glm::vec3(0.0f, 1.0472f, 0.0f), glm::vec3(0.0f, 0.0f, 0.0f),
glm::vec3(0.0f, 0.0f, 0.0f), shader);