X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fscreen.h;h=85b3c27ba36799364d558b89e46ac49ea28ea189;hp=d918dd1afc2a9fd0b604b46468939d1e4c247c7f;hb=208cee1f6967db42329a3e665401ef51b3f6d9ff;hpb=a851cf197844a2eb15fd5ee2c350ee296e415dca

diff --git a/src/screen.h b/src/screen.h
index d918dd1..85b3c27 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -1,7 +1,7 @@
 #ifndef _SCREEN_H
 #define _SCREEN_H
 
-#include <SDL.h>
+#include "SDL.h"
 
 #include <functional>
 
@@ -11,6 +11,7 @@
 
 namespace IPDF
 {
+	class View;
 	/*
 	 * The "Screen" class handles managing the OS window (using SDL2).
 	 */
@@ -41,7 +42,7 @@ namespace IPDF
 		void DebugFontPrintF(const char *fmt, ...);
 		
 		// Handle mouse input.
-		typedef std::function<void(int x, int y, int button, int wheel)> MouseHandler;
+		typedef void(*MouseHandler)(int x, int y, int button, int wheel, Screen * scr, View * view);
 		void SetMouseHandler(MouseHandler handler)
 		{
 			m_mouse_handler = handler;
@@ -59,6 +60,15 @@ namespace IPDF
 
 		void ScreenShot(const char * filename) const;
 		void RenderBMP(const char * filename) const;
+		void RenderPixels(int x, int y, int w, int h, uint8_t * pixels) const;
+
+
+		void SetView(View * new_view) {m_view = new_view;}
+
+		// Returns the CPU time (in seconds) it took to render the last completed frame.
+		double GetLastFrameTimeCPU() const { return m_last_frame_time / SDL_GetPerformanceFrequency(); }
+		// Returns the GPU time (in seconds) it took to render the last completed frame.
+		double GetLastFrameTimeGPU() const;
 	private:
 		void ResizeViewport(int width, int height);
 		void DebugFontFlush();
@@ -67,11 +77,17 @@ namespace IPDF
 		int m_last_mouse_x;
 		int m_last_mouse_y;
 
+		double m_last_frame_time;
+		double m_frame_begin_time;
+		GLuint m_frame_gpu_timer;
+		GLuint m_last_frame_gpu_timer;
+
 		int m_viewport_width;
 		int m_viewport_height;
 		SDL_Window *m_window;
 		SDL_GLContext m_gl_context;
 		ShaderProgram m_texture_prog;
+		ShaderProgram m_font_prog;
 		GLint m_colour_uniform_location;
 		GraphicsBuffer m_viewport_ubo;
 		stbtt_bakedchar m_debug_font_rects[96];
@@ -83,6 +99,7 @@ namespace IPDF
 		GraphicsBuffer m_debug_font_indices;
 		int m_debug_font_vertex_head;
 		int m_debug_font_index_head;
+		View * m_view;
 	};
 
 }