X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fscreen.h;h=6b52a094730c06e6f089efe1e5244554095a2d37;hp=e6418265b522bdf2a8dcdb51cf529c52158d4bab;hb=0ce8df17fae3ec986bd9570e5552aed92c080088;hpb=67fb91aae1fc5315f462d6b5818806f154e9e687

diff --git a/src/screen.h b/src/screen.h
index e641826..6b52a09 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -1,12 +1,17 @@
 #ifndef _SCREEN_H
 #define _SCREEN_H
 
-#include <SDL.h>
+#include "SDL.h"
 
 #include <functional>
 
+#include "stb_truetype.h"
+#include "graphicsbuffer.h"
+#include "shaderprogram.h"
+
 namespace IPDF
 {
+	class View;
 	/*
 	 * The "Screen" class handles managing the OS window (using SDL2).
 	 */
@@ -20,6 +25,9 @@ namespace IPDF
 		// Returns 'false' if the program should quit.
 		bool PumpEvents();
 
+		// Clears the screen to a given colour.
+		void Clear(float r=1.0, float g=1.0, float b=1.0, float a=1.0);
+
 		// Finishes rendering a frame, and presents it on the screen.
 		void Present();
 
@@ -27,8 +35,14 @@ namespace IPDF
 		int ViewportWidth() const { return m_viewport_width; }
 		int ViewportHeight() const { return m_viewport_height; }
 		
+		// Debug Font handling
+		void DebugFontInit(const char *font_name, float font_size = 12);
+		void DebugFontClear();
+		void DebugFontPrint(const char *str);
+		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;
@@ -46,17 +60,50 @@ 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;
+		
+		void RequestQuit() {m_no_quit_requested = false;}
+		bool QuitRequested() const {return !m_no_quit_requested;}
 	private:
 		void ResizeViewport(int width, int height);
+		void DebugFontFlush();
 		
 		MouseHandler m_mouse_handler;
 		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];
+		unsigned int m_debug_font_atlas;
+		float m_debug_font_x;
+		float m_debug_font_y;
+		float m_debug_font_size;
+		GraphicsBuffer m_debug_font_vertices;
+		GraphicsBuffer m_debug_font_indices;
+		int m_debug_font_vertex_head;
+		int m_debug_font_index_head;
+		View * m_view;
+		bool m_no_quit_requested;
 	};
 
 }