X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fscreen.cpp;h=ecc8c203af836c0510e92529d77f15fa7c8d319f;hp=712bd260982bd422a489747dcc0efbd9e4032017;hb=eff96d65bd1101083e04cb3ff2468b3feea3ff9e;hpb=eb7a30473a78452a890bd453f80d4a90aee5d364;ds=sidebyside diff --git a/src/screen.cpp b/src/screen.cpp index 712bd26..ecc8c20 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -2,6 +2,8 @@ #include "screen.h" #include "SDL_opengl.h" +#include // for access(2) +#include // for access(2) using namespace IPDF; using namespace std; @@ -19,11 +21,13 @@ Screen::Screen() m_gl_context = SDL_GL_CreateContext(m_window); - glClearColor(1.f,1.f,1.f,1.f); - glClear(GL_COLOR_BUFFER_BIT); + m_debug_font_atlas = 0; + + ResizeViewport(800, 600); + + Clear(); Present(); - ResizeViewport(800, 600); } @@ -34,6 +38,13 @@ Screen::~Screen() SDL_Quit(); } +void Screen::Clear(float r, float g, float b, float a) +{ + glClearColor(r,g,b,a); + glClear(GL_COLOR_BUFFER_BIT); + DebugFontClear(); +} + void Screen::ResizeViewport(int width, int height) { glViewport(0, 0, width, height); @@ -75,7 +86,7 @@ bool Screen::PumpEvents() m_last_mouse_y = evt.button.y; if (m_mouse_handler) { - m_mouse_handler(evt.button.x, evt.button.y, evt.button.state, 0); + m_mouse_handler(evt.button.x, evt.button.y, evt.button.state?evt.button.button:0, 0); } break; case SDL_MOUSEWHEEL: @@ -93,6 +104,7 @@ bool Screen::PumpEvents() filename[0] = (char)evt.key.keysym.sym; ScreenShot(filename); } + break; } default: break; @@ -120,6 +132,8 @@ void Screen::SetMouseCursor(Screen::MouseCursors cursor) void Screen::Present() { + if (m_debug_font_atlas) + DebugFontFlush(); SDL_GL_SwapWindow(m_window); } @@ -133,9 +147,16 @@ void Screen::ScreenShot(const char * filename) const if (pixels == NULL) Fatal("Failed to allocate %d x %d x 4 = %d pixel array", w, h, w*h*4); - glReadPixels(0,0,w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixels); + for (int y = 0; y < h; ++y) + { + glReadPixels(0,h-y-1,w, 1, GL_RGBA, GL_UNSIGNED_BYTE, &pixels[y*w*4]); + } - SDL_Surface * surf = SDL_CreateRGBSurfaceFrom(pixels, w, h, 8*4, w*4, 0,0,0,0); +#if SDL_BYTEORDER == SDL_LIL_ENDIAN + SDL_Surface * surf = SDL_CreateRGBSurfaceFrom(pixels, w, h, 8*4, w*4, 0x000000ff,0x0000ff00,0x00ff0000,0xff000000); +#else + SDL_Surface * surf = SDL_CreateRGBSurfaceFrom(pixels, w, h, 8*4, w*4, 0xff000000,0x00ff0000,0x0000ff00,0x000000ff); +#endif if (surf == NULL) Fatal("Failed to create SDL_Surface from pixel data - %s", SDL_GetError()); @@ -156,6 +177,11 @@ void Screen::ScreenShot(const char * filename) const */ void Screen::RenderBMP(const char * filename) const { + if (access(filename, R_OK) == -1) + { + Error("No such file \"%s\" - Nothing to render - You might have done this deliberately?", filename); + return; + } SDL_Surface * bmp = SDL_LoadBMP(filename); if (bmp == NULL) Fatal("Failed to load BMP from %s - %s", filename, SDL_GetError()); @@ -208,3 +234,128 @@ void Screen::RenderBMP(const char * filename) const glDisable(GL_TEXTURE_2D); SDL_FreeSurface(bmp); } + +void Screen::DebugFontInit(const char *name, float font_size) +{ + unsigned char font_atlas_data[1024*1024]; + FILE *font_file = fopen(name, "rb"); + fseek(font_file, 0, SEEK_END); + size_t font_file_size = ftell(font_file); + fseek(font_file, 0, SEEK_SET); + unsigned char *font_file_data = (unsigned char*)malloc(font_file_size); + fread(font_file_data, 1, font_file_size, font_file); + fclose(font_file); + stbtt_BakeFontBitmap(font_file_data,0, font_size, font_atlas_data,1024,1024, 32,96, m_debug_font_rects); + free(font_file_data); + glGenTextures(1, &m_debug_font_atlas); + glBindTexture(GL_TEXTURE_2D, m_debug_font_atlas); + glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, 1024,1024, 0, GL_ALPHA, GL_UNSIGNED_BYTE, font_atlas_data); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + m_debug_font_size = font_size; + + m_debug_font_vertices.SetUsage(GraphicsBuffer::BufferUsageStreamDraw); + m_debug_font_vertices.SetType(GraphicsBuffer::BufferTypeVertex); + m_debug_font_vertices.Upload(8192, nullptr); + m_debug_font_vertex_head = 0; +} + +void Screen::DebugFontClear() +{ + m_debug_font_x = m_debug_font_y = 0; + if (!m_debug_font_atlas) return; + DebugFontPrint("\n"); +} + +void Screen::DebugFontFlush() +{ + glBindFramebuffer(GL_FRAMEBUFFER, 0); + glMatrixMode(GL_PROJECTION); + glPushMatrix(); + glLoadIdentity(); + glOrtho(0,ViewportWidth(), ViewportHeight(), 0, -1, 1); + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); + glLoadIdentity(); + + glColor4f(0,0,0,1); + + + glEnable(GL_TEXTURE_2D); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBindTexture(GL_TEXTURE_2D, m_debug_font_atlas); + + m_debug_font_vertices.Bind(); + glEnableClientState(GL_VERTEX_ARRAY); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glVertexPointer(2, GL_FLOAT, 4*sizeof(float), (void*)(2*sizeof(float))); + glTexCoordPointer(2, GL_FLOAT, 4*sizeof(float), 0); + glDrawArrays(GL_QUADS, 0, m_debug_font_vertex_head/4); + glDisableClientState(GL_VERTEX_ARRAY); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + + glDisable(GL_BLEND); + glDisable(GL_TEXTURE_2D); + glPopMatrix(); + glMatrixMode(GL_PROJECTION); + glPopMatrix(); + + m_debug_font_vertex_head = 0; +} + +void Screen::DebugFontPrint(const char* str) +{ + if (!m_debug_font_atlas) return; + + float *vertexData = (float*)m_debug_font_vertices.MapRange(m_debug_font_vertex_head*sizeof(float), m_debug_font_vertices.GetSize() - m_debug_font_vertex_head*sizeof(float), false, true, true); + while (*str) { + if (m_debug_font_vertex_head*sizeof(float) + 16*sizeof(float) >= m_debug_font_vertices.GetSize() ) + { + m_debug_font_vertices.UnMap(); + DebugFontFlush(); + DebugFontPrint(str); + return; + } + if (*str >= 32 && *str < 128) { + stbtt_aligned_quad q; + stbtt_GetBakedQuad(m_debug_font_rects, 1024,1024, *str-32, &m_debug_font_x,&m_debug_font_y,&q,1); + *vertexData = q.s0; vertexData++; + *vertexData = q.t0; vertexData++; + *vertexData = q.x0; vertexData++; + *vertexData = q.y0; vertexData++; + *vertexData = q.s1; vertexData++; + *vertexData = q.t0; vertexData++; + *vertexData = q.x1; vertexData++; + *vertexData = q.y0; vertexData++; + *vertexData = q.s1; vertexData++; + *vertexData = q.t1; vertexData++; + *vertexData = q.x1; vertexData++; + *vertexData = q.y1; vertexData++; + *vertexData = q.s0; vertexData++; + *vertexData = q.t1; vertexData++; + *vertexData = q.x0; vertexData++; + *vertexData = q.y1; vertexData++; + + m_debug_font_vertex_head += 16; + + } + else if (*str == '\n') + { + m_debug_font_x = 0; + m_debug_font_y += m_debug_font_size; + } + ++str; + } + m_debug_font_vertices.UnMap(); + //DebugFontFlush(); +} + +void Screen::DebugFontPrintF(const char *fmt, ...) +{ + char buffer[BUFSIZ]; + va_list va; + va_start(va, fmt); + vsnprintf(buffer, BUFSIZ, fmt,va); + va_end(va); + DebugFontPrint(buffer); +}