Even more optimization

Author: Sirvoid

Makefile

@@ -34,7 +34,7 @@ else
 	CFLAGS += -s -O2 -Wl,--subsystem,windows
 endif
 
-INCLUDE_PATHS = -I$(DIR_INC) -I$(RAYLIB_PATH)/src -I$(RAYLIB_PATH)/src/external
+INCLUDE_PATHS = -I$(DIR_INC) -I$(RAYLIB_PATH)/src -I$(RAYLIB_PATH)/src/external -I$(RAYLIB_PATH)/src/extras
 LDFLAGS = -L. -L$(RAYLIB_PATH)/src
 LDLIBS = -static -lraylib -lopengl32 -lgdi32 -lwinmm -lpthread -lws2_32 -lwinmm
 

client/src/chunk/chunkLightning.c

@@ -10,6 +10,8 @@
 #include <stdio.h>
 #include "chunkLightning.h"
 #include "../block/block.h"
+#include "world.h"
+#include "player.h"
 
 Vector3 lightDirections[6] = {
     {-1, 0, 0},
@@ -145,7 +147,7 @@ void Chunk_DoSunlight(Chunk *srcChunk) {
             }
         }
     } else {
-        if(srcChunk->position.y >= 5) {
+        if(srcChunk->position.y >= fmax(floorf(player.position.y / CHUNK_SIZE_X) + fmin(world.drawDistance, 4), 5)) {
             for(int i = CHUNK_SIZE - CHUNK_SIZE_XZ; i < CHUNK_SIZE; i++) {
                 Block blockDefinition = Block_GetDefinition(srcChunk->data[i]);
 

client/src/gui/screens.c

@@ -151,7 +151,7 @@ void Screen_MakeOptions(void) {
     //Draw distance Button
     if(GuiButton((Rectangle) {offsetX, offsetY - 15, 200, 30 }, drawDistanceTxt)) {
         world.drawDistance += 1;
-        if(world.drawDistance > 6) {
+        if(world.drawDistance > 8) {
             world.drawDistance = 2;
             World_Reload();
         } else {

client/src/world.c

@@ -26,7 +26,7 @@ pthread_t chunkThread_id;
 void World_Init(void) {
     world.mat = LoadMaterialDefault();
     world.loadChunks = false;
-    world.drawDistance = 3;
+    world.drawDistance = 4;
     world.chunks = NULL;
 
     world.entities = MemAlloc(WORLD_MAX_ENTITIES * sizeof(Entity));
@@ -180,7 +180,7 @@ void World_UpdateChunks(void) {
         QueuedChunk* curQueued = world.buildChunksQueue;
         QueuedChunk* prevQueued = world.buildChunksQueue;
 
-        int meshUpdatesCount = 16;
+        int meshUpdatesCount = 4;
 
         while(curQueued != NULL) {
             QueuedChunk *nextQueued = curQueued->next;
@@ -191,7 +191,7 @@ void World_UpdateChunks(void) {
                     chunk->isBuilding = false;
                     world.buildChunksQueue = Chunk_RemoveFromQueue(world.buildChunksQueue, prevQueued, curQueued);
 
-                    if(meshUpdatesCount-- == 0) return;
+                    if(--meshUpdatesCount == 0) return;
 
                     curQueued = nextQueued;
                     continue;
@@ -212,7 +212,7 @@ void World_LoadChunks(void) {
     int loadingHeight = fmin(world.drawDistance, 4);
     for(int x = -world.drawDistance ; x <= world.drawDistance; x++) {
         for(int z = -world.drawDistance ; z <= world.drawDistance; z++) {
-            for(int y = loadingHeight ; y >= -loadingHeight; y--) {
+            for(int y = -loadingHeight ; y <= loadingHeight; y++) {
                 World_AddChunk((Vector3) {pos.x + x, pos.y + y, pos.z + z});
             }
         }