X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdebugscript.h;h=916425cc41df3bad59fb9aa5c124b2f96f9bb51c;hp=fd1a1959526918b91d6865ed7edbad1e6f1f4111;hb=6c0dfe752994312ee58d307b383948bfeb2d6e2e;hpb=ec45b44e3a44e12463c63ec09d63c648602ce866

diff --git a/src/debugscript.h b/src/debugscript.h
index fd1a195..916425c 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
@@ -41,28 +38,41 @@ private:
 		AT_PrintPerformance,
 		AT_RecordPerformance,
 		AT_DebugFont,
+		AT_ApproachBoundsZeno,
+		AT_ApproachBoundsLinear,
+		AT_SetBounds,
+		AT_QueryGPUBounds, // query bounds of Beziers when transformed to GPU
+		AT_ScreenShot, // take screenshot
+		AT_PrintSPF, // Print FPS statistics about the frames
+		AT_PrintBounds, // Print bounds
 		AT_Quit
 	};
 
 	struct Action
 	{
 		ActionType type;
-		Real x, y;
+		VReal x, y;
 		int ix, iy;
-		Real z;
+		VReal z;
 		int iz;
 		int loops;
+		VReal w, h;
 		std::string textargs;
 		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_spf_cpu_mean;
+	double m_spf_gpu_mean;
+	double m_spf_cpu_stddev;
+	double m_spf_gpu_stddev;
+	
 	struct PerformanceData
 	{
 		clock_t clock;
@@ -76,7 +86,7 @@ private:
 	void PrintPerformance(View * view, Screen * scr);
 	void ClearPerformance(View * view, Screen * scr);
 	
-	void ParseAction();
+	void ParseAction(View * view, Screen * scr);
 };
 
 }