Merge branch 'master' of git.ucc.asn.au:/ipdf/code

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

diff --git a/src/screen.h b/src/screen.h
index 66590e7..aed042d 100644 (file)
--- a/src/screen.h
+++ b/src/screen.h
@@ -1,14 +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).
         */
@@ -39,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;
@@ -57,22 +60,54 @@ 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;}
+               
+               void ShowDebugFont(bool show = true) {m_show_debug_font = show;}
+               bool DebugFontShown() const {return m_show_debug_font;}
        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;
+               bool m_show_debug_font;
        };
 
 }