PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

F3 add

Browse Source
This commit is contained in:
lllzebralll 2022-06-08 16:19:25 +03:00
parent 58ef13e402
commit 8cc5bdf0b1
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/voxel_engine.cpp
View File

@ -296,6 +296,7 @@ int main() {
long frame = 0;
bool occlusion = false;
bool devdata = false;
glfwSwapInterval(1);
@ -311,6 +312,9 @@ int main() {
if (Events::jpressed(GLFW_KEY_O)){
occlusion = !occlusion;
}
if (Events::jpressed(GLFW_KEY_F3)){
devdata = !devdata;
}
update_controls(&physics, chunks, player, delta);
update_interaction(chunks, &physics, player, &lighting);
@ -322,7 +326,7 @@ int main() {
for (int i = 0; i < freeLoaders; i++)
chunksController.loadVisible(wfile);
draw_world(camera, assets, chunks, occlusion);
draw_world(camera, assets, chunks, occlusion, devdata);
Window::swapBuffers();
Events::pullEvents();

14
src/world_render.h
View File

@ -105,8 +105,8 @@ bool chunks_comparator(size_t i, size_t j) {
}
void draw_world(Camera* camera, Assets* assets,
Chunks* chunks, bool occlusion){
void draw_world(Camera* camera, Assets* assets, Chunks* chunks,
bool occlusion, bool devdata){
glClearColor(0.7f,0.71f,0.73f,1);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glEnable(GL_DEPTH_TEST);
@ -158,8 +158,9 @@ void draw_world(Camera* camera, Assets* assets,
linesShader->use();
linesShader->uniformMatrix("u_projview", camera->getProjection()*camera->getView());
glLineWidth(2.0f);
lineBatch->line(camera->position.x, camera->position.y-0.5f, camera->position.z, camera->position.x+0.1f, camera->position.y-0.5f, camera->position.z, 1, 0, 0, 1);
lineBatch->line(camera->position.x, camera->position.y-0.5f, camera->position.z, camera->position.x, camera->position.y-0.5f, camera->position.z+0.1f, 0, 0, 1, 1);
lineBatch->line(camera->position.x, camera->position.y-0.1f, camera->position.z, camera->position.x+0.01f, camera->position.y-0.1f, camera->position.z, 1, 0, 0, 1);
lineBatch->line(camera->position.x, camera->position.y-0.1f, camera->position.z, camera->position.x, camera->position.y-0.1f, camera->position.z+0.01f, 0, 0, 1, 1);
lineBatch->line(camera->position.x, camera->position.y-0.1f, camera->position.z, camera->position.x, camera->position.y-0.1f+0.01f, camera->position.z, 0, 1, 0, 1);
lineBatch->render();
@ -171,7 +172,10 @@ void draw_world(Camera* camera, Assets* assets,
Font* font = assets->getFont("normal");
batch->begin();
batch->texture(font->texture);
font->draw(batch, "void Font::draw(Batch2D* batch, std::string text, int x, int y) {", 10, 10);
// font->draw(batch, "void Font::draw(Batch2D* batch, std::string text, int x, int y) {", 10, 10);
if (devdata){
font->draw(batch, "devdata does not exist", 10, 10);
}
//batch->rect(0, 0, 256, 256);
batch->render();
}