Fix debugscript, some quadtree stuff and don't intersect vertical/horz lines when...

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

diff --git a/src/main.h b/src/main.h
index 5015044..d7945e6 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -77,15 +77,25 @@ void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view)
 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", 12);
+       //scr.DebugFontInit("fonts/DejaVuSansMono.ttf", 18);
        scr.SetMouseHandler(RatCatcher);
 
-       if (script_filename)
+       ifstream tmp;
+       istream * script_input = NULL;
+       if (script_filename != NULL)
        {
-               script.Load(script_filename);
+               if (strcmp(script_filename, "stdin") == 0)
+                       script_input = &cin;
+               else
+               {
+                       tmp.open(script_filename);
+                       script_input = &tmp;
+               }
        }
+       DebugScript script(script_input);
 
        double total_cpu_time = 0;
        double total_gpu_time = 0;
@@ -143,20 +153,26 @@ void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
                        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)));
+
+               
+
+               scr.DebugFontPrintF("Top Left: (%s,%s)\n", Str(view.GetBounds().x).c_str(),Str(view.GetBounds().y).c_str());
+               scr.DebugFontPrintF("Width: %s\n", Str(view.GetBounds().w).c_str());
+               scr.DebugFontPrintF("Zoom: %s %%\n", Str(VReal(100)/VReal(view.GetBounds().w)).c_str());
+               //scr.DebugFontPrintF("Similar size: %s\n", HumanScale(view.GetBounds().w * VReal(22e-3)));
                
-               #if 0
+               #if 1
                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)
+               /*if (cpu_frame > 0 && total_cpu_time > 0)
                        scr.DebugFontPrintF("[CPU] Render took %lf ms (%lf FPS) (total %lf s, avg FPS %lf)\n", cpu_frame*1e3, 1.0/cpu_frame, total_cpu_time,frames/total_cpu_time);
                if (gpu_frame > 0 && total_gpu_time > 0)
                        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);
+                       */
                if (real_frame > 0 && total_real_time > 0)
-                       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("[REALTIME] Render 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("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");