diff --git a/Engine.cpp b/Engine.cpp index 37b3cba..9c343cf 100644 --- a/Engine.cpp +++ b/Engine.cpp @@ -291,10 +291,10 @@ Engine::Engine() screenHeight = 600; screenWidth = 800; crossHairSize = 8; - RenderDistance = 8; - ChunkSize = 8; + RenderDistance = 6; + ChunkSize = 6; ChunkOffset = 2; - RayRange = 7; + RayRange = 6; flyMode = false; SelectedBlock = BlockName::Cobble; StartPosition = glm::vec3(0, 40, 0); diff --git a/Model.cpp b/Model.cpp index 6ff6acf..459a5d9 100644 --- a/Model.cpp +++ b/Model.cpp @@ -167,8 +167,9 @@ void Model::Draw() texture.second->Bind(i); shadingProgram->SetData(texture.first.c_str(), i++); } + glBindVertexArray(VAO); glDrawElements(GL_TRIANGLES, indices.size(), GL_UNSIGNED_INT, nullptr); glBindVertexArray(0); - + } diff --git a/Text.cpp b/Text.cpp index 9fe2a4b..9c81179 100644 --- a/Text.cpp +++ b/Text.cpp @@ -108,6 +108,9 @@ void Text::RenderText(std::string text, float x, float y, float scale, glm::vec3 glBindTexture(GL_TEXTURE_2D, ch->texture); ch->BindData(); + + glDisable(GL_CULL_FACE); + ch->Draw(); x += (ch->Advance >> 6) * scale; // bitshift by 6 to get value in pixels (2^6 = 64 (divide amount of 1/64th pixels by 64 to get amount of pixels)) diff --git a/World.cpp b/World.cpp index 9041b6c..7ba1ccc 100644 --- a/World.cpp +++ b/World.cpp @@ -65,6 +65,9 @@ void World::DrawChunks(Camera& camera) chunk->model->shadingProgram->SetData("projection", camera.Projection); chunk->model->shadingProgram->SetData("view", camera.GetViewMatrix()); chunk->model->shadingProgram->SetData("model", glm::mat4(1.0f)); + glEnable(GL_CULL_FACE); + glCullFace(GL_BACK); + glFrontFace(GL_CW); chunk->model->Draw(); } else { diff --git a/main.cpp b/main.cpp index f44fd2b..e7d909e 100644 --- a/main.cpp +++ b/main.cpp @@ -3,7 +3,7 @@ int main() { Engine engine = Engine(); - engine.InitializeWindow(1240, 700, "Minecraft ++"); + engine.InitializeWindow(1240, 700, "Minecraft++"); engine.WindowLoop(); return 0;