X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=main.cc;fp=main.c;h=c9d39ba22d4d5918226adad9a021679e56b64128;hb=03be53bf14d0c2e1e3e19356376491945cdd78c8;hp=d0752d66a4e9632203993e5be639f7b824bd11be;hpb=bc662e293c854e1bdc9d46e9a410fe220247e6d4;p=chaz%2Frasterize

diff --git a/main.c b/main.cc
similarity index 82%
rename from main.c
rename to main.cc
index d0752d6..c9d39ba 100644
--- a/main.c
+++ b/main.cc
@@ -6,11 +6,11 @@
  */
 
 #define _POSIX_C_SOURCE 2
-#include <errno.h>
+#include <cerrno>
 #include <unistd.h>
 
-#include "raster.h"
-#include "scene.h"
+#include "raster.hh"
+#include "scene.hh"
 
 
 /*
@@ -54,30 +54,24 @@ static void draw(const char* filename)
     scene_t* scene;
     TRY_DO("Loading %s", load(&scene, filename), filename);
 
-#if OPENGL
-    scene_render_gl(scene);
-    scene_destroy(scene);
-#else
     raster_t* raster = scene_render(scene);
     scene_destroy(scene);
-    raster_printstats(raster);
 
-    char* u3d = mem_strdup(filename);
-    strcut(u3d, '.');
+    char* urt = mem_strdup(filename);
+    strcut(urt, '.');
 #if EXPORT_PPM
-    char* ppm = mem_strcat(u3d, ".ppm");
+    char* ppm = mem_strcat(urt, ".ppm");
     TRY_DO("Exporting to %s", raster_export_ppm(raster, ppm), ppm);
     mem_free(ppm);
 #endif
 #if EXPORT_BMP
-    char* bmp = mem_strcat(u3d, ".bmp");
+    char* bmp = mem_strcat(urt, ".bmp");
     TRY_DO("Exporting to %s", raster_export_bmp(raster, bmp), bmp);
     mem_free(bmp);
 #endif
 
-    mem_free(u3d);
+    mem_free(urt);
     raster_destroy(raster);
-#endif // OPENGL
 }
 
 /*
@@ -88,18 +82,12 @@ static void draw_from_stdin(const char* filename)
     scene_t* scene;
     TRY_DO("Loading from stdin", load_from_stdin(&scene));
 
-#if OPENGL
-    scene_render_gl(scene);
-    scene_destroy(scene);
-#else
     raster_t* raster = scene_render(scene);
     scene_destroy(scene);
-    raster_printstats(raster);
 
     TRY_DO("Exporting to %s", raster_export_bmp(raster, filename), filename);
 
     raster_destroy(raster);
-#endif // OPENGL
 }
 
 /*
@@ -118,7 +106,7 @@ int main(int argc, char* argv[])
     }
 
     if (out == 0 && argc <= 1) {
-        draw("scene.u3d");
+        draw("scene.urt");
     }
     else {
         for (int i = optind; i < argc; ++i) {