aboutsummaryrefslogtreecommitdiff
path: root/source/Renderer.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/Renderer.hpp')
-rw-r--r--source/Renderer.hpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/source/Renderer.hpp b/source/Renderer.hpp
index e527476..98a9f28 100644
--- a/source/Renderer.hpp
+++ b/source/Renderer.hpp
@@ -11,10 +11,9 @@
// TODO add optional support for OpenGL separate attrib binding & only depend on vertex format
-class RenderObject {
-public:
- glm::mat4 worldMatrix;
+class GameObject;
+class RenderObject {
public:
RcPtr<Texture> autofill_TextureAtlas;
@@ -52,7 +51,6 @@ struct RendererFrameInfo {
Camera* camera;
glm::mat4 matrixView;
glm::mat4 matrixProj;
- glm::mat4 matrixCombined;
float time;
float deltaTime;
};
@@ -65,6 +63,6 @@ private:
public:
void BeginFrame(Camera& camera, float currentTime, float deltaTime);
const RendererFrameInfo& GetLastFrameInfo() const { return mFrame; }
- void Draw(const RenderObject* objects, size_t count);
+ void Draw(const RenderObject* objects, const GameObject* gameObject, size_t count);
void EndFrame();
};