rexy712/our_dick
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix coding standard

Browse Source
This commit is contained in:
rexy712 2020-08-15 16:20:16 -07:00
parent 6211f7fc62
commit 82f63bc13c
2 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/render.hpp
View File

@ -12,36 +12,35 @@ class GLFWwindow;
class render_manager class render_manager
{ {
private: private:
void (*m_windowCloseCallback)(void); using close_callback = void(*)(void);
void (*m_inputHandler)(GLFWwindow* window, int key, int scancode, int action, int mods); using input_callback = void(*)(GLFWwindow*, int, int, int, int);
GLFWwindow* m_mainWindow; close_callback m_window_close_callback;
input_callback m_input_handler;
GLFWwindow* m_main_window;
public: public:
enum GLFW_ERROR enum RENDERER_ERROR{
{ RENDERER_OK,
GLFW_OK, RENDERER_CONTEXT_ERROR,
GLFW_CONTEXT_ERROR, RENDERER_WINDOW_ERROR,
GLFW_WINDOW_ERROR, RENDERER_INIT_ERROR,
GLFW_INIT_ERROR,
}; };
render_manager (render_manager&) = delete; render_manager (render_manager&) = delete;
render_manager (render_manager&&) = delete; render_manager (render_manager&&) = delete;
render_manager(); render_manager();
GLFW_ERROR init(int width, int height, const char* title); // Sets up the OpenGL environment RENDERER_ERROR init(int width, int height, const char* title); // Sets up the OpenGL environment
void update(); // Update the GL context and draw new frame void update(); // Update the GL context and draw new frame
void request_exit(); void request_exit();
template <typename T> void handle_window_close_event(close_callback handle){
void handle_window_close_event(T handle){ m_window_close_callback = handle;
m_windowCloseCallback = handle;
} }
template <typename T> void handle_keypress_event(input_callback handle){
void handle_keypress_event(T handle){ m_input_handler = handle;
m_inputHandler = handle; glfwSetKeyCallback(m_main_window, m_input_handler);
glfwSetKeyCallback(m_mainWindow, m_inputHandler);
} }
}; };

49
src/render.cpp
View File

@ -12,50 +12,49 @@ namespace
render_manager::render_manager() : render_manager::render_manager() :
m_windowCloseCallback (nullptr), m_window_close_callback (nullptr),
m_inputHandler (nullptr), m_input_handler (nullptr),
m_mainWindow (nullptr) m_main_window (nullptr){}
{}
render_manager::GLFW_ERROR render_manager::init (int width, int height, const char* title){ render_manager::RENDERER_ERROR render_manager::init (int width, int height, const char* title){
if (!glfwInit()) { if (!glfwInit()) {
fprintf(stdout, "[EE] failed to initialize GLFW.\n"); fprintf(stdout, "[EE] failed to initialize GLFW.\n");
return GLFW_INIT_ERROR; return RENDERER_INIT_ERROR;
}
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
m_mainWindow = glfwCreateWindow(width, height, title, nullptr, nullptr);
if (!m_mainWindow) {
fprintf (stdout, "[EE] Could not create window\n");
return GLFW_WINDOW_ERROR;
} }
glfwMakeContextCurrent(m_mainWindow); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
m_main_window = glfwCreateWindow(width, height, title, nullptr, nullptr);
if (!m_main_window) {
fprintf (stdout, "[EE] Could not create window\n");
return RENDERER_WINDOW_ERROR;
}
glfwMakeContextCurrent(m_main_window);
if (gl3wInit()) { if (gl3wInit()) {
fprintf(stdout, "[EE] failed to initialize OpenGL\n"); fprintf(stdout, "[EE] failed to initialize OpenGL\n");
return GLFW_CONTEXT_ERROR; return RENDERER_CONTEXT_ERROR;
} }
glViewport(0, 0, width, height); glViewport(0, 0, width, height);
printf("[DD] OpenGL %s, GLSL %s\n", glGetString(GL_VERSION), glGetString(GL_SHADING_LANGUAGE_VERSION)); printf("[DD] OpenGL %s, GLSL %s\n", glGetString(GL_VERSION), glGetString(GL_SHADING_LANGUAGE_VERSION));
glfwSetFramebufferSizeCallback(m_mainWindow, handle_resize_event); glfwSetFramebufferSizeCallback(m_main_window, handle_resize_event);
return GLFW_OK; return RENDERER_OK;
} }
void render_manager::update(){ void render_manager::update(){
glfwSwapBuffers(m_mainWindow); glfwSwapBuffers(m_main_window);
glfwPollEvents(); glfwPollEvents();
} }
void render_manager::request_exit() void render_manager::request_exit()
{ {
if (m_windowCloseCallback) if (m_window_close_callback)
m_windowCloseCallback(); m_window_close_callback();
glfwSetWindowShouldClose(m_mainWindow, true); glfwSetWindowShouldClose(m_main_window, true);
} }