summaryrefslogtreecommitdiffstats
path: root/src/RendererEntity.cpp
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2020-07-25 18:49:18 +0200
committerGitHub <noreply@github.com>2020-07-25 18:49:18 +0200
commit0a2ba2cdb8e01bbd7e9e8ef1d0582ef6a892f837 (patch)
tree3c760d4d981aad30fa151343c224d3ea366c99d9 /src/RendererEntity.cpp
parentMerge pull request #36 from LaG1924/fix-windows-vs2019 (diff)
parentCompletely removed hardcoded list of blockstates (diff)
downloadAltCraft-0a2ba2cdb8e01bbd7e9e8ef1d0582ef6a892f837.tar
AltCraft-0a2ba2cdb8e01bbd7e9e8ef1d0582ef6a892f837.tar.gz
AltCraft-0a2ba2cdb8e01bbd7e9e8ef1d0582ef6a892f837.tar.bz2
AltCraft-0a2ba2cdb8e01bbd7e9e8ef1d0582ef6a892f837.tar.lz
AltCraft-0a2ba2cdb8e01bbd7e9e8ef1d0582ef6a892f837.tar.xz
AltCraft-0a2ba2cdb8e01bbd7e9e8ef1d0582ef6a892f837.tar.zst
AltCraft-0a2ba2cdb8e01bbd7e9e8ef1d0582ef6a892f837.zip
Diffstat (limited to 'src/RendererEntity.cpp')
-rw-r--r--src/RendererEntity.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/RendererEntity.cpp b/src/RendererEntity.cpp
index 25403be..fcbf79a 100644
--- a/src/RendererEntity.cpp
+++ b/src/RendererEntity.cpp
@@ -2,12 +2,12 @@
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
+#include <optick.h>
#include "Entity.hpp"
#include "GameState.hpp"
#include "Renderer.hpp"
#include "AssetManager.hpp"
-#include "GlobalState.hpp"
const GLfloat vertices[] = {
-0.5f, 0.5f, 0.5f,
@@ -124,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());