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

Linting pass

Browse Source
This commit is contained in:
rexy712 2020-08-17 09:57:00 -07:00
parent 38d2ec4466
commit 156b7c3212
9 changed files with 77 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/coding_standard.txt
View File

@ -31,6 +31,9 @@ must do's:
comments max 2 lines
no void in parameter list: void func(){}
brace formatting:
namespace thing{
}
void function(void){
}
@ -91,5 +94,5 @@ no-no's:
struct game_state* gl; //bad boi
excess include directives
if body on the same line as the if keyword
elso body on the same line as the else keyword
else body on the same line as the else keyword
if(thing) do_stuff();

17
include/math/detail/matrix.tpp
View File

@ -92,70 +92,55 @@ namespace math::detail{
}
template<typename T>
constexpr matrix<T,4,4> inverse_helper<T,4>::perform(const matrix<T,4,4>& m){
//barely over 50 lines, can be made slightly shorter by making the return statement unreadable
T det = m.determinate();
if(!det)
return matrix<T,4,4>(zero_initialize);
//Math is power
return matrix<T,4,4>((m.get(5) * ((m.get(10) * m.get(15)) - (m.get(11) * m.get(14))) -
m.get(6) * ((m.get(9) * m.get(15)) - (m.get(11) * m.get(13))) +
m.get(7) * ((m.get(9) * m.get(14)) - (m.get(10) * m.get(13)))) / det,
-(m.get(1) * ((m.get(10) * m.get(15)) - (m.get(11) * m.get(14))) -
m.get(2) * ((m.get(9) * m.get(15)) - (m.get(11) * m.get(13))) +
m.get(3) * ((m.get(9) * m.get(14)) - (m.get(10) * m.get(13)))) / det,
(m.get(1) * ((m.get(6) * m.get(15)) - (m.get(7) * m.get(14))) -
m.get(2) * ((m.get(5) * m.get(15)) - (m.get(7) * m.get(13))) +
m.get(3) * ((m.get(5) * m.get(14)) - (m.get(6) * m.get(13)))) / det,
-(m.get(1) * ((m.get(6) * m.get(11)) - (m.get(7) * m.get(10))) -
m.get(2) * ((m.get(5) * m.get(11)) - (m.get(7) * m.get(9))) +
m.get(3) * ((m.get(5) * m.get(10)) - (m.get(6) * m.get(9)))) / det,
-(m.get(4) * ((m.get(10) * m.get(15)) - (m.get(11) * m.get(14))) -
m.get(6) * ((m.get(8) * m.get(15)) - (m.get(11) * m.get(12))) +
m.get(7) * ((m.get(8) * m.get(14)) - (m.get(10) * m.get(12)))) / det,
(m.get(0) * ((m.get(10) * m.get(15)) - (m.get(11) * m.get(14))) -
m.get(2) * ((m.get(8) * m.get(15)) - (m.get(11) * m.get(12))) +
m.get(3) * ((m.get(8) * m.get(14)) - (m.get(10) * m.get(12)))) / det,
-(m.get(0) * ((m.get(6) * m.get(15)) - (m.get(7) * m.get(14))) -
m.get(2) * ((m.get(4) * m.get(15)) - (m.get(7) * m.get(12))) +
m.get(3) * ((m.get(4) * m.get(14)) - (m.get(6) * m.get(12)))) / det,
(m.get(0) * ((m.get(6) * m.get(11)) - (m.get(7) * m.get(10))) -
m.get(2) * ((m.get(4) * m.get(11)) - (m.get(7) * m.get(8))) +
m.get(3) * ((m.get(4) * m.get(10)) - (m.get(6) * m.get(8)))) / det,
(m.get(4) * ((m.get(9) * m.get(15)) - (m.get(11) * m.get(13))) -
m.get(5) * ((m.get(8) * m.get(15)) - (m.get(11) * m.get(12))) +
m.get(7) * ((m.get(8) * m.get(13)) - (m.get(9) * m.get(12)))) / det,
-(m.get(0) * ((m.get(9) * m.get(15)) - (m.get(11) * m.get(13))) -
m.get(1) * ((m.get(8) * m.get(15)) - (m.get(11) * m.get(12))) +
m.get(3) * ((m.get(8) * m.get(13)) - (m.get(9) * m.get(12)))) / det,
(m.get(0) * ((m.get(5) * m.get(15)) - (m.get(7) * m.get(13))) -
m.get(1) * ((m.get(4) * m.get(15)) - (m.get(7) * m.get(12))) +
m.get(3) * ((m.get(4) * m.get(13)) - (m.get(5) * m.get(12)))) / det,
-(m.get(0) * ((m.get(5) * m.get(11)) - (m.get(7) * m.get(9))) -
m.get(1) * ((m.get(4) * m.get(11)) - (m.get(7) * m.get(8))) +
m.get(3) * ((m.get(4) * m.get(9)) - (m.get(5) * m.get(8)))) / det,
-(m.get(4) * ((m.get(9) * m.get(14)) - (m.get(10) * m.get(13))) -
m.get(5) * ((m.get(8) * m.get(14)) - (m.get(10) * m.get(12))) +
m.get(6) * ((m.get(8) * m.get(13)) - (m.get(9) * m.get(12)))) / det,
(m.get(0) * ((m.get(9) * m.get(14)) - (m.get(10) * m.get(13))) -
m.get(1) * ((m.get(8) * m.get(14)) - (m.get(10) * m.get(12))) +
m.get(2) * ((m.get(8) * m.get(13)) - (m.get(9) * m.get(12)))) / det,
-(m.get(0) * ((m.get(5) * m.get(14)) - (m.get(6) * m.get(13))) -
m.get(1) * ((m.get(4) * m.get(14)) - (m.get(6) * m.get(12))) +
m.get(2) * ((m.get(4) * m.get(13)) - (m.get(5) * m.get(12)))) / det,
(m.get(0) * ((m.get(5) * m.get(10)) - (m.get(6) * m.get(9))) -
m.get(1) * ((m.get(4) * m.get(10)) - (m.get(6) * m.get(8))) +
m.get(2) * ((m.get(4) * m.get(9)) - (m.get(5) * m.get(8)))) / det);

1
include/math/mat.hpp
View File

@ -90,7 +90,6 @@ namespace math{
constexpr const_pointer raw()const;
constexpr operator pointer();
constexpr operator const_pointer()const;
};
template<typename T, size_t R, size_t C>

6
include/render.hpp
View File

@ -4,7 +4,7 @@
#include <stdint.h>
#include <GLFW/glfw3.h>
#define OPENFL_VERSION 400
#define OPENGL_VERSION 400
#define GLSL_VERSION 400
class GLFWwindow;
@ -19,7 +19,7 @@ private:
GLFWwindow* m_main_window;
public:
enum RENDERER_ERROR{
enum renderer_error{
RENDERER_OK,
RENDERER_CONTEXT_ERROR,
RENDERER_WINDOW_ERROR,
@ -30,7 +30,7 @@ public:
render_manager(render_manager&&) = delete;
render_manager();
RENDERER_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 request_exit();

6
src/main.cpp
View File

@ -14,8 +14,7 @@
#define TILE_COUNT 9
namespace
{
namespace{
bool running = true;
render_manager manager;
}
@ -94,8 +93,7 @@ void handle_window_close(){
running = false;
}
void handle_input_events(GLFWwindow*, int key, int, int, int)
{
void handle_input_events(GLFWwindow*, int key, int, int, int){
printf("[II] Recieved keycode %d\n", key);
if(key == 256)
manager.request_exit();

12
src/render.cpp
View File

@ -1,9 +1,8 @@
#include <gl3w/GL/gl3w.h> // Must be included first
#include "render.hpp"
#include <stdio.h>
#include <cstdio>
namespace
{
namespace{
void handle_resize_event(GLFWwindow*, int width, int height){
printf("Window resized\n");
glViewport(0, 0, width, height);
@ -16,7 +15,7 @@ render_manager::render_manager() :
m_input_handler(nullptr),
m_main_window(nullptr){}
render_manager::RENDERER_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()){
fprintf(stderr, "[EE] failed to initialize GLFW.\n");
return RENDERER_INIT_ERROR;
@ -52,9 +51,8 @@ void render_manager::update(){
glfwPollEvents();
}
void render_manager::request_exit()
{
void render_manager::request_exit(){
if (m_window_close_callback)
m_window_close_callback();
glfwSetWindowShouldClose(m_main_window, true);
glfwSetWindowShouldClose(m_main_window, GLFW_TRUE);
}