X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.h;h=92bf0964877a71877e85cec489bdd1c390f47a3b;hp=43b8c5192f2d45b6053ae5eac1ab6c23055ac208;hb=ea748154f1bc7dbc81cb52611a52865e63109439;hpb=ea4829e265bd45b9c1b8556463d10ee1e082c6ce diff --git a/src/main.h b/src/main.h index 43b8c51..92bf096 100644 --- a/src/main.h +++ b/src/main.h @@ -53,11 +53,7 @@ void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view) } if (buttons) { - #if REALTYPE == 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())); - #endif + view->Translate(Real(oldx-x)/Real(scr->ViewportWidth()), Real(oldy-y)/Real(scr->ViewportHeight())); } else { @@ -69,12 +65,7 @@ void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view) if (wheel) { - #if REALTYPE == 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))); - #endif - + view->ScaleAroundPoint(Real(x)/Real(scr->ViewportWidth()),Real(y)/Real(scr->ViewportHeight()), Real(expf(-wheel/20.f))); } } @@ -129,9 +120,9 @@ inline void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = scr.DebugFontPrintF("[REALTIME] Render+Present+Cruft took %lf ms (%lf FPS) (total %lf s, avg FPS %lf)\n", real_frame*1e3, 1.0/real_frame, total_real_time,frames/total_real_time); scr.DebugFontPrintF("View bounds: %s\n", view.GetBounds().Str().c_str()); scr.DebugFontPrintF("type of Real == %s\n", g_real_name[REALTYPE]); - #if REALTYPE == REAL_MPFRCPP - scr.DebugFontPrintf("Precision: %s\nRounding: %s\n"); - #endif + //#if REALTYPE == REAL_MPFRCPP + // scr.DebugFontPrintf("Precision: %s\nRounding: %s\n"); + //#endif if (view.UsingGPUTransform()) {