Make OpenGLTextTexture moveable so that it doesn't need to be in a shared_ptr
This commit is contained in:
Thomas Goyne
parent
0b133de08f
commit
6e153ed7d9
2 changed files with 166 additions and 183 deletions
|
|
@ -34,13 +34,14 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include "gl_text.h"
|
||||
|
||||
#include <wx/bitmap.h>
|
||||
#include <wx/dcmemory.h>
|
||||
#include <wx/image.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <boost/noncopyable.hpp>
|
||||
|
||||
#include "gl_text.h"
|
||||
#include "utils.h"
|
||||
|
||||
#ifdef HAVE_OPENGL_GL_H
|
||||
|
|
@ -49,6 +50,7 @@
|
|||
#include <GL/gl.h>
|
||||
#endif
|
||||
|
||||
namespace {
|
||||
/// @class OpenGLTextGlyph
|
||||
/// @brief Struct storing the information needed to draw a glyph
|
||||
struct OpenGLTextGlyph {
|
||||
|
|
@ -62,14 +64,54 @@ struct OpenGLTextGlyph {
|
|||
int h; ///< Height of the glyph in pixels
|
||||
wxFont font; ///< Font used for this glyph
|
||||
|
||||
OpenGLTextGlyph(int value, wxFont const& font);
|
||||
void Draw(float x, float y) const;
|
||||
OpenGLTextGlyph(int value, wxFont const& font)
|
||||
: str(wxChar(value))
|
||||
, tex(0)
|
||||
, x1(0)
|
||||
, x2(0)
|
||||
, y1(0)
|
||||
, y2(0)
|
||||
, font(font)
|
||||
{
|
||||
wxCoord desc,lead;
|
||||
|
||||
wxBitmap tempBmp(32, 32, 24);
|
||||
wxMemoryDC dc(tempBmp);
|
||||
dc.SetFont(font);
|
||||
dc.GetTextExtent(str, &w, &h, &desc, &lead);
|
||||
}
|
||||
|
||||
void Draw(float x, float y) const {
|
||||
glBindTexture(GL_TEXTURE_2D, tex);
|
||||
glEnableClientState(GL_VERTEX_ARRAY);
|
||||
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
|
||||
|
||||
float tex_coords[] = {
|
||||
x1, y1,
|
||||
x1, y2,
|
||||
x2, y2,
|
||||
x2, y1
|
||||
};
|
||||
|
||||
float vert_coords[] = {
|
||||
x, y,
|
||||
x, y + h,
|
||||
x + w, y + h,
|
||||
x + w, y
|
||||
};
|
||||
|
||||
glVertexPointer(2, GL_FLOAT, 0, vert_coords);
|
||||
glTexCoordPointer(2, GL_FLOAT, 0, tex_coords);
|
||||
glDrawArrays(GL_QUADS, 0, 4);
|
||||
|
||||
glDisableClientState(GL_VERTEX_ARRAY);
|
||||
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
|
||||
}
|
||||
};
|
||||
|
||||
/// @class OpenGLTextTexture
|
||||
/// @brief OpenGL texture which stores one or more glyphs as sprites
|
||||
class OpenGLTextTexture {
|
||||
class OpenGLTextTexture : boost::noncopyable {
|
||||
int x; ///< Next x coordinate at which a glyph can be inserted
|
||||
int y; ///< Next y coordinate at which a glyph can be inserted
|
||||
int nextY; ///< Y coordinate of the next line; tracked due to that lines
|
||||
|
|
@ -79,18 +121,110 @@ class OpenGLTextTexture {
|
|||
GLuint tex; ///< The texture
|
||||
|
||||
/// Insert the glyph into this texture at the current coordinates
|
||||
void Insert(OpenGLTextGlyph &glyph);
|
||||
void Insert(OpenGLTextGlyph &glyph) {
|
||||
int w = glyph.w;
|
||||
int h = glyph.h;
|
||||
|
||||
// Fill glyph structure
|
||||
glyph.x1 = float(x)/width;
|
||||
glyph.y1 = float(y)/height;
|
||||
glyph.x2 = float(x+w)/width;
|
||||
glyph.y2 = float(y+h)/height;
|
||||
glyph.tex = tex;
|
||||
|
||||
// Create bitmap and bind it to a DC
|
||||
wxBitmap bmp(w + (w & 1), h + (h & 1), 24);
|
||||
wxMemoryDC dc(bmp);
|
||||
|
||||
// Draw text and convert to image
|
||||
dc.SetBackground(*wxBLACK_BRUSH);
|
||||
dc.Clear();
|
||||
dc.SetFont(glyph.font);
|
||||
dc.SetTextForeground(*wxWHITE);
|
||||
dc.DrawText(glyph.str, 0, 0);
|
||||
|
||||
// Convert RGB24 to Luminance + Alpha by using an arbitrary channel as A
|
||||
wxImage img = bmp.ConvertToImage();
|
||||
int imgw = img.GetWidth();
|
||||
int imgh = img.GetHeight();
|
||||
std::vector<unsigned char> alpha(imgw * imgh * 2, 255);
|
||||
const unsigned char *read = img.GetData();
|
||||
for (size_t write = 1; write < alpha.size(); write += 2, read += 3)
|
||||
alpha[write] = *read;
|
||||
|
||||
// Upload image to video memory
|
||||
glBindTexture(GL_TEXTURE_2D, tex);
|
||||
glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, imgw, imgh, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, &alpha[0]);
|
||||
if (glGetError()) throw "Internal OpenGL text renderer error: Error uploading glyph data to video memory.";
|
||||
}
|
||||
|
||||
public:
|
||||
OpenGLTextTexture(OpenGLTextGlyph &glyph)
|
||||
: x(0)
|
||||
, y(0)
|
||||
, nextY(0)
|
||||
, width(std::max(SmallestPowerOf2(glyph.w), 64))
|
||||
, height(std::max(SmallestPowerOf2(glyph.h), 64))
|
||||
, tex(0)
|
||||
{
|
||||
width = height = std::max(width, height);
|
||||
|
||||
// Generate and bind
|
||||
glGenTextures(1, &tex);
|
||||
glBindTexture(GL_TEXTURE_2D, tex);
|
||||
|
||||
// Texture parameters
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
|
||||
|
||||
// Allocate texture
|
||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, nullptr);
|
||||
if (glGetError()) throw "Internal OpenGL text renderer error: Could not allocate Text Texture";
|
||||
|
||||
TryToInsert(glyph);
|
||||
}
|
||||
|
||||
OpenGLTextTexture(OpenGLTextTexture&& rhs)
|
||||
: x(rhs.x)
|
||||
, y(rhs.y)
|
||||
, nextY(rhs.nextY)
|
||||
, width(rhs.width)
|
||||
, height(rhs.height)
|
||||
, tex(rhs.tex)
|
||||
{
|
||||
rhs.tex = 0;
|
||||
}
|
||||
|
||||
~OpenGLTextTexture() {
|
||||
if (tex) glDeleteTextures(1, &tex);
|
||||
}
|
||||
|
||||
/// @brief Try to insert a glyph into this texture
|
||||
/// @param[in][out] glyph Texture to insert
|
||||
/// @return Was the texture successfully added?
|
||||
bool TryToInsert(OpenGLTextGlyph &glyph);
|
||||
bool TryToInsert(OpenGLTextGlyph &glyph) {
|
||||
if (glyph.w > width) return false;
|
||||
if (y + glyph.h > height) return false;
|
||||
|
||||
OpenGLTextTexture(OpenGLTextGlyph &glyph);
|
||||
~OpenGLTextTexture();
|
||||
// Can fit in this row?
|
||||
if (x + glyph.w < width) {
|
||||
Insert(glyph);
|
||||
x += glyph.w;
|
||||
nextY = std::max(nextY, y + glyph.h);
|
||||
return true;
|
||||
}
|
||||
|
||||
// Can fit the next row?
|
||||
if (nextY + glyph.h > height) return false;
|
||||
x = 0;
|
||||
y = nextY;
|
||||
return TryToInsert(glyph);
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
OpenGLText::OpenGLText()
|
||||
: r(1.f)
|
||||
|
|
@ -214,165 +348,12 @@ OpenGLTextGlyph const& OpenGLText::CreateGlyph(int n) {
|
|||
OpenGLTextGlyph &glyph = glyphs.insert(std::make_pair(n, OpenGLTextGlyph(n, font))).first->second;
|
||||
|
||||
// Insert into some texture
|
||||
bool ok = false;
|
||||
for (auto texture : textures) {
|
||||
if (texture->TryToInsert(glyph)) {
|
||||
ok = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// No texture could fit it, create a new one
|
||||
if (!ok) {
|
||||
textures.push_back(std::shared_ptr<OpenGLTextTexture>(new OpenGLTextTexture(glyph)));
|
||||
}
|
||||
|
||||
for (auto& texture : textures) {
|
||||
if (texture.TryToInsert(glyph))
|
||||
return glyph;
|
||||
}
|
||||
|
||||
OpenGLTextTexture::OpenGLTextTexture(OpenGLTextGlyph &glyph) {
|
||||
x = y = nextY = 0;
|
||||
width = std::max(SmallestPowerOf2(glyph.w), 64);
|
||||
height = std::max(SmallestPowerOf2(glyph.h), 64);
|
||||
width = height = std::max(width, height);
|
||||
tex = 0;
|
||||
|
||||
// Generate and bind
|
||||
glGenTextures(1, &tex);
|
||||
glBindTexture(GL_TEXTURE_2D, tex);
|
||||
|
||||
// Texture parameters
|
||||
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST);
|
||||
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
|
||||
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_CLAMP);
|
||||
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_CLAMP);
|
||||
|
||||
// Allocate texture
|
||||
glTexImage2D(GL_TEXTURE_2D,0,GL_RGBA8,width,height,0,GL_ALPHA,GL_UNSIGNED_BYTE,nullptr);
|
||||
if (glGetError()) throw "Internal OpenGL text renderer error: Could not allocate Text Texture";
|
||||
|
||||
TryToInsert(glyph);
|
||||
}
|
||||
|
||||
OpenGLTextTexture::~OpenGLTextTexture() {
|
||||
if (tex) glDeleteTextures(1, &tex);
|
||||
}
|
||||
|
||||
/// @brief Can fit a glyph in it?
|
||||
/// @param glyph
|
||||
/// @return
|
||||
bool OpenGLTextTexture::TryToInsert(OpenGLTextGlyph &glyph) {
|
||||
int w = glyph.w;
|
||||
int h = glyph.h;
|
||||
if (w > width) return false;
|
||||
if (y+h > height) return false;
|
||||
|
||||
// Can fit in this row?
|
||||
if (x + w < width) {
|
||||
Insert(glyph);
|
||||
x += w;
|
||||
if (y+h > nextY) nextY = y+h;
|
||||
return true;
|
||||
}
|
||||
|
||||
// Can fit the next row?
|
||||
else {
|
||||
if (nextY+h > height) return false;
|
||||
x = 0;
|
||||
y = nextY;
|
||||
Insert(glyph);
|
||||
x += w;
|
||||
nextY = y+h;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/// @brief Insert
|
||||
/// @param glyph
|
||||
void OpenGLTextTexture::Insert(OpenGLTextGlyph &glyph) {
|
||||
int w = glyph.w;
|
||||
int h = glyph.h;
|
||||
|
||||
// Fill glyph structure
|
||||
glyph.x1 = float(x)/width;
|
||||
glyph.y1 = float(y)/height;
|
||||
glyph.x2 = float(x+w)/width;
|
||||
glyph.y2 = float(y+h)/height;
|
||||
glyph.tex = tex;
|
||||
|
||||
// Create bitmap and bind it to a DC
|
||||
wxBitmap bmp(w + (w & 1), h + (h & 1),24);
|
||||
wxMemoryDC dc(bmp);
|
||||
|
||||
// Draw text and convert to image
|
||||
dc.SetBackground(wxBrush(wxColour(0,0,0)));
|
||||
dc.Clear();
|
||||
dc.SetFont(glyph.font);
|
||||
dc.SetTextForeground(wxColour(255,255,255));
|
||||
dc.DrawText(glyph.str,0,0);
|
||||
wxImage img = bmp.ConvertToImage();
|
||||
|
||||
// Convert to alpha
|
||||
int imgw = img.GetWidth();
|
||||
int imgh = img.GetHeight();
|
||||
size_t len = imgw*imgh;
|
||||
const unsigned char *src = img.GetData();
|
||||
const unsigned char *read = src;
|
||||
std::vector<unsigned char> alpha(len * 2, 255);
|
||||
unsigned char *write = &alpha[1];
|
||||
for (size_t i=0;i<len;i++) {
|
||||
*write = *read;
|
||||
write += 2;
|
||||
read += 3;
|
||||
}
|
||||
|
||||
// Upload image to video memory
|
||||
glBindTexture(GL_TEXTURE_2D, tex);
|
||||
glTexSubImage2D(GL_TEXTURE_2D,0,x,y,imgw,imgh,GL_LUMINANCE_ALPHA,GL_UNSIGNED_BYTE,&alpha[0]);
|
||||
if (glGetError()) throw "Internal OpenGL text renderer error: Error uploading glyph data to video memory.";
|
||||
}
|
||||
|
||||
/// Draw a glyph at (x,y)
|
||||
void OpenGLTextGlyph::Draw(float x, float y) const {
|
||||
glBindTexture(GL_TEXTURE_2D, tex);
|
||||
glEnableClientState(GL_VERTEX_ARRAY);
|
||||
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
|
||||
|
||||
float tex_coords[] = {
|
||||
x1, y1,
|
||||
x1, y2,
|
||||
x2, y2,
|
||||
x2, y1
|
||||
};
|
||||
|
||||
float vert_coords[] = {
|
||||
x, y,
|
||||
x, y + h,
|
||||
x + w, y + h,
|
||||
x + w, y
|
||||
};
|
||||
|
||||
glVertexPointer(2, GL_FLOAT, 0, vert_coords);
|
||||
glTexCoordPointer(2, GL_FLOAT, 0, tex_coords);
|
||||
glDrawArrays(GL_QUADS, 0, 4);
|
||||
|
||||
glDisableClientState(GL_VERTEX_ARRAY);
|
||||
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
|
||||
}
|
||||
|
||||
OpenGLTextGlyph::OpenGLTextGlyph(int value, wxFont const& font)
|
||||
: str(wxChar(value))
|
||||
, tex(0)
|
||||
, x1(0)
|
||||
, x2(0)
|
||||
, y1(0)
|
||||
, y2(0)
|
||||
, font(font)
|
||||
{
|
||||
wxCoord desc,lead;
|
||||
|
||||
wxBitmap tempBmp(32, 32, 24);
|
||||
wxMemoryDC dc(tempBmp);
|
||||
dc.SetFont(font);
|
||||
dc.GetTextExtent(str,&w,&h,&desc,&lead);
|
||||
// No texture could fit it, create a new one
|
||||
textures.emplace_back(glyph);
|
||||
return glyph;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,8 +40,10 @@
|
|||
#include <wx/colour.h>
|
||||
#include <wx/font.h>
|
||||
|
||||
namespace {
|
||||
struct OpenGLTextGlyph;
|
||||
class OpenGLTextTexture;
|
||||
}
|
||||
|
||||
typedef boost::container::map<int,OpenGLTextGlyph> glyphMap;
|
||||
|
||||
|
|
@ -57,7 +59,7 @@ class OpenGLText {
|
|||
|
||||
glyphMap glyphs;
|
||||
|
||||
std::vector<std::shared_ptr<OpenGLTextTexture> > textures;
|
||||
std::vector<OpenGLTextTexture> textures;
|
||||
|
||||
OpenGLText(OpenGLText const&);
|
||||
OpenGLText& operator=(OpenGLText const&);
|
||||
|
|
|
|||
Loading…
Reference in a new issue