X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.h;h=43d195f2eb8a04f90277206d8172129e8595a358;hp=0d181c5978f0a3887621b48ab89734b2f4f46fb1;hb=8c88a35a1fb0dfc9e542bb1a1c13c5f3e36eb3e5;hpb=d3e941df79b54b698a5b8a1d4763346c4d6eb3d7 diff --git a/src/main.h b/src/main.h index 0d181c5..43d195f 100644 --- a/src/main.h +++ b/src/main.h @@ -28,7 +28,7 @@ inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const Screen scr; View view(doc,scr, bounds, c); scr.DebugFontInit("DejaVuSansMono.ttf"); - scr.SetMouseHandler([&](int x, int y, int buttons, int wheel) // [?] wtf + scr.SetMouseHandler([&](int x, int y, int buttons, int wheel) // [?] seriously WTF { static bool oldButtonDown = false; static int oldx, oldy; @@ -57,7 +57,11 @@ inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const } if (buttons) { - view.Translate(Real(oldx-x)/Real(scr.ViewportWidth()), Real(oldy-y)/Real(scr.ViewportHeight())); + #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())); + #endif } else { @@ -69,7 +73,12 @@ inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const if (wheel) { - view.ScaleAroundPoint(Real(x)/Real(scr.ViewportWidth()),Real(y)/Real(scr.ViewportHeight()), expf(-wheel/20.f)); + #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))); + #endif + } } ); @@ -114,6 +123,7 @@ inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const scr.DebugFontPrintF("[GPU] Render took %lf ms (%lf FPS) (total %lf s, avg FPS %lf)\n", gpu_frame*1e3, 1.0/gpu_frame, total_gpu_time, frames/total_gpu_time); 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[REAL]); if (view.UsingGPUTransform()) {