From 7129d65df7b02d7412ee5d56debd5a9c094db5ad Mon Sep 17 00:00:00 2001
From: rtk0c <mail.tianyig@gmail.com>
Date: Sat, 7 May 2022 15:36:35 -0700
Subject: Changeset: 23 Fix camera view matrix, [WIP] guizmo

---
 source/Renderer.hpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'source/Renderer.hpp')

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();
 };
-- 
cgit v1.2.3-70-g09d2