X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdebugscript.h;h=0625535db2532d6aa2412621172f73008919ec71;hp=9e85b51d9098758f72ce3e686c150f44c79b0f5c;hb=a8297c3461718f2d9afc7a2f8ca620d320ac5f97;hpb=180d764223a3568f734434a15d56f18e9ddc012b

diff --git a/src/debugscript.h b/src/debugscript.h
index 9e85b51..0625535 100644
--- a/src/debugscript.h
+++ b/src/debugscript.h
@@ -13,12 +13,9 @@ namespace IPDF
 class DebugScript
 {
 public:
-	DebugScript() : inp(), currentAction(), m_actions(), m_labels(), m_index(0) {}
+	DebugScript(std::istream * in) : m_input(in), currentAction(), m_actions(), m_labels(), m_index(0) {}
 	virtual ~DebugScript() {}
-	void Load(const char *filename)
-	{
-		inp.open(filename);
-	}
+
 	bool Execute(View *view, Screen *scr);
 private:
 	enum ActionType
@@ -46,6 +43,8 @@ private:
 		AT_SetBounds,
 		AT_QueryGPUBounds, // query bounds of Beziers when transformed to GPU
 		AT_ScreenShot, // take screenshot
+		AT_PrintFPS, // Print FPS statistics about the frames
+		AT_PrintBounds, // Print bounds
 		AT_Quit
 	};
 
@@ -62,13 +61,18 @@ private:
 		Action() : type(AT_WaitFrame), x(0), y(0), ix(0), iy(0), z(0), loops(0), textargs("") {}
 	};
 
-	std::ifstream inp;
+	std::istream * m_input;
 
 	Action currentAction;
 	std::vector<Action> m_actions;
 	std::map<std::string, int> m_labels;
 	unsigned m_index;
 	
+	double m_fps_cpu_mean;
+	double m_fps_gpu_mean;
+	double m_fps_cpu_stddev;
+	double m_fps_gpu_stddev;
+	
 	struct PerformanceData
 	{
 		clock_t clock;