summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/AssetManager.cpp2
-rw-r--r--src/Block.hpp17
-rw-r--r--src/Render.cpp2
-rw-r--r--src/RendererSection.cpp328
-rw-r--r--src/RendererSection.hpp36
-rw-r--r--src/RendererWorld.cpp19
-rw-r--r--src/Section.cpp10
-rw-r--r--src/ThreadGame.cpp2
-rw-r--r--src/World.cpp2
9 files changed, 263 insertions, 155 deletions
diff --git a/src/AssetManager.cpp b/src/AssetManager.cpp
index 02ee7ee..303f18a 100644
--- a/src/AssetManager.cpp
+++ b/src/AssetManager.cpp
@@ -194,7 +194,7 @@ AssetManager &AssetManager::Instance() {
}
const BlockModel *AssetManager::GetBlockModelByBlockId(BlockId block) {
- block.state = 0;
+ block.state = 0;
if (blockIdToBlockName.find(block) == blockIdToBlockName.end()) {
std::string blockName = "";
for (const auto& it : assetIds) {
diff --git a/src/Block.hpp b/src/Block.hpp
index c3dfcec..12d2907 100644
--- a/src/Block.hpp
+++ b/src/Block.hpp
@@ -1,5 +1,7 @@
#pragma once
+#include <functional>
+
struct Block {
Block();
@@ -20,4 +22,17 @@ struct BlockId {
bool operator==(const BlockId& lhs, const BlockId &rhs);
-bool operator<(const BlockId& lhs, const BlockId &rhs); \ No newline at end of file
+bool operator<(const BlockId& lhs, const BlockId &rhs);
+
+namespace std {
+ template <>
+ struct hash<BlockId> {
+ std::size_t operator()(const BlockId& k) const
+ {
+ size_t id = std::hash<unsigned short>()(k.id);
+ size_t state = std::hash<unsigned char>()(k.state);
+
+ return (id & state << 1);
+ }
+ };
+} \ No newline at end of file
diff --git a/src/Render.cpp b/src/Render.cpp
index 1473ae0..ffa219a 100644
--- a/src/Render.cpp
+++ b/src/Render.cpp
@@ -64,9 +64,11 @@ void Render::InitGlew() {
glViewport(0, 0, width, height);
glClearColor(0.8,0.8,0.8, 1.0f);
glEnable(GL_DEPTH_TEST);
+
glEnable(GL_CULL_FACE);
glCullFace(GL_BACK);
glFrontFace(GL_CCW);
+
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glCheckError();
diff --git a/src/RendererSection.cpp b/src/RendererSection.cpp
index 59e3558..c813071 100644
--- a/src/RendererSection.cpp
+++ b/src/RendererSection.cpp
@@ -24,14 +24,7 @@ const GLfloat uv_coords[] = {
const GLuint magicUniqueConstant = 88375;
GLuint RendererSection::VboVertices = magicUniqueConstant;
-GLuint RendererSection::VboUvs;
-GLuint RendererSection::Vao;
-GLuint RendererSection::Vbo[VBOCOUNT];
-
-std::vector<glm::mat4> contentModels;
-std::vector<glm::vec4> contentTextures;
-std::vector<glm::vec3> contentColors;
-std::vector<glm::vec2> contentLights;
+GLuint RendererSection::VboUvs = magicUniqueConstant;
RendererSection::RendererSection(RendererSectionData data) {
if (VboVertices == magicUniqueConstant) {
@@ -48,90 +41,87 @@ RendererSection::RendererSection(RendererSectionData data) {
LOG(INFO) << "Created VBOs with vertices (" << VboVertices << ") and UVs (" << VboUvs
<< ") for faces";
+ }
- glGenVertexArrays(1, &Vao);
- glGenBuffers(VBOCOUNT, Vbo);
-
- glBindVertexArray(Vao);
- {
- //Cube vertices
- GLuint VertAttribPos = 0;
- glBindBuffer(GL_ARRAY_BUFFER, VboVertices);
- glVertexAttribPointer(VertAttribPos, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(GLfloat), nullptr);
- glEnableVertexAttribArray(VertAttribPos);
-
- //Cube UVs
- GLuint UvAttribPos = 2;
- glBindBuffer(GL_ARRAY_BUFFER, VboUvs);
- glVertexAttribPointer(UvAttribPos, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr);
- glEnableVertexAttribArray(UvAttribPos);
-
- //Textures
- GLuint textureAttribPos = 7;
- glBindBuffer(GL_ARRAY_BUFFER, Vbo[TEXTURES]);
- glVertexAttribPointer(textureAttribPos, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), nullptr);
- glEnableVertexAttribArray(textureAttribPos);
- glVertexAttribDivisor(textureAttribPos, 1);
- glCheckError();
-
- //Blocks models
- GLuint matAttribPos = 8;
- size_t sizeOfMat4 = 4 * 4 * sizeof(GLfloat);
- glBindBuffer(GL_ARRAY_BUFFER, Vbo[MODELS]);
- glVertexAttribPointer(matAttribPos + 0, 4, GL_FLOAT, GL_FALSE, sizeOfMat4, nullptr);
- glVertexAttribPointer(matAttribPos + 1, 4, GL_FLOAT, GL_FALSE, sizeOfMat4, (void *)(1 * 4 * sizeof(GLfloat)));
- glVertexAttribPointer(matAttribPos + 2, 4, GL_FLOAT, GL_FALSE, sizeOfMat4, (void *)(2 * 4 * sizeof(GLfloat)));
- glVertexAttribPointer(matAttribPos + 3, 4, GL_FLOAT, GL_FALSE, sizeOfMat4, (void *)(3 * 4 * sizeof(GLfloat)));
- glEnableVertexAttribArray(matAttribPos + 0);
- glEnableVertexAttribArray(matAttribPos + 1);
- glEnableVertexAttribArray(matAttribPos + 2);
- glEnableVertexAttribArray(matAttribPos + 3);
- glVertexAttribDivisor(matAttribPos + 0, 1);
- glVertexAttribDivisor(matAttribPos + 1, 1);
- glVertexAttribDivisor(matAttribPos + 2, 1);
- glVertexAttribDivisor(matAttribPos + 3, 1);
-
- //Color
- GLuint colorAttribPos = 12;
- glBindBuffer(GL_ARRAY_BUFFER, Vbo[COLORS]);
- glVertexAttribPointer(colorAttribPos, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(GLfloat), nullptr);
- glEnableVertexAttribArray(colorAttribPos);
- glVertexAttribDivisor(colorAttribPos, 1);
-
- //Light
- GLuint lightAttribPos = 13;
- glBindBuffer(GL_ARRAY_BUFFER, Vbo[LIGHTS]);
- glVertexAttribPointer(lightAttribPos, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr);
- glEnableVertexAttribArray(lightAttribPos);
- glVertexAttribDivisor(lightAttribPos, 1);
-
- glBindBuffer(GL_ARRAY_BUFFER, 0);
- }
- glBindVertexArray(0);
+ glGenVertexArrays(1, &Vao);
+
+ glGenBuffers(VBOCOUNT, Vbo);
+
+ glBindVertexArray(Vao);
+ {
+ //Cube vertices
+ GLuint VertAttribPos = 0;
+ glBindBuffer(GL_ARRAY_BUFFER, VboVertices);
+ glVertexAttribPointer(VertAttribPos, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(GLfloat), nullptr);
+ glEnableVertexAttribArray(VertAttribPos);
+
+ //Cube UVs
+ GLuint UvAttribPos = 2;
+ glBindBuffer(GL_ARRAY_BUFFER, VboUvs);
+ glVertexAttribPointer(UvAttribPos, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr);
+ glEnableVertexAttribArray(UvAttribPos);
+
+ //Textures
+ GLuint textureAttribPos = 7;
+ glBindBuffer(GL_ARRAY_BUFFER, Vbo[TEXTURES]);
+ glVertexAttribPointer(textureAttribPos, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), nullptr);
+ glEnableVertexAttribArray(textureAttribPos);
+ glVertexAttribDivisor(textureAttribPos, 1);
glCheckError();
+
+ //Blocks models
+ GLuint matAttribPos = 8;
+ size_t sizeOfMat4 = 4 * 4 * sizeof(GLfloat);
+ glBindBuffer(GL_ARRAY_BUFFER, Vbo[MODELS]);
+ glVertexAttribPointer(matAttribPos + 0, 4, GL_FLOAT, GL_FALSE, sizeOfMat4, nullptr);
+ glVertexAttribPointer(matAttribPos + 1, 4, GL_FLOAT, GL_FALSE, sizeOfMat4, (void *)(1 * 4 * sizeof(GLfloat)));
+ glVertexAttribPointer(matAttribPos + 2, 4, GL_FLOAT, GL_FALSE, sizeOfMat4, (void *)(2 * 4 * sizeof(GLfloat)));
+ glVertexAttribPointer(matAttribPos + 3, 4, GL_FLOAT, GL_FALSE, sizeOfMat4, (void *)(3 * 4 * sizeof(GLfloat)));
+ glEnableVertexAttribArray(matAttribPos + 0);
+ glEnableVertexAttribArray(matAttribPos + 1);
+ glEnableVertexAttribArray(matAttribPos + 2);
+ glEnableVertexAttribArray(matAttribPos + 3);
+ glVertexAttribDivisor(matAttribPos + 0, 1);
+ glVertexAttribDivisor(matAttribPos + 1, 1);
+ glVertexAttribDivisor(matAttribPos + 2, 1);
+ glVertexAttribDivisor(matAttribPos + 3, 1);
+
+ //Color
+ GLuint colorAttribPos = 12;
+ glBindBuffer(GL_ARRAY_BUFFER, Vbo[COLORS]);
+ glVertexAttribPointer(colorAttribPos, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(GLfloat), nullptr);
+ glEnableVertexAttribArray(colorAttribPos);
+ glVertexAttribDivisor(colorAttribPos, 1);
+
+ //Light
+ GLuint lightAttribPos = 13;
+ glBindBuffer(GL_ARRAY_BUFFER, Vbo[LIGHTS]);
+ glVertexAttribPointer(lightAttribPos, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr);
+ glEnableVertexAttribArray(lightAttribPos);
+ glVertexAttribDivisor(lightAttribPos, 1);
+
+ glBindBuffer(GL_ARRAY_BUFFER, 0);
}
+ glBindVertexArray(0);
+ glCheckError();
+
//Upload data to VRAM
- contentModels.insert(contentModels.end(), data.models.begin(), data.models.end());
- glBindBuffer(GL_ARRAY_BUFFER, Vbo[MODELS]);
- glBufferData(GL_ARRAY_BUFFER, contentModels.size() * sizeof(glm::mat4), contentModels.data(), GL_DYNAMIC_DRAW);
-
- contentTextures.insert(contentTextures.end(), data.textures.begin(), data.textures.end());
glBindBuffer(GL_ARRAY_BUFFER, Vbo[TEXTURES]);
- glBufferData(GL_ARRAY_BUFFER, contentTextures.size() * sizeof(glm::vec4), contentTextures.data(), GL_DYNAMIC_DRAW);
+ glBufferData(GL_ARRAY_BUFFER, data.textures.size() * sizeof(glm::vec4), data.textures.data(), GL_DYNAMIC_DRAW);
+
+ glBindBuffer(GL_ARRAY_BUFFER, Vbo[MODELS]);
+ glBufferData(GL_ARRAY_BUFFER, data.models.size() * sizeof(glm::mat4), data.models.data(), GL_DYNAMIC_DRAW);
- contentColors.insert(contentColors.end(), data.colors.begin(), data.colors.end());
glBindBuffer(GL_ARRAY_BUFFER, Vbo[COLORS]);
- glBufferData(GL_ARRAY_BUFFER, contentColors.size() * sizeof(glm::vec3), contentColors.data(), GL_DYNAMIC_DRAW);
+ glBufferData(GL_ARRAY_BUFFER, data.colors.size() * sizeof(glm::vec3), data.colors.data(), GL_DYNAMIC_DRAW);
- contentLights.insert(contentLights.end(), data.lights.begin(), data.lights.end());
glBindBuffer(GL_ARRAY_BUFFER, Vbo[LIGHTS]);
- glBufferData(GL_ARRAY_BUFFER, contentLights.size() * sizeof(glm::vec2), contentLights.data(), GL_DYNAMIC_DRAW);
+ glBufferData(GL_ARRAY_BUFFER, data.lights.size() * sizeof(glm::vec2), data.lights.data(), GL_DYNAMIC_DRAW);
glBindBuffer(GL_ARRAY_BUFFER, 0);
numOfFaces = data.textures.size();
- offset = contentModels.size() - numOfFaces;
sectionPos = data.sectionPos;
hash = data.hash;
}
@@ -142,13 +132,30 @@ RendererSection::RendererSection(RendererSection && other) {
}
RendererSection::~RendererSection() {
+ if (Vao != 0)
+ glDeleteVertexArrays(1, &Vao);
+
+ for (int i = 0; i < VBOCOUNT; i++)
+ if (Vbo[i] != 0) {
+ glBindBuffer(GL_ARRAY_BUFFER, Vbo[i]);
+ glBufferData(GL_ARRAY_BUFFER, 0, 0, GL_STATIC_DRAW);
+ }
+
+ glDeleteBuffers(VBOCOUNT, Vbo);
}
void swap(RendererSection & lhs, RendererSection & rhs) {
+ std::swap(lhs.Vbo, rhs.Vbo);
+ std::swap(lhs.Vao, rhs.Vao);
std::swap(lhs.hash, rhs.hash);
std::swap(lhs.numOfFaces, rhs.numOfFaces);
std::swap(lhs.sectionPos, rhs.sectionPos);
- std::swap(lhs.offset, rhs.offset);
+}
+
+void RendererSection::Render(RenderState &renderState) {
+ renderState.SetActiveVao(Vao);
+ glDrawArraysInstanced(GL_TRIANGLES, 0, 6, numOfFaces);
+ glCheckError();
}
Vector RendererSection::GetPosition()
@@ -161,16 +168,16 @@ size_t RendererSection::GetHash()
return hash;
}
-GLuint RendererSection::GetVao() {
- return Vao;
-}
-
RendererSectionData::RendererSectionData(World * world, Vector sectionPosition) {
const std::map<BlockTextureId, glm::vec4> &textureAtlas = AssetManager::Instance().GetTextureAtlasIndexes();
const Section &section = world->GetSection(sectionPosition);
hash = section.GetHash();
sectionPos = sectionPosition;
+ SetBlockIdData(world);
+
+ auto blockVisibility = GetBlockVisibilityData(world);
+
glm::mat4 baseOffset = glm::translate(glm::mat4(), (section.GetPosition() * 16).glm()),transform;
auto sectionsList = world->GetSectionsList();
@@ -178,7 +185,7 @@ RendererSectionData::RendererSectionData(World * world, Vector sectionPosition)
for (int y = 0; y < 16; y++) {
for (int z = 0; z < 16; z++) {
for (int x = 0; x < 16; x++) {
- BlockId block = section.GetBlockId(Vector(x, y, z));
+ BlockId block = GetBlockId(x,y,z);
if (block.id == 0)
continue;
@@ -187,9 +194,9 @@ RendererSectionData::RendererSectionData(World * world, Vector sectionPosition)
transform = glm::translate(baseOffset, Vector(x, y, z).glm());
- const BlockModel* model = AssetManager::Instance().GetBlockModelByBlockId(block);
+ const BlockModel* model = this->GetInternalBlockModel(block);
if (model) {
- this->AddFacesByBlockModel(sectionsList, world, Vector(x, y, z), *model, transform, section.GetBlockLight(Vector(x, y, z)), section.GetBlockSkyLight(Vector(x, y, z)));
+ this->AddFacesByBlockModel(sectionsList, world, Vector(x, y, z), *model, transform, section.GetBlockLight(Vector(x, y, z)), section.GetBlockSkyLight(Vector(x, y, z)), blockVisibility);
}
else {
transform = glm::translate(transform, glm::vec3(0, 1, 0));
@@ -214,7 +221,7 @@ RendererSectionData::RendererSectionData(World * world, Vector sectionPosition)
colors.shrink_to_fit();
}
-void RendererSectionData::AddFacesByBlockModel(const std::vector<Vector> &sectionsList, World *world, Vector blockPos, const BlockModel &model, glm::mat4 transform, unsigned char light, unsigned char skyLight) {
+void RendererSectionData::AddFacesByBlockModel(const std::vector<Vector> &sectionsList, World *world, Vector blockPos, const BlockModel &model, glm::mat4 transform, unsigned char light, unsigned char skyLight, const std::array<unsigned char, 16 * 16 * 16>& visibility) {
glm::mat4 elementTransform, faceTransform;
for (const auto& element : model.Elements) {
Vector t = element.to - element.from;
@@ -225,29 +232,31 @@ void RendererSectionData::AddFacesByBlockModel(const std::vector<Vector> &sectio
for (const auto& face : element.faces) {
if (face.second.cullface != BlockModel::ElementData::FaceDirection::none) {
+ unsigned char visible = visibility[blockPos.y * 256 + blockPos.z * 16 + blockPos.x];
+
switch (face.second.cullface) {
case BlockModel::ElementData::FaceDirection::down:
- if (TestBlockExists(sectionsList, world, blockPos - Vector(0, +1, 0)))
+ if (visible >> 0 & 0x1)
continue;
break;
case BlockModel::ElementData::FaceDirection::up:
- if (TestBlockExists(sectionsList, world, blockPos - Vector(0, -1, 0)))
+ if (visible >> 1 & 0x1)
continue;
break;
case BlockModel::ElementData::FaceDirection::north:
- if (TestBlockExists(sectionsList, world, blockPos - Vector(0, 0, -1)))
+ if (visible >> 2 & 0x1)
continue;
break;
case BlockModel::ElementData::FaceDirection::south:
- if (TestBlockExists(sectionsList, world, blockPos - Vector(0, 0, +1)))
+ if (visible >> 3 & 0x1)
continue;
break;
case BlockModel::ElementData::FaceDirection::west:
- if (TestBlockExists(sectionsList, world, blockPos - Vector(-1, 0, 0)))
+ if (visible >> 4 & 0x1)
continue;
break;
case BlockModel::ElementData::FaceDirection::east:
- if (TestBlockExists(sectionsList, world, blockPos - Vector(+1, 0, 0)))
+ if (visible >> 5 & 0x1)
continue;
break;
}
@@ -302,39 +311,110 @@ void RendererSectionData::AddFacesByBlockModel(const std::vector<Vector> &sectio
}
}
-bool RendererSectionData::TestBlockExists(const std::vector<Vector> &sectionsList, World *world, Vector blockPos) {
- Vector section = sectionPos;
- if (blockPos.x == -1) {
- section = section + Vector(-1, 0, 0);
- blockPos.x = 15;
- }
- else if (blockPos.x == 16) {
- section = section + Vector(+1, 0, 0);
- blockPos.x = 0;
- }
- else if (blockPos.y == -1) {
- section = section + Vector(0, -1, 0);
- blockPos.y = 15;
- }
- else if (blockPos.y == 16) {
- section = section + Vector(0, +1, 0);
- blockPos.y = 0;
- }
- else if (blockPos.z == -1) {
- section = section + Vector(0, 0, -1);
- blockPos.z = 15;
- }
- else if (blockPos.z == 16) {
- section = section + Vector(0, 0, +1);
- blockPos.z = 0;
+std::array<unsigned char, 4096> RendererSectionData::GetBlockVisibilityData(World *world) {
+ //const auto& section = world->GetSection(sectionPos);
+ const auto& sectionDown = world->GetSection(sectionPos + Vector(0, -1, 0));
+ const auto& sectionUp = world->GetSection(sectionPos + Vector(0, +1, 0));
+ const auto& sectionNorth = world->GetSection(sectionPos + Vector(0, 0, +1));
+ const auto& sectionSouth = world->GetSection(sectionPos + Vector(0, 0, -1));
+ const auto& sectionWest = world->GetSection(sectionPos + Vector(+1, 0, 0));
+ const auto& sectionEast = world->GetSection(sectionPos + Vector(-1, 0, 0));
+
+ std::array<unsigned char, 4096> arr;
+ for (int y = 0; y < 16; y++) {
+ for (int z = 0; z < 16; z++) {
+ for (int x = 0; x < 16; x++) {
+ unsigned char value = 0;
+ BlockId blockIdDown;
+ BlockId blockIdUp;
+ BlockId blockIdNorth;
+ BlockId blockIdSouth;
+ BlockId blockIdWest;
+ BlockId blockIdEast;
+
+ switch (y) {
+ case 0:
+ blockIdDown = sectionDown.GetBlockId(Vector(x, 15, z));
+ blockIdUp = GetBlockId(x,1,z);
+ break;
+ case 15:
+ blockIdDown = GetBlockId(x,14,z);
+ blockIdUp = sectionUp.GetBlockId(Vector(x, 0, z));
+ break;
+ default:
+ blockIdDown = GetBlockId(x, y -1, z);
+ blockIdUp = GetBlockId(x, y + 1, z);
+ break;
+ }
+
+ switch (z) {
+ case 0:
+ blockIdNorth = GetBlockId(x, y, 1);
+ blockIdSouth = sectionSouth.GetBlockId(Vector(x, y, 15));
+ break;
+ case 15:
+ blockIdNorth = sectionNorth.GetBlockId(Vector(x, y, 0));
+ blockIdSouth = GetBlockId(x, y, 14);
+ break;
+ default:
+ blockIdNorth = GetBlockId(x, y, z + 1);
+ blockIdSouth = GetBlockId(x, y, z - 1);
+ break;
+ }
+
+ switch (x) {
+ case 0:
+ blockIdWest = GetBlockId(1, y, z);
+ blockIdEast = sectionEast.GetBlockId(Vector(15, y, z));
+ break;
+ case 15:
+ blockIdWest = sectionWest.GetBlockId(Vector(0, y, z));
+ blockIdEast = GetBlockId(14, y, z);
+ break;
+ default:
+ blockIdWest = GetBlockId(x + 1, y, z);
+ blockIdEast = GetBlockId(x - 1, y, z);
+ break;
+ }
+
+ auto blockModelDown = GetInternalBlockModel(blockIdDown);
+ auto blockModelUp = GetInternalBlockModel(blockIdUp);
+ auto blockModelNorth = GetInternalBlockModel(blockIdNorth);
+ auto blockModelSouth = GetInternalBlockModel(blockIdSouth);
+ auto blockModelWest = GetInternalBlockModel(blockIdWest);
+ auto blockModelEast = GetInternalBlockModel(blockIdEast);
+
+ value |= (blockIdDown.id != 0 && blockModelDown && blockModelDown->IsBlock) << 0;
+ value |= (blockIdUp.id != 0 && blockModelUp && blockModelUp->IsBlock) << 1;
+ value |= (blockIdNorth.id != 0 && blockModelNorth && blockModelNorth->IsBlock) << 2;
+ value |= (blockIdSouth.id != 0 && blockModelSouth && blockModelSouth->IsBlock) << 3;
+ value |= (blockIdWest.id != 0 && blockModelWest && blockModelWest->IsBlock) << 4;
+ value |= (blockIdEast.id != 0 && blockModelEast && blockModelEast->IsBlock) << 5;
+
+ arr[y * 256 + z * 16 + x] = value;
+ }
+ }
}
-
- if (std::find(sectionsList.begin(), sectionsList.end(),section) == sectionsList.end())
- return true;
+ return arr;
+}
- BlockId blockId = world->GetSection(section).GetBlockId(blockPos);
+const BlockModel* RendererSectionData::GetInternalBlockModel(const BlockId& id) {
+ for (const auto& it : idModels) {
+ if (it.first == id)
+ return it.second;
+ }
+ idModels.push_back(std::make_pair(id, am.GetBlockModelByBlockId(id)));
+ return idModels.back().second;
+}
- auto blockModel = AssetManager::Instance().GetBlockModelByBlockId(world->GetSection(section).GetBlockId(blockPos));
+void RendererSectionData::SetBlockIdData(World* world) {
+ const Section& section = world->GetSection(sectionPos);
- return blockId.id != 0 && blockModel && blockModel->IsBlock;
+ for (int y = 0; y < 16; y++) {
+ for (int z = 0; z < 16; z++) {
+ for (int x = 0; x < 16; x++) {
+ blockIdData[y * 256 + z * 16 + x] = section.GetBlockId(Vector(x,y,z));
+ }
+ }
+ }
} \ No newline at end of file
diff --git a/src/RendererSection.hpp b/src/RendererSection.hpp
index fa4a389..6745987 100644
--- a/src/RendererSection.hpp
+++ b/src/RendererSection.hpp
@@ -23,11 +23,31 @@ struct RendererSectionData {
RendererSectionData(World *world, Vector sectionPosition);
private:
- bool TestBlockExists(const std::vector<Vector> &sectionsList, World *world, Vector blockPos);
- void AddFacesByBlockModel(const std::vector<Vector> &sectionsList, World *world, Vector blockPos, const BlockModel &model, glm::mat4 transform, unsigned char light, unsigned char skyLight);
+ void AddFacesByBlockModel(const std::vector<Vector> &sectionsList, World *world, Vector blockPos, const BlockModel &model, glm::mat4 transform, unsigned char light, unsigned char skyLight, const std::array<unsigned char, 16 * 16 * 16>& visibility);
+
+ std::array<unsigned char, 16 * 16 * 16> GetBlockVisibilityData(World *world);
+
+ AssetManager& am = AssetManager::Instance();
+
+ std::vector<std::pair<BlockId, const BlockModel *>> idModels;
+ const BlockModel* GetInternalBlockModel(const BlockId& id);
+
+ std::array<BlockId, 4096> blockIdData;
+ void SetBlockIdData(World *world);
+
+ inline const BlockId& GetBlockId(const Vector& pos) {
+ return blockIdData[pos.y * 256 + pos.z * 16 + pos.x];
+ }
+
+ inline const BlockId& GetBlockId(int x, int y, int z) {
+ return blockIdData[y * 256 +z * 16 + x];
+ }
+
+
};
+
class RendererSection {
enum Vbos {
MODELS = 0,
@@ -36,9 +56,9 @@ class RendererSection {
LIGHTS,
VBOCOUNT,
};
-
- static GLuint Vao;
- static GLuint Vbo[VBOCOUNT];
+ GLuint Vao = { 0 };
+ GLuint Vbo[VBOCOUNT] = { 0 };
+
static GLuint VboVertices, VboUvs;
size_t hash;
@@ -52,15 +72,13 @@ public:
~RendererSection();
+ void Render(RenderState &renderState);
+
Vector GetPosition();
size_t GetHash();
size_t numOfFaces;
- size_t offset;
-
- static GLuint GetVao();
-
friend void swap(RendererSection &lhs, RendererSection &rhs);
}; \ No newline at end of file
diff --git a/src/RendererWorld.cpp b/src/RendererWorld.cpp
index f13011e..62fb243 100644
--- a/src/RendererWorld.cpp
+++ b/src/RendererWorld.cpp
@@ -87,8 +87,8 @@ void RendererWorld::UpdateAllSections(VectorF playerPos)
}
RendererWorld::RendererWorld(std::shared_ptr<GameState> ptr):gs(ptr) {
- MaxRenderingDistance = 1;
- numOfWorkers = std::thread::hardware_concurrency() - 2;
+ MaxRenderingDistance = 2;
+ numOfWorkers = 2;
PrepareRender();
@@ -218,7 +218,6 @@ void RendererWorld::Render(RenderState & renderState) {
GLint projectionLoc = glGetUniformLocation(blockShader->Program, "projection");
GLint viewLoc = glGetUniformLocation(blockShader->Program, "view");
GLint windowSizeLoc = glGetUniformLocation(blockShader->Program, "windowSize");
- GLint modelLoc = glGetUniformLocation(blockShader->Program, "model");
glm::mat4 projection = glm::perspective(45.0f, (float)renderState.WindowWidth / (float)renderState.WindowHeight, 0.1f, 10000000.0f);
glm::mat4 view = gs->GetViewMatrix();
glUniformMatrix4fv(projectionLoc, 1, GL_FALSE, glm::value_ptr(projection));
@@ -226,13 +225,8 @@ void RendererWorld::Render(RenderState & renderState) {
glUniform2f(windowSizeLoc, renderState.WindowWidth, renderState.WindowHeight);
glCheckError();
- glBindVertexArray(RendererSection::GetVao());
-
- size_t faces = 0;
-
sectionsMutex.lock();
- for (auto& section : sections) {
- faces += section.second.numOfFaces;
+ for (auto& section : sections) {
sectionsMutex.unlock();
std::vector<Vector> sectionCorners = {
Vector(0, 0, 0),
@@ -263,13 +257,10 @@ void RendererWorld::Render(RenderState & renderState) {
sectionsMutex.lock();
continue;
}
-
- //glDrawArraysInstanced(GL_TRIANGLES, section.second.offset, 6, section.second.numOfFaces);
+ section.second.Render(renderState);
sectionsMutex.lock();
}
sectionsMutex.unlock();
- glBindVertexArray(RendererSection::GetVao());
- glDrawArraysInstanced(GL_TRIANGLES, 0, 6, faces);
glCheckError();
glLineWidth(3.0);
@@ -280,7 +271,7 @@ void RendererWorld::Render(RenderState & renderState) {
glUniformMatrix4fv(projectionLoc, 1, GL_FALSE, glm::value_ptr(projection));
glUniformMatrix4fv(viewLoc, 1, GL_FALSE, glm::value_ptr(view));
glCheckError();
- modelLoc = glGetUniformLocation(entityShader->Program, "model");
+ GLint modelLoc = glGetUniformLocation(entityShader->Program, "model");
GLint colorLoc = glGetUniformLocation(entityShader->Program, "color");
for (auto& it : entities) {
it.modelLoc = modelLoc;
diff --git a/src/Section.cpp b/src/Section.cpp
index 67dde70..e6b6d93 100644
--- a/src/Section.cpp
+++ b/src/Section.cpp
@@ -69,9 +69,11 @@ BlockId Section::GetBlockId(Vector pos) const {
if (block.empty())
return BlockId{ 0,0 };
- auto iter = overrideList.find(pos);
- if (iter != overrideList.end())
- return iter->second;
+ if (!overrideList.empty()) {
+ auto iter = overrideList.find(pos);
+ if (iter != overrideList.end())
+ return iter->second;
+ }
int value;
@@ -104,7 +106,7 @@ BlockId Section::GetBlockId(Vector pos) const {
BlockId blockId;
blockId.id = value >> 4;
- blockId.state = value & 0xF;
+ blockId.state = value & 0xF;
return blockId;
}
diff --git a/src/ThreadGame.cpp b/src/ThreadGame.cpp
index f425747..3ca9b13 100644
--- a/src/ThreadGame.cpp
+++ b/src/ThreadGame.cpp
@@ -83,7 +83,7 @@ void ThreadGame::Execute() {
gs->HandleRotation(data.x, data.y);
});
- LoopExecutionTimeController timer(std::chrono::milliseconds(int(1.0f / 60.0f * 1000.0f)));
+ LoopExecutionTimeController timer(std::chrono::milliseconds(int(1.0f / 120.0f * 1000.0f)));
while (isRunning) {
DebugInfo::gameThreadTime = timer.GetRealDeltaS() * 1000'00.0f;
diff --git a/src/World.cpp b/src/World.cpp
index 8cff53a..0176a91 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -120,7 +120,7 @@ static Section fallbackSection;
const Section &World::GetSection(Vector sectionPos) {
auto result = sections.find(sectionPos);
if (result == sections.end()) {
- LOG(ERROR) << "Accessed not loaded section " << sectionPos;
+ //LOG(ERROR) << "Accessed not loaded section " << sectionPos;
return fallbackSection;
}
else {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 15:09:49 +0100