Added projection matrix; Now 3D
This commit is contained in:
1 parent
bd8df1c2cf
commit
4f1ea8327a
9 files changed
+13
-8
No files matched your search
@@ -13,7 +13,7 @@ namespace nf {
|
||||
|
||||
void create(const void* vertexBufferData, const size_t vertexBufferSize, const void* indexBufferData, size_t indexBufferCount);
|
||||
//TODO: Do this using loaded assets somehow
|
||||
void setLocation(float x, float y, float z);
|
||||
void setPosition(float x, float y, float z);
|
||||
void setRotation(float x, float y, float z);
|
||||
void setScale(float x);
|
||||
void setScale(float x, float y, float z);
|
||||
|
||||
@@ -23,7 +23,8 @@ namespace nf {
|
||||
Entity();
|
||||
|
||||
void create(const void* vertexBufferData, const size_t vertexBufferSize, const void* indexBufferData, size_t indexBufferCount);
|
||||
void setLocation(float x, float y, float z);
|
||||
//TODO: Do this using loaded assets somehow
|
||||
void setPosition(float x, float y, float z);
|
||||
void setRotation(float x, float y, float z);
|
||||
void setScale(float x);
|
||||
void setScale(float x, float y, float z);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#pragma once
|
||||
#include <vector>
|
||||
#include <Windows.h>
|
||||
#include "glm/glm.hpp"
|
||||
|
||||
#include "Entity.h"
|
||||
|
||||
@@ -26,5 +27,7 @@ namespace nf {
|
||||
std::vector<Entity*> m_lGame;
|
||||
std::vector<Drawable*> m_lUI;
|
||||
Shader* m_defaultShader;
|
||||
|
||||
glm::mat4 proj;
|
||||
};
|
||||
}
|
||||
@@ -12,7 +12,6 @@ namespace nf {
|
||||
|
||||
void bind();
|
||||
void setUniform(const char* name, glm::mat4& data);
|
||||
|
||||
static unsigned int current;
|
||||
|
||||
~Shader();
|
||||
|
||||
Reference in new issue
Block a user