David's final changes: more profiler features, fixes.

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

diff --git a/src/main.h b/src/main.h
index d7945e6..2ead6f6 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -4,6 +4,7 @@
 #include "view.h"
 #include "screen.h"
 #include "debugscript.h"
+#include "profiler.h"
 #include <unistd.h>
 
 
@@ -12,6 +13,8 @@ using namespace IPDF;
 
 
 extern const char *script_filename;
+extern bool make_movie; // whyyy
+extern const char * program_name;
 
 inline void OverlayBMP(Document & doc, const char * input, const char * output, const Rect & bounds = Rect(0,0,1,1), const Colour & c = Colour(0.f,0.f,0.f,1.f))
 {
@@ -69,7 +72,7 @@ void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view)
                
        if (wheel)
        {
-               view->ScaleAroundPoint(Real(x)/Real(scr->ViewportWidth()),Real(y)/Real(scr->ViewportHeight()), Real(expf(-wheel/20.f)));
+               view->ScaleAroundPoint(Real(x)/Real(scr->ViewportWidth()),Real(y)/Real(scr->ViewportHeight()), exp(Real(-wheel)/Real(20)));
        }
 }
 
@@ -79,8 +82,8 @@ 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 -_-
        
 
-       scr.DebugFontInit("fonts/DejaVuSansMono.ttf", 12);
-       //scr.DebugFontInit("fonts/DejaVuSansMono.ttf", 18);
+       //scr.DebugFontInit("fonts/DejaVuSansMono.ttf", 12);
+       scr.DebugFontInit("fonts/DejaVuSansMono.ttf", 36);
        scr.SetMouseHandler(RatCatcher);
 
        ifstream tmp;
@@ -122,7 +125,10 @@ void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
                real_clock_prev = real_clock_now;
                #endif
                ++frames;
+               g_profiler.BeginZone("MainLoop");
+               g_profiler.BeginZone("scr.Clear()");
                scr.Clear();
+               g_profiler.EndZone();
                //view.ForceBoundsDirty();
                //view.ForceBufferDirty();
                //view.ForceRenderDirty();
@@ -133,7 +139,9 @@ void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
                                return;
                }
 
+               g_profiler.BeginZone("view.Render");
                view.Render(scr.ViewportWidth(), scr.ViewportHeight());
+               g_profiler.EndZone();
 
                double cpu_frame = scr.GetLastFrameTimeCPU();
                double gpu_frame = scr.GetLastFrameTimeGPU();
@@ -155,20 +163,22 @@ void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
                
 
                
-
+               scr.DebugFontPrintF("%s\n", program_name);
                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)));
+               Real zoom(100);
+               zoom = zoom/Real(view.GetBounds().w);
+               scr.DebugFontPrintF("Zoom: %s %%\n", Str(zoom).c_str());
+               scr.DebugFontPrintF("Similar size: %s\n", HumanScale(ClampFloat(Double(view.GetBounds().w))));
                
-               #if 1
+               #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)
+               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 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);
 
@@ -205,7 +215,23 @@ void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
                        scr.DebugFontPrint("Doing rendering using CPU.\n");
                }
                #endif // 0
-               
+
+               if (make_movie)
+               {
+                       std::stringstream s;
+                       s << "frame" << frames << ".bmp";
+                       scr.ScreenShot(s.str().c_str());
+               }       
+
+       
+
+               g_profiler.BeginZone("scr.Present()");
                scr.Present();
+               g_profiler.EndZone();
+               g_profiler.EndZone();
+               g_profiler.AddCounter("Total Objects", doc.ObjectCount());
+               g_profiler.EndFrame();
+               
+               
        }
 }