From d4e9d6bbc0abe66acb149a358a25c9a0f385ce74 Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Sun, 21 Apr 2019 18:06:55 +0500
Subject: Renamed GlobalState to Game

---
 src/RendererEntity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/RendererEntity.cpp')

diff --git a/src/RendererEntity.cpp b/src/RendererEntity.cpp
index 25403be..ed1e854 100644
--- a/src/RendererEntity.cpp
+++ b/src/RendererEntity.cpp
@@ -7,7 +7,7 @@
 #include "GameState.hpp"
 #include "Renderer.hpp"
 #include "AssetManager.hpp"
-#include "GlobalState.hpp"
+#include "Game.hpp"
 
 const GLfloat vertices[] = {
     -0.5f, 0.5f, 0.5f,
-- 
cgit v1.2.3


From 9d9a415b9a6e4a9ad75256e10f68e4ce55dd5f95 Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Sun, 21 Apr 2019 19:04:53 +0500
Subject: Basic single-threaded implementation

---
 src/RendererEntity.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/RendererEntity.cpp')

diff --git a/src/RendererEntity.cpp b/src/RendererEntity.cpp
index ed1e854..fc5e1a2 100644
--- a/src/RendererEntity.cpp
+++ b/src/RendererEntity.cpp
@@ -7,7 +7,6 @@
 #include "GameState.hpp"
 #include "Renderer.hpp"
 #include "AssetManager.hpp"
-#include "Game.hpp"
 
 const GLfloat vertices[] = {
     -0.5f, 0.5f, 0.5f,
-- 
cgit v1.2.3


From 868ba6279a20e4d1412c2d576c67400167de6694 Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Tue, 30 Apr 2019 16:12:35 +0500
Subject: Integrated Optick profiler

---
 src/RendererEntity.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/RendererEntity.cpp')

diff --git a/src/RendererEntity.cpp b/src/RendererEntity.cpp
index fc5e1a2..fcbf79a 100644
--- a/src/RendererEntity.cpp
+++ b/src/RendererEntity.cpp
@@ -2,6 +2,7 @@
 
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
+#include <optick.h>
 
 #include "Entity.hpp"
 #include "GameState.hpp"
@@ -123,6 +124,7 @@ RendererEntity::~RendererEntity() {
 }
 
 void RendererEntity::Render(RenderState& renderState, const World *world) {
+	OPTICK_EVENT();
     glm::mat4 model = glm::mat4(1.0);
     const Entity &entity = world->GetEntity(entityId);
     model = glm::translate(model, entity.pos.glm());
-- 
cgit v1.2.3