quick backup - everything is going to be changed on vulkan side.

[demo] / src / main.cc

diff --git a/src/main.cc b/src/main.cc
index cbe6ed6..6b1050b 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,4 +1,5 @@
 #include <GL/glew.h>
+#include <GLFW/glfw3.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -69,6 +70,7 @@ static MorphRenderer *cow_rend;
 static Terrain terrain;
 static TerrainParams p;
 static Texture *skybox_tex;
+static Texture *irradiance_tex;
 static Texture *terrain_tex;
 static Material terrain_mat;
 static Renderer *terrain_rend;
@@ -79,7 +81,7 @@ int main(int argc, char **argv)
 {
        Gfx_API api;
 
-       for(int i=0; i<argc; ++i) {
+       for(int i=1; i<argc; i++) {
                if(strcmp(argv[i], "-opengl") == 0) {
                        api = GFX_GL;
                        printf("Backend: OpenGL.\n");
@@ -99,6 +101,9 @@ int main(int argc, char **argv)
                return 1;
        }
 
+       //TODO
+       return 0;
+
        glfwSetKeyCallback(win, clbk_key);
        glfwSetCursorPosCallback(win, clbk_motion);
        glfwSetMouseButtonCallback(win, clbk_mouse);
@@ -115,7 +120,6 @@ int main(int argc, char **argv)
        }
 
        cleanup();
-       // atexit(cleanup);
        return 0;
 }
 
@@ -170,9 +174,12 @@ static bool init(Gfx_API api)
 
        skybox_tex = gfx_create_texture();
        skybox_tex->load("data/cubemap/cubemap.hdr");
-       //irr_tex->load("data/cubemap/irradiance.hdr");
        terrain_rend->set_sky_tex(skybox_tex);
 
+       irradiance_tex = gfx_create_texture();
+       irradiance_tex->load("data/cubemap/irradiance.hdr");
+       terrain_rend->set_diffuse_sky_tex(irradiance_tex);
+
        if(!terrain_rend->create()) {
                fprintf(stderr, "terrain fail\n");
                return false;
@@ -207,7 +214,7 @@ static bool init(Gfx_API api)
                Object *cow = new Object;
                *cow = *cow0;
 
-               if (!gen_poisson(cow_pos, cow_gap, disk_radius))
+               if(!gen_poisson(cow_pos, cow_gap, disk_radius))
                        goto cowgen_end;
                Vec2 pos = cow_pos.back();
                float y = terrain.get_height(Vec3(pos.x, 1, pos.y));
@@ -230,8 +237,11 @@ static void cleanup()
        delete cow_scene;
        delete cow_rend;
 
+       delete skybox_tex;
+       delete irradiance_tex;
        delete terrain_tex;
        delete terrain_rend;
+
        gfx_cleanup();
 }
 
@@ -298,7 +308,7 @@ static void clbk_motion(GLFWwindow *win, double x, double y)
                        cam_dist = 0.0;
                }
        }
- }
+}
 
 static void clbk_mouse(GLFWwindow *win, int bn, int action, int mods)
 {
@@ -357,8 +367,7 @@ static void display()
 static bool gen_poisson(std::vector<Vec2> &points, float min_dist, float radius)
 {
        /* poisson radius */
-       for (int i = 0; i < 1000; i++)
-       {
+       for(int i = 0; i < 1000; i++) {
                float angle = (float)rand() / (float)RAND_MAX * 2 * M_PI;
                float r = sqrt((float)rand() / (float)RAND_MAX) * radius;
 
@@ -366,7 +375,7 @@ static bool gen_poisson(std::vector<Vec2> &points, float min_dist, float radius)
                p.x = cos(angle) * r;
                p.y = sin(angle) * r;
 
-               bool valid = true; 
+               bool valid = true;
                for(size_t j=0; j<points.size(); j++) {
                        if(length_sq(points[j] - p) < min_dist * min_dist) {
                                valid = false;