GLint texture_uniform_location = m_texture_prog.GetUniformLocation("tex");
glUniform1i(texture_uniform_location, 0);
- m_colour_uniform_location = m_texture_prog.GetUniformLocation("colour");
+ m_font_prog.InitialiseShaders(BASICTEX_VERT, "shaders/fonttex_frag.glsl");
+ m_font_prog.Use();
+
+ // We always want to use the texture bound to texture unit 0.
+ GLint font_texture_uniform_location = m_font_prog.GetUniformLocation("tex");
+ glUniform1i(font_texture_uniform_location, 0);
+ m_colour_uniform_location = m_font_prog.GetUniformLocation("colour");
m_viewport_ubo.SetUsage(GraphicsBuffer::BufferUsageDynamicDraw);
m_viewport_ubo.SetType(GraphicsBuffer::BufferTypeUniform);
m_debug_font_atlas = 0;
+ m_view = NULL;
ResizeViewport(800, 600);
Clear();
m_last_mouse_y = evt.motion.y;
if (m_mouse_handler)
{
- m_mouse_handler(evt.motion.x, evt.motion.y,evt.motion.state, 0);
+ m_mouse_handler(evt.motion.x, evt.motion.y,evt.motion.state, 0, this, m_view);
}
break;
case SDL_MOUSEBUTTONDOWN:
m_last_mouse_y = evt.button.y;
if (m_mouse_handler)
{
- m_mouse_handler(evt.button.x, evt.button.y, evt.button.state?evt.button.button:0, 0);
+ m_mouse_handler(evt.button.x, evt.button.y, evt.button.state?evt.button.button:0, 0, this, m_view);
}
break;
case SDL_MOUSEWHEEL:
if (m_mouse_handler)
{
- m_mouse_handler(m_last_mouse_x, m_last_mouse_y, 0, evt.wheel.y);
+ m_mouse_handler(m_last_mouse_x, m_last_mouse_y, 0, evt.wheel.y, this, m_view);
}
break;
case SDL_KEYDOWN:
GLfloat quad[] = {
0, 0, (float)x, (float)y,
1, 0, (float)(x+w), (float)y,
- 1, 1, (float)(x+w), (float)(y+h),
- 0, 1, (float)x, (float)(y+h)
+ 0, 1, (float)x, (float)(y+h),
+ 1, 1, (float)(x+w), (float)(y+h)
};
quad_vertex_buffer.Upload(sizeof(GLfloat) * 16, quad);
quad_vertex_buffer.Bind();
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
- glTexImage2D(GL_TEXTURE_2D, 0, 4, w, h, 0, texture_format, GL_UNSIGNED_BYTE, pixels);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, texture_format, GL_UNSIGNED_BYTE, pixels);
glEnableVertexAttribArray(0);
glEnableVertexAttribArray(1);
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4*sizeof(float), (void*)(2*sizeof(float)));
glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4*sizeof(float), 0);
+ glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
glDisableVertexAttribArray(1);
glDisableVertexAttribArray(0);
- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
}
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);
+ SDL_assert(fread(font_file_data, 1, font_file_size, font_file) == font_file_size);
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);
m_debug_font_vertices.SetUsage(GraphicsBuffer::BufferUsageStreamDraw);
m_debug_font_vertices.SetType(GraphicsBuffer::BufferTypeVertex);
- m_debug_font_vertices.Upload(8192, nullptr);
+ m_debug_font_vertices.Upload(8192,NULL);
m_debug_font_vertex_head = 0;
m_debug_font_indices.SetUsage(GraphicsBuffer::BufferUsageStreamDraw);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBindTexture(GL_TEXTURE_2D, m_debug_font_atlas);
- m_texture_prog.Use();
+ m_font_prog.Use();
m_viewport_ubo.Bind();
m_debug_font_vertices.Bind();
m_debug_font_indices.Bind();
m_debug_font_index_head = 0;
}
+struct fontvertex
+{
+ float x, y, s, t;
+};
+
void Screen::DebugFontPrint(const char* str)
{
if (!m_debug_font_atlas) return;
- struct fontvertex
- {
- float x, y, s, t;
- };
BufferBuilder<fontvertex> vertexData(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), m_debug_font_vertices.GetSize() - m_debug_font_vertex_head*sizeof(float));
BufferBuilder<uint16_t> indexData(m_debug_font_indices.MapRange(m_debug_font_index_head*sizeof(uint16_t), m_debug_font_indices.GetSize() - m_debug_font_index_head*sizeof(uint16_t), false, true, true), m_debug_font_indices.GetSize() - m_debug_font_index_head*sizeof(uint16_t));