diff --git a/data/models/cube/Bake.jpg b/data/models/cube/Bake.jpg new file mode 100644 index 0000000..0683d85 Binary files /dev/null and b/data/models/cube/Bake.jpg differ diff --git a/data/models/cube/cube.mtl b/data/models/cube/cube.mtl new file mode 100644 index 0000000..1b46602 --- /dev/null +++ b/data/models/cube/cube.mtl @@ -0,0 +1,13 @@ +# Blender MTL File: 'cube.blend' +# Material Count: 1 + +newmtl Material +Ns 225.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.800000 0.800000 0.800000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 2 +map_Kd Bake.jpg diff --git a/data/models/cube/cube.obj b/data/models/cube/cube.obj new file mode 100644 index 0000000..afcc3d6 --- /dev/null +++ b/data/models/cube/cube.obj @@ -0,0 +1,50 @@ +# Blender v2.83.5 OBJ File: 'cube.blend' +# www.blender.org +mtllib cube.mtl +o Cube +v 1.000000 1.000000 -1.000000 +v 1.000000 -1.000000 -1.000000 +v 1.000000 1.000000 1.000000 +v 1.000000 -1.000000 1.000000 +v -1.000000 1.000000 -1.000000 +v -1.000000 -1.000000 -1.000000 +v -1.000000 1.000000 1.000000 +v -1.000000 -1.000000 1.000000 +vt 0.331683 0.668317 +vt 0.331683 0.998350 +vt 0.001650 0.998350 +vt 0.001650 0.668317 +vt 0.334984 0.331683 +vt 0.334984 0.001650 +vt 0.665017 0.001650 +vt 0.665017 0.331683 +vt 0.665017 0.665017 +vt 0.334984 0.665017 +vt 0.334984 0.334984 +vt 0.665017 0.334984 +vt 0.998350 0.331683 +vt 0.668317 0.331683 +vt 0.668317 0.001650 +vt 0.998350 0.001650 +vt 0.331683 0.331683 +vt 0.001650 0.331683 +vt 0.001650 0.001650 +vt 0.331683 0.001650 +vt 0.331683 0.665017 +vt 0.001650 0.665017 +vt 0.001650 0.334984 +vt 0.331683 0.334984 +vn 0.0000 1.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 -1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +usemtl Material +s off +f 1/1/1 5/2/1 7/3/1 3/4/1 +f 4/5/2 3/6/2 7/7/2 8/8/2 +f 8/9/3 7/10/3 5/11/3 6/12/3 +f 6/13/4 2/14/4 4/15/4 8/16/4 +f 2/17/5 1/18/5 3/19/5 4/20/5 +f 6/21/6 5/22/6 1/23/6 2/24/6 diff --git a/src/main.cpp b/src/main.cpp index fd72d52..01c8857 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -186,7 +186,8 @@ int main(int argc, char **argv) { model.translate(glm::vec3(1.0f, 0.0f, 0.0f)); - Model backpack(ROOT_DIR "data/models/backpack/backpack.obj"); + // Model backpack(ROOT_DIR "data/models/backpack/backpack.obj"); + Model cube(ROOT_DIR "data/models/cube/cube.obj"); // Mess with perspective // Projection matrix : 45° Field of View, 4:3 ratio, display range : 0.1 @@ -203,7 +204,7 @@ int main(int argc, char **argv) { glEnable(GL_DEPTH_TEST); glEnable(GL_CULL_FACE); // glCullFace(GL_FRONT); - glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + glClearColor(0.2f, 0.3f, 0.3f, 1.0f); // Game loop bool running = true; @@ -227,9 +228,9 @@ int main(int argc, char **argv) { shader.setMat4("MVP", camera.getMVP()); // Draw Meshes - model2.draw(shader); - model.draw(shader); - backpack.draw(shader); + // model2.draw(shader); + // model.draw(shader); + cube.draw(shader); // Finally render everything shader.use();