merge

[raytracer.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 1199ec4f4143b52c05bb1d2628661cb4a42d799d..a291648e82de6da1029862dc26676b1c74ec4b3f 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -6,6 +6,7 @@
 #include "objects.h"
 #include "raytrace.h"
 #include "vector.h"
+#include "stl.h"
 SDL_Event event;
 rgb colorC(const color c) {
     rgb colors;
@@ -19,7 +20,6 @@ int threshold[2] = {30,10}; // corners sides
 inline bool checkT(rgb ca, rgb cb,int t){
     return ((abs(((int)ca.r)-((int)cb.r)) +abs(((int)ca.g)-((int)cb.g)) + abs(((int)ca.b)-((int)cb.b)) > t*3));
 }
-
 vec3 rotate(vec3 v, const vec3 k)
 {
     double cos_theta = cos(k.x);
@@ -38,12 +38,12 @@ vec3 rotate(vec3 v, const vec3 k)
     return v;
 }
 
-void render(const std::vector<Sphere> &spheres, const std::vector<Light> &lights,const Cam &cam) {
+void render(const Objects &spheres, const Lights &lights,const Cam &cam) {
     const float fov  = cam.fov;
-    frame framebuffer(SCREEN_HEIGHT,SCREEN_WIDTH);
-    #if antialias 
+    #if ANTIALIAS 
     rgb frame1[SCREEN_HEIGHT+2][SCREEN_WIDTH+2];
     #endif
+    frame framebuffer(SCREEN_HEIGHT,SCREEN_WIDTH);
 
     #pragma omp parallel for
     for (size_t j = 0; j<SCREEN_HEIGHT; j++) { // actual rendering loop
@@ -53,12 +53,12 @@ void render(const std::vector<Sphere> &spheres, const std::vector<Light> &lights
             double dir_z = -SCREEN_HEIGHT/(2.*tan(fov/2.));
             framebuffer[j][i] = colorC(cast_ray(cam.pos, rotate(vec3{dir_x, dir_y, dir_z},cam.dir).normalize(), spheres, lights));
             
-            #if antialias 
+            #if ANTIALIAS 
             frame1[j][i] = framebuffer[j][i];
             #endif
         }
     }
-    #if antialias 
+    #if ANTIALIAS 
     #pragma omp parallel for
     for (size_t j = 0; j<SCREEN_HEIGHT; j++) { // actual rendering loop
         for (size_t i = 0; i<SCREEN_WIDTH; i++) {
@@ -96,44 +96,63 @@ void render(const std::vector<Sphere> &spheres, const std::vector<Light> &lights
 
 void signal_hand(int signum) {
    std::cout << "Caught signal " << signum << std::endl;
+   #pragma omp flush // fix seg fault from open mp accesing sdl doesnt work though
    sdl_pixels_unlock();
    sdl_close(0);
 }
-
-int main() {
-    int winsizeX, winsizeY;
-    signal(SIGINT, signal_hand);
-       if( !sdl_init() )
-       {
-               printf( "Failed to initialize!\n" );
-        exit(-1);
-       }
-
+void create_objects(Objects& objects ,Lights& lights){
     const Material      ivory = {1.0, {0.6,  0.3, 0.1, 0.0}, {0.4, 0.4, 0.3},   50.};
     const Material      glass = {1.5, {0.0,  0.5, 0.1, 0.8}, {0.6, 0.7, 0.8},  125.};
     const Material red_rubber = {1.0, {0.9,  0.1, 0.0, 0.0}, {0.3, 0.1, 0.1},   10.};
-    const Material     mirror = {1.0, {0.0, 10.0, 0.8, 0.0}, {1.0, 1.0, 1.0}, 1425.};
+    const Material     mirror = {1.0, {0.0, 10.0, 0.8, 0.0}, {5.0, 1.0, 1.0}, 1425.};
+    const Material       wood = {1.0, {1.2,  0.1, 0.0, 0.0}, {0.2, 0.1, 0.02},    1.};
 
-    std::vector<Sphere> spheres = {
-        Sphere{vec3{-3,    0,   -16}, 2,      ivory},
+    objects ={{
+        /*Sphere{vec3{-3,    0,   -16}, 2,      ivory},
         Sphere{vec3{-1.0, -1.5, -12}, 2,      glass},
         Sphere{vec3{ 1.5, -0.5, -18}, 3, red_rubber},
-        Sphere{vec3{ 7,    5,   -18}, 4,     mirror}
+        Sphere{vec3{ 7,    5,   -18}, 4,     mirror},
+        Sphere{vec3{-3,    10,   -17}, 2,      wood}*/
+    },{
+        //Triangle{vec3{-3,    0,   -16},vec3{-3,    10,   -17},vec3{ 7,    5,   -18},red_rubber}
+    }
     };
 
-    std::vector<Light> lights = {
+    lights = {{
         {{-20, 20,  20}, {1.5,1,1}},
         {{ 30, 50, -25}, {1,1.8,1}},
         {{ 30, 20,  30}, {1,1,1.7}}
+    }
     };
 
+}
+
+int main(int argc, char*argv[]) {
+    signal(SIGINT, signal_hand);
+       if( !sdl_init() )
+       {
+               printf( "Failed to initialize!\n" );
+        exit(-1);
+       }
+
     Cam cam = {
-        {1,1,0},
-        {1,1,0},
+        {-1.8,12.2,16.8},
+        {-0.52,-0.30,0.},
         M_PI_2
     };
-
+    std::vector<STL_Triangle> triangles;
+    if(argc == 2)
+        triangles = parsestl(std::string(argv[1]));
+    int winsizeX, winsizeY;
+    Objects objects;
+    Lights lights;
+    create_objects(objects,lights);
     int xM = 0,yM = 0;
+
+    const Material      default_mat = {1.0, {0.9,  0.1, 0.0, 0.0}, {0.3, 0.1, 0.1},   10.};
+    for(STL_Triangle t: triangles){
+        objects.triangle.push_back(Triangle{vec3{t.a[0],t.a[2],t.a[1]},vec3{t.c[0],t.c[2],t.c[1]},vec3{t.b[0],t.b[2],t.b[1]},default_mat});
+    }
     while(1){
 
         SDL_PumpEvents();
@@ -164,7 +183,8 @@ int main() {
             cam.pos.y += MOVEMENT_SPEED;
         if(keystates[SDL_SCANCODE_LSHIFT])
             cam.pos.y -= MOVEMENT_SPEED;
-        render(spheres, lights,cam);
+        render(objects, lights,cam);
+        //SDL_Log("{%lf,%lf,%lf},{%lf,%lf,%lf}",cam.pos.x,cam.pos.y,cam.pos.z,cam.dir.x,cam.dir.y,cam.dir.z);
         sdl_frame();
     }
     sdl_free();