benkyd/Minecraft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BROKE BUILD: entity system lol time to dieee

Browse Source
This commit is contained in:
Ben
2019-11-07 23:40:29 +00:00
parent dc8d6c2741
commit 11445de644
12 changed files with 89 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/world/world.cpp
View File

@@ -4,9 +4,11 @@
#include "../renderer/shader.hpp"
#include "../config.hpp"
#include "../util/fastnoise.hpp"
#include "../config.hpp"
#include "entity.hpp"
World::World() {
}
@@ -87,7 +89,11 @@ std::vector<std::shared_ptr<Chunk>> World::GetRenderableChunks() {
}
void World::Render(std::shared_ptr<Camera> camera) {
void World::Update(std::shared_ptr<Entity> player) {
}
void World::Render(std::shared_ptr<Entity> player) {
glBindTexture(GL_TEXTURE_2D_ARRAY, m_textureMapID);
@@ -96,7 +102,7 @@ void World::Render(std::shared_ptr<Camera> camera) {
for (int i = 0; i < chunks.size(); i++) {
chunks[i]->Render(camera, m_shaders["Basic"]);
chunks[i]->Render(player->EntityCamera, m_shaders["Basic"]);
}