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

refactoring btw

Browse Source
This commit is contained in:
A-lex-Ra
2023-12-20 22:23:55 +06:00
parent bcfdc55277
commit 76475dd1b1
6 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/files/WorldFiles.cpp
+13 -13
View File
@@ -46,12 +46,12 @@ using std::filesystem::path;
namespace fs = std::filesystem;
WorldRegion::WorldRegion() {
chunksData = new ubyte*[REGION_VOL]{};
sizes = new uint32_t[REGION_VOL]{};
chunksData = new ubyte*[REGION_CHUNKS_COUNT]{};
sizes = new uint32_t[REGION_CHUNKS_COUNT]{};
}
WorldRegion::~WorldRegion() {
for (uint i = 0; i < REGION_VOL; i++) {
for (uint i = 0; i < REGION_CHUNKS_COUNT; i++) {
delete[] chunksData[i];
}
delete[] sizes;
@@ -80,11 +80,11 @@ void WorldRegion::put(uint x, uint z, ubyte* data, uint32_t size) {
sizes[chunk_index] = size;
}
ubyte* WorldRegion::get(uint x, uint z) {
ubyte* WorldRegion::getChunkData(uint x, uint z) {
return chunksData[z * REGION_SIZE + x];
}
uint WorldRegion::getSize(uint x, uint z) {
uint WorldRegion::getChunkDataSize(uint x, uint z) {
return sizes[z * REGION_SIZE + x];
}
@@ -240,7 +240,7 @@ ubyte* WorldFiles::getData(unordered_map<ivec2, WorldRegion*>& regions,
WorldRegion* region = getOrCreateRegion(regions, regionX, regionZ);
ubyte* data = region->get(localX, localZ);
ubyte* data = region->getChunkData(localX, localZ);
if (data == nullptr) {
uint32_t size;
data = readChunkData(x, z, size,
@@ -250,7 +250,7 @@ ubyte* WorldFiles::getData(unordered_map<ivec2, WorldRegion*>& regions,
}
}
if (data != nullptr) {
return decompress(data, region->getSize(localX, localZ), CHUNK_DATA_LEN);
return decompress(data, region->getChunkDataSize(localX, localZ), CHUNK_DATA_LEN);
}
return nullptr;
}
@@ -265,13 +265,13 @@ ubyte* WorldFiles::readChunkData(int x, int z, uint32_t& length, path filename){
int localZ = z - (regionZ * REGION_SIZE);
int chunkIndex = localZ * REGION_SIZE + localX;
std::ifstream input(filename, std::ios::binary);
std::ifstream input(filename, std::ios::binary); // BAD: open/close a file for every single chunk may be ineffective
if (!input.is_open()){
return nullptr;
}
input.seekg(0, ios::end);
size_t file_size = input.tellg();
size_t table_offset = file_size - REGION_VOL * 4;
size_t table_offset = file_size - REGION_CHUNKS_COUNT * 4;
uint32_t offset;
input.seekg(table_offset + chunkIndex * 4);
@@ -296,7 +296,7 @@ ubyte* WorldFiles::readChunkData(int x, int z, uint32_t& length, path filename){
void WorldFiles::writeRegion(int x, int y, WorldRegion* entry, path filename){
ubyte** region = entry->getChunks();
uint32_t* sizes = entry->getSizes();
for (size_t i = 0; i < REGION_VOL; i++) {
for (size_t i = 0; i < REGION_CHUNKS_COUNT; i++) {
int chunk_x = (i % REGION_SIZE) + x * REGION_SIZE;
int chunk_z = (i / REGION_SIZE) + y * REGION_SIZE;
if (region[i] == nullptr) {
@@ -312,9 +312,9 @@ void WorldFiles::writeRegion(int x, int y, WorldRegion* entry, path filename){
size_t offset = 10;
char intbuf[4]{};
uint offsets[REGION_VOL]{};
uint offsets[REGION_CHUNKS_COUNT]{};
for (size_t i = 0; i < REGION_VOL; i++) {
for (size_t i = 0; i < REGION_CHUNKS_COUNT; i++) {
ubyte* chunk = region[i];
if (chunk == nullptr){
offsets[i] = 0;
@@ -329,7 +329,7 @@ void WorldFiles::writeRegion(int x, int y, WorldRegion* entry, path filename){
file.write((const char*)chunk, compressedSize);
}
}
for (size_t i = 0; i < REGION_VOL; i++) {
for (size_t i = 0; i < REGION_CHUNKS_COUNT; i++) {
dataio::write_int32_big(offsets[i], (ubyte*)intbuf, 0);
file.write(intbuf, 4);
}