Terrible hacky SolveCubic.

[ipdf/code.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index ee78f59..9e48967 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -78,11 +78,10 @@ void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view)
 }
 
 
-inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const Colour & c = Colour(0.f,0.f,0.f,1.f))
+inline void MainLoop(Document & doc, Screen & scr, View & view)
 {
        // order is important... segfaults occur when screen (which inits GL) is not constructed first -_-
-       Screen scr;
-       View view(doc,scr, bounds, c);
+
        scr.DebugFontInit("DejaVuSansMono.ttf");
        scr.SetMouseHandler(RatCatcher);
 
@@ -118,7 +117,7 @@ inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const
                total_real_time += real_frame; total_cpu_time += cpu_frame; total_gpu_time += gpu_frame;
                if (data_rate > 0 && total_real_time > data_rate*(data_points+1)) 
                {
-                       printf("%lu\t%f\t%f\t%f\t%f\t%f\t%f\n", (uint64_t)frames, total_real_time, total_cpu_time, total_gpu_time, real_frame, cpu_frame, gpu_frame);
+                       printf("%lu\t%f\t%f\t%f\t%f\t%f\t%f\n", (long unsigned int)frames, total_real_time, total_cpu_time, total_gpu_time, real_frame, cpu_frame, gpu_frame);
                        data_points++;
                }
                scr.DebugFontPrintF("Rendered frame %lu\n", (uint64_t)frames);