Continue adding opengl font support.
This commit is contained in:
James Grogan
parent
649079a5c7
commit
eef93efc29
37 changed files with 530 additions and 157 deletions
|
|
@ -5,6 +5,15 @@
|
|||
#include "Scene.h"
|
||||
#include "TriMesh.h"
|
||||
|
||||
#include "FontsManager.h"
|
||||
#include "FontGlyph.h"
|
||||
|
||||
#include "OpenGlFontTexture.h"
|
||||
#include "OpenGlShaderProgram.h"
|
||||
#include "TextData.h"
|
||||
|
||||
#include "File.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
|
@ -14,30 +23,18 @@
|
|||
#include <GL/glu.h>
|
||||
#include <GL/glx.h>
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
#include <glm/gtc/type_ptr.hpp>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
const char* vertexShaderSource = "#version 330 core\n"
|
||||
"layout (location = 0) in vec3 aPos;\n"
|
||||
"void main()\n"
|
||||
"{\n"
|
||||
" gl_Position = vec4(aPos.x, aPos.y, aPos.z, 1.0);\n"
|
||||
"}\0";
|
||||
|
||||
|
||||
const char* fragmentShaderSource = "#version 330 core\n"
|
||||
"out vec4 FragColor;\n"
|
||||
"void main()\n"
|
||||
"{\n"
|
||||
"FragColor = vec4(1.0f, 0.5f, 0.2f, 1.0f);\n"
|
||||
"}\n";
|
||||
|
||||
|
||||
OpenGlPainter::OpenGlPainter()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void OpenGlPainter::initialize()
|
||||
void OpenGlPainter::initializeMeshShader()
|
||||
{
|
||||
if (auto context = glXGetCurrentContext())
|
||||
{
|
||||
|
|
@ -54,99 +51,70 @@ void OpenGlPainter::initialize()
|
|||
glGetIntegerv(GL_MINOR_VERSION, &minor_version);
|
||||
std::cout << "Using opengl version " << major_version << "|" << minor_version << std::endl;
|
||||
|
||||
std::cout << "Creating opengl painter" << std::endl;
|
||||
unsigned int vertexShader = glCreateShader(GL_VERTEX_SHADER);
|
||||
glShaderSource(vertexShader, 1, &vertexShaderSource, nullptr);
|
||||
glCompileShader(vertexShader);
|
||||
auto vert_shader_path = std::filesystem::path(__FILE__).parent_path() / "shaders/default.vert";
|
||||
auto frag_shader_path = std::filesystem::path(__FILE__).parent_path() / "shaders/default.frag";
|
||||
|
||||
int success;
|
||||
char infoLog[512];
|
||||
glGetShaderiv(vertexShader, GL_COMPILE_STATUS, &success);
|
||||
if(!success)
|
||||
mMeshShaderProgram = std::make_unique<OpenGlShaderProgram>(vert_shader_path, frag_shader_path);
|
||||
}
|
||||
|
||||
void OpenGlPainter::initializeTextShader()
|
||||
{
|
||||
auto vert_shader_path = std::filesystem::path(__FILE__).parent_path() / "shaders/text.vert";
|
||||
auto frag_shader_path = std::filesystem::path(__FILE__).parent_path() / "shaders/text.frag";
|
||||
|
||||
mTextShaderProgram = std::make_unique<OpenGlShaderProgram>(vert_shader_path, frag_shader_path);
|
||||
}
|
||||
|
||||
void OpenGlPainter::renderTextLayer(const TextData& textData, DrawingContext* context)
|
||||
{
|
||||
if (!mTextShaderProgram)
|
||||
{
|
||||
glGetShaderInfoLog(vertexShader, 512, nullptr, infoLog);
|
||||
std::cout << "ERROR::SHADER::VERTEX::COMPILATION_FAILED: " << std::string(infoLog) << std::endl;
|
||||
initializeTextShader();
|
||||
}
|
||||
|
||||
if (auto errCode = glGetError(); errCode != GL_NO_ERROR)
|
||||
{
|
||||
auto errString = gluErrorString(errCode);
|
||||
std::cout << "Got gl error" << errString << std::endl;
|
||||
}
|
||||
auto first_char = textData.mContent[0];
|
||||
auto iter = mFontTextures.find(first_char);
|
||||
OpenGlFontTexture* working_texture{nullptr};
|
||||
if (iter == mFontTextures.end())
|
||||
{
|
||||
auto glyph = context->getFontsManager()->getGlyph(first_char);
|
||||
auto new_texture = std::make_unique<OpenGlFontTexture>(nullptr);
|
||||
working_texture = new_texture.get();
|
||||
mFontTextures[first_char] = std::move(new_texture);
|
||||
}
|
||||
else
|
||||
{
|
||||
std::cout << "Shader compiled ok" << std::endl;
|
||||
if (auto errCode = glGetError(); errCode != GL_NO_ERROR)
|
||||
{
|
||||
auto errString = gluErrorString(errCode);
|
||||
std::cout << "Got gl error after ok" << errString << std::endl;
|
||||
}
|
||||
working_texture = iter->second.get();
|
||||
}
|
||||
|
||||
unsigned int fragmentShader;
|
||||
fragmentShader = glCreateShader(GL_FRAGMENT_SHADER);
|
||||
glShaderSource(fragmentShader, 1, &fragmentShaderSource, nullptr);
|
||||
glCompileShader(fragmentShader);
|
||||
|
||||
glGetShaderiv(fragmentShader, GL_COMPILE_STATUS, &success);
|
||||
|
||||
if(!success)
|
||||
{
|
||||
glGetShaderInfoLog(fragmentShader, 512, NULL, infoLog);
|
||||
std::cout << "ERROR::SHADER::FRAGMENT::COMPILATION_FAILED: " << infoLog << std::endl;
|
||||
}
|
||||
|
||||
mShaderProgram = glCreateProgram();
|
||||
|
||||
glAttachShader(mShaderProgram, vertexShader);
|
||||
glAttachShader(mShaderProgram, fragmentShader);
|
||||
glLinkProgram(mShaderProgram);
|
||||
|
||||
glGetProgramiv(mShaderProgram, GL_LINK_STATUS, &success);
|
||||
if(!success)
|
||||
{
|
||||
glGetProgramInfoLog(mShaderProgram, 512, NULL, infoLog);
|
||||
std::cout << "Shader linking FAILED\n" << infoLog << std::endl;
|
||||
}
|
||||
|
||||
glDeleteShader(vertexShader);
|
||||
glDeleteShader(fragmentShader);
|
||||
|
||||
mInitialized = true;
|
||||
glEnable(GL_BLEND);
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
}
|
||||
|
||||
void OpenGlPainter::paint(DrawingContext* context)
|
||||
void OpenGlPainter::renderMeshLayer(TriMesh* mesh, DrawingContext* context)
|
||||
{
|
||||
if (!mInitialized)
|
||||
if (!mMeshShaderProgram)
|
||||
{
|
||||
initialize();
|
||||
initializeMeshShader();
|
||||
}
|
||||
|
||||
auto surface = context->getSurface();
|
||||
const auto width = double(surface->getWidth());
|
||||
const auto height = double(surface->getHeight());
|
||||
const auto num_mesh = context->getScene()->getNumMeshes();
|
||||
|
||||
glViewport(0, 0, width, height);
|
||||
//glOrtho(-1.0, 1.0, -1.0, 1.0, -1.0, 1.0);
|
||||
//glScissor(0, 0, width, height);
|
||||
//glMatrixMode(GL_PROJECTION);
|
||||
//glLoadIdentity();
|
||||
|
||||
glClearColor(0.5, 0.5, 1.0, 0.0);
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
//glMatrixMode(GL_MODELVIEW);
|
||||
//glLoadIdentity();
|
||||
|
||||
float vertices[] = {
|
||||
-0.5f, -0.5f, 0.0f,
|
||||
0.5f, -0.5f, 0.0f,
|
||||
0.0f, 0.5f, 0.0f
|
||||
0.5f, 0.5f, 0.0f, // top right
|
||||
0.5f, -0.5f, 0.0f, // bottom right
|
||||
-0.5f, -0.5f, 0.0f, // bottom left
|
||||
-0.5f, 0.5f, 0.0f // top left
|
||||
};
|
||||
|
||||
unsigned int indices[] = { // note that we start from 0!
|
||||
0, 1, 3, // first triangle
|
||||
1, 2, 3 // second triangle
|
||||
};
|
||||
unsigned int vbo{0};
|
||||
glGenBuffers(1, &vbo);
|
||||
|
||||
unsigned int EBO;
|
||||
glGenBuffers(1, &EBO);
|
||||
|
||||
unsigned int VAO;
|
||||
glGenVertexArrays(1, &VAO);
|
||||
glBindVertexArray(VAO);
|
||||
|
|
@ -154,14 +122,22 @@ void OpenGlPainter::paint(DrawingContext* context)
|
|||
glBindBuffer(GL_ARRAY_BUFFER, vbo);
|
||||
glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
|
||||
|
||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, EBO);
|
||||
glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW);
|
||||
|
||||
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (void*)0);
|
||||
glEnableVertexAttribArray(0);
|
||||
|
||||
glUseProgram(mShaderProgram);
|
||||
int vertexColorLocation = glGetUniformLocation(mMeshShaderProgram->getHandle(), "ourColor");
|
||||
|
||||
glUseProgram(mMeshShaderProgram->getHandle());
|
||||
glBindVertexArray(VAO);
|
||||
|
||||
glDrawArrays(GL_TRIANGLES, 0, 3);
|
||||
glUniform4f(vertexColorLocation, 0.0f, 1.0, 0.0f, 1.0f);
|
||||
|
||||
//glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
|
||||
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
|
||||
glBindVertexArray(0);
|
||||
/*
|
||||
std::cout << "Bounds are : " << width << " | " << height << std::endl;
|
||||
|
||||
|
|
@ -207,6 +183,31 @@ void OpenGlPainter::paint(DrawingContext* context)
|
|||
break;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
void OpenGlPainter::paint(DrawingContext* context)
|
||||
{
|
||||
auto surface = context->getSurface();
|
||||
const auto width = double(surface->getWidth());
|
||||
const auto height = double(surface->getHeight());
|
||||
|
||||
glViewport(0, 0, width, height);
|
||||
//glOrtho(-1.0, 1.0, -1.0, 1.0, -1.0, 1.0);
|
||||
//glScissor(0, 0, width, height);
|
||||
//glMatrixMode(GL_PROJECTION);
|
||||
//glLoadIdentity();
|
||||
|
||||
glClearColor(0.5, 0.5, 1.0, 0.0);
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
//glMatrixMode(GL_MODELVIEW);
|
||||
//glLoadIdentity();
|
||||
|
||||
const auto num_mesh = context->getScene()->getNumMeshes();
|
||||
//renderMeshLayer(nullptr, context);
|
||||
|
||||
auto text_data = context->getScene()->getTextData();
|
||||
renderTextLayer(text_data[0], context);
|
||||
|
||||
glFlush();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue