Skip to content

Commit a7aea78

Browse files
committed
Chunk loading optimized.
1 parent 42c7d72 commit a7aea78

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

client/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -DSOL_CHECK_ARGUMENTS
3333

3434
target_compile_features(${CMAKE_PROJECT_NAME} PRIVATE cxx_std_17)
3535

36-
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -pg)
37-
target_link_options(${CMAKE_PROJECT_NAME} PRIVATE -pg)
36+
# target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -pg)
37+
# target_link_options(${CMAKE_PROJECT_NAME} PRIVATE -pg)
3838

3939
#------------------------------------------------------------------------------
4040
# Link options

client/source/world/ClientWorld.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@ void ClientWorld::receiveChunkData(sf::Packet &packet) {
8181

8282
chunk->setInitialized(true);
8383

84+
// if(chunk->getSurroundingChunk(Chunk::Left)) chunk->getSurroundingChunk(Chunk::Left)->setChanged(true);
85+
// if(chunk->getSurroundingChunk(Chunk::Right)) chunk->getSurroundingChunk(Chunk::Right)->setChanged(true);
86+
// if(chunk->getSurroundingChunk(Chunk::Bottom)) chunk->getSurroundingChunk(Chunk::Bottom)->setChanged(true);
87+
// if(chunk->getSurroundingChunk(Chunk::Top)) chunk->getSurroundingChunk(Chunk::Top)->setChanged(true);
88+
// if(chunk->getSurroundingChunk(Chunk::Front)) chunk->getSurroundingChunk(Chunk::Front)->setChanged(true);
89+
// if(chunk->getSurroundingChunk(Chunk::Back)) chunk->getSurroundingChunk(Chunk::Back)->setChanged(true);
90+
8491
// std::cout << "Chunk at (" << cx << ", " << cy << ", " << cz << ") received" << std::endl;
8592
}
8693
}

common/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ add_library(${CMAKE_PROJECT_NAME}_common STATIC ${SOURCE_FILES})
1818
# Compiler flags
1919
#------------------------------------------------------------------------------
2020
# target_compile_options(${CMAKE_PROJECT_NAME}_common PRIVATE -O3 -ffast-math)
21-
target_compile_options(${CMAKE_PROJECT_NAME}_common PRIVATE -g -pg -Wall -Wextra -Wfatal-errors -Wno-variadic-macros)
21+
target_compile_options(${CMAKE_PROJECT_NAME}_common PRIVATE -g -Wall -Wextra -Wfatal-errors -Wno-variadic-macros)
2222
target_compile_options(${CMAKE_PROJECT_NAME}_common PRIVATE -DDEBUG_ENABLED)
2323
target_compile_options(${CMAKE_PROJECT_NAME}_common PRIVATE -DSOL_CHECK_ARGUMENTS
2424
# -DSOL_SAFE_USERTYPE=1
@@ -32,3 +32,5 @@ target_compile_options(${CMAKE_PROJECT_NAME}_common PRIVATE -DSOL_CHECK_ARGUMENT
3232

3333
target_compile_features(${CMAKE_PROJECT_NAME}_common PRIVATE cxx_std_17)
3434

35+
# target_compile_options(${CMAKE_PROJECT_NAME}_server PRIVATE -pg)
36+

server/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ target_compile_options(${CMAKE_PROJECT_NAME}_server PRIVATE -DSOL_CHECK_ARGUMENT
3333

3434
target_compile_features(${CMAKE_PROJECT_NAME}_server PRIVATE cxx_std_17)
3535

36-
target_compile_options(${CMAKE_PROJECT_NAME}_server PRIVATE -pg)
37-
target_link_options(${CMAKE_PROJECT_NAME}_server PRIVATE -pg)
36+
# target_compile_options(${CMAKE_PROJECT_NAME}_server PRIVATE -pg)
37+
# target_link_options(${CMAKE_PROJECT_NAME}_server PRIVATE -pg)
3838

3939
#------------------------------------------------------------------------------
4040
# Link options

server/source/world/ServerWorld.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,6 @@ void ServerWorld::sendRequestedData(Client &client, int cx, int cy, int cz) {
8383
ServerChunk *chunk = getChunk(cx, cy, cz);
8484
if (chunk) {
8585
sendChunkData(client, chunk);
86-
87-
if(chunk->getSurroundingChunk(Chunk::Left)) sendChunkData(client, (ServerChunk *)chunk->getSurroundingChunk(Chunk::Left));
88-
if(chunk->getSurroundingChunk(Chunk::Right)) sendChunkData(client, (ServerChunk *)chunk->getSurroundingChunk(Chunk::Right));
89-
if(chunk->getSurroundingChunk(Chunk::Bottom)) sendChunkData(client, (ServerChunk *)chunk->getSurroundingChunk(Chunk::Bottom));
90-
if(chunk->getSurroundingChunk(Chunk::Top)) sendChunkData(client, (ServerChunk *)chunk->getSurroundingChunk(Chunk::Top));
91-
if(chunk->getSurroundingChunk(Chunk::Front)) sendChunkData(client, (ServerChunk *)chunk->getSurroundingChunk(Chunk::Front));
92-
if(chunk->getSurroundingChunk(Chunk::Back)) sendChunkData(client, (ServerChunk *)chunk->getSurroundingChunk(Chunk::Back));
9386
}
9487
}
9588

0 commit comments

Comments
 (0)