Quadtree addition to root node now functions (w/out Qt)

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

diff --git a/src/main.h b/src/main.h
index b0c7a47..5015044 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -74,12 +74,12 @@ void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view)
 }
 
 
-inline void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
+void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
 {
        // order is important... segfaults occur when screen (which inits GL) is not constructed first -_-
        DebugScript script;
 
-       scr.DebugFontInit("fonts/DejaVuSansMono.ttf");
+       scr.DebugFontInit("fonts/DejaVuSansMono.ttf", 12);
        scr.SetMouseHandler(RatCatcher);
 
        if (script_filename)
@@ -90,11 +90,17 @@ inline void MainLoop(Document & doc, Screen & scr, View & view, int max_frames =
        double total_cpu_time = 0;
        double total_gpu_time = 0;
        double total_real_time = 0;
+
+       // MINGW doesn't support a lot of ctime stuff here
+       #ifndef __MINGW32__     
        struct timespec real_clock_start;
        struct timespec real_clock_now;
        struct timespec real_clock_prev;
        clock_gettime(CLOCK_MONOTONIC_RAW, &real_clock_start);
        real_clock_now = real_clock_start;
+       #endif
+
+
        double frames = 0;
        double data_rate = 0; // period between data output to stdout (if <= 0 there will be no output)
        uint64_t data_points = 0;
@@ -102,7 +108,9 @@ inline void MainLoop(Document & doc, Screen & scr, View & view, int max_frames =
        int frame_number = 0;
        while (scr.PumpEvents() && (max_frames < 0 || frame_number++ < max_frames))
        {
+               #ifndef __MINGW32__
                real_clock_prev = real_clock_now;
+               #endif
                ++frames;
                scr.Clear();
                //view.ForceBoundsDirty();
@@ -119,16 +127,26 @@ inline void MainLoop(Document & doc, Screen & scr, View & view, int max_frames =
 
                double cpu_frame = scr.GetLastFrameTimeCPU();
                double gpu_frame = scr.GetLastFrameTimeGPU();
+               total_cpu_time += cpu_frame; total_gpu_time += gpu_frame;
+               
+               #ifndef __MINGW32__
                clock_gettime(CLOCK_MONOTONIC_RAW, &real_clock_now);
                double real_frame = (real_clock_now.tv_sec - real_clock_prev.tv_sec) + 1e-9*(real_clock_now.tv_nsec - real_clock_prev.tv_nsec);
-
-
-               total_real_time += real_frame; total_cpu_time += cpu_frame; total_gpu_time += gpu_frame;
+               #else
+               double real_frame = cpu_frame;
+               #endif
+               
+               total_real_time += real_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", (long unsigned int)frames, total_real_time, total_cpu_time, total_gpu_time, real_frame, cpu_frame, gpu_frame);
                        data_points++;
                }
+               
+               scr.DebugFontPrintF("View Width = %s m\n", Str(view.GetBounds().w * VReal(22e-3)).c_str());
+               scr.DebugFontPrintF("Similar size: %s\n", HumanScale(view.GetBounds().w * VReal(22e-3)));
+               
+               #if 0
                scr.DebugFontPrintF("Rendered frame %lu\n", (uint64_t)frames);
                scr.DebugFontPrintF("Lazy Rendering = %d\n", view.UsingLazyRendering());
                if (cpu_frame > 0 && total_cpu_time > 0)
@@ -170,6 +188,8 @@ inline void MainLoop(Document & doc, Screen & scr, View & view, int max_frames =
                {
                        scr.DebugFontPrint("Doing rendering using CPU.\n");
                }
+               #endif // 0
+               
                scr.Present();
        }
 }