quick backup

[demo] / src / main.cc

diff --git a/src/main.cc b/src/main.cc
index 1e45c4b..2727f4b 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -11,6 +11,7 @@
 #include "camera.h"
 #include "mesh.h"
 #include "object.h"
+#include "renderer.h"
 #include "scene.h"
 #include "shader_manager.h"
 
@@ -32,14 +33,13 @@ static void clbk_reshape(GLFWwindow *win, int width, int height);
 
 /* global variables */
 
-bool use_vulkan;
+bool use_vulkan = false;
 Mat4 mprojection;
 
 GLFWwindow *win;
 int win_w = 800;
 int win_h = 600;
 
-OrbitCamera *camera;
 float phi = 25;
 float theta = 0;
 float dist = 4;
@@ -48,15 +48,14 @@ ShaderManager *sdr_man;
 
 /* variables */
 static float aspect;
-
-// TODO: remove just for test:
-static Scene scene;
+static Scene *scene;
+static OrbitCamera *camera;
+static Renderer *rdefault; // default renderer
 
 int main(int argc, char **argv)
 {
        for(int i=0; i<argc; ++i) {
                if(strcmp(argv[i], "-opengl") == 0) {
-                       use_vulkan = false;
                        printf("Backend: OpenGL.\n");
                }
                else if(strcmp(argv[i], "-vulkan") == 0) {
@@ -78,6 +77,9 @@ int main(int argc, char **argv)
        glfwSetMouseButtonCallback(win, clbk_mouse);
        glfwSetWindowSizeCallback(win, clbk_reshape);
 
+       glfwGetWindowSize(win, &win_w, &win_h);
+       clbk_reshape(win, win_w, win_h);
+
        while(!glfwWindowShouldClose(win)) {
                display();
 
@@ -85,7 +87,8 @@ int main(int argc, char **argv)
                glfwPollEvents();
        }
 
-       atexit(cleanup);
+       cleanup();
+       // atexit(cleanup);
        return 0;
 }
 
@@ -105,18 +108,28 @@ static bool init()
        camera = new OrbitCamera;
        camera->set_orbit_params(phi, theta, dist);
 
-       if(!scene.load("data/spot/spot_control_mesh.obj")) {
+       scene = new Scene;
+       if(!scene->load("data/spot/spot.obj")) {
                fprintf(stderr, "Failed to load scene.\n");
                return false;
        }
 
+       rdefault = new Renderer;
+       rdefault->camera = camera;
+       rdefault->scene = scene;
+
+       if(!rdefault->create()) {
+               fprintf(stderr, "Failed to create default renderer.\n");
+               return false;
+       }
+
 // TODO delete: debugging
-       for(size_t i=0; i<scene.objects.size(); ++i) {
+       for(size_t i=0; i<scene->objects.size(); ++i) {
                printf("object: %d\n", (int)i);
-               printf("mesh: %s\n", scene.objects[i]->mesh->name.c_str());
-               printf("material: %s\n", scene.objects[i]->material->name.c_str());
+               printf("mesh: %s\n", scene->objects[i]->mesh->name.c_str());
+               printf("material: %s\n", scene->objects[i]->material->name.c_str());
                printf("transform:\n");
-               scene.objects[i]->transform.print();
+               scene->objects[i]->transform.print();
        }
        return true;
 }
@@ -125,6 +138,7 @@ static void cleanup()
 {
        delete sdr_man;
        delete camera;
+       delete rdefault;
 
        if(use_vulkan) {
                cleanup_vulkan();
@@ -142,37 +156,37 @@ static void clbk_key(GLFWwindow *win, int key, int scancode, int action, int mod
 }
 
 static double prev_x, prev_y;
-static int button;
+static bool button[8];
 
 static void clbk_motion(GLFWwindow *win, double x, double y)
 {
-       switch(button) {
-       case GLFW_MOUSE_BUTTON_LEFT:
-               theta += x - prev_x;
-               phi += y - prev_y;
+       double dx = x - prev_x;
+       double dy = y - prev_y;
+
+       prev_x = x;
+       prev_y = y;
+
+       if(button[0]) {
+               theta += dx;
+               phi += dy;
 
                if(phi < -90)
                        phi = -90;
                if(phi > 90)
                        phi = 90;
+       }
 
-               break;
-
-       case GLFW_MOUSE_BUTTON_RIGHT:
-               dist *= (y - prev_y) * 0.01 + 1;
+       if(button[1]) {
+               dist += dy;
                if(dist < 0.0) {
                        dist = 0.0;
                }
-               break;
        }
-
-       prev_x = x;
-       prev_y = y;
 }
 
 static void clbk_mouse(GLFWwindow *win, int bn, int action, int mods)
 {
-       button = bn;
+       button[bn] = action == GLFW_PRESS;
        glfwGetCursorPos(win, &prev_x, &prev_y);
 }
 
@@ -185,17 +199,15 @@ static void clbk_reshape(GLFWwindow *win, int width, int height)
        else {
                glViewport(0, 0, width, height);
                aspect = (float)width / (float)height;
-               mprojection = calc_projection_matrix(1000, 0.5, aspect, 45);
+               mprojection = calc_projection_matrix(45, aspect, 0.5, 1000.0);
        }
+
+       win_h = height;
+       win_w = width;
 }
 
 static void display()
 {
-       if(use_vulkan) {
-               display_vulkan();
-       }
-       else {
-               display_opengl();
-               scene.objects[0]->mesh->draw();
-       }
+       camera->set_orbit_params(phi, theta, dist);
+       rdefault->draw();
 }
\ No newline at end of file