Add MPFRC++ mpreal type

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

diff --git a/src/main.h b/src/main.h
index cfc6909..3de819c 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -23,6 +23,7 @@ inline void OverlayBMP(Document & doc, const char * input, const char * output,
 }
 
 // It is the only way.
+// Dear god what have I done
 void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view)
 {
        static bool oldButtonDown = false;
@@ -52,7 +53,7 @@ void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view)
        }
        if (buttons)
        {
-               #if REAL >= REAL_RATIONAL
+               #if REAL == REAL_RATIONAL
                        view->Translate(Real(oldx, scr->ViewportWidth()) -Real(x,scr->ViewportWidth()), Real(oldy, scr->ViewportHeight()) - Real(y,scr->ViewportHeight()));
                #else                   
                        view->Translate(Real(oldx-x)/Real(scr->ViewportWidth()), Real(oldy-y)/Real(scr->ViewportHeight()));
@@ -68,7 +69,7 @@ void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view)
                
        if (wheel)
        {
-               #if REAL >= REAL_RATIONAL
+               #if REAL == REAL_RATIONAL
                        view->ScaleAroundPoint(Real(x,scr->ViewportWidth()), Real(y,scr->ViewportHeight()), Real(20-wheel, 20));
                #else
                        view->ScaleAroundPoint(Real(x)/Real(scr->ViewportWidth()),Real(y)/Real(scr->ViewportHeight()), Real(expf(-wheel/20.f)));
@@ -78,12 +79,11 @@ 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.DebugFontInit("fonts/DejaVuSansMono.ttf");
        scr.SetMouseHandler(RatCatcher);
 
        double total_cpu_time = 0;
@@ -95,7 +95,7 @@ inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const
        clock_gettime(CLOCK_MONOTONIC_RAW, &real_clock_start);
        real_clock_now = real_clock_start;
        double frames = 0;
-       double data_rate = 1; // period between data output to stdout (if <= 0 there will be no output)
+       double data_rate = 0; // period between data output to stdout (if <= 0 there will be no output)
        uint64_t data_points = 0;
        setbuf(stdout, NULL);
        while (scr.PumpEvents())