derek/fall-fever
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete reformatting of the code following the KDE Frameworks formatting style

Browse Source
This commit is contained in:
Derek Christ
2020-10-16 11:50:41 +02:00
parent 5b8060d9b8
commit 23e5f549ca
29 changed files with 694 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/Window.cpp
View File

@@ -6,11 +6,13 @@
#include "defines.h"
Window::Window() {
width = INIT_WINDOW_WIDTH; height = INIT_WINDOW_HEIGHT;
Window::Window()
{
width = INIT_WINDOW_WIDTH;
height = INIT_WINDOW_HEIGHT;
window = glfwCreateWindow(width, height, "OpenGL", NULL, NULL);
if(!window) {
if (!window) {
std::cout << "Failed to create window" << std::endl;
}
@@ -37,92 +39,101 @@ Window::Window() {
glEnable(GL_MULTISAMPLE);
// Disable mouse cursor
#ifdef _DEBUG
#ifdef _DEBUG
mouseCatched = false;
#endif
#endif
setCatchedCursor(mouseCatched);
// Enable primitive gamma correction
// glEnable(GL_FRAMEBUFFER_SRGB);
// Maximize in release build
#ifndef _DEBUG
#ifndef _DEBUG
glfwMaximizeWindow(window);
#endif
#endif
#ifdef _DEBUG
#ifdef _DEBUG
std::cout << "OpenGL version: " << glGetString(GL_VERSION) << std::endl;
glEnable(GL_DEBUG_OUTPUT);
glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
glDebugMessageCallback(openGLDebugCallback, NULL);
#endif
glEnable(GL_DEBUG_OUTPUT);
glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
glDebugMessageCallback(openGLDebugCallback, NULL);
#endif
glViewport(0, 0, width, height);
// Tell GLFW which function to call when window is resized
//glfwSetFramebufferSizeCallback(window, framebuffer_size_callback);
}
Window::~Window() {
Window::~Window()
{
glfwDestroyWindow(window);
}
bool Window::checkWindowWasResized() {
bool Window::checkWindowWasResized()
{
int new_width, new_height, new_posx, new_posy;
glfwGetFramebufferSize(window, &new_width, &new_height);
glfwGetWindowPos(window, &new_posx, &new_posy);
if(new_width == width && new_height == height && new_posx == posX && new_posy == posY)
if (new_width == width && new_height == height && new_posx == posX && new_posy == posY) {
return 0;
}
width = new_width; height = new_height; posX = new_posx; posY = new_posy;
width = new_width;
height = new_height;
posX = new_posx;
posY = new_posy;
glViewport(0, 0, width, height);
return 1;
}
void Window::setCatchedCursor(bool value) {
if(value) {
void Window::setCatchedCursor(bool value)
{
if (value) {
glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_DISABLED);
} else {
glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
}
}
void Window::handleActionRegister(bool *windowActionRegister) {
if(windowActionRegister[wireFrameToggle]) {
void Window::handleActionRegister(bool *windowActionRegister)
{
if (windowActionRegister[wireFrameToggle]) {
windowActionRegister[wireFrameToggle] = 0;
wireFrameMode = !wireFrameMode;
if(wireFrameMode) {
if (wireFrameMode) {
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
} else {
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
}
}
if(windowActionRegister[mouseCatchToggle]) {
if (windowActionRegister[mouseCatchToggle]) {
windowActionRegister[mouseCatchToggle] = 0;
mouseCatched = !mouseCatched;
setCatchedCursor(mouseCatched);
}
}
// This function is called when the window gets resized (currently not used)
void Window::framebuffer_size_callback(GLFWwindow* window, int width, int height) {
void Window::framebuffer_size_callback(GLFWwindow *window, int width, int height)
{
(void)window;
glViewport(0, 0, width, height);
}
void Window::openGLDebugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* userParam) {
(void)length; (void)userParam;
if(severity == GL_DEBUG_SEVERITY_HIGH || severity == GL_DEBUG_SEVERITY_MEDIUM)
std::cout << "[OpenGL Error]" << std::endl
<< "Message: " << message << std::endl
<< "Source: " << source << std::endl
<< "Type: " << type << std::endl
<< "ID: " << id << std::endl
<< "Severity: " << severity << std::endl
<< std::endl;
}
void Window::openGLDebugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam)
{
(void)length;
(void)userParam;
if (severity == GL_DEBUG_SEVERITY_HIGH || severity == GL_DEBUG_SEVERITY_MEDIUM)
std::cout << "[OpenGL Error]" << std::endl
<< "Message: " << message << std::endl
<< "Source: " << source << std::endl
<< "Type: " << type << std::endl
<< "ID: " << id << std::endl
<< "Severity: " << severity << std::endl
<< std::endl;
}