sem/SDBA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into mergebranch-Jasper

Browse Source
This commit is contained in:
SemvdH
2021-06-11 10:27:30 +02:00
committed by GitHub
parent 509f64f04d dbecbb594e
commit ab7123b89a
46 changed files with 28302 additions and 4730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/renderEngine/Renderer.cpp
View File

@@ -4,7 +4,6 @@
#include "loader.h"
#include "../toolbox/toolbox.h"
#include "renderer.h"
#include <iostream>
namespace render_engine
@@ -51,12 +50,12 @@ namespace render_engine
/*
This function will Render a Model on the screen.
*/
void Render(entities::Entity& entity, shaders::EntityShader& shader)
void Render(std::shared_ptr<entities::Entity> entity, shaders::EntityShader& shader)
{
const models::TexturedModel model = entity.GetModel();
const models::TexturedModel model = entity.get()->GetModel();
const models::RawModel raw_model = model.raw_model;
const models::ModelTexture texture = model.texture;
// Enable the model (VAO)
glBindVertexArray(raw_model.vao_id);
@@ -66,7 +65,7 @@ namespace render_engine
glEnableVertexAttribArray(2);
// Load the transformation of the model into the shader
const glm::mat4 modelMatrix = toolbox::CreateModelMatrix(entity.GetPosition(), entity.GetRotation(), entity.GetScale());
const glm::mat4 modelMatrix = toolbox::CreateModelMatrix(entity.get()->GetPosition(), entity.get()->GetRotation(), entity.get()->GetScale());
shader.LoadModelMatrix(modelMatrix);
shader.LoadShineVariables(texture.shine_damper, texture.reflectivity);

3
src/renderEngine/Renderer.h
View File

@@ -1,5 +1,6 @@
#pragma once
#include <memory>
#include "../gui/gui_element.h"
#include "../entities/entity.h"
#include "../shaders/entity_shader.h"
@@ -30,7 +31,7 @@ namespace render_engine
@param entity: The entity which needs to be rendered
@param shader: The shader the entity needs to be rendered with
*/
void Render(entities::Entity& entity, shaders::EntityShader& shader);
void Render(std::shared_ptr<entities::Entity> entity, shaders::EntityShader& shader);
/*
@brief: Call this function to render gui_textures on the screen