axis spheres still aren't showing, but some obvious bugs were removed. still debugging
This commit is contained in:
@@ -4,6 +4,8 @@
|
||||
#include <glm/glm.hpp>
|
||||
#include "util.hpp"
|
||||
|
||||
static uint shader;
|
||||
|
||||
struct Body {
|
||||
glm::mat4 pose;
|
||||
float scale;
|
||||
@@ -18,3 +20,4 @@ struct Body {
|
||||
|
||||
bool load_body(Body* out_body, const char* obj_filepath);
|
||||
void draw_body(const Body& b);
|
||||
void create_new_sphere(Body* b, float scale=1.0f);
|
||||
@@ -6,9 +6,6 @@
|
||||
#include <glm/ext/vector_float4.hpp>
|
||||
#include <stdio.h>
|
||||
|
||||
#define min(a, b) ((a < b) ? a : b)
|
||||
#define max(a, b) ((a > b) ? a : b)
|
||||
|
||||
typedef unsigned int uint;
|
||||
|
||||
template<class T> struct Array {
|
||||
@@ -26,4 +23,4 @@ bool read_file(Array<char>* out, const char* filepath);
|
||||
Array<char*> split_str(const char* s, char delimiter);
|
||||
Array<char*> split_str(const char* s);
|
||||
|
||||
glm::mat4 quat_to_mat4(glm::quat q);
|
||||
glm::mat4 quat_to_mat4(glm::quat q);
|
||||
Reference in New Issue
Block a user