From bc9d29cf68b5c834ad96bbb17146e3effd8288f4 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 28 Feb 2022 02:30:15 +0300 Subject: [PATCH 01/31] A lot of changes in almost all files --- res/block.png | Bin 13667 -> 8247 bytes res/crosshair.glslv | 5 +- res/main.glslf | 6 +- res/main.glslv | 4 +- src/files/WorldFiles.cpp | 68 +- src/files/WorldFiles.h | 6 +- src/files/files.cpp | 14 +- src/files/files.h | 1 + src/graphics/LineBatch.cpp | 1 + src/graphics/VoxelRenderer.cpp | 497 ++++--- src/lighting/LightSolver.cpp | 3 +- src/lighting/Lighting.cpp | 44 +- src/lighting/Lighting.h | 20 +- src/lighting/Lightmap.cpp | 6 + src/lighting/Lightmap.h | 6 + src/loaders/png_loading.cpp | 2 +- src/maths/FastNoiseLite.h | 2433 +++++++++++++++++++++++++++++++ src/voxel_engine.cpp | 196 ++- src/voxels/Block.h | 1 + src/voxels/Chunk.cpp | 8 + src/voxels/Chunk.h | 5 + src/voxels/Chunks.cpp | 168 +-- src/voxels/Chunks.h | 9 +- src/voxels/ChunksController.cpp | 209 +++ src/voxels/ChunksController.h | 23 + src/voxels/ChunksLoader.cpp | 64 + src/voxels/ChunksLoader.h | 36 + src/voxels/WorldGenerator.cpp | 126 +- 28 files changed, 3485 insertions(+), 476 deletions(-) create mode 100644 src/maths/FastNoiseLite.h create mode 100644 src/voxels/ChunksController.cpp create mode 100644 src/voxels/ChunksController.h create mode 100644 src/voxels/ChunksLoader.cpp create mode 100644 src/voxels/ChunksLoader.h diff --git a/res/block.png b/res/block.png index 5f63998d52395084b8452440a2945b61f987051b..5e2512c7d531cc21c8c2cb913134d300f2800ef2 100644 GIT binary patch literal 8247 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 OTCkq+{f|11asLlgJv(3k diff --git a/res/crosshair.glslv b/res/crosshair.glslv index 5d240912..1d67cb55 100644 --- a/res/crosshair.glslv +++ b/res/crosshair.glslv @@ -2,6 +2,9 @@ layout (location = 0) in vec2 v_position; +uniform float u_ar; +uniform float u_scale; + void main(){ - gl_Position = vec4(v_position, 0.0, 1.0); + gl_Position = vec4(v_position.x * u_ar * u_scale, v_position.y * u_scale, 0.0, 1.0); } diff --git a/res/main.glslf b/res/main.glslf index 7528e68a..1b998767 100644 --- a/res/main.glslf +++ b/res/main.glslf @@ -10,8 +10,8 @@ uniform vec3 u_fogColor; void main(){ vec4 tex_color = texture(u_texture0, a_texCoord); - if (tex_color.a < 0.5) - discard; + //if (tex_color.a < 0.5) + // discard; float depth = (a_distance/256.0)*(a_distance/256.0)*256.0; - f_color = mix(a_color * tex_color, vec4(u_fogColor,1.0), min(1.0, depth/256.0)); + f_color = mix(a_color * tex_color, vec4(u_fogColor,1.0), min(1.0, depth/256.0/1.0f)); } diff --git a/res/main.glslv b/res/main.glslv index a0513030..8f3e237e 100644 --- a/res/main.glslv +++ b/res/main.glslv @@ -12,10 +12,12 @@ uniform mat4 u_model; uniform mat4 u_proj; uniform mat4 u_view; uniform vec3 u_skyLightColor; +uniform vec3 u_cameraPos; uniform float u_gamma; void main(){ - vec4 viewmodelpos = u_view * u_model * vec4(v_position, 1.0); + vec2 pos2d = (u_model * vec4(v_position, 1.0)).xz-u_cameraPos.xz; + vec4 viewmodelpos = u_view * u_model * vec4(v_position+vec3(0,pow(length(pos2d)*0.0, 3.0),0), 1.0); a_color = vec4(pow(v_light.rgb, vec3(u_gamma)),1.0f); a_texCoord = v_texCoord; a_color.rgb += u_skyLightColor * v_light.a*0.5; diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index 6df02573..f0c56e9c 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -14,6 +14,9 @@ union { #include #include +#define SECTION_POSITION 1 +#define SECTION_ROTATION 2 + unsigned long WorldFiles::totalCompressed = 0; int bytes2Int(const unsigned char* src, unsigned int offset){ @@ -27,6 +30,23 @@ void int2Bytes(int value, char* dest, unsigned int offset){ dest[offset+3] = (char) (value >> 0 & 255); } +void float2Bytes(float fvalue, char* dest, unsigned int offset){ + uint32_t value = *((uint32_t*)&fvalue); + dest[offset] = (char) (value >> 24 & 255); + dest[offset+1] = (char) (value >> 16 & 255); + dest[offset+2] = (char) (value >> 8 & 255); + dest[offset+3] = (char) (value >> 0 & 255); +} + +float bytes2Float(char* srcs, unsigned int offset){ + unsigned char* src = (unsigned char*) srcs; + uint32_t value = ((src[offset] << 24) | + (src[offset+1] << 16) | + (src[offset+2] << 8) | + (src[offset+3])); + return *(float*)(&value); +} + WorldFiles::WorldFiles(const char* directory, size_t mainBufferCapacity) : directory(directory){ mainBufferIn = new char[CHUNK_VOL*2]; mainBufferOut = new char[mainBufferCapacity]; @@ -81,6 +101,10 @@ std::string WorldFiles::getRegionFile(int x, int y) { return directory + std::to_string(x) + "_" + std::to_string(y) + ".bin"; } +std::string WorldFiles::getPlayerFile() { + return directory + "/player.bin"; +} + bool WorldFiles::getChunk(int x, int y, char* out){ assert(out != nullptr); @@ -129,7 +153,7 @@ bool WorldFiles::readChunk(int x, int y, char* out){ input.read((char*)(&offset), 4); // Ordering bytes from big-endian to machine order (any, just reading) offset = bytes2Int((const unsigned char*)(&offset), 0); - assert (offset < 1000000); + //assert (offset < 1000000); if (offset == 0){ input.close(); return false; @@ -161,6 +185,48 @@ void WorldFiles::write(){ } } +void WorldFiles::writePlayer(glm::vec3 position, float camX, float camY){ + char dst[1+3*4 + 1+2*4]; + + size_t offset = 0; + dst[offset++] = SECTION_POSITION; + float2Bytes(position.x, dst, offset); offset += 4; + float2Bytes(position.y, dst, offset); offset += 4; + float2Bytes(position.z, dst, offset); offset += 4; + + dst[offset++] = SECTION_ROTATION; + float2Bytes(camX, dst, offset); offset += 4; + float2Bytes(camY, dst, offset); offset += 4; + + write_binary_file(getPlayerFile(), (const char*)dst, sizeof(dst)); +} + +bool WorldFiles::readPlayer(glm::vec3& position, float& camX, float& camY) { + size_t length = 0; + char* data = read_binary_file(getPlayerFile(), length); + if (data == nullptr){ + std::cerr << "could not to read player.bin" << std::endl; + return false; + } + size_t offset = 0; + while (offset < length){ + char section = data[offset++]; + switch (section){ + case SECTION_POSITION: + position.x = bytes2Float(data, offset); offset += 4; + position.y = bytes2Float(data, offset); offset += 4; + position.z = bytes2Float(data, offset); offset += 4; + break; + case SECTION_ROTATION: + camX = bytes2Float(data, offset); offset += 4; + camY = bytes2Float(data, offset); offset += 4; + break; + } + } + std::cout << position.x << " " << position.y << " " << position.z << std::endl; + return true; +} + unsigned int WorldFiles::writeRegion(char* out, int x, int y, char** region){ unsigned int offset = REGION_VOL * 4; for (unsigned int i = 0; i < offset; i++) diff --git a/src/files/WorldFiles.h b/src/files/WorldFiles.h index 92910ef7..88b93f37 100644 --- a/src/files/WorldFiles.h +++ b/src/files/WorldFiles.h @@ -3,7 +3,8 @@ #include #include -#include +#include + #define REGION_SIZE_BIT 5 #define REGION_SIZE (1 << (REGION_SIZE_BIT)) #define REGION_VOL ((REGION_SIZE) * (REGION_SIZE)) @@ -26,13 +27,16 @@ public: void put(const char* chunkData, int x, int y); + bool readPlayer(glm::vec3& position, float& camX, float& camY); bool readChunk(int x, int y, char* out); bool getChunk(int x, int y, char* out); void readRegion(char* fileContent); unsigned int writeRegion(char* out, int x, int y, char** region); + void writePlayer(glm::vec3 position, float camX, float camY); void write(); std::string getRegionFile(int x, int y); + std::string getPlayerFile(); }; extern void longToCoords(int& x, int& y, long key); diff --git a/src/files/files.cpp b/src/files/files.cpp index 3b6e8881..2344128b 100644 --- a/src/files/files.cpp +++ b/src/files/files.cpp @@ -40,14 +40,18 @@ bool read_binary_file(std::string filename, char* data, size_t size) { return true; } -bool read_binary_file(std::string filename, char* data, size_t offset, size_t size) { +char* read_binary_file(std::string filename, size_t& length) { std::ifstream input(filename, std::ios::binary); if (!input.is_open()) - return false; - input.seekg(offset); - input.read(data, size); + return nullptr; + input.seekg(0, std::ios_base::end); + length = input.tellg(); + input.seekg(0, std::ios_base::beg); + + char* data = new char[length]; + input.read(data, length); input.close(); - return true; + return data; } // returns decompressed length diff --git a/src/files/files.h b/src/files/files.h index 6e75175a..7b53cb16 100644 --- a/src/files/files.h +++ b/src/files/files.h @@ -7,6 +7,7 @@ extern bool write_binary_file(std::string filename, const char* data, size_t siz extern unsigned int append_binary_file(std::string filename, const char* data, size_t size); extern bool read_binary_file(std::string filename, char* data, size_t size); extern bool read_binary_file(std::string filename, char* data, size_t offset, size_t size); +extern char* read_binary_file(std::string filename, size_t& length); extern unsigned int calcRLE(const char* src, unsigned int length); extern unsigned int compressRLE(const char* src, unsigned int length, char* dst); diff --git a/src/graphics/LineBatch.cpp b/src/graphics/LineBatch.cpp index eab957d4..ca37f26e 100644 --- a/src/graphics/LineBatch.cpp +++ b/src/graphics/LineBatch.cpp @@ -67,6 +67,7 @@ void LineBatch::box(float x, float y, float z, float w, float h, float d, line(x+w, y+h, z-d, x+w, y+h, z+d, r,g,b,a); } +#include void LineBatch::render(){ if (index == 0) return; diff --git a/src/graphics/VoxelRenderer.cpp b/src/graphics/VoxelRenderer.cpp index 6dbf2c9a..850c9c48 100644 --- a/src/graphics/VoxelRenderer.cpp +++ b/src/graphics/VoxelRenderer.cpp @@ -44,254 +44,271 @@ VoxelRenderer::~VoxelRenderer(){ delete[] buffer; } +inline void _renderBlock(float* buffer, int x, int y, int z, const Chunk** chunks, voxel vox, size_t& index){ + unsigned int id = vox.id; + + if (!id){ + return; + } + + float l; + float uvsize = 1.0f/16.0f; + + Block* block = Block::blocks[id]; + unsigned char group = block->drawGroup; + + if (!IS_BLOCKED(x,y+1,z,group)){ + l = 1.0f; + + SETUP_UV(block->textureFaces[3]); + + float lr = LIGHT(x,y+1,z, 0) / 15.0f; + float lg = LIGHT(x,y+1,z, 1) / 15.0f; + float lb = LIGHT(x,y+1,z, 2) / 15.0f; + float ls = LIGHT(x,y+1,z, 3) / 15.0f; + + float lr0 = (LIGHT(x-1,y+1,z,0) + lr*30 + LIGHT(x-1,y+1,z-1,0) + LIGHT(x,y+1,z-1,0)) / 5.0f / 15.0f; + float lr1 = (LIGHT(x-1,y+1,z,0) + lr*30 + LIGHT(x-1,y+1,z+1,0) + LIGHT(x,y+1,z+1,0)) / 5.0f / 15.0f; + float lr2 = (LIGHT(x+1,y+1,z,0) + lr*30 + LIGHT(x+1,y+1,z+1,0) + LIGHT(x,y+1,z+1,0)) / 5.0f / 15.0f; + float lr3 = (LIGHT(x+1,y+1,z,0) + lr*30 + LIGHT(x+1,y+1,z-1,0) + LIGHT(x,y+1,z-1,0)) / 5.0f / 15.0f; + + float lg0 = (LIGHT(x-1,y+1,z,1) + lg*30 + LIGHT(x-1,y+1,z-1,1) + LIGHT(x,y+1,z-1,1)) / 5.0f / 15.0f; + float lg1 = (LIGHT(x-1,y+1,z,1) + lg*30 + LIGHT(x-1,y+1,z+1,1) + LIGHT(x,y+1,z+1,1)) / 5.0f / 15.0f; + float lg2 = (LIGHT(x+1,y+1,z,1) + lg*30 + LIGHT(x+1,y+1,z+1,1) + LIGHT(x,y+1,z+1,1)) / 5.0f / 15.0f; + float lg3 = (LIGHT(x+1,y+1,z,1) + lg*30 + LIGHT(x+1,y+1,z-1,1) + LIGHT(x,y+1,z-1,1)) / 5.0f / 15.0f; + + float lb0 = (LIGHT(x-1,y+1,z,2) + lb*30 + LIGHT(x-1,y+1,z-1,2) + LIGHT(x,y+1,z-1,2)) / 5.0f / 15.0f; + float lb1 = (LIGHT(x-1,y+1,z,2) + lb*30 + LIGHT(x-1,y+1,z+1,2) + LIGHT(x,y+1,z+1,2)) / 5.0f / 15.0f; + float lb2 = (LIGHT(x+1,y+1,z,2) + lb*30 + LIGHT(x+1,y+1,z+1,2) + LIGHT(x,y+1,z+1,2)) / 5.0f / 15.0f; + float lb3 = (LIGHT(x+1,y+1,z,2) + lb*30 + LIGHT(x+1,y+1,z-1,2) + LIGHT(x,y+1,z-1,2)) / 5.0f / 15.0f; + + float ls0 = (LIGHT(x-1,y+1,z,3) + ls*30 + LIGHT(x-1,y+1,z-1,3) + LIGHT(x,y+1,z-1,3)) / 5.0f / 15.0f; + float ls1 = (LIGHT(x-1,y+1,z,3) + ls*30 + LIGHT(x-1,y+1,z+1,3) + LIGHT(x,y+1,z+1,3)) / 5.0f / 15.0f; + float ls2 = (LIGHT(x+1,y+1,z,3) + ls*30 + LIGHT(x+1,y+1,z+1,3) + LIGHT(x,y+1,z+1,3)) / 5.0f / 15.0f; + float ls3 = (LIGHT(x+1,y+1,z,3) + ls*30 + LIGHT(x+1,y+1,z-1,3) + LIGHT(x,y+1,z-1,3)) / 5.0f / 15.0f; + + VERTEX(index, x-0.5f, y+0.5f, z-0.5f, u2,v1, lr0, lg0, lb0, ls0); + VERTEX(index, x-0.5f, y+0.5f, z+0.5f, u2,v2, lr1, lg1, lb1, ls1); + VERTEX(index, x+0.5f, y+0.5f, z+0.5f, u1,v2, lr2, lg2, lb2, ls2); + + VERTEX(index, x-0.5f, y+0.5f, z-0.5f, u2,v1, lr0, lg0, lb0, ls0); + VERTEX(index, x+0.5f, y+0.5f, z+0.5f, u1,v2, lr2, lg2, lb2, ls2); + VERTEX(index, x+0.5f, y+0.5f, z-0.5f, u1,v1, lr3, lg3, lb3, ls3); + } + if (!IS_BLOCKED(x,y-1,z,group)){ + l = 0.75f; + + SETUP_UV(block->textureFaces[2]); + + float lr = LIGHT(x,y-1,z, 0) / 15.0f; + float lg = LIGHT(x,y-1,z, 1) / 15.0f; + float lb = LIGHT(x,y-1,z, 2) / 15.0f; + float ls = LIGHT(x,y-1,z, 3) / 15.0f; + + float lr0 = (LIGHT(x-1,y-1,z-1,0) + lr*30 + LIGHT(x-1,y-1,z,0) + LIGHT(x,y-1,z-1,0)) / 5.0f / 15.0f; + float lr1 = (LIGHT(x+1,y-1,z+1,0) + lr*30 + LIGHT(x+1,y-1,z,0) + LIGHT(x,y-1,z+1,0)) / 5.0f / 15.0f; + float lr2 = (LIGHT(x-1,y-1,z+1,0) + lr*30 + LIGHT(x-1,y-1,z,0) + LIGHT(x,y-1,z+1,0)) / 5.0f / 15.0f; + float lr3 = (LIGHT(x+1,y-1,z-1,0) + lr*30 + LIGHT(x+1,y-1,z,0) + LIGHT(x,y-1,z-1,0)) / 5.0f / 15.0f; + + float lg0 = (LIGHT(x-1,y-1,z-1,1) + lg*30 + LIGHT(x-1,y-1,z,1) + LIGHT(x,y-1,z-1,1)) / 5.0f / 15.0f; + float lg1 = (LIGHT(x+1,y-1,z+1,1) + lg*30 + LIGHT(x+1,y-1,z,1) + LIGHT(x,y-1,z+1,1)) / 5.0f / 15.0f; + float lg2 = (LIGHT(x-1,y-1,z+1,1) + lg*30 + LIGHT(x-1,y-1,z,1) + LIGHT(x,y-1,z+1,1)) / 5.0f / 15.0f; + float lg3 = (LIGHT(x+1,y-1,z-1,1) + lg*30 + LIGHT(x+1,y-1,z,1) + LIGHT(x,y-1,z-1,1)) / 5.0f / 15.0f; + + float lb0 = (LIGHT(x-1,y-1,z-1,2) + lb*30 + LIGHT(x-1,y-1,z,2) + LIGHT(x,y-1,z-1,2)) / 5.0f / 15.0f; + float lb1 = (LIGHT(x+1,y-1,z+1,2) + lb*30 + LIGHT(x+1,y-1,z,2) + LIGHT(x,y-1,z+1,2)) / 5.0f / 15.0f; + float lb2 = (LIGHT(x-1,y-1,z+1,2) + lb*30 + LIGHT(x-1,y-1,z,2) + LIGHT(x,y-1,z+1,2)) / 5.0f / 15.0f; + float lb3 = (LIGHT(x+1,y-1,z-1,2) + lb*30 + LIGHT(x+1,y-1,z,2) + LIGHT(x,y-1,z-1,2)) / 5.0f / 15.0f; + + float ls0 = (LIGHT(x-1,y-1,z-1,3) + ls*30 + LIGHT(x-1,y-1,z,3) + LIGHT(x,y-1,z-1,3)) / 5.0f / 15.0f; + float ls1 = (LIGHT(x+1,y-1,z+1,3) + ls*30 + LIGHT(x+1,y-1,z,3) + LIGHT(x,y-1,z+1,3)) / 5.0f / 15.0f; + float ls2 = (LIGHT(x-1,y-1,z+1,3) + ls*30 + LIGHT(x-1,y-1,z,3) + LIGHT(x,y-1,z+1,3)) / 5.0f / 15.0f; + float ls3 = (LIGHT(x+1,y-1,z-1,3) + ls*30 + LIGHT(x+1,y-1,z,3) + LIGHT(x,y-1,z-1,3)) / 5.0f / 15.0f; + + VERTEX(index, x-0.5f, y-0.5f, z-0.5f, u1,v1, lr0,lg0,lb0,ls0); + VERTEX(index, x+0.5f, y-0.5f, z+0.5f, u2,v2, lr1,lg1,lb1,ls1); + VERTEX(index, x-0.5f, y-0.5f, z+0.5f, u1,v2, lr2,lg2,lb2,ls2); + + VERTEX(index, x-0.5f, y-0.5f, z-0.5f, u1,v1, lr0,lg0,lb0,ls0); + VERTEX(index, x+0.5f, y-0.5f, z-0.5f, u2,v1, lr3,lg3,lb3,ls3); + VERTEX(index, x+0.5f, y-0.5f, z+0.5f, u2,v2, lr1,lg1,lb1,ls1); + } + + if (!IS_BLOCKED(x+1,y,z,group)){ + l = 0.95f; + + SETUP_UV(block->textureFaces[1]); + + float lr = LIGHT(x+1,y,z, 0) / 15.0f; + float lg = LIGHT(x+1,y,z, 1) / 15.0f; + float lb = LIGHT(x+1,y,z, 2) / 15.0f; + float ls = LIGHT(x+1,y,z, 3) / 15.0f; + + float lr0 = (LIGHT(x+1,y-1,z-1,0) + lr*30 + LIGHT(x+1,y,z-1,0) + LIGHT(x+1,y-1,z,0)) / 5.0f / 15.0f; + float lr1 = (LIGHT(x+1,y+1,z-1,0) + lr*30 + LIGHT(x+1,y,z-1,0) + LIGHT(x+1,y+1,z,0)) / 5.0f / 15.0f; + float lr2 = (LIGHT(x+1,y+1,z+1,0) + lr*30 + LIGHT(x+1,y,z+1,0) + LIGHT(x+1,y+1,z,0)) / 5.0f / 15.0f; + float lr3 = (LIGHT(x+1,y-1,z+1,0) + lr*30 + LIGHT(x+1,y,z+1,0) + LIGHT(x+1,y-1,z,0)) / 5.0f / 15.0f; + + float lg0 = (LIGHT(x+1,y-1,z-1,1) + lg*30 + LIGHT(x+1,y,z-1,1) + LIGHT(x+1,y-1,z,1)) / 5.0f / 15.0f; + float lg1 = (LIGHT(x+1,y+1,z-1,1) + lg*30 + LIGHT(x+1,y,z-1,1) + LIGHT(x+1,y+1,z,1)) / 5.0f / 15.0f; + float lg2 = (LIGHT(x+1,y+1,z+1,1) + lg*30 + LIGHT(x+1,y,z+1,1) + LIGHT(x+1,y+1,z,1)) / 5.0f / 15.0f; + float lg3 = (LIGHT(x+1,y-1,z+1,1) + lg*30 + LIGHT(x+1,y,z+1,1) + LIGHT(x+1,y-1,z,1)) / 5.0f / 15.0f; + + float lb0 = (LIGHT(x+1,y-1,z-1,2) + lb*30 + LIGHT(x+1,y,z-1,2) + LIGHT(x+1,y-1,z,2)) / 5.0f / 15.0f; + float lb1 = (LIGHT(x+1,y+1,z-1,2) + lb*30 + LIGHT(x+1,y,z-1,2) + LIGHT(x+1,y+1,z,2)) / 5.0f / 15.0f; + float lb2 = (LIGHT(x+1,y+1,z+1,2) + lb*30 + LIGHT(x+1,y,z+1,2) + LIGHT(x+1,y+1,z,2)) / 5.0f / 15.0f; + float lb3 = (LIGHT(x+1,y-1,z+1,2) + lb*30 + LIGHT(x+1,y,z+1,2) + LIGHT(x+1,y-1,z,2)) / 5.0f / 15.0f; + + float ls0 = (LIGHT(x+1,y-1,z-1,3) + ls*30 + LIGHT(x+1,y,z-1,3) + LIGHT(x+1,y-1,z,3)) / 5.0f / 15.0f; + float ls1 = (LIGHT(x+1,y+1,z-1,3) + ls*30 + LIGHT(x+1,y,z-1,3) + LIGHT(x+1,y+1,z,3)) / 5.0f / 15.0f; + float ls2 = (LIGHT(x+1,y+1,z+1,3) + ls*30 + LIGHT(x+1,y,z+1,3) + LIGHT(x+1,y+1,z,3)) / 5.0f / 15.0f; + float ls3 = (LIGHT(x+1,y-1,z+1,3) + ls*30 + LIGHT(x+1,y,z+1,3) + LIGHT(x+1,y-1,z,3)) / 5.0f / 15.0f; + + VERTEX(index, x+0.5f, y-0.5f, z-0.5f, u2,v1, lr0,lg0,lb0,ls0); + VERTEX(index, x+0.5f, y+0.5f, z-0.5f, u2,v2, lr1,lg1,lb1,ls1); + VERTEX(index, x+0.5f, y+0.5f, z+0.5f, u1,v2, lr2,lg2,lb2,ls2); + + VERTEX(index, x+0.5f, y-0.5f, z-0.5f, u2,v1, lr0,lg0,lb0,ls0); + VERTEX(index, x+0.5f, y+0.5f, z+0.5f, u1,v2, lr2,lg2,lb2,ls2); + VERTEX(index, x+0.5f, y-0.5f, z+0.5f, u1,v1, lr3,lg3,lb3,ls3); + } + if (!IS_BLOCKED(x-1,y,z,group)){ + l = 0.85f; + + SETUP_UV(block->textureFaces[0]); + + float lr = LIGHT(x-1,y,z, 0) / 15.0f; + float lg = LIGHT(x-1,y,z, 1) / 15.0f; + float lb = LIGHT(x-1,y,z, 2) / 15.0f; + float ls = LIGHT(x-1,y,z, 3) / 15.0f; + + float lr0 = (LIGHT(x-1,y-1,z-1,0) + lr*30 + LIGHT(x-1,y,z-1,0) + LIGHT(x-1,y-1,z,0)) / 5.0f / 15.0f; + float lr1 = (LIGHT(x-1,y+1,z+1,0) + lr*30 + LIGHT(x-1,y,z+1,0) + LIGHT(x-1,y+1,z,0)) / 5.0f / 15.0f; + float lr2 = (LIGHT(x-1,y+1,z-1,0) + lr*30 + LIGHT(x-1,y,z-1,0) + LIGHT(x-1,y+1,z,0)) / 5.0f / 15.0f; + float lr3 = (LIGHT(x-1,y-1,z+1,0) + lr*30 + LIGHT(x-1,y,z+1,0) + LIGHT(x-1,y-1,z,0)) / 5.0f / 15.0f; + + float lg0 = (LIGHT(x-1,y-1,z-1,1) + lg*30 + LIGHT(x-1,y,z-1,1) + LIGHT(x-1,y-1,z,1)) / 5.0f / 15.0f; + float lg1 = (LIGHT(x-1,y+1,z+1,1) + lg*30 + LIGHT(x-1,y,z+1,1) + LIGHT(x-1,y+1,z,1)) / 5.0f / 15.0f; + float lg2 = (LIGHT(x-1,y+1,z-1,1) + lg*30 + LIGHT(x-1,y,z-1,1) + LIGHT(x-1,y+1,z,1)) / 5.0f / 15.0f; + float lg3 = (LIGHT(x-1,y-1,z+1,1) + lg*30 + LIGHT(x-1,y,z+1,1) + LIGHT(x-1,y-1,z,1)) / 5.0f / 15.0f; + + float lb0 = (LIGHT(x-1,y-1,z-1,2) + lb*30 + LIGHT(x-1,y,z-1,2) + LIGHT(x-1,y-1,z,2)) / 5.0f / 15.0f; + float lb1 = (LIGHT(x-1,y+1,z+1,2) + lb*30 + LIGHT(x-1,y,z+1,2) + LIGHT(x-1,y+1,z,2)) / 5.0f / 15.0f; + float lb2 = (LIGHT(x-1,y+1,z-1,2) + lb*30 + LIGHT(x-1,y,z-1,2) + LIGHT(x-1,y+1,z,2)) / 5.0f / 15.0f; + float lb3 = (LIGHT(x-1,y-1,z+1,2) + lb*30 + LIGHT(x-1,y,z+1,2) + LIGHT(x-1,y-1,z,2)) / 5.0f / 15.0f; + + float ls0 = (LIGHT(x-1,y-1,z-1,3) + ls*30 + LIGHT(x-1,y,z-1,3) + LIGHT(x-1,y-1,z,3)) / 5.0f / 15.0f; + float ls1 = (LIGHT(x-1,y+1,z+1,3) + ls*30 + LIGHT(x-1,y,z+1,3) + LIGHT(x-1,y+1,z,3)) / 5.0f / 15.0f; + float ls2 = (LIGHT(x-1,y+1,z-1,3) + ls*30 + LIGHT(x-1,y,z-1,3) + LIGHT(x-1,y+1,z,3)) / 5.0f / 15.0f; + float ls3 = (LIGHT(x-1,y-1,z+1,3) + ls*30 + LIGHT(x-1,y,z+1,3) + LIGHT(x-1,y-1,z,3)) / 5.0f / 15.0f; + + VERTEX(index, x-0.5f, y-0.5f, z-0.5f, u1,v1, lr0,lg0,lb0,ls0); + VERTEX(index, x-0.5f, y+0.5f, z+0.5f, u2,v2, lr1,lg1,lb1,ls1); + VERTEX(index, x-0.5f, y+0.5f, z-0.5f, u1,v2, lr2,lg2,lb2,ls2); + + VERTEX(index, x-0.5f, y-0.5f, z-0.5f, u1,v1, lr0,lg0,lb0,ls0); + VERTEX(index, x-0.5f, y-0.5f, z+0.5f, u2,v1, lr3,lg3,lb3,ls3); + VERTEX(index, x-0.5f, y+0.5f, z+0.5f, u2,v2, lr1,lg1,lb1,ls1); + } + + if (!IS_BLOCKED(x,y,z+1,group)){ + l = 0.9f; + + SETUP_UV(block->textureFaces[5]); + + float lr = LIGHT(x,y,z+1, 0) / 15.0f; + float lg = LIGHT(x,y,z+1, 1) / 15.0f; + float lb = LIGHT(x,y,z+1, 2) / 15.0f; + float ls = LIGHT(x,y,z+1, 3) / 15.0f; + + float lr0 = l*(LIGHT(x-1,y-1,z+1,0) + lr*30 + LIGHT(x,y-1,z+1,0) + LIGHT(x-1,y,z+1,0)) / 5.0f / 15.0f; + float lr1 = l*(LIGHT(x+1,y+1,z+1,0) + lr*30 + LIGHT(x,y+1,z+1,0) + LIGHT(x+1,y,z+1,0)) / 5.0f / 15.0f; + float lr2 = l*(LIGHT(x-1,y+1,z+1,0) + lr*30 + LIGHT(x,y+1,z+1,0) + LIGHT(x-1,y,z+1,0)) / 5.0f / 15.0f; + float lr3 = l*(LIGHT(x+1,y-1,z+1,0) + lr*30 + LIGHT(x,y-1,z+1,0) + LIGHT(x+1,y,z+1,0)) / 5.0f / 15.0f; + + float lg0 = l*(LIGHT(x-1,y-1,z+1,1) + lg*30 + LIGHT(x,y-1,z+1,1) + LIGHT(x-1,y,z+1,1)) / 5.0f / 15.0f; + float lg1 = l*(LIGHT(x+1,y+1,z+1,1) + lg*30 + LIGHT(x,y+1,z+1,1) + LIGHT(x+1,y,z+1,1)) / 5.0f / 15.0f; + float lg2 = l*(LIGHT(x-1,y+1,z+1,1) + lg*30 + LIGHT(x,y+1,z+1,1) + LIGHT(x-1,y,z+1,1)) / 5.0f / 15.0f; + float lg3 = l*(LIGHT(x+1,y-1,z+1,1) + lg*30 + LIGHT(x,y-1,z+1,1) + LIGHT(x+1,y,z+1,1)) / 5.0f / 15.0f; + + float lb0 = l*(LIGHT(x-1,y-1,z+1,2) + lb*30 + LIGHT(x,y-1,z+1,2) + LIGHT(x-1,y,z+1,2)) / 5.0f / 15.0f; + float lb1 = l*(LIGHT(x+1,y+1,z+1,2) + lb*30 + LIGHT(x,y+1,z+1,2) + LIGHT(x+1,y,z+1,2)) / 5.0f / 15.0f; + float lb2 = l*(LIGHT(x-1,y+1,z+1,2) + lb*30 + LIGHT(x,y+1,z+1,2) + LIGHT(x-1,y,z+1,2)) / 5.0f / 15.0f; + float lb3 = l*(LIGHT(x+1,y-1,z+1,2) + lb*30 + LIGHT(x,y-1,z+1,2) + LIGHT(x+1,y,z+1,2)) / 5.0f / 15.0f; + + float ls0 = l*(LIGHT(x-1,y-1,z+1,3) + ls*30 + LIGHT(x,y-1,z+1,3) + LIGHT(x-1,y,z+1,3)) / 5.0f / 15.0f; + float ls1 = l*(LIGHT(x+1,y+1,z+1,3) + ls*30 + LIGHT(x,y+1,z+1,3) + LIGHT(x+1,y,z+1,3)) / 5.0f / 15.0f; + float ls2 = l*(LIGHT(x-1,y+1,z+1,3) + ls*30 + LIGHT(x,y+1,z+1,3) + LIGHT(x-1,y,z+1,3)) / 5.0f / 15.0f; + float ls3 = l*(LIGHT(x+1,y-1,z+1,3) + ls*30 + LIGHT(x,y-1,z+1,3) + LIGHT(x+1,y,z+1,3)) / 5.0f / 15.0f; + + VERTEX(index, x-0.5f, y-0.5f, z+0.5f, u1,v1, lr0,lg0,lb0,ls0); + VERTEX(index, x+0.5f, y+0.5f, z+0.5f, u2,v2, lr1,lg1,lb1,ls1); + VERTEX(index, x-0.5f, y+0.5f, z+0.5f, u1,v2, lr2,lg2,lb2,ls2); + + VERTEX(index, x-0.5f, y-0.5f, z+0.5f, u1,v1, lr0,lg0,lb0,ls0); + VERTEX(index, x+0.5f, y-0.5f, z+0.5f, u2,v1, lr3,lg3,lb3,ls3); + VERTEX(index, x+0.5f, y+0.5f, z+0.5f, u2,v2, lr1,lg1,lb1,ls1); + } + if (!IS_BLOCKED(x,y,z-1,group)){ + l = 0.8f; + + SETUP_UV(block->textureFaces[4]); + + float lr = LIGHT(x,y,z-1, 0) / 15.0f; + float lg = LIGHT(x,y,z-1, 1) / 15.0f; + float lb = LIGHT(x,y,z-1, 2) / 15.0f; + float ls = LIGHT(x,y,z-1, 3) / 15.0f; + + float lr0 = l*(LIGHT(x-1,y-1,z-1,0) + lr*30 + LIGHT(x,y-1,z-1,0) + LIGHT(x-1,y,z-1,0)) / 5.0f / 15.0f; + float lr1 = l*(LIGHT(x-1,y+1,z-1,0) + lr*30 + LIGHT(x,y+1,z-1,0) + LIGHT(x-1,y,z-1,0)) / 5.0f / 15.0f; + float lr2 = l*(LIGHT(x+1,y+1,z-1,0) + lr*30 + LIGHT(x,y+1,z-1,0) + LIGHT(x+1,y,z-1,0)) / 5.0f / 15.0f; + float lr3 = l*(LIGHT(x+1,y-1,z-1,0) + lr*30 + LIGHT(x,y-1,z-1,0) + LIGHT(x+1,y,z-1,0)) / 5.0f / 15.0f; + + float lg0 = l*(LIGHT(x-1,y-1,z-1,1) + lg*30 + LIGHT(x,y-1,z-1,1) + LIGHT(x-1,y,z-1,1)) / 5.0f / 15.0f; + float lg1 = l*(LIGHT(x-1,y+1,z-1,1) + lg*30 + LIGHT(x,y+1,z-1,1) + LIGHT(x-1,y,z-1,1)) / 5.0f / 15.0f; + float lg2 = l*(LIGHT(x+1,y+1,z-1,1) + lg*30 + LIGHT(x,y+1,z-1,1) + LIGHT(x+1,y,z-1,1)) / 5.0f / 15.0f; + float lg3 = l*(LIGHT(x+1,y-1,z-1,1) + lg*30 + LIGHT(x,y-1,z-1,1) + LIGHT(x+1,y,z-1,1)) / 5.0f / 15.0f; + + float lb0 = l*(LIGHT(x-1,y-1,z-1,2) + lb*30 + LIGHT(x,y-1,z-1,2) + LIGHT(x-1,y,z-1,2)) / 5.0f / 15.0f; + float lb1 = l*(LIGHT(x-1,y+1,z-1,2) + lb*30 + LIGHT(x,y+1,z-1,2) + LIGHT(x-1,y,z-1,2)) / 5.0f / 15.0f; + float lb2 = l*(LIGHT(x+1,y+1,z-1,2) + lb*30 + LIGHT(x,y+1,z-1,2) + LIGHT(x+1,y,z-1,2)) / 5.0f / 15.0f; + float lb3 = l*(LIGHT(x+1,y-1,z-1,2) + lb*30 + LIGHT(x,y-1,z-1,2) + LIGHT(x+1,y,z-1,2)) / 5.0f / 15.0f; + + float ls0 = l*(LIGHT(x-1,y-1,z-1,3) + ls*30 + LIGHT(x,y-1,z-1,3) + LIGHT(x-1,y,z-1,3)) / 5.0f / 15.0f; + float ls1 = l*(LIGHT(x-1,y+1,z-1,3) + ls*30 + LIGHT(x,y+1,z-1,3) + LIGHT(x-1,y,z-1,3)) / 5.0f / 15.0f; + float ls2 = l*(LIGHT(x+1,y+1,z-1,3) + ls*30 + LIGHT(x,y+1,z-1,3) + LIGHT(x+1,y,z-1,3)) / 5.0f / 15.0f; + float ls3 = l*(LIGHT(x+1,y-1,z-1,3) + ls*30 + LIGHT(x,y-1,z-1,3) + LIGHT(x+1,y,z-1,3)) / 5.0f / 15.0f; + + VERTEX(index, x-0.5f, y-0.5f, z-0.5f, u2,v1, lr0,lg0,lb0,ls0); + VERTEX(index, x-0.5f, y+0.5f, z-0.5f, u2,v2, lr1,lg1,lb1,ls1); + VERTEX(index, x+0.5f, y+0.5f, z-0.5f, u1,v2, lr2,lg2,lb2,ls2); + + VERTEX(index, x-0.5f, y-0.5f, z-0.5f, u2,v1, lr0,lg0,lb0,ls0); + VERTEX(index, x+0.5f, y+0.5f, z-0.5f, u1,v2, lr2,lg2,lb2,ls2); + VERTEX(index, x+0.5f, y-0.5f, z-0.5f, u1,v1, lr3,lg3,lb3,ls3); + } +} + Mesh* VoxelRenderer::render(Chunk* chunk, const Chunk** chunks){ size_t index = 0; for (int y = 0; y < CHUNK_H; y++){ for (int z = 0; z < CHUNK_D; z++){ for (int x = 0; x < CHUNK_W; x++){ voxel vox = chunk->voxels[(y * CHUNK_D + z) * CHUNK_W + x]; - unsigned int id = vox.id; - - if (!id){ + if (vox.id == 9) continue; - } + _renderBlock(buffer, x, y, z, chunks, vox, index); + } + } + } - float l; - float uvsize = 1.0f/16.0f; - - Block* block = Block::blocks[id]; - unsigned char group = block->drawGroup; - - if (!IS_BLOCKED(x,y+1,z,group)){ - l = 1.0f; - - SETUP_UV(block->textureFaces[3]); - - float lr = LIGHT(x,y+1,z, 0) / 15.0f; - float lg = LIGHT(x,y+1,z, 1) / 15.0f; - float lb = LIGHT(x,y+1,z, 2) / 15.0f; - float ls = LIGHT(x,y+1,z, 3) / 15.0f; - - float lr0 = (LIGHT(x-1,y+1,z,0) + lr*30 + LIGHT(x-1,y+1,z-1,0) + LIGHT(x,y+1,z-1,0)) / 5.0f / 15.0f; - float lr1 = (LIGHT(x-1,y+1,z,0) + lr*30 + LIGHT(x-1,y+1,z+1,0) + LIGHT(x,y+1,z+1,0)) / 5.0f / 15.0f; - float lr2 = (LIGHT(x+1,y+1,z,0) + lr*30 + LIGHT(x+1,y+1,z+1,0) + LIGHT(x,y+1,z+1,0)) / 5.0f / 15.0f; - float lr3 = (LIGHT(x+1,y+1,z,0) + lr*30 + LIGHT(x+1,y+1,z-1,0) + LIGHT(x,y+1,z-1,0)) / 5.0f / 15.0f; - - float lg0 = (LIGHT(x-1,y+1,z,1) + lg*30 + LIGHT(x-1,y+1,z-1,1) + LIGHT(x,y+1,z-1,1)) / 5.0f / 15.0f; - float lg1 = (LIGHT(x-1,y+1,z,1) + lg*30 + LIGHT(x-1,y+1,z+1,1) + LIGHT(x,y+1,z+1,1)) / 5.0f / 15.0f; - float lg2 = (LIGHT(x+1,y+1,z,1) + lg*30 + LIGHT(x+1,y+1,z+1,1) + LIGHT(x,y+1,z+1,1)) / 5.0f / 15.0f; - float lg3 = (LIGHT(x+1,y+1,z,1) + lg*30 + LIGHT(x+1,y+1,z-1,1) + LIGHT(x,y+1,z-1,1)) / 5.0f / 15.0f; - - float lb0 = (LIGHT(x-1,y+1,z,2) + lb*30 + LIGHT(x-1,y+1,z-1,2) + LIGHT(x,y+1,z-1,2)) / 5.0f / 15.0f; - float lb1 = (LIGHT(x-1,y+1,z,2) + lb*30 + LIGHT(x-1,y+1,z+1,2) + LIGHT(x,y+1,z+1,2)) / 5.0f / 15.0f; - float lb2 = (LIGHT(x+1,y+1,z,2) + lb*30 + LIGHT(x+1,y+1,z+1,2) + LIGHT(x,y+1,z+1,2)) / 5.0f / 15.0f; - float lb3 = (LIGHT(x+1,y+1,z,2) + lb*30 + LIGHT(x+1,y+1,z-1,2) + LIGHT(x,y+1,z-1,2)) / 5.0f / 15.0f; - - float ls0 = (LIGHT(x-1,y+1,z,3) + ls*30 + LIGHT(x-1,y+1,z-1,3) + LIGHT(x,y+1,z-1,3)) / 5.0f / 15.0f; - float ls1 = (LIGHT(x-1,y+1,z,3) + ls*30 + LIGHT(x-1,y+1,z+1,3) + LIGHT(x,y+1,z+1,3)) / 5.0f / 15.0f; - float ls2 = (LIGHT(x+1,y+1,z,3) + ls*30 + LIGHT(x+1,y+1,z+1,3) + LIGHT(x,y+1,z+1,3)) / 5.0f / 15.0f; - float ls3 = (LIGHT(x+1,y+1,z,3) + ls*30 + LIGHT(x+1,y+1,z-1,3) + LIGHT(x,y+1,z-1,3)) / 5.0f / 15.0f; - - VERTEX(index, x-0.5f, y+0.5f, z-0.5f, u2,v1, lr0, lg0, lb0, ls0); - VERTEX(index, x-0.5f, y+0.5f, z+0.5f, u2,v2, lr1, lg1, lb1, ls1); - VERTEX(index, x+0.5f, y+0.5f, z+0.5f, u1,v2, lr2, lg2, lb2, ls2); - - VERTEX(index, x-0.5f, y+0.5f, z-0.5f, u2,v1, lr0, lg0, lb0, ls0); - VERTEX(index, x+0.5f, y+0.5f, z+0.5f, u1,v2, lr2, lg2, lb2, ls2); - VERTEX(index, x+0.5f, y+0.5f, z-0.5f, u1,v1, lr3, lg3, lb3, ls3); - } - if (!IS_BLOCKED(x,y-1,z,group)){ - l = 0.75f; - - SETUP_UV(block->textureFaces[2]); - - float lr = LIGHT(x,y-1,z, 0) / 15.0f; - float lg = LIGHT(x,y-1,z, 1) / 15.0f; - float lb = LIGHT(x,y-1,z, 2) / 15.0f; - float ls = LIGHT(x,y-1,z, 3) / 15.0f; - - float lr0 = (LIGHT(x-1,y-1,z-1,0) + lr*30 + LIGHT(x-1,y-1,z,0) + LIGHT(x,y-1,z-1,0)) / 5.0f / 15.0f; - float lr1 = (LIGHT(x+1,y-1,z+1,0) + lr*30 + LIGHT(x+1,y-1,z,0) + LIGHT(x,y-1,z+1,0)) / 5.0f / 15.0f; - float lr2 = (LIGHT(x-1,y-1,z+1,0) + lr*30 + LIGHT(x-1,y-1,z,0) + LIGHT(x,y-1,z+1,0)) / 5.0f / 15.0f; - float lr3 = (LIGHT(x+1,y-1,z-1,0) + lr*30 + LIGHT(x+1,y-1,z,0) + LIGHT(x,y-1,z-1,0)) / 5.0f / 15.0f; - - float lg0 = (LIGHT(x-1,y-1,z-1,1) + lg*30 + LIGHT(x-1,y-1,z,1) + LIGHT(x,y-1,z-1,1)) / 5.0f / 15.0f; - float lg1 = (LIGHT(x+1,y-1,z+1,1) + lg*30 + LIGHT(x+1,y-1,z,1) + LIGHT(x,y-1,z+1,1)) / 5.0f / 15.0f; - float lg2 = (LIGHT(x-1,y-1,z+1,1) + lg*30 + LIGHT(x-1,y-1,z,1) + LIGHT(x,y-1,z+1,1)) / 5.0f / 15.0f; - float lg3 = (LIGHT(x+1,y-1,z-1,1) + lg*30 + LIGHT(x+1,y-1,z,1) + LIGHT(x,y-1,z-1,1)) / 5.0f / 15.0f; - - float lb0 = (LIGHT(x-1,y-1,z-1,2) + lb*30 + LIGHT(x-1,y-1,z,2) + LIGHT(x,y-1,z-1,2)) / 5.0f / 15.0f; - float lb1 = (LIGHT(x+1,y-1,z+1,2) + lb*30 + LIGHT(x+1,y-1,z,2) + LIGHT(x,y-1,z+1,2)) / 5.0f / 15.0f; - float lb2 = (LIGHT(x-1,y-1,z+1,2) + lb*30 + LIGHT(x-1,y-1,z,2) + LIGHT(x,y-1,z+1,2)) / 5.0f / 15.0f; - float lb3 = (LIGHT(x+1,y-1,z-1,2) + lb*30 + LIGHT(x+1,y-1,z,2) + LIGHT(x,y-1,z-1,2)) / 5.0f / 15.0f; - - float ls0 = (LIGHT(x-1,y-1,z-1,3) + ls*30 + LIGHT(x-1,y-1,z,3) + LIGHT(x,y-1,z-1,3)) / 5.0f / 15.0f; - float ls1 = (LIGHT(x+1,y-1,z+1,3) + ls*30 + LIGHT(x+1,y-1,z,3) + LIGHT(x,y-1,z+1,3)) / 5.0f / 15.0f; - float ls2 = (LIGHT(x-1,y-1,z+1,3) + ls*30 + LIGHT(x-1,y-1,z,3) + LIGHT(x,y-1,z+1,3)) / 5.0f / 15.0f; - float ls3 = (LIGHT(x+1,y-1,z-1,3) + ls*30 + LIGHT(x+1,y-1,z,3) + LIGHT(x,y-1,z-1,3)) / 5.0f / 15.0f; - - VERTEX(index, x-0.5f, y-0.5f, z-0.5f, u1,v1, lr0,lg0,lb0,ls0); - VERTEX(index, x+0.5f, y-0.5f, z+0.5f, u2,v2, lr1,lg1,lb1,ls1); - VERTEX(index, x-0.5f, y-0.5f, z+0.5f, u1,v2, lr2,lg2,lb2,ls2); - - VERTEX(index, x-0.5f, y-0.5f, z-0.5f, u1,v1, lr0,lg0,lb0,ls0); - VERTEX(index, x+0.5f, y-0.5f, z-0.5f, u2,v1, lr3,lg3,lb3,ls3); - VERTEX(index, x+0.5f, y-0.5f, z+0.5f, u2,v2, lr1,lg1,lb1,ls1); - } - - if (!IS_BLOCKED(x+1,y,z,group)){ - l = 0.95f; - - SETUP_UV(block->textureFaces[1]); - - float lr = LIGHT(x+1,y,z, 0) / 15.0f; - float lg = LIGHT(x+1,y,z, 1) / 15.0f; - float lb = LIGHT(x+1,y,z, 2) / 15.0f; - float ls = LIGHT(x+1,y,z, 3) / 15.0f; - - float lr0 = (LIGHT(x+1,y-1,z-1,0) + lr*30 + LIGHT(x+1,y,z-1,0) + LIGHT(x+1,y-1,z,0)) / 5.0f / 15.0f; - float lr1 = (LIGHT(x+1,y+1,z-1,0) + lr*30 + LIGHT(x+1,y,z-1,0) + LIGHT(x+1,y+1,z,0)) / 5.0f / 15.0f; - float lr2 = (LIGHT(x+1,y+1,z+1,0) + lr*30 + LIGHT(x+1,y,z+1,0) + LIGHT(x+1,y+1,z,0)) / 5.0f / 15.0f; - float lr3 = (LIGHT(x+1,y-1,z+1,0) + lr*30 + LIGHT(x+1,y,z+1,0) + LIGHT(x+1,y-1,z,0)) / 5.0f / 15.0f; - - float lg0 = (LIGHT(x+1,y-1,z-1,1) + lg*30 + LIGHT(x+1,y,z-1,1) + LIGHT(x+1,y-1,z,1)) / 5.0f / 15.0f; - float lg1 = (LIGHT(x+1,y+1,z-1,1) + lg*30 + LIGHT(x+1,y,z-1,1) + LIGHT(x+1,y+1,z,1)) / 5.0f / 15.0f; - float lg2 = (LIGHT(x+1,y+1,z+1,1) + lg*30 + LIGHT(x+1,y,z+1,1) + LIGHT(x+1,y+1,z,1)) / 5.0f / 15.0f; - float lg3 = (LIGHT(x+1,y-1,z+1,1) + lg*30 + LIGHT(x+1,y,z+1,1) + LIGHT(x+1,y-1,z,1)) / 5.0f / 15.0f; - - float lb0 = (LIGHT(x+1,y-1,z-1,2) + lb*30 + LIGHT(x+1,y,z-1,2) + LIGHT(x+1,y-1,z,2)) / 5.0f / 15.0f; - float lb1 = (LIGHT(x+1,y+1,z-1,2) + lb*30 + LIGHT(x+1,y,z-1,2) + LIGHT(x+1,y+1,z,2)) / 5.0f / 15.0f; - float lb2 = (LIGHT(x+1,y+1,z+1,2) + lb*30 + LIGHT(x+1,y,z+1,2) + LIGHT(x+1,y+1,z,2)) / 5.0f / 15.0f; - float lb3 = (LIGHT(x+1,y-1,z+1,2) + lb*30 + LIGHT(x+1,y,z+1,2) + LIGHT(x+1,y-1,z,2)) / 5.0f / 15.0f; - - float ls0 = (LIGHT(x+1,y-1,z-1,3) + ls*30 + LIGHT(x+1,y,z-1,3) + LIGHT(x+1,y-1,z,3)) / 5.0f / 15.0f; - float ls1 = (LIGHT(x+1,y+1,z-1,3) + ls*30 + LIGHT(x+1,y,z-1,3) + LIGHT(x+1,y+1,z,3)) / 5.0f / 15.0f; - float ls2 = (LIGHT(x+1,y+1,z+1,3) + ls*30 + LIGHT(x+1,y,z+1,3) + LIGHT(x+1,y+1,z,3)) / 5.0f / 15.0f; - float ls3 = (LIGHT(x+1,y-1,z+1,3) + ls*30 + LIGHT(x+1,y,z+1,3) + LIGHT(x+1,y-1,z,3)) / 5.0f / 15.0f; - - VERTEX(index, x+0.5f, y-0.5f, z-0.5f, u2,v1, lr0,lg0,lb0,ls0); - VERTEX(index, x+0.5f, y+0.5f, z-0.5f, u2,v2, lr1,lg1,lb1,ls1); - VERTEX(index, x+0.5f, y+0.5f, z+0.5f, u1,v2, lr2,lg2,lb2,ls2); - - VERTEX(index, x+0.5f, y-0.5f, z-0.5f, u2,v1, lr0,lg0,lb0,ls0); - VERTEX(index, x+0.5f, y+0.5f, z+0.5f, u1,v2, lr2,lg2,lb2,ls2); - VERTEX(index, x+0.5f, y-0.5f, z+0.5f, u1,v1, lr3,lg3,lb3,ls3); - } - if (!IS_BLOCKED(x-1,y,z,group)){ - l = 0.85f; - - SETUP_UV(block->textureFaces[0]); - - float lr = LIGHT(x-1,y,z, 0) / 15.0f; - float lg = LIGHT(x-1,y,z, 1) / 15.0f; - float lb = LIGHT(x-1,y,z, 2) / 15.0f; - float ls = LIGHT(x-1,y,z, 3) / 15.0f; - - float lr0 = (LIGHT(x-1,y-1,z-1,0) + lr*30 + LIGHT(x-1,y,z-1,0) + LIGHT(x-1,y-1,z,0)) / 5.0f / 15.0f; - float lr1 = (LIGHT(x-1,y+1,z+1,0) + lr*30 + LIGHT(x-1,y,z+1,0) + LIGHT(x-1,y+1,z,0)) / 5.0f / 15.0f; - float lr2 = (LIGHT(x-1,y+1,z-1,0) + lr*30 + LIGHT(x-1,y,z-1,0) + LIGHT(x-1,y+1,z,0)) / 5.0f / 15.0f; - float lr3 = (LIGHT(x-1,y-1,z+1,0) + lr*30 + LIGHT(x-1,y,z+1,0) + LIGHT(x-1,y-1,z,0)) / 5.0f / 15.0f; - - float lg0 = (LIGHT(x-1,y-1,z-1,1) + lg*30 + LIGHT(x-1,y,z-1,1) + LIGHT(x-1,y-1,z,1)) / 5.0f / 15.0f; - float lg1 = (LIGHT(x-1,y+1,z+1,1) + lg*30 + LIGHT(x-1,y,z+1,1) + LIGHT(x-1,y+1,z,1)) / 5.0f / 15.0f; - float lg2 = (LIGHT(x-1,y+1,z-1,1) + lg*30 + LIGHT(x-1,y,z-1,1) + LIGHT(x-1,y+1,z,1)) / 5.0f / 15.0f; - float lg3 = (LIGHT(x-1,y-1,z+1,1) + lg*30 + LIGHT(x-1,y,z+1,1) + LIGHT(x-1,y-1,z,1)) / 5.0f / 15.0f; - - float lb0 = (LIGHT(x-1,y-1,z-1,2) + lb*30 + LIGHT(x-1,y,z-1,2) + LIGHT(x-1,y-1,z,2)) / 5.0f / 15.0f; - float lb1 = (LIGHT(x-1,y+1,z+1,2) + lb*30 + LIGHT(x-1,y,z+1,2) + LIGHT(x-1,y+1,z,2)) / 5.0f / 15.0f; - float lb2 = (LIGHT(x-1,y+1,z-1,2) + lb*30 + LIGHT(x-1,y,z-1,2) + LIGHT(x-1,y+1,z,2)) / 5.0f / 15.0f; - float lb3 = (LIGHT(x-1,y-1,z+1,2) + lb*30 + LIGHT(x-1,y,z+1,2) + LIGHT(x-1,y-1,z,2)) / 5.0f / 15.0f; - - float ls0 = (LIGHT(x-1,y-1,z-1,3) + ls*30 + LIGHT(x-1,y,z-1,3) + LIGHT(x-1,y-1,z,3)) / 5.0f / 15.0f; - float ls1 = (LIGHT(x-1,y+1,z+1,3) + ls*30 + LIGHT(x-1,y,z+1,3) + LIGHT(x-1,y+1,z,3)) / 5.0f / 15.0f; - float ls2 = (LIGHT(x-1,y+1,z-1,3) + ls*30 + LIGHT(x-1,y,z-1,3) + LIGHT(x-1,y+1,z,3)) / 5.0f / 15.0f; - float ls3 = (LIGHT(x-1,y-1,z+1,3) + ls*30 + LIGHT(x-1,y,z+1,3) + LIGHT(x-1,y-1,z,3)) / 5.0f / 15.0f; - - VERTEX(index, x-0.5f, y-0.5f, z-0.5f, u1,v1, lr0,lg0,lb0,ls0); - VERTEX(index, x-0.5f, y+0.5f, z+0.5f, u2,v2, lr1,lg1,lb1,ls1); - VERTEX(index, x-0.5f, y+0.5f, z-0.5f, u1,v2, lr2,lg2,lb2,ls2); - - VERTEX(index, x-0.5f, y-0.5f, z-0.5f, u1,v1, lr0,lg0,lb0,ls0); - VERTEX(index, x-0.5f, y-0.5f, z+0.5f, u2,v1, lr3,lg3,lb3,ls3); - VERTEX(index, x-0.5f, y+0.5f, z+0.5f, u2,v2, lr1,lg1,lb1,ls1); - } - - if (!IS_BLOCKED(x,y,z+1,group)){ - l = 0.9f; - - SETUP_UV(block->textureFaces[5]); - - float lr = LIGHT(x,y,z+1, 0) / 15.0f; - float lg = LIGHT(x,y,z+1, 1) / 15.0f; - float lb = LIGHT(x,y,z+1, 2) / 15.0f; - float ls = LIGHT(x,y,z+1, 3) / 15.0f; - - float lr0 = l*(LIGHT(x-1,y-1,z+1,0) + lr*30 + LIGHT(x,y-1,z+1,0) + LIGHT(x-1,y,z+1,0)) / 5.0f / 15.0f; - float lr1 = l*(LIGHT(x+1,y+1,z+1,0) + lr*30 + LIGHT(x,y+1,z+1,0) + LIGHT(x+1,y,z+1,0)) / 5.0f / 15.0f; - float lr2 = l*(LIGHT(x-1,y+1,z+1,0) + lr*30 + LIGHT(x,y+1,z+1,0) + LIGHT(x-1,y,z+1,0)) / 5.0f / 15.0f; - float lr3 = l*(LIGHT(x+1,y-1,z+1,0) + lr*30 + LIGHT(x,y-1,z+1,0) + LIGHT(x+1,y,z+1,0)) / 5.0f / 15.0f; - - float lg0 = l*(LIGHT(x-1,y-1,z+1,1) + lg*30 + LIGHT(x,y-1,z+1,1) + LIGHT(x-1,y,z+1,1)) / 5.0f / 15.0f; - float lg1 = l*(LIGHT(x+1,y+1,z+1,1) + lg*30 + LIGHT(x,y+1,z+1,1) + LIGHT(x+1,y,z+1,1)) / 5.0f / 15.0f; - float lg2 = l*(LIGHT(x-1,y+1,z+1,1) + lg*30 + LIGHT(x,y+1,z+1,1) + LIGHT(x-1,y,z+1,1)) / 5.0f / 15.0f; - float lg3 = l*(LIGHT(x+1,y-1,z+1,1) + lg*30 + LIGHT(x,y-1,z+1,1) + LIGHT(x+1,y,z+1,1)) / 5.0f / 15.0f; - - float lb0 = l*(LIGHT(x-1,y-1,z+1,2) + lb*30 + LIGHT(x,y-1,z+1,2) + LIGHT(x-1,y,z+1,2)) / 5.0f / 15.0f; - float lb1 = l*(LIGHT(x+1,y+1,z+1,2) + lb*30 + LIGHT(x,y+1,z+1,2) + LIGHT(x+1,y,z+1,2)) / 5.0f / 15.0f; - float lb2 = l*(LIGHT(x-1,y+1,z+1,2) + lb*30 + LIGHT(x,y+1,z+1,2) + LIGHT(x-1,y,z+1,2)) / 5.0f / 15.0f; - float lb3 = l*(LIGHT(x+1,y-1,z+1,2) + lb*30 + LIGHT(x,y-1,z+1,2) + LIGHT(x+1,y,z+1,2)) / 5.0f / 15.0f; - - float ls0 = l*(LIGHT(x-1,y-1,z+1,3) + ls*30 + LIGHT(x,y-1,z+1,3) + LIGHT(x-1,y,z+1,3)) / 5.0f / 15.0f; - float ls1 = l*(LIGHT(x+1,y+1,z+1,3) + ls*30 + LIGHT(x,y+1,z+1,3) + LIGHT(x+1,y,z+1,3)) / 5.0f / 15.0f; - float ls2 = l*(LIGHT(x-1,y+1,z+1,3) + ls*30 + LIGHT(x,y+1,z+1,3) + LIGHT(x-1,y,z+1,3)) / 5.0f / 15.0f; - float ls3 = l*(LIGHT(x+1,y-1,z+1,3) + ls*30 + LIGHT(x,y-1,z+1,3) + LIGHT(x+1,y,z+1,3)) / 5.0f / 15.0f; - - VERTEX(index, x-0.5f, y-0.5f, z+0.5f, u1,v1, lr0,lg0,lb0,ls0); - VERTEX(index, x+0.5f, y+0.5f, z+0.5f, u2,v2, lr1,lg1,lb1,ls1); - VERTEX(index, x-0.5f, y+0.5f, z+0.5f, u1,v2, lr2,lg2,lb2,ls2); - - VERTEX(index, x-0.5f, y-0.5f, z+0.5f, u1,v1, lr0,lg0,lb0,ls0); - VERTEX(index, x+0.5f, y-0.5f, z+0.5f, u2,v1, lr3,lg3,lb3,ls3); - VERTEX(index, x+0.5f, y+0.5f, z+0.5f, u2,v2, lr1,lg1,lb1,ls1); - } - if (!IS_BLOCKED(x,y,z-1,group)){ - l = 0.8f; - - SETUP_UV(block->textureFaces[4]); - - float lr = LIGHT(x,y,z-1, 0) / 15.0f; - float lg = LIGHT(x,y,z-1, 1) / 15.0f; - float lb = LIGHT(x,y,z-1, 2) / 15.0f; - float ls = LIGHT(x,y,z-1, 3) / 15.0f; - - float lr0 = l*(LIGHT(x-1,y-1,z-1,0) + lr*30 + LIGHT(x,y-1,z-1,0) + LIGHT(x-1,y,z-1,0)) / 5.0f / 15.0f; - float lr1 = l*(LIGHT(x-1,y+1,z-1,0) + lr*30 + LIGHT(x,y+1,z-1,0) + LIGHT(x-1,y,z-1,0)) / 5.0f / 15.0f; - float lr2 = l*(LIGHT(x+1,y+1,z-1,0) + lr*30 + LIGHT(x,y+1,z-1,0) + LIGHT(x+1,y,z-1,0)) / 5.0f / 15.0f; - float lr3 = l*(LIGHT(x+1,y-1,z-1,0) + lr*30 + LIGHT(x,y-1,z-1,0) + LIGHT(x+1,y,z-1,0)) / 5.0f / 15.0f; - - float lg0 = l*(LIGHT(x-1,y-1,z-1,1) + lg*30 + LIGHT(x,y-1,z-1,1) + LIGHT(x-1,y,z-1,1)) / 5.0f / 15.0f; - float lg1 = l*(LIGHT(x-1,y+1,z-1,1) + lg*30 + LIGHT(x,y+1,z-1,1) + LIGHT(x-1,y,z-1,1)) / 5.0f / 15.0f; - float lg2 = l*(LIGHT(x+1,y+1,z-1,1) + lg*30 + LIGHT(x,y+1,z-1,1) + LIGHT(x+1,y,z-1,1)) / 5.0f / 15.0f; - float lg3 = l*(LIGHT(x+1,y-1,z-1,1) + lg*30 + LIGHT(x,y-1,z-1,1) + LIGHT(x+1,y,z-1,1)) / 5.0f / 15.0f; - - float lb0 = l*(LIGHT(x-1,y-1,z-1,2) + lb*30 + LIGHT(x,y-1,z-1,2) + LIGHT(x-1,y,z-1,2)) / 5.0f / 15.0f; - float lb1 = l*(LIGHT(x-1,y+1,z-1,2) + lb*30 + LIGHT(x,y+1,z-1,2) + LIGHT(x-1,y,z-1,2)) / 5.0f / 15.0f; - float lb2 = l*(LIGHT(x+1,y+1,z-1,2) + lb*30 + LIGHT(x,y+1,z-1,2) + LIGHT(x+1,y,z-1,2)) / 5.0f / 15.0f; - float lb3 = l*(LIGHT(x+1,y-1,z-1,2) + lb*30 + LIGHT(x,y-1,z-1,2) + LIGHT(x+1,y,z-1,2)) / 5.0f / 15.0f; - - float ls0 = l*(LIGHT(x-1,y-1,z-1,3) + ls*30 + LIGHT(x,y-1,z-1,3) + LIGHT(x-1,y,z-1,3)) / 5.0f / 15.0f; - float ls1 = l*(LIGHT(x-1,y+1,z-1,3) + ls*30 + LIGHT(x,y+1,z-1,3) + LIGHT(x-1,y,z-1,3)) / 5.0f / 15.0f; - float ls2 = l*(LIGHT(x+1,y+1,z-1,3) + ls*30 + LIGHT(x,y+1,z-1,3) + LIGHT(x+1,y,z-1,3)) / 5.0f / 15.0f; - float ls3 = l*(LIGHT(x+1,y-1,z-1,3) + ls*30 + LIGHT(x,y-1,z-1,3) + LIGHT(x+1,y,z-1,3)) / 5.0f / 15.0f; - - VERTEX(index, x-0.5f, y-0.5f, z-0.5f, u2,v1, lr0,lg0,lb0,ls0); - VERTEX(index, x-0.5f, y+0.5f, z-0.5f, u2,v2, lr1,lg1,lb1,ls1); - VERTEX(index, x+0.5f, y+0.5f, z-0.5f, u1,v2, lr2,lg2,lb2,ls2); - - VERTEX(index, x-0.5f, y-0.5f, z-0.5f, u2,v1, lr0,lg0,lb0,ls0); - VERTEX(index, x+0.5f, y+0.5f, z-0.5f, u1,v2, lr2,lg2,lb2,ls2); - VERTEX(index, x+0.5f, y-0.5f, z-0.5f, u1,v1, lr3,lg3,lb3,ls3); - } + for (int y = 0; y < CHUNK_H; y++){ + for (int z = 0; z < CHUNK_D; z++){ + for (int x = 0; x < CHUNK_W; x++){ + voxel vox = chunk->voxels[(y * CHUNK_D + z) * CHUNK_W + x]; + if (vox.id != 9) + continue; + _renderBlock(buffer, x, y, z, chunks, vox, index); } } } diff --git a/src/lighting/LightSolver.cpp b/src/lighting/LightSolver.cpp index c101539c..b4f22bd6 100644 --- a/src/lighting/LightSolver.cpp +++ b/src/lighting/LightSolver.cpp @@ -1,3 +1,4 @@ +#include #include #include "LightSolver.h" #include "Lightmap.h" @@ -60,7 +61,7 @@ void LightSolver::solve(){ }; while (!remqueue.empty()){ - lightentry entry = remqueue.front(); + const lightentry entry = remqueue.front(); remqueue.pop(); for (size_t i = 0; i < 6; i++) { diff --git a/src/lighting/Lighting.cpp b/src/lighting/Lighting.cpp index 5da4161f..2e1282cb 100644 --- a/src/lighting/Lighting.cpp +++ b/src/lighting/Lighting.cpp @@ -6,22 +6,15 @@ #include "../voxels/voxel.h" #include "../voxels/Block.h" -Chunks* Lighting::chunks = nullptr; -LightSolver* Lighting::solverR = nullptr; -LightSolver* Lighting::solverG = nullptr; -LightSolver* Lighting::solverB = nullptr; -LightSolver* Lighting::solverS = nullptr; - -int Lighting::initialize(Chunks* chunks){ - Lighting::chunks = chunks; +Lighting::Lighting(Chunks* chunks){ + this->chunks = chunks; solverR = new LightSolver(chunks, 0); solverG = new LightSolver(chunks, 1); solverB = new LightSolver(chunks, 2); solverS = new LightSolver(chunks, 3); - return 0; } -void Lighting::finalize(){ +Lighting::~Lighting(){ delete solverR, solverG, solverB, solverS; } @@ -37,11 +30,11 @@ void Lighting::clear(){ } } -void Lighting::onChunkLoaded(int cx, int cy, int cz){ +void Lighting::onChunkLoaded(int cx, int cy, int cz, bool sky){ Chunk* chunk = chunks->getChunk(cx, cy, cz); Chunk* chunkUpper = chunks->getChunk(cx, cy+1, cz); Chunk* chunkLower = chunks->getChunk(cx, cy-1, cz); - if (chunkLower){ + if (chunkLower && sky){ for (int z = 0; z < CHUNK_D; z++){ for (int x = 0; x < CHUNK_W; x++){ int gx = x + cx * CHUNK_W; @@ -65,7 +58,7 @@ void Lighting::onChunkLoaded(int cx, int cy, int cz){ break; voxel* vox = &(current->voxels[(y * CHUNK_D + z) * CHUNK_W + x]);//chunks->get(gx,gy+y,gz); Block* block = Block::blocks[vox->id]; - if (!block->lightPassing) + if (!block->skyLightPassing) break; //current->lightmap->setS(x,y,z, 0); current->modified = true; @@ -76,7 +69,7 @@ void Lighting::onChunkLoaded(int cx, int cy, int cz){ } } } - if (chunkUpper){ + if (chunkUpper && sky){ for (int z = 0; z < CHUNK_D; z++){ for (int x = 0; x < CHUNK_W; x++){ int gx = x + cx * CHUNK_W; @@ -99,7 +92,7 @@ void Lighting::onChunkLoaded(int cx, int cy, int cz){ break; voxel* vox = &(current->voxels[(y * CHUNK_D + z) * CHUNK_W + x]);//chunks->get(gx,gy+y,gz); Block* block = Block::blocks[vox->id]; - if (!block->lightPassing) + if (!block->skyLightPassing) break; current->lightmap->setS(x,y,z, 15); current->modified = true; @@ -110,7 +103,7 @@ void Lighting::onChunkLoaded(int cx, int cy, int cz){ } } } - } else { + } else if (sky){ for (int z = 0; z < CHUNK_D; z++){ for (int x = 0; x < CHUNK_W; x++){ int gx = x + cx * CHUNK_W; @@ -129,11 +122,11 @@ void Lighting::onChunkLoaded(int cx, int cy, int cz){ break; voxel* vox = &(current->voxels[(y * CHUNK_D + z) * CHUNK_W + x]);//chunks->get(gx,gy+y,gz); Block* block = Block::blocks[vox->id]; - if (!block->lightPassing) + if (!block->skyLightPassing) break; current->lightmap->setS(x,y,z, 15); current->modified = true; - //solverS->add(gx,y+ncy*CHUNK_H,gz); + solverS->add(gx,y+ncy*CHUNK_H,gz); } } } @@ -163,10 +156,13 @@ void Lighting::onChunkLoaded(int cx, int cy, int cz){ int gx = x + cx * CHUNK_W; int gy = y + cy * CHUNK_H; int gz = z + cz * CHUNK_D; - solverR->add(gx,gy,gz); - solverG->add(gx,gy,gz); - solverB->add(gx,gy,gz); - solverS->add(gx,gy,gz); + if (chunks->getLight(x,y,z)){ + solverR->add(gx,gy,gz); + solverG->add(gx,gy,gz); + solverB->add(gx,gy,gz); + if (sky) + solverS->add(gx,gy,gz); + } } } } @@ -199,7 +195,7 @@ void Lighting::onBlockSet(int x, int y, int z, int id){ if (chunks->getLight(x,y+1,z, 3) == 0xF){ for (int i = y; i >= 0; i--){ voxel* vox = chunks->get(x,i,z); - if (vox == nullptr || vox->id != 0) + if (vox == nullptr || vox->id != 0 && Block::blocks[id]->skyLightPassing) break; solverS->add(x,i,z, 0xF); } @@ -220,7 +216,7 @@ void Lighting::onBlockSet(int x, int y, int z, int id){ solverR->remove(x,y,z); solverG->remove(x,y,z); solverB->remove(x,y,z); - if (!block->lightPassing){ + if (!block->skyLightPassing){ solverS->remove(x,y,z); for (int i = y-1; i >= 0; i--){ solverS->remove(x,i,z); diff --git a/src/lighting/Lighting.h b/src/lighting/Lighting.h index 6bd22a2c..ebbb2173 100644 --- a/src/lighting/Lighting.h +++ b/src/lighting/Lighting.h @@ -5,18 +5,18 @@ class Chunks; class LightSolver; class Lighting { - static Chunks* chunks; - static LightSolver* solverR; - static LightSolver* solverG; - static LightSolver* solverB; - static LightSolver* solverS; + Chunks* chunks = nullptr; + LightSolver* solverR = nullptr; + LightSolver* solverG = nullptr; + LightSolver* solverB = nullptr; + LightSolver* solverS = nullptr; public: - static int initialize(Chunks* chunks); - static void finalize(); + Lighting(Chunks* chunks); + ~Lighting(); - static void clear(); - static void onChunkLoaded(int cx, int cy, int cz); - static void onBlockSet(int x, int y, int z, int id); + void clear(); + void onChunkLoaded(int cx, int cy, int cz, bool sky); + void onBlockSet(int x, int y, int z, int id); }; #endif /* LIGHTING_LIGHTING_H_ */ diff --git a/src/lighting/Lightmap.cpp b/src/lighting/Lightmap.cpp index 7b37ec14..fd5cec4e 100644 --- a/src/lighting/Lightmap.cpp +++ b/src/lighting/Lightmap.cpp @@ -10,3 +10,9 @@ Lightmap::Lightmap(){ Lightmap::~Lightmap(){ delete[] map; } + +void Lightmap::set(const Lightmap* lightmap) { + for (unsigned int i = 0; i < CHUNK_VOL; i++){ + map[i] = lightmap->map[i]; + } +} diff --git a/src/lighting/Lightmap.h b/src/lighting/Lightmap.h index a2f88ad9..bee5c5e7 100644 --- a/src/lighting/Lightmap.h +++ b/src/lighting/Lightmap.h @@ -9,6 +9,12 @@ public: Lightmap(); ~Lightmap(); + void set(const Lightmap* lightmap); + + inline unsigned short get(int x, int y, int z){ + return (map[y*CHUNK_D*CHUNK_W+z*CHUNK_W+x]); + } + inline unsigned char get(int x, int y, int z, int channel){ return (map[y*CHUNK_D*CHUNK_W+z*CHUNK_W+x] >> (channel << 2)) & 0xF; } diff --git a/src/loaders/png_loading.cpp b/src/loaders/png_loading.cpp index c101632c..e3df6f0d 100644 --- a/src/loaders/png_loading.cpp +++ b/src/loaders/png_loading.cpp @@ -101,7 +101,7 @@ int _png_load(const char* file, int* width, int* height){ alpha, GL_UNSIGNED_BYTE, (GLvoid *) image_data); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 4); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 3); glGenerateMipmap(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, 0); diff --git a/src/maths/FastNoiseLite.h b/src/maths/FastNoiseLite.h new file mode 100644 index 00000000..eff196e3 --- /dev/null +++ b/src/maths/FastNoiseLite.h @@ -0,0 +1,2433 @@ +// MIT License +// +// Copyright(c) 2020 Jordan Peck (jordan.me2@gmail.com) +// Copyright(c) 2020 Contributors +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files(the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions : +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// +// .'',;:cldxkO00KKXXNNWWWNNXKOkxdollcc::::::;:::ccllloooolllllllllooollc:,'... ...........',;cldxkO000Okxdlc::;;;,,;;;::cclllllll +// ..',;:ldxO0KXXNNNNNNNNXXK0kxdolcc::::::;;;,,,,,,;;;;;;;;;;:::cclllllc:;'.... ...........',;:ldxO0KXXXK0Okxdolc::;;;;::cllodddddo +// ...',:loxO0KXNNNNNXXKK0Okxdolc::;::::::::;;;,,'''''.....''',;:clllllc:;,'............''''''''',;:loxO0KXNNNNNXK0Okxdollccccllodxxxxxxd +// ....';:ldkO0KXXXKK00Okxdolcc:;;;;;::cclllcc:;;,''..... ....',;clooddolcc:;;;;,,;;;;;::::;;;;;;:cloxk0KXNWWWWWWNXKK0Okxddoooddxxkkkkkxx +// .....';:ldxkOOOOOkxxdolcc:;;;,,,;;:cllooooolcc:;'... ..,:codxkkkxddooollloooooooollcc:::::clodkO0KXNWWWWWWNNXK00Okxxxxxxxxkkkkxxx +// . ....';:cloddddo___________,,,,;;:clooddddoolc:,... ..,:ldx__00OOOkkk___kkkkkkxxdollc::::cclodkO0KXXNNNNNNXXK0OOkxxxxxxxxxxxxddd +// .......',;:cccc:| |,,,;;:cclooddddoll:;'.. ..';cox| \KKK000| |KK00OOkxdocc___;::clldxxkO0KKKKK00Okkxdddddddddddddddoo +// .......'',,,,,''| ________|',,;;::cclloooooolc:;'......___:ldk| \KK000| |XKKK0Okxolc| |;;::cclodxxkkkkxxdoolllcclllooodddooooo +// ''......''''....| | ....'',,,,;;;::cclloooollc:;,''.'| |oxk| \OOO0| |KKK00Oxdoll|___|;;;;;::ccllllllcc::;;,,;;;:cclloooooooo +// ;;,''.......... | |_____',,;;;____:___cllo________.___| |___| \xkk| |KK_______ool___:::;________;;;_______...'',;;:ccclllloo +// c:;,''......... | |:::/ ' |lo/ | | \dx| |0/ \d| |cc/ |'/ \......',,;;:ccllo +// ol:;,'..........| _____|ll/ __ |o/ ______|____ ___| | \o| |/ ___ \| |o/ ______|/ ___ \ .......'',;:clo +// dlc;,...........| |::clooo| / | |x\___ \KXKKK0| |dol| |\ \| | | | | |d\___ \..| | / / ....',:cl +// xoc;'... .....'| |llodddd| \__| |_____\ \KKK0O| |lc:| |'\ | |___| | |_____\ \.| |_/___/... ...',;:c +// dlc;'... ....',;| |oddddddo\ | |Okkx| |::;| |..\ |\ /| | | \ |... ....',;:c +// ol:,'.......',:c|___|xxxddollc\_____,___|_________/ddoll|___|,,,|___|...\_____|:\ ______/l|___|_________/...\________|'........',;::cc +// c:;'.......';:codxxkkkkxxolc::;::clodxkOO0OOkkxdollc::;;,,''''',,,,''''''''''',,'''''',;:loxkkOOkxol:;,'''',,;:ccllcc:;,'''''',;::ccll +// ;,'.......',:codxkOO0OOkxdlc:;,,;;:cldxxkkxxdolc:;;,,''.....'',;;:::;;,,,'''''........,;cldkO0KK0Okdoc::;;::cloodddoolc:;;;;;::ccllooo +// .........',;:lodxOO0000Okdoc:,,',,;:clloddoolc:;,''.......'',;:clooollc:;;,,''.......',:ldkOKXNNXX0Oxdolllloddxxxxxxdolccccccllooodddd +// . .....';:cldxkO0000Okxol:;,''',,;::cccc:;,,'.......'',;:cldxxkkxxdolc:;;,'.......';coxOKXNWWWNXKOkxddddxxkkkkkkxdoollllooddxxxxkkk +// ....',;:codxkO000OOxdoc:;,''',,,;;;;,''.......',,;:clodkO00000Okxolc::;,,''..',;:ldxOKXNWWWNNK0OkkkkkkkkkkkxxddooooodxxkOOOOO000 +// ....',;;clodxkkOOOkkdolc:;,,,,,,,,'..........,;:clodxkO0KKXKK0Okxdolcc::;;,,,;;:codkO0XXNNNNXKK0OOOOOkkkkxxdoollloodxkO0KKKXXXXX +// +// VERSION: 1.0.1 +// https://github.com/Auburn/FastNoise + +// In *one* C or C++ file, use #define FNL_IMPL to generate implementation + +#ifndef FASTNOISELITE_H +#define FASTNOISELITE_H + +// Switch between using floats or doubles for input position +typedef float FNLfloat; +//typedef double FNLfloat; + +#if defined(__cplusplus) +extern "C" { +#endif + +#include +#include +#include +#include + +// Enums +typedef enum +{ + FNL_NOISE_OPENSIMPLEX2, + FNL_NOISE_OPENSIMPLEX2S, + FNL_NOISE_CELLULAR, + FNL_NOISE_PERLIN, + FNL_NOISE_VALUE_CUBIC, + FNL_NOISE_VALUE +} fnl_noise_type; + +typedef enum +{ + FNL_ROTATION_NONE, + FNL_ROTATION_IMPROVE_XY_PLANES, + FNL_ROTATION_IMPROVE_XZ_PLANES +} fnl_rotation_type_3d; + +typedef enum +{ + FNL_FRACTAL_NONE, + FNL_FRACTAL_FBM, + FNL_FRACTAL_RIDGED, + FNL_FRACTAL_PINGPONG, + FNL_FRACTAL_DOMAIN_WARP_PROGRESSIVE, + FNL_FRACTAL_DOMAIN_WARP_INDEPENDENT +} fnl_fractal_type; + +typedef enum +{ + FNL_CELLULAR_DISTANCE_EUCLIDEAN, + FNL_CELLULAR_DISTANCE_EUCLIDEANSQ, + FNL_CELLULAR_DISTANCE_MANHATTAN, + FNL_CELLULAR_DISTANCE_HYBRID +} fnl_cellular_distance_func; + +typedef enum +{ + FNL_CELLULAR_RETURN_VALUE_CELLVALUE, + FNL_CELLULAR_RETURN_VALUE_DISTANCE, + FNL_CELLULAR_RETURN_VALUE_DISTANCE2, + FNL_CELLULAR_RETURN_VALUE_DISTANCE2ADD, + FNL_CELLULAR_RETURN_VALUE_DISTANCE2SUB, + FNL_CELLULAR_RETURN_VALUE_DISTANCE2MUL, + FNL_CELLULAR_RETURN_VALUE_DISTANCE2DIV, +} fnl_cellular_return_type; + +typedef enum +{ + FNL_DOMAIN_WARP_OPENSIMPLEX2, + FNL_DOMAIN_WARP_OPENSIMPLEX2_REDUCED, + FNL_DOMAIN_WARP_BASICGRID +} fnl_domain_warp_type; + +/** + * Structure containing entire noise system state. + * @note Must only be created using fnlCreateState(optional: seed). To ensure defaults are set. + */ +typedef struct fnl_state +{ + /** + * Seed used for all noise types. + * @remark Default: 1337 + */ + int seed; + + /** + * The frequency for all noise types. + * @remark Default: 0.01 + */ + float frequency; + + /** + * The noise algorithm to be used by GetNoise(...). + * @remark Default: FNL_NOISE_OPENSIMPLEX2 + */ + fnl_noise_type noise_type; + + /** + * Sets noise rotation type for 3D. + * @remark Default: FNL_ROTATION_NONE + */ + fnl_rotation_type_3d rotation_type_3d; + + /** + * The method used for combining octaves for all fractal noise types. + * @remark Default: None + * @remark FNL_FRACTAL_DOMAIN_WARP_... only effects fnlDomainWarp... + */ + fnl_fractal_type fractal_type; + + /** + * The octave count for all fractal noise types. + * @remark Default: 3 + */ + int octaves; + + /** + * The octave lacunarity for all fractal noise types. + * @remark Default: 2.0 + */ + float lacunarity; + + /** + * The octave gain for all fractal noise types. + * @remark Default: 0.5 + */ + float gain; + + /** + * The octave weighting for all none Domaain Warp fractal types. + * @remark Default: 0.0 + * @remark + */ + float weighted_strength; + + /** + * The strength of the fractal ping pong effect. + * @remark Default: 2.0 + */ + float ping_pong_strength; + + /** + * The distance function used in cellular noise calculations. + * @remark Default: FNL_CELLULAR_FUNC_DISTANCE + */ + fnl_cellular_distance_func cellular_distance_func; + + /** + * The cellular return type from cellular noise calculations. + * @remark Default: FNL_CELLULAR_RETURN_VALUE_EUCLIEANSQ + */ + fnl_cellular_return_type cellular_return_type; + + /** + * The maximum distance a cellular point can move from it's grid position. + * @remark Default: 1.0 + * @note Setting this higher than 1 will cause artifacts. + */ + float cellular_jitter_mod; + + /** + * The warp algorithm when using fnlDomainWarp... + * @remark Default: OpenSimplex2 + */ + fnl_domain_warp_type domain_warp_type; + + /** + * The maximum warp distance from original position when using fnlDomainWarp... + * @remark Default: 1.0 + */ + float domain_warp_amp; +} fnl_state; + +/** + * Creates a noise state with default values. + * @param seed Optionally set the state seed. + */ +fnl_state fnlCreateState(); + +/** + * 2D noise at given position using the state settings + * @returns Noise output bounded between -1 and 1. + */ +float fnlGetNoise2D(fnl_state *state, FNLfloat x, FNLfloat y); + +/** + * 3D noise at given position using the state settings + * @returns Noise output bounded between -1 and 1. + */ +float fnlGetNoise3D(fnl_state *state, FNLfloat x, FNLfloat y, FNLfloat z); + +/** + * 2D warps the input position using current domain warp settings. + * + * Example usage with fnlGetNoise2D: + * ``` + * fnlDomainWarp2D(&state, &x, &y); + * noise = fnlGetNoise2D(&state, x, y); + * ``` + */ +void fnlDomainWarp2D(fnl_state *state, FNLfloat *x, FNLfloat *y); + +/** + * 3D warps the input position using current domain warp settings. + * + * Example usage with fnlGetNoise3D: + * ``` + * fnlDomainWarp3D(&state, &x, &y, &z); + * noise = fnlGetNoise3D(&state, x, y, z); + * ``` + */ +void fnlDomainWarp3D(fnl_state *state, FNLfloat *x, FNLfloat *y, FNLfloat *z); + +// ==================== +// Below this line is the implementation +// ==================== + +#if defined(FNL_IMPL) + +// Constants + +static const float GRADIENTS_2D[] = +{ + 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, 0.793353340291235f, 0.608761429008721f, + 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, + 0.793353340291235f, -0.60876142900872f, 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, + -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, -0.793353340291235f, -0.608761429008721f, + -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, + -0.793353340291235f, 0.608761429008721f, -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, + 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, 0.793353340291235f, 0.608761429008721f, + 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, + 0.793353340291235f, -0.60876142900872f, 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, + -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, -0.793353340291235f, -0.608761429008721f, + -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, + -0.793353340291235f, 0.608761429008721f, -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, + 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, 0.793353340291235f, 0.608761429008721f, + 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, + 0.793353340291235f, -0.60876142900872f, 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, + -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, -0.793353340291235f, -0.608761429008721f, + -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, + -0.793353340291235f, 0.608761429008721f, -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, + 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, 0.793353340291235f, 0.608761429008721f, + 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, + 0.793353340291235f, -0.60876142900872f, 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, + -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, -0.793353340291235f, -0.608761429008721f, + -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, + -0.793353340291235f, 0.608761429008721f, -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, + 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, 0.793353340291235f, 0.608761429008721f, + 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, + 0.793353340291235f, -0.60876142900872f, 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, + -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, -0.793353340291235f, -0.608761429008721f, + -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, + -0.793353340291235f, 0.608761429008721f, -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, + 0.38268343236509f, 0.923879532511287f, 0.923879532511287f, 0.38268343236509f, 0.923879532511287f, -0.38268343236509f, 0.38268343236509f, -0.923879532511287f, + -0.38268343236509f, -0.923879532511287f, -0.923879532511287f, -0.38268343236509f, -0.923879532511287f, 0.38268343236509f, -0.38268343236509f, 0.923879532511287f, +}; + +static const float RAND_VECS_2D[] = +{ + -0.2700222198f, -0.9628540911f, 0.3863092627f, -0.9223693152f, 0.04444859006f, -0.999011673f, -0.5992523158f, -0.8005602176f, -0.7819280288f, 0.6233687174f, 0.9464672271f, 0.3227999196f, -0.6514146797f, -0.7587218957f, 0.9378472289f, 0.347048376f, + -0.8497875957f, -0.5271252623f, -0.879042592f, 0.4767432447f, -0.892300288f, -0.4514423508f, -0.379844434f, -0.9250503802f, -0.9951650832f, 0.0982163789f, 0.7724397808f, -0.6350880136f, 0.7573283322f, -0.6530343002f, -0.9928004525f, -0.119780055f, + -0.0532665713f, 0.9985803285f, 0.9754253726f, -0.2203300762f, -0.7665018163f, 0.6422421394f, 0.991636706f, 0.1290606184f, -0.994696838f, 0.1028503788f, -0.5379205513f, -0.84299554f, 0.5022815471f, -0.8647041387f, 0.4559821461f, -0.8899889226f, + -0.8659131224f, -0.5001944266f, 0.0879458407f, -0.9961252577f, -0.5051684983f, 0.8630207346f, 0.7753185226f, -0.6315704146f, -0.6921944612f, 0.7217110418f, -0.5191659449f, -0.8546734591f, 0.8978622882f, -0.4402764035f, -0.1706774107f, 0.9853269617f, + -0.9353430106f, -0.3537420705f, -0.9992404798f, 0.03896746794f, -0.2882064021f, -0.9575683108f, -0.9663811329f, 0.2571137995f, -0.8759714238f, -0.4823630009f, -0.8303123018f, -0.5572983775f, 0.05110133755f, -0.9986934731f, -0.8558373281f, -0.5172450752f, + 0.09887025282f, 0.9951003332f, 0.9189016087f, 0.3944867976f, -0.2439375892f, -0.9697909324f, -0.8121409387f, -0.5834613061f, -0.9910431363f, 0.1335421355f, 0.8492423985f, -0.5280031709f, -0.9717838994f, -0.2358729591f, 0.9949457207f, 0.1004142068f, + 0.6241065508f, -0.7813392434f, 0.662910307f, 0.7486988212f, -0.7197418176f, 0.6942418282f, -0.8143370775f, -0.5803922158f, 0.104521054f, -0.9945226741f, -0.1065926113f, -0.9943027784f, 0.445799684f, -0.8951327509f, 0.105547406f, 0.9944142724f, + -0.992790267f, 0.1198644477f, -0.8334366408f, 0.552615025f, 0.9115561563f, -0.4111755999f, 0.8285544909f, -0.5599084351f, 0.7217097654f, -0.6921957921f, 0.4940492677f, -0.8694339084f, -0.3652321272f, -0.9309164803f, -0.9696606758f, 0.2444548501f, + 0.08925509731f, -0.996008799f, 0.5354071276f, -0.8445941083f, -0.1053576186f, 0.9944343981f, -0.9890284586f, 0.1477251101f, 0.004856104961f, 0.9999882091f, 0.9885598478f, 0.1508291331f, 0.9286129562f, -0.3710498316f, -0.5832393863f, -0.8123003252f, + 0.3015207509f, 0.9534596146f, -0.9575110528f, 0.2883965738f, 0.9715802154f, -0.2367105511f, 0.229981792f, 0.9731949318f, 0.955763816f, -0.2941352207f, 0.740956116f, 0.6715534485f, -0.9971513787f, -0.07542630764f, 0.6905710663f, -0.7232645452f, + -0.290713703f, -0.9568100872f, 0.5912777791f, -0.8064679708f, -0.9454592212f, -0.325740481f, 0.6664455681f, 0.74555369f, 0.6236134912f, 0.7817328275f, 0.9126993851f, -0.4086316587f, -0.8191762011f, 0.5735419353f, -0.8812745759f, -0.4726046147f, + 0.9953313627f, 0.09651672651f, 0.9855650846f, -0.1692969699f, -0.8495980887f, 0.5274306472f, 0.6174853946f, -0.7865823463f, 0.8508156371f, 0.52546432f, 0.9985032451f, -0.05469249926f, 0.1971371563f, -0.9803759185f, 0.6607855748f, -0.7505747292f, + -0.03097494063f, 0.9995201614f, -0.6731660801f, 0.739491331f, -0.7195018362f, -0.6944905383f, 0.9727511689f, 0.2318515979f, 0.9997059088f, -0.0242506907f, 0.4421787429f, -0.8969269532f, 0.9981350961f, -0.061043673f, -0.9173660799f, -0.3980445648f, + -0.8150056635f, -0.5794529907f, -0.8789331304f, 0.4769450202f, 0.0158605829f, 0.999874213f, -0.8095464474f, 0.5870558317f, -0.9165898907f, -0.3998286786f, -0.8023542565f, 0.5968480938f, -0.5176737917f, 0.8555780767f, -0.8154407307f, -0.5788405779f, + 0.4022010347f, -0.9155513791f, -0.9052556868f, -0.4248672045f, 0.7317445619f, 0.6815789728f, -0.5647632201f, -0.8252529947f, -0.8403276335f, -0.5420788397f, -0.9314281527f, 0.363925262f, 0.5238198472f, 0.8518290719f, 0.7432803869f, -0.6689800195f, + -0.985371561f, -0.1704197369f, 0.4601468731f, 0.88784281f, 0.825855404f, 0.5638819483f, 0.6182366099f, 0.7859920446f, 0.8331502863f, -0.553046653f, 0.1500307506f, 0.9886813308f, -0.662330369f, -0.7492119075f, -0.668598664f, 0.743623444f, + 0.7025606278f, 0.7116238924f, -0.5419389763f, -0.8404178401f, -0.3388616456f, 0.9408362159f, 0.8331530315f, 0.5530425174f, -0.2989720662f, -0.9542618632f, 0.2638522993f, 0.9645630949f, 0.124108739f, -0.9922686234f, -0.7282649308f, -0.6852956957f, + 0.6962500149f, 0.7177993569f, -0.9183535368f, 0.3957610156f, -0.6326102274f, -0.7744703352f, -0.9331891859f, -0.359385508f, -0.1153779357f, -0.9933216659f, 0.9514974788f, -0.3076565421f, -0.08987977445f, -0.9959526224f, 0.6678496916f, 0.7442961705f, + 0.7952400393f, -0.6062947138f, -0.6462007402f, -0.7631674805f, -0.2733598753f, 0.9619118351f, 0.9669590226f, -0.254931851f, -0.9792894595f, 0.2024651934f, -0.5369502995f, -0.8436138784f, -0.270036471f, -0.9628500944f, -0.6400277131f, 0.7683518247f, + -0.7854537493f, -0.6189203566f, 0.06005905383f, -0.9981948257f, -0.02455770378f, 0.9996984141f, -0.65983623f, 0.751409442f, -0.6253894466f, -0.7803127835f, -0.6210408851f, -0.7837781695f, 0.8348888491f, 0.5504185768f, -0.1592275245f, 0.9872419133f, + 0.8367622488f, 0.5475663786f, -0.8675753916f, -0.4973056806f, -0.2022662628f, -0.9793305667f, 0.9399189937f, 0.3413975472f, 0.9877404807f, -0.1561049093f, -0.9034455656f, 0.4287028224f, 0.1269804218f, -0.9919052235f, -0.3819600854f, 0.924178821f, + 0.9754625894f, 0.2201652486f, -0.3204015856f, -0.9472818081f, -0.9874760884f, 0.1577687387f, 0.02535348474f, -0.9996785487f, 0.4835130794f, -0.8753371362f, -0.2850799925f, -0.9585037287f, -0.06805516006f, -0.99768156f, -0.7885244045f, -0.6150034663f, + 0.3185392127f, -0.9479096845f, 0.8880043089f, 0.4598351306f, 0.6476921488f, -0.7619021462f, 0.9820241299f, 0.1887554194f, 0.9357275128f, -0.3527237187f, -0.8894895414f, 0.4569555293f, 0.7922791302f, 0.6101588153f, 0.7483818261f, 0.6632681526f, + -0.7288929755f, -0.6846276581f, 0.8729032783f, -0.4878932944f, 0.8288345784f, 0.5594937369f, 0.08074567077f, 0.9967347374f, 0.9799148216f, -0.1994165048f, -0.580730673f, -0.8140957471f, -0.4700049791f, -0.8826637636f, 0.2409492979f, 0.9705377045f, + 0.9437816757f, -0.3305694308f, -0.8927998638f, -0.4504535528f, -0.8069622304f, 0.5906030467f, 0.06258973166f, 0.9980393407f, -0.9312597469f, 0.3643559849f, 0.5777449785f, 0.8162173362f, -0.3360095855f, -0.941858566f, 0.697932075f, -0.7161639607f, + -0.002008157227f, -0.9999979837f, -0.1827294312f, -0.9831632392f, -0.6523911722f, 0.7578824173f, -0.4302626911f, -0.9027037258f, -0.9985126289f, -0.05452091251f, -0.01028102172f, -0.9999471489f, -0.4946071129f, 0.8691166802f, -0.2999350194f, 0.9539596344f, + 0.8165471961f, 0.5772786819f, 0.2697460475f, 0.962931498f, -0.7306287391f, -0.6827749597f, -0.7590952064f, -0.6509796216f, -0.907053853f, 0.4210146171f, -0.5104861064f, -0.8598860013f, 0.8613350597f, 0.5080373165f, 0.5007881595f, -0.8655698812f, + -0.654158152f, 0.7563577938f, -0.8382755311f, -0.545246856f, 0.6940070834f, 0.7199681717f, 0.06950936031f, 0.9975812994f, 0.1702942185f, -0.9853932612f, 0.2695973274f, 0.9629731466f, 0.5519612192f, -0.8338697815f, 0.225657487f, -0.9742067022f, + 0.4215262855f, -0.9068161835f, 0.4881873305f, -0.8727388672f, -0.3683854996f, -0.9296731273f, -0.9825390578f, 0.1860564427f, 0.81256471f, 0.5828709909f, 0.3196460933f, -0.9475370046f, 0.9570913859f, 0.2897862643f, -0.6876655497f, -0.7260276109f, + -0.9988770922f, -0.047376731f, -0.1250179027f, 0.992154486f, -0.8280133617f, 0.560708367f, 0.9324863769f, -0.3612051451f, 0.6394653183f, 0.7688199442f, -0.01623847064f, -0.9998681473f, -0.9955014666f, -0.09474613458f, -0.81453315f, 0.580117012f, + 0.4037327978f, -0.9148769469f, 0.9944263371f, 0.1054336766f, -0.1624711654f, 0.9867132919f, -0.9949487814f, -0.100383875f, -0.6995302564f, 0.7146029809f, 0.5263414922f, -0.85027327f, -0.5395221479f, 0.841971408f, 0.6579370318f, 0.7530729462f, + 0.01426758847f, -0.9998982128f, -0.6734383991f, 0.7392433447f, 0.639412098f, -0.7688642071f, 0.9211571421f, 0.3891908523f, -0.146637214f, -0.9891903394f, -0.782318098f, 0.6228791163f, -0.5039610839f, -0.8637263605f, -0.7743120191f, -0.6328039957f, +}; + +static const float GRADIENTS_3D[] = +{ + 0, 1, 1, 0, 0,-1, 1, 0, 0, 1,-1, 0, 0,-1,-1, 0, + 1, 0, 1, 0, -1, 0, 1, 0, 1, 0,-1, 0, -1, 0,-1, 0, + 1, 1, 0, 0, -1, 1, 0, 0, 1,-1, 0, 0, -1,-1, 0, 0, + 0, 1, 1, 0, 0,-1, 1, 0, 0, 1,-1, 0, 0,-1,-1, 0, + 1, 0, 1, 0, -1, 0, 1, 0, 1, 0,-1, 0, -1, 0,-1, 0, + 1, 1, 0, 0, -1, 1, 0, 0, 1,-1, 0, 0, -1,-1, 0, 0, + 0, 1, 1, 0, 0,-1, 1, 0, 0, 1,-1, 0, 0,-1,-1, 0, + 1, 0, 1, 0, -1, 0, 1, 0, 1, 0,-1, 0, -1, 0,-1, 0, + 1, 1, 0, 0, -1, 1, 0, 0, 1,-1, 0, 0, -1,-1, 0, 0, + 0, 1, 1, 0, 0,-1, 1, 0, 0, 1,-1, 0, 0,-1,-1, 0, + 1, 0, 1, 0, -1, 0, 1, 0, 1, 0,-1, 0, -1, 0,-1, 0, + 1, 1, 0, 0, -1, 1, 0, 0, 1,-1, 0, 0, -1,-1, 0, 0, + 0, 1, 1, 0, 0,-1, 1, 0, 0, 1,-1, 0, 0,-1,-1, 0, + 1, 0, 1, 0, -1, 0, 1, 0, 1, 0,-1, 0, -1, 0,-1, 0, + 1, 1, 0, 0, -1, 1, 0, 0, 1,-1, 0, 0, -1,-1, 0, 0, + 1, 1, 0, 0, 0,-1, 1, 0, -1, 1, 0, 0, 0,-1,-1, 0 +}; + +static const float RAND_VECS_3D[] = +{ + -0.7292736885f, -0.6618439697f, 0.1735581948f, 0, 0.790292081f, -0.5480887466f, -0.2739291014f, 0, 0.7217578935f, 0.6226212466f, -0.3023380997f, 0, 0.565683137f, -0.8208298145f, -0.0790000257f, 0, 0.760049034f, -0.5555979497f, -0.3370999617f, 0, 0.3713945616f, 0.5011264475f, 0.7816254623f, 0, -0.1277062463f, -0.4254438999f, -0.8959289049f, 0, -0.2881560924f, -0.5815838982f, 0.7607405838f, 0, + 0.5849561111f, -0.662820239f, -0.4674352136f, 0, 0.3307171178f, 0.0391653737f, 0.94291689f, 0, 0.8712121778f, -0.4113374369f, -0.2679381538f, 0, 0.580981015f, 0.7021915846f, 0.4115677815f, 0, 0.503756873f, 0.6330056931f, -0.5878203852f, 0, 0.4493712205f, 0.601390195f, 0.6606022552f, 0, -0.6878403724f, 0.09018890807f, -0.7202371714f, 0, -0.5958956522f, -0.6469350577f, 0.475797649f, 0, + -0.5127052122f, 0.1946921978f, -0.8361987284f, 0, -0.9911507142f, -0.05410276466f, -0.1212153153f, 0, -0.2149721042f, 0.9720882117f, -0.09397607749f, 0, -0.7518650936f, -0.5428057603f, 0.3742469607f, 0, 0.5237068895f, 0.8516377189f, -0.02107817834f, 0, 0.6333504779f, 0.1926167129f, -0.7495104896f, 0, -0.06788241606f, 0.3998305789f, 0.9140719259f, 0, -0.5538628599f, -0.4729896695f, -0.6852128902f, 0, + -0.7261455366f, -0.5911990757f, 0.3509933228f, 0, -0.9229274737f, -0.1782808786f, 0.3412049336f, 0, -0.6968815002f, 0.6511274338f, 0.3006480328f, 0, 0.9608044783f, -0.2098363234f, -0.1811724921f, 0, 0.06817146062f, -0.9743405129f, 0.2145069156f, 0, -0.3577285196f, -0.6697087264f, -0.6507845481f, 0, -0.1868621131f, 0.7648617052f, -0.6164974636f, 0, -0.6541697588f, 0.3967914832f, 0.6439087246f, 0, + 0.6993340405f, -0.6164538506f, 0.3618239211f, 0, -0.1546665739f, 0.6291283928f, 0.7617583057f, 0, -0.6841612949f, -0.2580482182f, -0.6821542638f, 0, 0.5383980957f, 0.4258654885f, 0.7271630328f, 0, -0.5026987823f, -0.7939832935f, -0.3418836993f, 0, 0.3202971715f, 0.2834415347f, 0.9039195862f, 0, 0.8683227101f, -0.0003762656404f, -0.4959995258f, 0, 0.791120031f, -0.08511045745f, 0.6057105799f, 0, + -0.04011016052f, -0.4397248749f, 0.8972364289f, 0, 0.9145119872f, 0.3579346169f, -0.1885487608f, 0, -0.9612039066f, -0.2756484276f, 0.01024666929f, 0, 0.6510361721f, -0.2877799159f, -0.7023778346f, 0, -0.2041786351f, 0.7365237271f, 0.644859585f, 0, -0.7718263711f, 0.3790626912f, 0.5104855816f, 0, -0.3060082741f, -0.7692987727f, 0.5608371729f, 0, 0.454007341f, -0.5024843065f, 0.7357899537f, 0, + 0.4816795475f, 0.6021208291f, -0.6367380315f, 0, 0.6961980369f, -0.3222197429f, 0.641469197f, 0, -0.6532160499f, -0.6781148932f, 0.3368515753f, 0, 0.5089301236f, -0.6154662304f, -0.6018234363f, 0, -0.1635919754f, -0.9133604627f, -0.372840892f, 0, 0.52408019f, -0.8437664109f, 0.1157505864f, 0, 0.5902587356f, 0.4983817807f, -0.6349883666f, 0, 0.5863227872f, 0.494764745f, 0.6414307729f, 0, + 0.6779335087f, 0.2341345225f, 0.6968408593f, 0, 0.7177054546f, -0.6858979348f, 0.120178631f, 0, -0.5328819713f, -0.5205125012f, 0.6671608058f, 0, -0.8654874251f, -0.0700727088f, -0.4960053754f, 0, -0.2861810166f, 0.7952089234f, 0.5345495242f, 0, -0.04849529634f, 0.9810836427f, -0.1874115585f, 0, -0.6358521667f, 0.6058348682f, 0.4781800233f, 0, 0.6254794696f, -0.2861619734f, 0.7258696564f, 0, + -0.2585259868f, 0.5061949264f, -0.8227581726f, 0, 0.02136306781f, 0.5064016808f, -0.8620330371f, 0, 0.200111773f, 0.8599263484f, 0.4695550591f, 0, 0.4743561372f, 0.6014985084f, -0.6427953014f, 0, 0.6622993731f, -0.5202474575f, -0.5391679918f, 0, 0.08084972818f, -0.6532720452f, 0.7527940996f, 0, -0.6893687501f, 0.0592860349f, 0.7219805347f, 0, -0.1121887082f, -0.9673185067f, 0.2273952515f, 0, + 0.7344116094f, 0.5979668656f, -0.3210532909f, 0, 0.5789393465f, -0.2488849713f, 0.7764570201f, 0, 0.6988182827f, 0.3557169806f, -0.6205791146f, 0, -0.8636845529f, -0.2748771249f, -0.4224826141f, 0, -0.4247027957f, -0.4640880967f, 0.777335046f, 0, 0.5257722489f, -0.8427017621f, 0.1158329937f, 0, 0.9343830603f, 0.316302472f, -0.1639543925f, 0, -0.1016836419f, -0.8057303073f, -0.5834887393f, 0, + -0.6529238969f, 0.50602126f, -0.5635892736f, 0, -0.2465286165f, -0.9668205684f, -0.06694497494f, 0, -0.9776897119f, -0.2099250524f, -0.007368825344f, 0, 0.7736893337f, 0.5734244712f, 0.2694238123f, 0, -0.6095087895f, 0.4995678998f, 0.6155736747f, 0, 0.5794535482f, 0.7434546771f, 0.3339292269f, 0, -0.8226211154f, 0.08142581855f, 0.5627293636f, 0, -0.510385483f, 0.4703667658f, 0.7199039967f, 0, + -0.5764971849f, -0.07231656274f, -0.8138926898f, 0, 0.7250628871f, 0.3949971505f, -0.5641463116f, 0, -0.1525424005f, 0.4860840828f, -0.8604958341f, 0, -0.5550976208f, -0.4957820792f, 0.667882296f, 0, -0.1883614327f, 0.9145869398f, 0.357841725f, 0, 0.7625556724f, -0.5414408243f, -0.3540489801f, 0, -0.5870231946f, -0.3226498013f, -0.7424963803f, 0, 0.3051124198f, 0.2262544068f, -0.9250488391f, 0, + 0.6379576059f, 0.577242424f, -0.5097070502f, 0, -0.5966775796f, 0.1454852398f, -0.7891830656f, 0, -0.658330573f, 0.6555487542f, -0.3699414651f, 0, 0.7434892426f, 0.2351084581f, 0.6260573129f, 0, 0.5562114096f, 0.8264360377f, -0.0873632843f, 0, -0.3028940016f, -0.8251527185f, 0.4768419182f, 0, 0.1129343818f, -0.985888439f, -0.1235710781f, 0, 0.5937652891f, -0.5896813806f, 0.5474656618f, 0, + 0.6757964092f, -0.5835758614f, -0.4502648413f, 0, 0.7242302609f, -0.1152719764f, 0.6798550586f, 0, -0.9511914166f, 0.0753623979f, -0.2992580792f, 0, 0.2539470961f, -0.1886339355f, 0.9486454084f, 0, 0.571433621f, -0.1679450851f, -0.8032795685f, 0, -0.06778234979f, 0.3978269256f, 0.9149531629f, 0, 0.6074972649f, 0.733060024f, -0.3058922593f, 0, -0.5435478392f, 0.1675822484f, 0.8224791405f, 0, + -0.5876678086f, -0.3380045064f, -0.7351186982f, 0, -0.7967562402f, 0.04097822706f, -0.6029098428f, 0, -0.1996350917f, 0.8706294745f, 0.4496111079f, 0, -0.02787660336f, -0.9106232682f, -0.4122962022f, 0, -0.7797625996f, -0.6257634692f, 0.01975775581f, 0, -0.5211232846f, 0.7401644346f, -0.4249554471f, 0, 0.8575424857f, 0.4053272873f, -0.3167501783f, 0, 0.1045223322f, 0.8390195772f, -0.5339674439f, 0, + 0.3501822831f, 0.9242524096f, -0.1520850155f, 0, 0.1987849858f, 0.07647613266f, 0.9770547224f, 0, 0.7845996363f, 0.6066256811f, -0.1280964233f, 0, 0.09006737436f, -0.9750989929f, -0.2026569073f, 0, -0.8274343547f, -0.542299559f, 0.1458203587f, 0, -0.3485797732f, -0.415802277f, 0.840000362f, 0, -0.2471778936f, -0.7304819962f, -0.6366310879f, 0, -0.3700154943f, 0.8577948156f, 0.3567584454f, 0, + 0.5913394901f, -0.548311967f, -0.5913303597f, 0, 0.1204873514f, -0.7626472379f, -0.6354935001f, 0, 0.616959265f, 0.03079647928f, 0.7863922953f, 0, 0.1258156836f, -0.6640829889f, -0.7369967419f, 0, -0.6477565124f, -0.1740147258f, -0.7417077429f, 0, 0.6217889313f, -0.7804430448f, -0.06547655076f, 0, 0.6589943422f, -0.6096987708f, 0.4404473475f, 0, -0.2689837504f, -0.6732403169f, -0.6887635427f, 0, + -0.3849775103f, 0.5676542638f, 0.7277093879f, 0, 0.5754444408f, 0.8110471154f, -0.1051963504f, 0, 0.9141593684f, 0.3832947817f, 0.131900567f, 0, -0.107925319f, 0.9245493968f, 0.3654593525f, 0, 0.377977089f, 0.3043148782f, 0.8743716458f, 0, -0.2142885215f, -0.8259286236f, 0.5214617324f, 0, 0.5802544474f, 0.4148098596f, -0.7008834116f, 0, -0.1982660881f, 0.8567161266f, -0.4761596756f, 0, + -0.03381553704f, 0.3773180787f, -0.9254661404f, 0, -0.6867922841f, -0.6656597827f, 0.2919133642f, 0, 0.7731742607f, -0.2875793547f, -0.5652430251f, 0, -0.09655941928f, 0.9193708367f, -0.3813575004f, 0, 0.2715702457f, -0.9577909544f, -0.09426605581f, 0, 0.2451015704f, -0.6917998565f, -0.6792188003f, 0, 0.977700782f, -0.1753855374f, 0.1155036542f, 0, -0.5224739938f, 0.8521606816f, 0.02903615945f, 0, + -0.7734880599f, -0.5261292347f, 0.3534179531f, 0, -0.7134492443f, -0.269547243f, 0.6467878011f, 0, 0.1644037271f, 0.5105846203f, -0.8439637196f, 0, 0.6494635788f, 0.05585611296f, 0.7583384168f, 0, -0.4711970882f, 0.5017280509f, -0.7254255765f, 0, -0.6335764307f, -0.2381686273f, -0.7361091029f, 0, -0.9021533097f, -0.270947803f, -0.3357181763f, 0, -0.3793711033f, 0.872258117f, 0.3086152025f, 0, + -0.6855598966f, -0.3250143309f, 0.6514394162f, 0, 0.2900942212f, -0.7799057743f, -0.5546100667f, 0, -0.2098319339f, 0.85037073f, 0.4825351604f, 0, -0.4592603758f, 0.6598504336f, -0.5947077538f, 0, 0.8715945488f, 0.09616365406f, -0.4807031248f, 0, -0.6776666319f, 0.7118504878f, -0.1844907016f, 0, 0.7044377633f, 0.312427597f, 0.637304036f, 0, -0.7052318886f, -0.2401093292f, -0.6670798253f, 0, + 0.081921007f, -0.7207336136f, -0.6883545647f, 0, -0.6993680906f, -0.5875763221f, -0.4069869034f, 0, -0.1281454481f, 0.6419895885f, 0.7559286424f, 0, -0.6337388239f, -0.6785471501f, -0.3714146849f, 0, 0.5565051903f, -0.2168887573f, -0.8020356851f, 0, -0.5791554484f, 0.7244372011f, -0.3738578718f, 0, 0.1175779076f, -0.7096451073f, 0.6946792478f, 0, -0.6134619607f, 0.1323631078f, 0.7785527795f, 0, + 0.6984635305f, -0.02980516237f, -0.715024719f, 0, 0.8318082963f, -0.3930171956f, 0.3919597455f, 0, 0.1469576422f, 0.05541651717f, -0.9875892167f, 0, 0.708868575f, -0.2690503865f, 0.6520101478f, 0, 0.2726053183f, 0.67369766f, -0.68688995f, 0, -0.6591295371f, 0.3035458599f, -0.6880466294f, 0, 0.4815131379f, -0.7528270071f, 0.4487723203f, 0, 0.9430009463f, 0.1675647412f, -0.2875261255f, 0, + 0.434802957f, 0.7695304522f, -0.4677277752f, 0, 0.3931996188f, 0.594473625f, 0.7014236729f, 0, 0.7254336655f, -0.603925654f, 0.3301814672f, 0, 0.7590235227f, -0.6506083235f, 0.02433313207f, 0, -0.8552768592f, -0.3430042733f, 0.3883935666f, 0, -0.6139746835f, 0.6981725247f, 0.3682257648f, 0, -0.7465905486f, -0.5752009504f, 0.3342849376f, 0, 0.5730065677f, 0.810555537f, -0.1210916791f, 0, + -0.9225877367f, -0.3475211012f, -0.167514036f, 0, -0.7105816789f, -0.4719692027f, -0.5218416899f, 0, -0.08564609717f, 0.3583001386f, 0.929669703f, 0, -0.8279697606f, -0.2043157126f, 0.5222271202f, 0, 0.427944023f, 0.278165994f, 0.8599346446f, 0, 0.5399079671f, -0.7857120652f, -0.3019204161f, 0, 0.5678404253f, -0.5495413974f, -0.6128307303f, 0, -0.9896071041f, 0.1365639107f, -0.04503418428f, 0, + -0.6154342638f, -0.6440875597f, 0.4543037336f, 0, 0.1074204368f, -0.7946340692f, 0.5975094525f, 0, -0.3595449969f, -0.8885529948f, 0.28495784f, 0, -0.2180405296f, 0.1529888965f, 0.9638738118f, 0, -0.7277432317f, -0.6164050508f, -0.3007234646f, 0, 0.7249729114f, -0.00669719484f, 0.6887448187f, 0, -0.5553659455f, -0.5336586252f, 0.6377908264f, 0, 0.5137558015f, 0.7976208196f, -0.3160000073f, 0, + -0.3794024848f, 0.9245608561f, -0.03522751494f, 0, 0.8229248658f, 0.2745365933f, -0.4974176556f, 0, -0.5404114394f, 0.6091141441f, 0.5804613989f, 0, 0.8036581901f, -0.2703029469f, 0.5301601931f, 0, 0.6044318879f, 0.6832968393f, 0.4095943388f, 0, 0.06389988817f, 0.9658208605f, -0.2512108074f, 0, 0.1087113286f, 0.7402471173f, -0.6634877936f, 0, -0.713427712f, -0.6926784018f, 0.1059128479f, 0, + 0.6458897819f, -0.5724548511f, -0.5050958653f, 0, -0.6553931414f, 0.7381471625f, 0.159995615f, 0, 0.3910961323f, 0.9188871375f, -0.05186755998f, 0, -0.4879022471f, -0.5904376907f, 0.6429111375f, 0, 0.6014790094f, 0.7707441366f, -0.2101820095f, 0, -0.5677173047f, 0.7511360995f, 0.3368851762f, 0, 0.7858573506f, 0.226674665f, 0.5753666838f, 0, -0.4520345543f, -0.604222686f, -0.6561857263f, 0, + 0.002272116345f, 0.4132844051f, -0.9105991643f, 0, -0.5815751419f, -0.5162925989f, 0.6286591339f, 0, -0.03703704785f, 0.8273785755f, 0.5604221175f, 0, -0.5119692504f, 0.7953543429f, -0.3244980058f, 0, -0.2682417366f, -0.9572290247f, -0.1084387619f, 0, -0.2322482736f, -0.9679131102f, -0.09594243324f, 0, 0.3554328906f, -0.8881505545f, 0.2913006227f, 0, 0.7346520519f, -0.4371373164f, 0.5188422971f, 0, + 0.9985120116f, 0.04659011161f, -0.02833944577f, 0, -0.3727687496f, -0.9082481361f, 0.1900757285f, 0, 0.91737377f, -0.3483642108f, 0.1925298489f, 0, 0.2714911074f, 0.4147529736f, -0.8684886582f, 0, 0.5131763485f, -0.7116334161f, 0.4798207128f, 0, -0.8737353606f, 0.18886992f, -0.4482350644f, 0, 0.8460043821f, -0.3725217914f, 0.3814499973f, 0, 0.8978727456f, -0.1780209141f, -0.4026575304f, 0, + 0.2178065647f, -0.9698322841f, -0.1094789531f, 0, -0.1518031304f, -0.7788918132f, -0.6085091231f, 0, -0.2600384876f, -0.4755398075f, -0.8403819825f, 0, 0.572313509f, -0.7474340931f, -0.3373418503f, 0, -0.7174141009f, 0.1699017182f, -0.6756111411f, 0, -0.684180784f, 0.02145707593f, -0.7289967412f, 0, -0.2007447902f, 0.06555605789f, -0.9774476623f, 0, -0.1148803697f, -0.8044887315f, 0.5827524187f, 0, + -0.7870349638f, 0.03447489231f, 0.6159443543f, 0, -0.2015596421f, 0.6859872284f, 0.6991389226f, 0, -0.08581082512f, -0.10920836f, -0.9903080513f, 0, 0.5532693395f, 0.7325250401f, -0.396610771f, 0, -0.1842489331f, -0.9777375055f, -0.1004076743f, 0, 0.0775473789f, -0.9111505856f, 0.4047110257f, 0, 0.1399838409f, 0.7601631212f, -0.6344734459f, 0, 0.4484419361f, -0.845289248f, 0.2904925424f, 0 +}; + +// Utilities + +static inline float _fnlFastMin(float x, float y) { return x < y ? x : y; } + +static inline float _fnlFastMax(float x, float y) { return x > y ? x : y; } + +static inline float _fnlFastAbs(float f) { return f < 0 ? -f : f; } + +static inline float _fnlCasti32Tof32(int i) +{ + union + { + float f; + int32_t i; + } u; + u.i = i; + return u.f; +} + +static inline int _fnlCastf32Toi32(float f) +{ + union + { + float f; + int32_t i; + } u; + u.f = f; + return u.i; +} + +static inline float _fnlInvSqrt(float a) +{ + float xhalf = 0.5f * a; + a = _fnlCasti32Tof32(0x5f3759df - (_fnlCastf32Toi32(a) >> 1)); + a = a * (1.5f - xhalf * a * a); + return a; +} + +// NOTE: If your language does not support this method (seen above), then simply use the native sqrt function. +static inline float _fnlFastSqrt(float a) { return a * _fnlInvSqrt(a); } + +static inline int _fnlFastFloor(FNLfloat f) { return (f >= 0 ? (int)f : (int)f - 1); } + +static inline int _fnlFastRound(FNLfloat f) { return (f >= 0) ? (int)(f + 0.5f) : (int)(f - 0.5f); } + +static inline float _fnlLerp(float a, float b, float t) { return a + t * (b - a); } + +static inline float _fnlInterpHermite(float t) { return t * t * (3 - 2 * t); } + +static inline float _fnlInterpQuintic(float t) { return t * t * t * (t * (t * 6 - 15) + 10); } + +static inline float _fnlCubicLerp(float a, float b, float c, float d, float t) +{ + float p = (d - c) - (a - b); + return t * t * t * p + t * t * ((a - b) - p) + t * (c - a) + b; +} + +static inline float _fnlPingPong(float t) +{ + t -= (int)(t * 0.5f) * 2; + return t < 1 ? t : 2 - t; +} + +static float _fnlCalculateFractalBounding(fnl_state *state) +{ + float gain = _fnlFastAbs(state->gain); + float amp = gain; + float ampFractal = 1.0f; + for (int i = 1; i < state->octaves; i++) + { + ampFractal += amp; + amp *= gain; + } + return 1.0f / ampFractal; +} + +// Hashing + +static const int PRIME_X = 501125321; +static const int PRIME_Y = 1136930381; +static const int PRIME_Z = 1720413743; + +static inline int _fnlHash2D(int seed, int xPrimed, int yPrimed) +{ + int hash = seed ^ xPrimed ^ yPrimed; + + hash *= 0x27d4eb2d; + return hash; +} + +static inline int _fnlHash3D(int seed, int xPrimed, int yPrimed, int zPrimed) +{ + int hash = seed ^ xPrimed ^ yPrimed ^ zPrimed; + + hash *= 0x27d4eb2d; + return hash; +} + +static inline float _fnlValCoord2D(int seed, int xPrimed, int yPrimed) +{ + int hash = _fnlHash2D(seed, xPrimed, yPrimed); + hash *= hash; + hash ^= hash << 19; + return hash * (1 / 2147483648.0f); +} + +static inline float _fnlValCoord3D(int seed, int xPrimed, int yPrimed, int zPrimed) +{ + int hash = _fnlHash3D(seed, xPrimed, yPrimed, zPrimed); + hash *= hash; + hash ^= hash << 19; + return hash * (1 / 2147483648.0f); +} + +static inline float _fnlGradCoord2D(int seed, int xPrimed, int yPrimed, float xd, float yd) +{ + int hash = _fnlHash2D(seed, xPrimed, yPrimed); + hash ^= hash >> 15; + hash &= 127 << 1; + return xd * GRADIENTS_2D[hash] + yd * GRADIENTS_2D[hash | 1]; +} + +static inline float _fnlGradCoord3D(int seed, int xPrimed, int yPrimed, int zPrimed, float xd, float yd, float zd) +{ + int hash = _fnlHash3D(seed, xPrimed, yPrimed, zPrimed); + hash ^= hash >> 15; + hash &= 63 << 2; + return xd * GRADIENTS_3D[hash] + yd * GRADIENTS_3D[hash | 1] + zd * GRADIENTS_3D[hash | 2]; +} + +static inline void _fnlGradCoordOut2D(int seed, int xPrimed, int yPrimed, float *xo, float *yo) +{ + int hash = _fnlHash2D(seed, xPrimed, yPrimed) & (255 << 1); + + *xo = RAND_VECS_2D[hash]; + *yo = RAND_VECS_2D[hash | 1]; +} + +static inline void _fnlGradCoordOut3D(int seed, int xPrimed, int yPrimed, int zPrimed, float *xo, float *yo, float *zo) +{ + int hash = _fnlHash3D(seed, xPrimed, yPrimed, zPrimed) & (255 << 2); + + *xo = RAND_VECS_3D[hash]; + *yo = RAND_VECS_3D[hash | 1]; + *zo = RAND_VECS_3D[hash | 2]; +} + +static inline void _fnlGradCoordDual2D(int seed, int xPrimed, int yPrimed, float xd, float yd, float *xo, float *yo) +{ + int hash = _fnlHash2D(seed, xPrimed, yPrimed); + int index1 = hash & (127 << 1); + int index2 = (hash >> 7) & (255 << 1); + + float xg = GRADIENTS_2D[index1]; + float yg = GRADIENTS_2D[index1 | 1]; + float value = xd * xg + yd * yg; + + float xgo = RAND_VECS_2D[index2]; + float ygo = RAND_VECS_2D[index2 | 1]; + + *xo = value * xgo; + *yo = value * ygo; +} + +static inline void _fnlGradCoordDual3D(int seed, int xPrimed, int yPrimed, int zPrimed, float xd, float yd, float zd, float *xo, float *yo, float *zo) +{ + int hash = _fnlHash3D(seed, xPrimed, yPrimed, zPrimed); + int index1 = hash & (63 << 2); + int index2 = (hash >> 6) & (255 << 2); + + float xg = GRADIENTS_3D[index1]; + float yg = GRADIENTS_3D[index1 | 1]; + float zg = GRADIENTS_3D[index1 | 2]; + float value = xd * xg + yd * yg + zd * zg; + + float xgo = RAND_VECS_3D[index2]; + float ygo = RAND_VECS_3D[index2 | 1]; + float zgo = RAND_VECS_3D[index2 | 2]; + + *xo = value * xgo; + *yo = value * ygo; + *zo = value * zgo; +} + +// Generic Noise Gen + +static float _fnlSingleSimplex2D(int seed, FNLfloat x, FNLfloat y); +static float _fnlSingleOpenSimplex23D(int seed, FNLfloat x, FNLfloat y, FNLfloat z); +static float _fnlSingleOpenSimplex2S2D(int seed, FNLfloat x, FNLfloat y); +static float _fnlSingleOpenSimplex2S3D(int seed, FNLfloat x, FNLfloat y, FNLfloat z); +static float _fnlSingleCellular2D(fnl_state *state, int seed, FNLfloat x, FNLfloat y); +static float _fnlSingleCellular3D(fnl_state *state, int seed, FNLfloat x, FNLfloat y, FNLfloat z); +static float _fnlSinglePerlin2D(int seed, FNLfloat x, FNLfloat y); +static float _fnlSinglePerlin3D(int seed, FNLfloat x, FNLfloat y, FNLfloat z); +static float _fnlSingleValueCubic2D(int seed, FNLfloat x, FNLfloat y); +static float _fnlSingleValueCubic3D(int seed, FNLfloat x, FNLfloat y, FNLfloat z); +static float _fnlSingleValue2D(int seed, FNLfloat x, FNLfloat y); +static float _fnlSingleValue3D(int seed, FNLfloat x, FNLfloat y, FNLfloat z); + +static float _fnlGenNoiseSingle2D(fnl_state *state, int seed, FNLfloat x, FNLfloat y) +{ + switch (state->noise_type) + { + case FNL_NOISE_OPENSIMPLEX2: + return _fnlSingleSimplex2D(seed, x, y); + case FNL_NOISE_OPENSIMPLEX2S: + return _fnlSingleOpenSimplex2S2D(seed, x, y); + case FNL_NOISE_CELLULAR: + return _fnlSingleCellular2D(state, seed, x, y); + case FNL_NOISE_PERLIN: + return _fnlSinglePerlin2D(seed, x, y); + case FNL_NOISE_VALUE_CUBIC: + return _fnlSingleValueCubic2D(seed, x, y); + case FNL_NOISE_VALUE: + return _fnlSingleValue2D(seed, x, y); + default: + return 0; + } +} + +static float _fnlGenNoiseSingle3D(fnl_state *state, int seed, FNLfloat x, FNLfloat y, FNLfloat z) +{ + switch (state->noise_type) + { + case FNL_NOISE_OPENSIMPLEX2: + return _fnlSingleOpenSimplex23D(seed, x, y, z); + case FNL_NOISE_OPENSIMPLEX2S: + return _fnlSingleOpenSimplex2S3D(seed, x, y, z); + case FNL_NOISE_CELLULAR: + return _fnlSingleCellular3D(state, seed, x, y, z); + case FNL_NOISE_PERLIN: + return _fnlSinglePerlin3D(seed, x, y, z); + case FNL_NOISE_VALUE_CUBIC: + return _fnlSingleValueCubic3D(seed, x, y, z); + case FNL_NOISE_VALUE: + return _fnlSingleValue3D(seed, x, y, z); + default: + return 0; + } +} + +// Noise Coordinate Transforms (frequency, and possible skew or rotation) + +static void _fnlTransformNoiseCoordinate2D(fnl_state *state, FNLfloat *x, FNLfloat *y) +{ + *x *= state->frequency; + *y *= state->frequency; + + switch (state->noise_type) + { + case FNL_NOISE_OPENSIMPLEX2: + case FNL_NOISE_OPENSIMPLEX2S: + { + const FNLfloat SQRT3 = (FNLfloat)1.7320508075688772935274463415059; + const FNLfloat F2 = 0.5f * (SQRT3 - 1); + FNLfloat t = (*x + *y) * F2; + *x += t; + *y += t; + } + break; + default: + break; + } +} + +static void _fnlTransformNoiseCoordinate3D(fnl_state *state, FNLfloat *x, FNLfloat *y, FNLfloat *z) +{ + *x *= state->frequency; + *y *= state->frequency; + *z *= state->frequency; + + switch (state->rotation_type_3d) + { + case FNL_ROTATION_IMPROVE_XY_PLANES: + { + FNLfloat xy = *x + *y; + FNLfloat s2 = xy * -(FNLfloat)0.211324865405187; + *z *= (FNLfloat)0.577350269189626; + *x += s2 - *z; + *y = *y + s2 - *z; + *z += xy * (FNLfloat)0.577350269189626; + } + break; + case FNL_ROTATION_IMPROVE_XZ_PLANES: + { + FNLfloat xz = *x + *z; + FNLfloat s2 = xz * -(FNLfloat)0.211324865405187; + *y *= (FNLfloat)0.577350269189626; + *x += s2 - *y; + *z += s2 - *y; + *y += xz * (FNLfloat)0.577350269189626; + } + break; + default: + switch (state->noise_type) + { + case FNL_NOISE_OPENSIMPLEX2: + case FNL_NOISE_OPENSIMPLEX2S: + { + const FNLfloat R3 = (FNLfloat)(2.0 / 3.0); + FNLfloat r = (*x + *y + *z) * R3; // Rotation, not skew + *x = r - *x; + *y = r - *y; + *z = r - *z; + } + break; + default: + break; + } + } +} + +// Domain Warp Coordinate Transforms + +static void _fnlTransformDomainWarpCoordinate2D(fnl_state *state, FNLfloat *x, FNLfloat *y) +{ + switch (state->domain_warp_type) + { + case FNL_DOMAIN_WARP_OPENSIMPLEX2: + case FNL_DOMAIN_WARP_OPENSIMPLEX2_REDUCED: + { + const FNLfloat SQRT3 = (FNLfloat)1.7320508075688772935274463415059; + const FNLfloat F2 = 0.5f * (SQRT3 - 1); + FNLfloat t = (*x + *y) * F2; + *x += t; + *y += t; + } + break; + default: + break; + } +} + +static void _fnlTransformDomainWarpCoordinate3D(fnl_state *state, FNLfloat *x, FNLfloat *y, FNLfloat *z) +{ + switch (state->rotation_type_3d) + { + case FNL_ROTATION_IMPROVE_XY_PLANES: + { + FNLfloat xy = *x + *y; + FNLfloat s2 = xy * -(FNLfloat)0.211324865405187; + *z *= (FNLfloat)0.577350269189626; + *x += s2 - *z; + *y = *y + s2 - *z; + *z += xy * (FNLfloat)0.577350269189626; + } + break; + case FNL_ROTATION_IMPROVE_XZ_PLANES: + { + FNLfloat xz = *x + *z; + FNLfloat s2 = xz * -(FNLfloat)0.211324865405187; + *y *= (FNLfloat)0.577350269189626; + *x += s2 - *y; + *z += s2 - *y; + *y += xz * (FNLfloat)0.577350269189626; + } + break; + default: + switch (state->domain_warp_type) + { + case FNL_DOMAIN_WARP_OPENSIMPLEX2: + case FNL_DOMAIN_WARP_OPENSIMPLEX2_REDUCED: + { + const FNLfloat R3 = (FNLfloat)(2.0 / 3.0); + FNLfloat r = (*x + *y + *z) * R3; // Rotation, not skew + *x = r - *x; + *y = r - *y; + *z = r - *z; + } + break; + default: + break; + } + } +} + +// Fractal FBm +static float _fnlGenFractalFBM2D(fnl_state *state, FNLfloat x, FNLfloat y) +{ + int seed = state->seed; + float sum = 0; + float amp = _fnlCalculateFractalBounding(state); + + for (int i = 0; i < state->octaves; i++) + { + float noise = _fnlGenNoiseSingle2D(state, seed++, x, y); + sum += noise * amp; + amp *= _fnlLerp(1.0f, _fnlFastMin(noise + 1, 2) * 0.5f, state->weighted_strength); + + x *= state->lacunarity; + y *= state->lacunarity; + amp *= state->gain; + } + + return sum; +} + +static float _fnlGenFractalFBM3D(fnl_state *state, FNLfloat x, FNLfloat y, FNLfloat z) +{ + int seed = state->seed; + float sum = 0; + float amp = _fnlCalculateFractalBounding(state); + + for (int i = 0; i < state->octaves; i++) + { + float noise = _fnlGenNoiseSingle3D(state, seed++, x, y, z); + sum += noise * amp; + amp *= _fnlLerp(1.0f, (noise + 1) * 0.5f, state->weighted_strength); + + x *= state->lacunarity; + y *= state->lacunarity; + z *= state->lacunarity; + amp *= state->gain; + } + + return sum; +} + +// Fractal Ridged + +static float _fnlGenFractalRidged2D(fnl_state *state, FNLfloat x, FNLfloat y) +{ + int seed = state->seed; + float sum = 0; + float amp = _fnlCalculateFractalBounding(state); + + for (int i = 0; i < state->octaves; i++) + { + float noise = _fnlFastAbs(_fnlGenNoiseSingle2D(state, seed++, x, y)); + sum += (noise * -2 + 1) * amp; + amp *= _fnlLerp(1.0f, 1 - noise, state->weighted_strength); + + x *= state->lacunarity; + y *= state->lacunarity; + amp *= state->gain; + } + + return sum; +} + +static float _fnlGenFractalRidged3D(fnl_state *state, FNLfloat x, FNLfloat y, FNLfloat z) +{ + int seed = state->seed; + float sum = 0; + float amp = _fnlCalculateFractalBounding(state); + + for (int i = 0; i < state->octaves; i++) + { + float noise = _fnlFastAbs(_fnlGenNoiseSingle3D(state, seed++, x, y, z)); + sum += (noise * -2 + 1) * amp; + amp *= _fnlLerp(1.0f, 1 - noise, state->weighted_strength); + + x *= state->lacunarity; + y *= state->lacunarity; + z *= state->lacunarity; + amp *= state->gain; + } + + return sum; +} + +// Fractal PingPong + +static float _fnlGenFractalPingPong2D(fnl_state *state, FNLfloat x, FNLfloat y) +{ + int seed = state->seed; + float sum = 0; + float amp = _fnlCalculateFractalBounding(state); + + for (int i = 0; i < state->octaves; i++) + { + float noise = _fnlPingPong((_fnlGenNoiseSingle2D(state, seed++, x, y) + 1) * state->ping_pong_strength); + sum += (noise - 0.5f) * 2 * amp; + amp *= _fnlLerp(1.0f, noise, state->weighted_strength); + + x *= state->lacunarity; + y *= state->lacunarity; + amp *= state->gain; + } + + return sum; +} + +static float _fnlGenFractalPingPong3D(fnl_state *state, FNLfloat x, FNLfloat y, FNLfloat z) +{ + int seed = state->seed; + float sum = 0; + float amp = _fnlCalculateFractalBounding(state); + + for (int i = 0; i < state->octaves; i++) + { + float noise = _fnlPingPong((_fnlGenNoiseSingle3D(state, seed++, x, y, z) + 1) * state->ping_pong_strength); + sum += (noise - 0.5f) * 2 * amp; + amp *= _fnlLerp(1.0f, noise, state->weighted_strength); + + x *= state->lacunarity; + y *= state->lacunarity; + z *= state->lacunarity; + amp *= state->gain; + } + + return sum; +} + +// Simplex/OpenSimplex2 Noise + +static float _fnlSingleSimplex2D(int seed, FNLfloat x, FNLfloat y) +{ + // 2D OpenSimplex2 case uses the same algorithm as ordinary Simplex. + + const float SQRT3 = 1.7320508075688772935274463415059f; + const float G2 = (3 - SQRT3) / 6; + + /* + * --- Skew moved to TransformNoiseCoordinate method --- + * const FNLfloat F2 = 0.5f * (SQRT3 - 1); + * FNLfloat s = (x + y) * F2; + * x += s; y += s; + */ + + int i = _fnlFastFloor(x); + int j = _fnlFastFloor(y); + float xi = (float)(x - i); + float yi = (float)(y - j); + + float t = (xi + yi) * G2; + float x0 = (float)(xi - t); + float y0 = (float)(yi - t); + + i *= PRIME_X; + j *= PRIME_Y; + + float n0, n1, n2; + + float a = 0.5f - x0 * x0 - y0 * y0; + if (a <= 0) + n0 = 0; + else + { + n0 = (a * a) * (a * a) * _fnlGradCoord2D(seed, i, j, x0, y0); + } + + float c = (float)(2 * (1 - 2 * G2) * (1 / G2 - 2)) * t + ((float)(-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a); + if (c <= 0) + n2 = 0; + else + { + float x2 = x0 + (2 * (float)G2 - 1); + float y2 = y0 + (2 * (float)G2 - 1); + n2 = (c * c) * (c * c) * _fnlGradCoord2D(seed, i + PRIME_X, j + PRIME_Y, x2, y2); + } + + if (y0 > x0) + { + float x1 = x0 + (float)G2; + float y1 = y0 + ((float)G2 - 1); + float b = 0.5f - x1 * x1 - y1 * y1; + if (b <= 0) + n1 = 0; + else + { + n1 = (b * b) * (b * b) * _fnlGradCoord2D(seed, i, j + PRIME_Y, x1, y1); + } + } + else + { + float x1 = x0 + ((float)G2 - 1); + float y1 = y0 + (float)G2; + float b = 0.5f - x1 * x1 - y1 * y1; + if (b <= 0) + n1 = 0; + else + { + n1 = (b * b) * (b * b) * _fnlGradCoord2D(seed, i + PRIME_X, j, x1, y1); + } + } + + return (n0 + n1 + n2) * 99.83685446303647f; +} + +static float _fnlSingleOpenSimplex23D(int seed, FNLfloat x, FNLfloat y, FNLfloat z) +{ + // 3D OpenSimplex2 case uses two offset rotated cube grids. + + /* + * --- Rotation moved to TransformNoiseCoordinate method --- + * const FNLfloat R3 = (FNLfloat)(2.0 / 3.0); + * FNLfloat r = (x + y + z) * R3; // Rotation, not skew + * x = r - x; y = r - y; z = r - z; + */ + + int i = _fnlFastRound(x); + int j = _fnlFastRound(y); + int k = _fnlFastRound(z); + float x0 = (float)(x - i); + float y0 = (float)(y - j); + float z0 = (float)(z - k); + + int xNSign = (int)(-1.0f - x0) | 1; + int yNSign = (int)(-1.0f - y0) | 1; + int zNSign = (int)(-1.0f - z0) | 1; + + float ax0 = xNSign * -x0; + float ay0 = yNSign * -y0; + float az0 = zNSign * -z0; + + i *= PRIME_X; + j *= PRIME_Y; + k *= PRIME_Z; + + float value = 0; + float a = (0.6f - x0 * x0) - (y0 * y0 + z0 * z0); + + for (int l = 0; ; l++) + { + if (a > 0) + { + value += (a * a) * (a * a) * _fnlGradCoord3D(seed, i, j, k, x0, y0, z0); + } + + float b = a + 1; + int i1 = i; + int j1 = j; + int k1 = k; + float x1 = x0; + float y1 = y0; + float z1 = z0; + if (ax0 >= ay0 && ax0 >= az0) + { + x1 += xNSign; + b -= xNSign * 2 * x1; + i1 -= xNSign * PRIME_X; + } + else if (ay0 > ax0 && ay0 >= az0) + { + y1 += yNSign; + b -= yNSign * 2 * y1; + j1 -= yNSign * PRIME_Y; + } + else + { + z1 += zNSign; + b -= zNSign * 2 * z1; + k1 -= zNSign * PRIME_Z; + } + + if (b > 0) + { + value += (b * b) * (b * b) * _fnlGradCoord3D(seed, i1, j1, k1, x1, y1, z1); + } + + if (l == 1) + break; + + ax0 = 0.5f - ax0; + ay0 = 0.5f - ay0; + az0 = 0.5f - az0; + + x0 = xNSign * ax0; + y0 = yNSign * ay0; + z0 = zNSign * az0; + + a += (0.75f - ax0) - (ay0 + az0); + + i += (xNSign >> 1) & PRIME_X; + j += (yNSign >> 1) & PRIME_Y; + k += (zNSign >> 1) & PRIME_Z; + + xNSign = -xNSign; + yNSign = -yNSign; + zNSign = -zNSign; + + seed = ~seed; + } + + return value * 32.69428253173828125f; +} + +// OpenSimplex2S Noise + +static float _fnlSingleOpenSimplex2S2D(int seed, FNLfloat x, FNLfloat y) +{ + // 2D OpenSimplex2S case is a modified 2D simplex noise. + + const FNLfloat SQRT3 = (FNLfloat)1.7320508075688772935274463415059; + const FNLfloat G2 = (3 - SQRT3) / 6; + + /* + * --- Skew moved to TransformNoiseCoordinate method --- + * const FNLfloat F2 = 0.5f * (SQRT3 - 1); + * FNLfloat s = (x + y) * F2; + * x += s; y += s; + */ + + int i = _fnlFastFloor(x); + int j = _fnlFastFloor(y); + float xi = (float)(x - i); + float yi = (float)(y - j); + + i *= PRIME_X; + j *= PRIME_Y; + int i1 = i + PRIME_X; + int j1 = j + PRIME_Y; + + float t = (xi + yi) * (float)G2; + float x0 = xi - t; + float y0 = yi - t; + + float a0 = (2.0f / 3.0f) - x0 * x0 - y0 * y0; + float value = (a0 * a0) * (a0 * a0) * _fnlGradCoord2D(seed, i, j, x0, y0); + + float a1 = (float)(2 * (1 - 2 * G2) * (1 / G2 - 2)) * t + ((float)(-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a0); + float x1 = x0 - (float)(1 - 2 * G2); + float y1 = y0 - (float)(1 - 2 * G2); + value += (a1 * a1) * (a1 * a1) * _fnlGradCoord2D(seed, i1, j1, x1, y1); + + // Nested conditionals were faster than compact bit logic/arithmetic. + float xmyi = xi - yi; + if (t > G2) + { + if (xi + xmyi > 1) + { + float x2 = x0 + (float)(3 * G2 - 2); + float y2 = y0 + (float)(3 * G2 - 1); + float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; + if (a2 > 0) + { + value += (a2 * a2) * (a2 * a2) * _fnlGradCoord2D(seed, i + (PRIME_X << 1), j + PRIME_Y, x2, y2); + } + } + else + { + float x2 = x0 + (float)G2; + float y2 = y0 + (float)(G2 - 1); + float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; + if (a2 > 0) + { + value += (a2 * a2) * (a2 * a2) * _fnlGradCoord2D(seed, i, j + PRIME_Y, x2, y2); + } + } + + if (yi - xmyi > 1) + { + float x3 = x0 + (float)(3 * G2 - 1); + float y3 = y0 + (float)(3 * G2 - 2); + float a3 = (2.0f / 3.0f) - x3 * x3 - y3 * y3; + if (a3 > 0) + { + value += (a3 * a3) * (a3 * a3) * _fnlGradCoord2D(seed, i + PRIME_X, j + (PRIME_Y << 1), x3, y3); + } + } + else + { + float x3 = x0 + (float)(G2 - 1); + float y3 = y0 + (float)G2; + float a3 = (2.0f / 3.0f) - x3 * x3 - y3 * y3; + if (a3 > 0) + { + value += (a3 * a3) * (a3 * a3) * _fnlGradCoord2D(seed, i + PRIME_X, j, x3, y3); + } + } + } + else + { + if (xi + xmyi < 0) + { + float x2 = x0 + (float)(1 - G2); + float y2 = y0 - (float)G2; + float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; + if (a2 > 0) + { + value += (a2 * a2) * (a2 * a2) * _fnlGradCoord2D(seed, i - PRIME_X, j, x2, y2); + } + } + else + { + float x2 = x0 + (float)(G2 - 1); + float y2 = y0 + (float)G2; + float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; + if (a2 > 0) + { + value += (a2 * a2) * (a2 * a2) * _fnlGradCoord2D(seed, i + PRIME_X, j, x2, y2); + } + } + + if (yi < xmyi) + { + float x2 = x0 - (float)G2; + float y2 = y0 - (float)(G2 - 1); + float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; + if (a2 > 0) + { + value += (a2 * a2) * (a2 * a2) * _fnlGradCoord2D(seed, i, j - PRIME_Y, x2, y2); + } + } + else + { + float x2 = x0 + (float)G2; + float y2 = y0 + (float)(G2 - 1); + float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; + if (a2 > 0) + { + value += (a2 * a2) * (a2 * a2) * _fnlGradCoord2D(seed, i, j + PRIME_Y, x2, y2); + } + } + } + + return value * 18.24196194486065f; +} + +static float _fnlSingleOpenSimplex2S3D(int seed, FNLfloat x, FNLfloat y, FNLfloat z) +{ + // 3D OpenSimplex2S case uses two offset rotated cube grids. + + /* + * --- Rotation moved to TransformNoiseCoordinate method --- + * const FNLfloat R3 = (FNLfloat)(2.0 / 3.0); + * FNLfloat r = (x + y + z) * R3; // Rotation, not skew + * x = r - x; y = r - y; z = r - z; + */ + + int i = _fnlFastFloor(x); + int j = _fnlFastFloor(y); + int k = _fnlFastFloor(z); + float xi = (float)(x - i); + float yi = (float)(y - j); + float zi = (float)(z - k); + + i *= PRIME_X; + j *= PRIME_Y; + k *= PRIME_Z; + int seed2 = seed + 1293373; + + int xNMask = (int)(-0.5f - xi); + int yNMask = (int)(-0.5f - yi); + int zNMask = (int)(-0.5f - zi); + + float x0 = xi + xNMask; + float y0 = yi + yNMask; + float z0 = zi + zNMask; + float a0 = 0.75f - x0 * x0 - y0 * y0 - z0 * z0; + float value = (a0 * a0) * (a0 * a0) * _fnlGradCoord3D(seed, + i + (xNMask & PRIME_X), j + (yNMask & PRIME_Y), k + (zNMask & PRIME_Z), x0, y0, z0); + + float x1 = xi - 0.5f; + float y1 = yi - 0.5f; + float z1 = zi - 0.5f; + float a1 = 0.75f - x1 * x1 - y1 * y1 - z1 * z1; + value += (a1 * a1) * (a1 * a1) * _fnlGradCoord3D(seed2, + i + PRIME_X, j + PRIME_Y, k + PRIME_Z, x1, y1, z1); + + float xAFlipMask0 = ((xNMask | 1) << 1) * x1; + float yAFlipMask0 = ((yNMask | 1) << 1) * y1; + float zAFlipMask0 = ((zNMask | 1) << 1) * z1; + float xAFlipMask1 = (-2 - (xNMask << 2)) * x1 - 1.0f; + float yAFlipMask1 = (-2 - (yNMask << 2)) * y1 - 1.0f; + float zAFlipMask1 = (-2 - (zNMask << 2)) * z1 - 1.0f; + + bool skip5 = false; + float a2 = xAFlipMask0 + a0; + if (a2 > 0) + { + float x2 = x0 - (xNMask | 1); + float y2 = y0; + float z2 = z0; + value += (a2 * a2) * (a2 * a2) * _fnlGradCoord3D(seed, + i + (~xNMask & PRIME_X), j + (yNMask & PRIME_Y), k + (zNMask & PRIME_Z), x2, y2, z2); + } + else + { + float a3 = yAFlipMask0 + zAFlipMask0 + a0; + if (a3 > 0) + { + float x3 = x0; + float y3 = y0 - (yNMask | 1); + float z3 = z0 - (zNMask | 1); + value += (a3 * a3) * (a3 * a3) * _fnlGradCoord3D(seed, + i + (xNMask & PRIME_X), j + (~yNMask & PRIME_Y), k + (~zNMask & PRIME_Z), x3, y3, z3); + } + + float a4 = xAFlipMask1 + a1; + if (a4 > 0) + { + float x4 = (xNMask | 1) + x1; + float y4 = y1; + float z4 = z1; + value += (a4 * a4) * (a4 * a4) * _fnlGradCoord3D(seed2, + i + (xNMask & (PRIME_X * 2)), j + PRIME_Y, k + PRIME_Z, x4, y4, z4); + skip5 = true; + } + } + + bool skip9 = false; + float a6 = yAFlipMask0 + a0; + if (a6 > 0) + { + float x6 = x0; + float y6 = y0 - (yNMask | 1); + float z6 = z0; + value += (a6 * a6) * (a6 * a6) * _fnlGradCoord3D(seed, + i + (xNMask & PRIME_X), j + (~yNMask & PRIME_Y), k + (zNMask & PRIME_Z), x6, y6, z6); + } + else + { + float a7 = xAFlipMask0 + zAFlipMask0 + a0; + if (a7 > 0) + { + float x7 = x0 - (xNMask | 1); + float y7 = y0; + float z7 = z0 - (zNMask | 1); + value += (a7 * a7) * (a7 * a7) * _fnlGradCoord3D(seed, + i + (~xNMask & PRIME_X), j + (yNMask & PRIME_Y), k + (~zNMask & PRIME_Z), x7, y7, z7); + } + + float a8 = yAFlipMask1 + a1; + if (a8 > 0) + { + float x8 = x1; + float y8 = (yNMask | 1) + y1; + float z8 = z1; + value += (a8 * a8) * (a8 * a8) * _fnlGradCoord3D(seed2, + i + PRIME_X, j + (yNMask & (PRIME_Y << 1)), k + PRIME_Z, x8, y8, z8); + skip9 = true; + } + } + + bool skipD = false; + float aA = zAFlipMask0 + a0; + if (aA > 0) + { + float xA = x0; + float yA = y0; + float zA = z0 - (zNMask | 1); + value += (aA * aA) * (aA * aA) * _fnlGradCoord3D(seed, + i + (xNMask & PRIME_X), j + (yNMask & PRIME_Y), k + (~zNMask & PRIME_Z), xA, yA, zA); + } + else + { + float aB = xAFlipMask0 + yAFlipMask0 + a0; + if (aB > 0) + { + float xB = x0 - (xNMask | 1); + float yB = y0 - (yNMask | 1); + float zB = z0; + value += (aB * aB) * (aB * aB) * _fnlGradCoord3D(seed, + i + (~xNMask & PRIME_X), j + (~yNMask & PRIME_Y), k + (zNMask & PRIME_Z), xB, yB, zB); + } + + float aC = zAFlipMask1 + a1; + if (aC > 0) + { + float xC = x1; + float yC = y1; + float zC = (zNMask | 1) + z1; + value += (aC * aC) * (aC * aC) * _fnlGradCoord3D(seed2, + i + PRIME_X, j + PRIME_Y, k + (zNMask & (PRIME_Z << 1)), xC, yC, zC); + skipD = true; + } + } + + if (!skip5) + { + float a5 = yAFlipMask1 + zAFlipMask1 + a1; + if (a5 > 0) + { + float x5 = x1; + float y5 = (yNMask | 1) + y1; + float z5 = (zNMask | 1) + z1; + value += (a5 * a5) * (a5 * a5) * _fnlGradCoord3D(seed2, + i + PRIME_X, j + (yNMask & (PRIME_Y << 1)), k + (zNMask & (PRIME_Z << 1)), x5, y5, z5); + } + } + + if (!skip9) + { + float a9 = xAFlipMask1 + zAFlipMask1 + a1; + if (a9 > 0) + { + float x9 = (xNMask | 1) + x1; + float y9 = y1; + float z9 = (zNMask | 1) + z1; + value += (a9 * a9) * (a9 * a9) * _fnlGradCoord3D(seed2, + i + (xNMask & (PRIME_X * 2)), j + PRIME_Y, k + (zNMask & (PRIME_Z << 1)), x9, y9, z9); + } + } + + if (!skipD) + { + float aD = xAFlipMask1 + yAFlipMask1 + a1; + if (aD > 0) + { + float xD = (xNMask | 1) + x1; + float yD = (yNMask | 1) + y1; + float zD = z1; + value += (aD * aD) * (aD * aD) * _fnlGradCoord3D(seed2, + i + (xNMask & (PRIME_X << 1)), j + (yNMask & (PRIME_Y << 1)), k + PRIME_Z, xD, yD, zD); + } + } + + return value * 9.046026385208288f; +} + +// Cellular Noise + +static float _fnlSingleCellular2D(fnl_state *state, int seed, FNLfloat x, FNLfloat y) +{ + int xr = _fnlFastRound(x); + int yr = _fnlFastRound(y); + + float distance0 = FLT_MAX; + float distance1 = FLT_MAX; + int closestHash = 0; + + float cellularJitter = 0.5f * state->cellular_jitter_mod; + + int xPrimed = (xr - 1) * PRIME_X; + int yPrimedBase = (yr - 1) * PRIME_Y; + + switch (state->cellular_distance_func) + { + default: + case FNL_CELLULAR_DISTANCE_EUCLIDEAN: + case FNL_CELLULAR_DISTANCE_EUCLIDEANSQ: + for (int xi = xr - 1; xi <= xr + 1; xi++) + { + int yPrimed = yPrimedBase; + + for (int yi = yr - 1; yi <= yr + 1; yi++) + { + int hash = _fnlHash2D(seed, xPrimed, yPrimed); + int idx = hash & (255 << 1); + + float vecX = (float)(xi - x) + RAND_VECS_2D[idx] * cellularJitter; + float vecY = (float)(yi - y) + RAND_VECS_2D[idx | 1] * cellularJitter; + + float newDistance = vecX * vecX + vecY * vecY; + + distance1 = _fnlFastMax(_fnlFastMin(distance1, newDistance), distance0); + if (newDistance < distance0) + { + distance0 = newDistance; + closestHash = hash; + } + yPrimed += PRIME_Y; + } + xPrimed += PRIME_X; + } + break; + case FNL_CELLULAR_DISTANCE_MANHATTAN: + for (int xi = xr - 1; xi <= xr + 1; xi++) + { + int yPrimed = yPrimedBase; + + for (int yi = yr - 1; yi <= yr + 1; yi++) + { + int hash = _fnlHash2D(seed, xPrimed, yPrimed); + int idx = hash & (255 << 1); + + float vecX = (float)(xi - x) + RAND_VECS_2D[idx] * cellularJitter; + float vecY = (float)(yi - y) + RAND_VECS_2D[idx | 1] * cellularJitter; + + float newDistance = _fnlFastAbs(vecX) + _fnlFastAbs(vecY); + + distance1 = _fnlFastMax(_fnlFastMin(distance1, newDistance), distance0); + if (newDistance < distance0) + { + distance0 = newDistance; + closestHash = hash; + } + yPrimed += PRIME_Y; + } + xPrimed += PRIME_X; + } + break; + case FNL_CELLULAR_DISTANCE_HYBRID: + for (int xi = xr - 1; xi <= xr + 1; xi++) + { + int yPrimed = yPrimedBase; + for (int yi = yr - 1; yi <= yr + 1; yi++) + { + int hash = _fnlHash2D(seed, xPrimed, yPrimed); + int idx = hash & (255 << 1); + + float vecX = (float)(xi - x) + RAND_VECS_2D[idx] * cellularJitter; + float vecY = (float)(yi - y) + RAND_VECS_2D[idx | 1] * cellularJitter; + + float newDistance = (_fnlFastAbs(vecX) + _fnlFastAbs(vecY)) + (vecX * vecX + vecY * vecY); + + distance1 = _fnlFastMax(_fnlFastMin(distance1, newDistance), distance0); + if (newDistance < distance0) + { + distance0 = newDistance; + closestHash = hash; + } + yPrimed += PRIME_Y; + } + xPrimed += PRIME_X; + } + break; + } + + if (state->cellular_distance_func == FNL_CELLULAR_DISTANCE_EUCLIDEAN && state->cellular_return_type >= FNL_CELLULAR_RETURN_VALUE_DISTANCE) + { + distance0 = _fnlFastSqrt(distance0); + if (state->cellular_return_type >= FNL_CELLULAR_RETURN_VALUE_DISTANCE2) + distance1 = _fnlFastSqrt(distance1); + } + + switch (state->cellular_return_type) + { + case FNL_CELLULAR_RETURN_VALUE_CELLVALUE: + return closestHash * (1 / 2147483648.0f); + case FNL_CELLULAR_RETURN_VALUE_DISTANCE: + return distance0 - 1; + case FNL_CELLULAR_RETURN_VALUE_DISTANCE2: + return distance1 - 1; + case FNL_CELLULAR_RETURN_VALUE_DISTANCE2ADD: + return (distance1 + distance0) * 0.5f - 1; + case FNL_CELLULAR_RETURN_VALUE_DISTANCE2SUB: + return distance1 - distance0 - 1; + case FNL_CELLULAR_RETURN_VALUE_DISTANCE2MUL: + return distance1 * distance0 * 0.5f - 1; + case FNL_CELLULAR_RETURN_VALUE_DISTANCE2DIV: + return distance0 / distance1 - 1; + default: + return 0; + } +} + +static float _fnlSingleCellular3D(fnl_state *state, int seed, FNLfloat x, FNLfloat y, FNLfloat z) +{ + int xr = _fnlFastRound(x); + int yr = _fnlFastRound(y); + int zr = _fnlFastRound(z); + + float distance0 = FLT_MAX; + float distance1 = FLT_MAX; + int closestHash = 0; + + float cellularJitter = 0.39614353f * state->cellular_jitter_mod; + + int xPrimed = (xr - 1) * PRIME_X; + int yPrimedBase = (yr - 1) * PRIME_Y; + int zPrimedBase = (zr - 1) * PRIME_Z; + + switch (state->cellular_distance_func) + { + default: + case FNL_CELLULAR_DISTANCE_EUCLIDEAN: + case FNL_CELLULAR_DISTANCE_EUCLIDEANSQ: + for (int xi = xr - 1; xi <= xr + 1; xi++) + { + int yPrimed = yPrimedBase; + + for (int yi = yr - 1; yi <= yr + 1; yi++) + { + int zPrimed = zPrimedBase; + + for (int zi = zr - 1; zi <= zr + 1; zi++) + { + int hash = _fnlHash3D(seed, xPrimed, yPrimed, zPrimed); + int idx = hash & (255 << 2); + + float vecX = (float)(xi - x) + RAND_VECS_3D[idx] * cellularJitter; + float vecY = (float)(yi - y) + RAND_VECS_3D[idx | 1] * cellularJitter; + float vecZ = (float)(zi - z) + RAND_VECS_3D[idx | 2] * cellularJitter; + + float newDistance = vecX * vecX + vecY * vecY + vecZ * vecZ; + + distance1 = _fnlFastMax(_fnlFastMin(distance1, newDistance), distance0); + if (newDistance < distance0) + { + distance0 = newDistance; + closestHash = hash; + } + zPrimed += PRIME_Z; + } + yPrimed += PRIME_Y; + } + xPrimed += PRIME_X; + } + break; + case FNL_CELLULAR_DISTANCE_MANHATTAN: + for (int xi = xr - 1; xi <= xr + 1; xi++) + { + int yPrimed = yPrimedBase; + + for (int yi = yr - 1; yi <= yr + 1; yi++) + { + int zPrimed = zPrimedBase; + + for (int zi = zr - 1; zi <= zr + 1; zi++) + { + int hash = _fnlHash3D(seed, xPrimed, yPrimed, zPrimed); + int idx = hash & (255 << 2); + + float vecX = (float)(xi - x) + RAND_VECS_3D[idx] * cellularJitter; + float vecY = (float)(yi - y) + RAND_VECS_3D[idx | 1] * cellularJitter; + float vecZ = (float)(zi - z) + RAND_VECS_3D[idx | 2] * cellularJitter; + + float newDistance = _fnlFastAbs(vecX) + _fnlFastAbs(vecY) + _fnlFastAbs(vecZ); + + distance1 = _fnlFastMax(_fnlFastMin(distance1, newDistance), distance0); + if (newDistance < distance0) + { + distance0 = newDistance; + closestHash = hash; + } + zPrimed += PRIME_Z; + } + yPrimed += PRIME_Y; + } + xPrimed += PRIME_X; + } + break; + case FNL_CELLULAR_DISTANCE_HYBRID: + for (int xi = xr - 1; xi <= xr + 1; xi++) + { + int yPrimed = yPrimedBase; + + for (int yi = yr - 1; yi <= yr + 1; yi++) + { + int zPrimed = zPrimedBase; + + for (int zi = zr - 1; zi <= zr + 1; zi++) + { + int hash = _fnlHash3D(seed, xPrimed, yPrimed, zPrimed); + int idx = hash & (255 << 2); + + float vecX = (float)(xi - x) + RAND_VECS_3D[idx] * cellularJitter; + float vecY = (float)(yi - y) + RAND_VECS_3D[idx | 1] * cellularJitter; + float vecZ = (float)(zi - z) + RAND_VECS_3D[idx | 2] * cellularJitter; + + float newDistance = (_fnlFastAbs(vecX) + _fnlFastAbs(vecY) + _fnlFastAbs(vecZ)) + (vecX * vecX + vecY * vecY + vecZ * vecZ); + + distance1 = _fnlFastMax(_fnlFastMin(distance1, newDistance), distance0); + if (newDistance < distance0) + { + distance0 = newDistance; + closestHash = hash; + } + zPrimed += PRIME_Z; + } + yPrimed += PRIME_Y; + } + xPrimed += PRIME_X; + } + break; + } + + if (state->cellular_distance_func == FNL_CELLULAR_DISTANCE_EUCLIDEAN && state->cellular_return_type >= FNL_CELLULAR_RETURN_VALUE_DISTANCE) + { + distance0 = _fnlFastSqrt(distance0); + if (state->cellular_return_type >= FNL_CELLULAR_RETURN_VALUE_DISTANCE2) + distance1 = _fnlFastSqrt(distance1); + } + + switch (state->cellular_return_type) + { + case FNL_CELLULAR_RETURN_VALUE_CELLVALUE: + return closestHash * (1 / 2147483648.0f); + case FNL_CELLULAR_RETURN_VALUE_DISTANCE: + return distance0 - 1; + case FNL_CELLULAR_RETURN_VALUE_DISTANCE2: + return distance1 - 1; + case FNL_CELLULAR_RETURN_VALUE_DISTANCE2ADD: + return (distance1 + distance0) * 0.5f - 1; + case FNL_CELLULAR_RETURN_VALUE_DISTANCE2SUB: + return distance1 - distance0 - 1; + case FNL_CELLULAR_RETURN_VALUE_DISTANCE2MUL: + return distance1 * distance0 * 0.5f - 1; + case FNL_CELLULAR_RETURN_VALUE_DISTANCE2DIV: + return distance0 / distance1 - 1; + default: + return 0; + } +} + +// Perlin Noise + +static float _fnlSinglePerlin2D(int seed, FNLfloat x, FNLfloat y) +{ + int x0 = _fnlFastFloor(x); + int y0 = _fnlFastFloor(y); + + float xd0 = (float)(x - x0); + float yd0 = (float)(y - y0); + float xd1 = xd0 - 1; + float yd1 = yd0 - 1; + + float xs = _fnlInterpQuintic(xd0); + float ys = _fnlInterpQuintic(yd0); + + x0 *= PRIME_X; + y0 *= PRIME_Y; + int x1 = x0 + PRIME_X; + int y1 = y0 + PRIME_Y; + + float xf0 = _fnlLerp(_fnlGradCoord2D(seed, x0, y0, xd0, yd0), _fnlGradCoord2D(seed, x1, y0, xd1, yd0), xs); + float xf1 = _fnlLerp(_fnlGradCoord2D(seed, x0, y1, xd0, yd1), _fnlGradCoord2D(seed, x1, y1, xd1, yd1), xs); + + return _fnlLerp(xf0, xf1, ys) * 1.4247691104677813f; +} + +static float _fnlSinglePerlin3D(int seed, FNLfloat x, FNLfloat y, FNLfloat z) +{ + int x0 = _fnlFastFloor(x); + int y0 = _fnlFastFloor(y); + int z0 = _fnlFastFloor(z); + + float xd0 = (float)(x - x0); + float yd0 = (float)(y - y0); + float zd0 = (float)(z - z0); + float xd1 = xd0 - 1; + float yd1 = yd0 - 1; + float zd1 = zd0 - 1; + + float xs = _fnlInterpQuintic(xd0); + float ys = _fnlInterpQuintic(yd0); + float zs = _fnlInterpQuintic(zd0); + + x0 *= PRIME_X; + y0 *= PRIME_Y; + z0 *= PRIME_Z; + int x1 = x0 + PRIME_X; + int y1 = y0 + PRIME_Y; + int z1 = z0 + PRIME_Z; + + float xf00 = _fnlLerp(_fnlGradCoord3D(seed, x0, y0, z0, xd0, yd0, zd0), _fnlGradCoord3D(seed, x1, y0, z0, xd1, yd0, zd0), xs); + float xf10 = _fnlLerp(_fnlGradCoord3D(seed, x0, y1, z0, xd0, yd1, zd0), _fnlGradCoord3D(seed, x1, y1, z0, xd1, yd1, zd0), xs); + float xf01 = _fnlLerp(_fnlGradCoord3D(seed, x0, y0, z1, xd0, yd0, zd1), _fnlGradCoord3D(seed, x1, y0, z1, xd1, yd0, zd1), xs); + float xf11 = _fnlLerp(_fnlGradCoord3D(seed, x0, y1, z1, xd0, yd1, zd1), _fnlGradCoord3D(seed, x1, y1, z1, xd1, yd1, zd1), xs); + + float yf0 = _fnlLerp(xf00, xf10, ys); + float yf1 = _fnlLerp(xf01, xf11, ys); + + return _fnlLerp(yf0, yf1, zs) * 0.964921414852142333984375f; +} + +// Value Cubic + +static float _fnlSingleValueCubic2D(int seed, FNLfloat x, FNLfloat y) +{ + int x1 = _fnlFastFloor(x); + int y1 = _fnlFastFloor(y); + + float xs = x - (float)x1; + float ys = y - (float)y1; + + x1 *= PRIME_X; + y1 *= PRIME_Y; + + int x0 = x1 - PRIME_X; + int y0 = y1 - PRIME_Y; + int x2 = x1 + PRIME_X; + int y2 = y1 + PRIME_Y; + int x3 = x1 + (int)((long)PRIME_X << 1); + int y3 = y1 + (int)((long)PRIME_Y << 1); + + return _fnlCubicLerp( + _fnlCubicLerp(_fnlValCoord2D(seed, x0, y0), _fnlValCoord2D(seed, x1, y0), _fnlValCoord2D(seed, x2, y0), _fnlValCoord2D(seed, x3, y0), + xs), + _fnlCubicLerp(_fnlValCoord2D(seed, x0, y1), _fnlValCoord2D(seed, x1, y1), _fnlValCoord2D(seed, x2, y1), _fnlValCoord2D(seed, x3, y1), + xs), + _fnlCubicLerp(_fnlValCoord2D(seed, x0, y2), _fnlValCoord2D(seed, x1, y2), _fnlValCoord2D(seed, x2, y2), _fnlValCoord2D(seed, x3, y2), + xs), + _fnlCubicLerp(_fnlValCoord2D(seed, x0, y3), _fnlValCoord2D(seed, x1, y3), _fnlValCoord2D(seed, x2, y3), _fnlValCoord2D(seed, x3, y3), + xs), + ys) * (1 / (1.5f * 1.5f)); +} + +static float _fnlSingleValueCubic3D(int seed, FNLfloat x, FNLfloat y, FNLfloat z) +{ + int x1 = _fnlFastFloor(x); + int y1 = _fnlFastFloor(y); + int z1 = _fnlFastFloor(z); + + float xs = x - (float)x1; + float ys = y - (float)y1; + float zs = z - (float)z1; + + x1 *= PRIME_X; + y1 *= PRIME_Y; + z1 *= PRIME_Z; + + int x0 = x1 - PRIME_X; + int y0 = y1 - PRIME_Y; + int z0 = z1 - PRIME_Z; + int x2 = x1 + PRIME_X; + int y2 = y1 + PRIME_Y; + int z2 = z1 + PRIME_Z; + int x3 = x1 + (int)((long)PRIME_X << 1); + int y3 = y1 + (int)((long)PRIME_Y << 1); + int z3 = z1 + (int)((long)PRIME_Z << 1); + + return _fnlCubicLerp( + _fnlCubicLerp( + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y0, z0), _fnlValCoord3D(seed, x1, y0, z0), _fnlValCoord3D(seed, x2, y0, z0), _fnlValCoord3D(seed, x3, y0, z0), xs), + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y1, z0), _fnlValCoord3D(seed, x1, y1, z0), _fnlValCoord3D(seed, x2, y1, z0), _fnlValCoord3D(seed, x3, y1, z0), xs), + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y2, z0), _fnlValCoord3D(seed, x1, y2, z0), _fnlValCoord3D(seed, x2, y2, z0), _fnlValCoord3D(seed, x3, y2, z0), xs), + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y3, z0), _fnlValCoord3D(seed, x1, y3, z0), _fnlValCoord3D(seed, x2, y3, z0), _fnlValCoord3D(seed, x3, y3, z0), xs), + ys), + _fnlCubicLerp( + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y0, z1), _fnlValCoord3D(seed, x1, y0, z1), _fnlValCoord3D(seed, x2, y0, z1), _fnlValCoord3D(seed, x3, y0, z1), xs), + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y1, z1), _fnlValCoord3D(seed, x1, y1, z1), _fnlValCoord3D(seed, x2, y1, z1), _fnlValCoord3D(seed, x3, y1, z1), xs), + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y2, z1), _fnlValCoord3D(seed, x1, y2, z1), _fnlValCoord3D(seed, x2, y2, z1), _fnlValCoord3D(seed, x3, y2, z1), xs), + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y3, z1), _fnlValCoord3D(seed, x1, y3, z1), _fnlValCoord3D(seed, x2, y3, z1), _fnlValCoord3D(seed, x3, y3, z1), xs), + ys), + _fnlCubicLerp( + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y0, z2), _fnlValCoord3D(seed, x1, y0, z2), _fnlValCoord3D(seed, x2, y0, z2), _fnlValCoord3D(seed, x3, y0, z2), xs), + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y1, z2), _fnlValCoord3D(seed, x1, y1, z2), _fnlValCoord3D(seed, x2, y1, z2), _fnlValCoord3D(seed, x3, y1, z2), xs), + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y2, z2), _fnlValCoord3D(seed, x1, y2, z2), _fnlValCoord3D(seed, x2, y2, z2), _fnlValCoord3D(seed, x3, y2, z2), xs), + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y3, z2), _fnlValCoord3D(seed, x1, y3, z2), _fnlValCoord3D(seed, x2, y3, z2), _fnlValCoord3D(seed, x3, y3, z2), xs), + ys), + _fnlCubicLerp( + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y0, z3), _fnlValCoord3D(seed, x1, y0, z3), _fnlValCoord3D(seed, x2, y0, z3), _fnlValCoord3D(seed, x3, y0, z3), xs), + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y1, z3), _fnlValCoord3D(seed, x1, y1, z3), _fnlValCoord3D(seed, x2, y1, z3), _fnlValCoord3D(seed, x3, y1, z3), xs), + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y2, z3), _fnlValCoord3D(seed, x1, y2, z3), _fnlValCoord3D(seed, x2, y2, z3), _fnlValCoord3D(seed, x3, y2, z3), xs), + _fnlCubicLerp(_fnlValCoord3D(seed, x0, y3, z3), _fnlValCoord3D(seed, x1, y3, z3), _fnlValCoord3D(seed, x2, y3, z3), _fnlValCoord3D(seed, x3, y3, z3), xs), + ys), + zs) * (1 / 1.5f * 1.5f * 1.5f); +} + +// Value noise + +static float _fnlSingleValue2D(int seed, FNLfloat x, FNLfloat y) +{ + int x0 = _fnlFastFloor(x); + int y0 = _fnlFastFloor(y); + + float xs = _fnlInterpHermite((float)(x - x0)); + float ys = _fnlInterpHermite((float)(y - y0)); + + x0 *= PRIME_X; + y0 *= PRIME_Y; + int x1 = x0 + PRIME_X; + int y1 = y0 + PRIME_Y; + + float xf0 = _fnlLerp(_fnlValCoord2D(seed, x0, y0), _fnlValCoord2D(seed, x1, y0), xs); + float xf1 = _fnlLerp(_fnlValCoord2D(seed, x0, y1), _fnlValCoord2D(seed, x1, y1), xs); + + return _fnlLerp(xf0, xf1, ys); +} + +static float _fnlSingleValue3D(int seed, FNLfloat x, FNLfloat y, FNLfloat z) +{ + int x0 = _fnlFastFloor(x); + int y0 = _fnlFastFloor(y); + int z0 = _fnlFastFloor(z); + + float xs = _fnlInterpHermite((float)(x - x0)); + float ys = _fnlInterpHermite((float)(y - y0)); + float zs = _fnlInterpHermite((float)(z - z0)); + + x0 *= PRIME_X; + y0 *= PRIME_Y; + z0 *= PRIME_Z; + int x1 = x0 + PRIME_X; + int y1 = y0 + PRIME_Y; + int z1 = z0 + PRIME_Z; + + float xf00 = _fnlLerp(_fnlValCoord3D(seed, x0, y0, z0), _fnlValCoord3D(seed, x1, y0, z0), xs); + float xf10 = _fnlLerp(_fnlValCoord3D(seed, x0, y1, z0), _fnlValCoord3D(seed, x1, y1, z0), xs); + float xf01 = _fnlLerp(_fnlValCoord3D(seed, x0, y0, z1), _fnlValCoord3D(seed, x1, y0, z1), xs); + float xf11 = _fnlLerp(_fnlValCoord3D(seed, x0, y1, z1), _fnlValCoord3D(seed, x1, y1, z1), xs); + + float yf0 = _fnlLerp(xf00, xf10, ys); + float yf1 = _fnlLerp(xf01, xf11, ys); + + return _fnlLerp(yf0, yf1, zs); +} + +// Domain Warp + +// Forward declare +static void _fnlSingleDomainWarpBasicGrid2D(int seed, float warpAmp, float frequency, FNLfloat x, FNLfloat y, FNLfloat *xp, FNLfloat *yp); +static void _fnlSingleDomainWarpBasicGrid3D(int seed, float warpAmp, float frequency, FNLfloat x, FNLfloat y, FNLfloat z, FNLfloat *xp, FNLfloat *yp, FNLfloat *zp); +static void _fnlSingleDomainWarpSimplexGradient(int seed, float warpAmp, float frequency, FNLfloat x, FNLfloat y, FNLfloat *xr, FNLfloat *yr, bool outGradOnly); +static void _fnlSingleDomainWarpOpenSimplex2Gradient(int seed, float warpAmp, float frequency, FNLfloat x, FNLfloat y, FNLfloat z, FNLfloat *xr, FNLfloat *yr, FNLfloat *zr, bool outGradOnly); + +static inline void _fnlDoSingleDomainWarp2D(fnl_state *state, int seed, float amp, float freq, FNLfloat x, FNLfloat y, FNLfloat *xp, FNLfloat *yp) +{ + switch (state->domain_warp_type) + { + case FNL_DOMAIN_WARP_OPENSIMPLEX2: + _fnlSingleDomainWarpSimplexGradient(seed, amp * 38.283687591552734375f, freq, x, y, xp, yp, false); + break; + case FNL_DOMAIN_WARP_OPENSIMPLEX2_REDUCED: + _fnlSingleDomainWarpSimplexGradient(seed, amp * 16.0f, freq, x, y, xp, yp, true); + break; + case FNL_DOMAIN_WARP_BASICGRID: + _fnlSingleDomainWarpBasicGrid2D(seed, amp, freq, x, y, xp, yp); + break; + } +} + +static inline void _fnlDoSingleDomainWarp3D(fnl_state *state, int seed, float amp, float freq, FNLfloat x, FNLfloat y, FNLfloat z, FNLfloat *xp, FNLfloat *yp, FNLfloat *zp) +{ + switch (state->domain_warp_type) + { + case FNL_DOMAIN_WARP_OPENSIMPLEX2: + _fnlSingleDomainWarpOpenSimplex2Gradient(seed, amp * 32.69428253173828125f, freq, x, y, z, xp, yp, zp, false); + break; + case FNL_DOMAIN_WARP_OPENSIMPLEX2_REDUCED: + _fnlSingleDomainWarpOpenSimplex2Gradient(seed, amp * 7.71604938271605f, freq, x, y, z, xp, yp, zp, true); + break; + case FNL_DOMAIN_WARP_BASICGRID: + _fnlSingleDomainWarpBasicGrid3D(seed, amp, freq, x, y, z, xp, yp, zp); + break; + } +} + +// Domain Warp Single Wrapper + +static void _fnlDomainWarpSingle2D(fnl_state *state, FNLfloat *x, FNLfloat *y) +{ + int seed = state->seed; + float amp = state->domain_warp_amp * _fnlCalculateFractalBounding(state); + float freq = state->frequency; + + FNLfloat xs = *x; + FNLfloat ys = *y; + _fnlTransformDomainWarpCoordinate2D(state, &xs, &ys); + + _fnlDoSingleDomainWarp2D(state, seed, amp, freq, xs, ys, x, y); +} + +static void _fnlDomainWarpSingle3D(fnl_state *state, FNLfloat *x, FNLfloat *y, FNLfloat *z) +{ + int seed = state->seed; + float amp = state->domain_warp_amp * _fnlCalculateFractalBounding(state); + float freq = state->frequency; + + FNLfloat xs = *x; + FNLfloat ys = *y; + FNLfloat zs = *z; + _fnlTransformDomainWarpCoordinate3D(state, &xs, &ys, &zs); + + _fnlDoSingleDomainWarp3D(state, seed, amp, freq, xs, ys, zs, x, y, z); +} + +// Domain Warp Fractal Progressive + +static void _fnlDomainWarpFractalProgressive2D(fnl_state *state, FNLfloat *x, FNLfloat *y) +{ + int seed = state->seed; + float amp = state->domain_warp_amp * _fnlCalculateFractalBounding(state); + float freq = state->frequency; + + for (int i = 0; i < state->octaves; i++) + { + FNLfloat xs = *x; + FNLfloat ys = *y; + _fnlTransformDomainWarpCoordinate2D(state, &xs, &ys); + + _fnlDoSingleDomainWarp2D(state, seed, amp, freq, xs, ys, x, y); + + seed++; + amp *= state->gain; + freq *= state->lacunarity; + } +} + +static void _fnlDomainWarpFractalProgressive3D(fnl_state *state, FNLfloat *x, FNLfloat *y, FNLfloat *z) +{ + int seed = state->seed; + float amp = state->domain_warp_amp * _fnlCalculateFractalBounding(state); + float freq = state->frequency; + + for (int i = 0; i < state->octaves; i++) + { + FNLfloat xs = *x; + FNLfloat ys = *y; + FNLfloat zs = *z; + _fnlTransformDomainWarpCoordinate3D(state, &xs, &ys, &zs); + + _fnlDoSingleDomainWarp3D(state, seed, amp, freq, xs, ys, zs, x, y, z); + + seed++; + amp *= state->gain; + freq *= state->lacunarity; + } +} + +// Domain Warp Fractal Independent + +static void _fnlDomainWarpFractalIndependent2D(fnl_state *state, FNLfloat *x, FNLfloat *y) +{ + FNLfloat xs = *x; + FNLfloat ys = *y; + _fnlTransformDomainWarpCoordinate2D(state, &xs, &ys); + + int seed = state->seed; + float amp = state->domain_warp_amp * _fnlCalculateFractalBounding(state); + float freq = state->frequency; + + for (int i = 0; i < state->octaves; i++) + { + _fnlDoSingleDomainWarp2D(state, seed, amp, freq, xs, ys, x, y); + + seed++; + amp *= state->gain; + freq *= state->lacunarity; + } +} + +static void _fnlDomainWarpFractalIndependent3D(fnl_state *state, FNLfloat *x, FNLfloat *y, FNLfloat *z) +{ + FNLfloat xs = *x; + FNLfloat ys = *y; + FNLfloat zs = *z; + _fnlTransformDomainWarpCoordinate3D(state, &xs, &ys, &zs); + + int seed = state->seed; + float amp = state->domain_warp_amp * _fnlCalculateFractalBounding(state); + float freq = state->frequency; + + for (int i = 0; i < state->octaves; i++) + { + _fnlDoSingleDomainWarp3D(state, seed, amp, freq, xs, ys, zs, x, y, z); + + seed++; + amp *= state->gain; + freq *= state->lacunarity; + } +} + +// Domain Warp Basic Grid + +static void _fnlSingleDomainWarpBasicGrid2D(int seed, float warpAmp, float frequency, FNLfloat x, FNLfloat y, FNLfloat *xp, FNLfloat *yp) +{ + FNLfloat xf = x * frequency; + FNLfloat yf = y * frequency; + + int x0 = _fnlFastFloor(xf); + int y0 = _fnlFastFloor(yf); + + float xs = _fnlInterpHermite((float)(xf - x0)); + float ys = _fnlInterpHermite((float)(yf - y0)); + + x0 *= PRIME_X; + y0 *= PRIME_Y; + int x1 = x0 + PRIME_X; + int y1 = y0 + PRIME_Y; + + int idx0 = _fnlHash2D(seed, x0, y0) & (255 << 1); + int idx1 = _fnlHash2D(seed, x1, y0) & (255 << 1); + + float lx0x = _fnlLerp(RAND_VECS_2D[idx0], RAND_VECS_2D[idx1], xs); + float ly0x = _fnlLerp(RAND_VECS_2D[idx0 | 1], RAND_VECS_2D[idx1 | 1], xs); + + idx0 = _fnlHash2D(seed, x0, y1) & (255 << 1); + idx1 = _fnlHash2D(seed, x1, y1) & (255 << 1); + + float lx1x = _fnlLerp(RAND_VECS_2D[idx0], RAND_VECS_2D[idx1], xs); + float ly1x = _fnlLerp(RAND_VECS_2D[idx0 | 1], RAND_VECS_2D[idx1 | 1], xs); + + *xp += _fnlLerp(lx0x, lx1x, ys) * warpAmp; + *yp += _fnlLerp(ly0x, ly1x, ys) * warpAmp; +} + +static void _fnlSingleDomainWarpBasicGrid3D(int seed, float warpAmp, float frequency, FNLfloat x, FNLfloat y, FNLfloat z, FNLfloat *xp, FNLfloat *yp, FNLfloat *zp) +{ + FNLfloat xf = x * frequency; + FNLfloat yf = y * frequency; + FNLfloat zf = z * frequency; + + int x0 = _fnlFastFloor(xf); + int y0 = _fnlFastFloor(yf); + int z0 = _fnlFastFloor(zf); + + float xs = _fnlInterpHermite((float)(xf - x0)); + float ys = _fnlInterpHermite((float)(yf - y0)); + float zs = _fnlInterpHermite((float)(zf - z0)); + + x0 *= PRIME_X; + y0 *= PRIME_Y; + z0 *= PRIME_Z; + int x1 = x0 + PRIME_X; + int y1 = y0 + PRIME_Y; + int z1 = z0 + PRIME_Z; + + int idx0 = _fnlHash3D(seed, x0, y0, z0) & (255 << 2); + int idx1 = _fnlHash3D(seed, x1, y0, z0) & (255 << 2); + + float lx0x = _fnlLerp(RAND_VECS_3D[idx0], RAND_VECS_3D[idx1], xs); + float ly0x = _fnlLerp(RAND_VECS_3D[idx0 | 1], RAND_VECS_3D[idx1 | 1], xs); + float lz0x = _fnlLerp(RAND_VECS_3D[idx0 | 2], RAND_VECS_3D[idx1 | 2], xs); + + idx0 = _fnlHash3D(seed, x0, y1, z0) & (255 << 2); + idx1 = _fnlHash3D(seed, x1, y1, z0) & (255 << 2); + + float lx1x = _fnlLerp(RAND_VECS_3D[idx0], RAND_VECS_3D[idx1], xs); + float ly1x = _fnlLerp(RAND_VECS_3D[idx0 | 1], RAND_VECS_3D[idx1 | 1], xs); + float lz1x = _fnlLerp(RAND_VECS_3D[idx0 | 2], RAND_VECS_3D[idx1 | 2], xs); + + float lx0y = _fnlLerp(lx0x, lx1x, ys); + float ly0y = _fnlLerp(ly0x, ly1x, ys); + float lz0y = _fnlLerp(lz0x, lz1x, ys); + + idx0 = _fnlHash3D(seed, x0, y0, z1) & (255 << 2); + idx1 = _fnlHash3D(seed, x1, y0, z1) & (255 << 2); + + lx0x = _fnlLerp(RAND_VECS_3D[idx0], RAND_VECS_3D[idx1], xs); + ly0x = _fnlLerp(RAND_VECS_3D[idx0 | 1], RAND_VECS_3D[idx1 | 1], xs); + lz0x = _fnlLerp(RAND_VECS_3D[idx0 | 2], RAND_VECS_3D[idx1 | 2], xs); + + idx0 = _fnlHash3D(seed, x0, y1, z1) & (255 << 2); + idx1 = _fnlHash3D(seed, x1, y1, z1) & (255 << 2); + + lx1x = _fnlLerp(RAND_VECS_3D[idx0], RAND_VECS_3D[idx1], xs); + ly1x = _fnlLerp(RAND_VECS_3D[idx0 | 1], RAND_VECS_3D[idx1 | 1], xs); + lz1x = _fnlLerp(RAND_VECS_3D[idx0 | 2], RAND_VECS_3D[idx1 | 2], xs); + + *xp += _fnlLerp(lx0y, _fnlLerp(lx0x, lx1x, ys), zs) * warpAmp; + *yp += _fnlLerp(ly0y, _fnlLerp(ly0x, ly1x, ys), zs) * warpAmp; + *zp += _fnlLerp(lz0y, _fnlLerp(lz0x, lz1x, ys), zs) * warpAmp; +} + +// Domain Warp Simplex/OpenSimplex2 + +static void _fnlSingleDomainWarpSimplexGradient(int seed, float warpAmp, float frequency, FNLfloat x, FNLfloat y, FNLfloat *xr, FNLfloat *yr, bool outGradOnly) +{ + const float SQRT3 = 1.7320508075688772935274463415059f; + const float G2 = (3 - SQRT3) / 6; + + x *= frequency; + y *= frequency; + + /* + * --- Skew moved to TransformNoiseCoordinate method --- + * const FNLfloat F2 = 0.5f * (SQRT3 - 1); + * FNLfloat s = (x + y) * F2; + * x += s; y += s; + */ + + int i = _fnlFastFloor(x); + int j = _fnlFastFloor(y); + float xi = (float)(x - i); + float yi = (float)(y - j); + + float t = (xi + yi) * G2; + float x0 = (float)(xi - t); + float y0 = (float)(yi - t); + + i *= PRIME_X; + j *= PRIME_Y; + + float vx, vy; + vx = vy = 0; + + float a = 0.5f - x0 * x0 - y0 * y0; + if (a > 0) + { + float aaaa = (a * a) * (a * a); + float xo, yo; + if (outGradOnly) + _fnlGradCoordOut2D(seed, i, j, &xo, &yo); + else + _fnlGradCoordDual2D(seed, i, j, x0, y0, &xo, &yo); + vx += aaaa * xo; + vy += aaaa * yo; + } + + float c = (float)(2 * (1 - 2 * G2) * (1 / G2 - 2)) * t + ((float)(-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a); + if (c > 0) + { + float x2 = x0 + (2 * (float)G2 - 1); + float y2 = y0 + (2 * (float)G2 - 1); + float cccc = (c * c) * (c * c); + float xo, yo; + if (outGradOnly) + _fnlGradCoordOut2D(seed, i + PRIME_X, j + PRIME_Y, &xo, &yo); + else + _fnlGradCoordDual2D(seed, i + PRIME_X, j + PRIME_Y, x2, y2, &xo, &yo); + vx += cccc * xo; + vy += cccc * yo; + } + + if (y0 > x0) + { + float x1 = x0 + (float)G2; + float y1 = y0 + ((float)G2 - 1); + float b = 0.5f - x1 * x1 - y1 * y1; + if (b > 0) + { + float bbbb = (b * b) * (b * b); + float xo, yo; + if (outGradOnly) + _fnlGradCoordOut2D(seed, i, j + PRIME_Y, &xo, &yo); + else + _fnlGradCoordDual2D(seed, i, j + PRIME_Y, x1, y1, &xo, &yo); + vx += bbbb * xo; + vy += bbbb * yo; + } + } + else + { + float x1 = x0 + ((float)G2 - 1); + float y1 = y0 + (float)G2; + float b = 0.5f - x1 * x1 - y1 * y1; + if (b > 0) + { + float bbbb = (b * b) * (b * b); + float xo, yo; + if (outGradOnly) + _fnlGradCoordOut2D(seed, i + PRIME_X, j, &xo, &yo); + else + _fnlGradCoordDual2D(seed, i + PRIME_X, j, x1, y1, &xo, &yo); + vx += bbbb * xo; + vy += bbbb * yo; + } + } + + *xr += vx * warpAmp; + *yr += vy * warpAmp; +} + +static void _fnlSingleDomainWarpOpenSimplex2Gradient(int seed, float warpAmp, float frequency, FNLfloat x, FNLfloat y, FNLfloat z, FNLfloat *xr, FNLfloat *yr, FNLfloat *zr, bool outGradOnly) +{ + x *= frequency; + y *= frequency; + z *= frequency; + + /* + * --- Rotation moved to TransformDomainWarpCoordinate method --- + * const FNLfloat R3 = (FNLfloat)(2.0 / 3.0); + * FNLfloat r = (x + y + z) * R3; // Rotation, not skew + * x = r - x; y = r - y; z = r - z; + */ + + int i = _fnlFastRound(x); + int j = _fnlFastRound(y); + int k = _fnlFastRound(z); + float x0 = (float)x - i; + float y0 = (float)y - j; + float z0 = (float)z - k; + + int xNSign = (int)(-x0 - 1.0f) | 1; + int yNSign = (int)(-y0 - 1.0f) | 1; + int zNSign = (int)(-z0 - 1.0f) | 1; + + float ax0 = xNSign * -x0; + float ay0 = yNSign * -y0; + float az0 = zNSign * -z0; + + i *= PRIME_X; + j *= PRIME_Y; + k *= PRIME_Z; + + float vx, vy, vz; + vx = vy = vz = 0; + + float a = (0.6f - x0 * x0) - (y0 * y0 + z0 * z0); + for (int l = 0; l < 2; l++) + { + if (a > 0) + { + float aaaa = (a * a) * (a * a); + float xo, yo, zo; + if (outGradOnly) + _fnlGradCoordOut3D(seed, i, j, k, &xo, &yo, &zo); + else + _fnlGradCoordDual3D(seed, i, j, k, x0, y0, z0, &xo, &yo, &zo); + vx += aaaa * xo; + vy += aaaa * yo; + vz += aaaa * zo; + } + + float b = a + 1; + int i1 = i; + int j1 = j; + int k1 = k; + float x1 = x0; + float y1 = y0; + float z1 = z0; + if (ax0 >= ay0 && ax0 >= az0) + { + x1 += xNSign; + b -= xNSign * 2 * x1; + i1 -= xNSign * PRIME_X; + } + else if (ay0 > ax0 && ay0 >= az0) + { + y1 += yNSign; + b -= yNSign * 2 * y1; + j1 -= yNSign * PRIME_Y; + } + else + { + z1 += zNSign; + b -= zNSign * 2 * z1; + k1 -= zNSign * PRIME_Z; + } + + if (b > 0) + { + float bbbb = (b * b) * (b * b); + float xo, yo, zo; + if (outGradOnly) + _fnlGradCoordOut3D(seed, i1, j1, k1, &xo, &yo, &zo); + else + _fnlGradCoordDual3D(seed, i1, j1, k1, x1, y1, z1, &xo, &yo, &zo); + vx += bbbb * xo; + vy += bbbb * yo; + vz += bbbb * zo; + } + + if (l == 1) + break; + + ax0 = 0.5f - ax0; + ay0 = 0.5f - ay0; + az0 = 0.5f - az0; + + x0 = xNSign * ax0; + y0 = yNSign * ay0; + z0 = zNSign * az0; + + a += (0.75f - ax0) - (ay0 + az0); + + i += (xNSign >> 1) & PRIME_X; + j += (yNSign >> 1) & PRIME_Y; + k += (zNSign >> 1) & PRIME_Z; + + xNSign = -xNSign; + yNSign = -yNSign; + zNSign = -zNSign; + + seed += 1293373; + } + + *xr += vx * warpAmp; + *yr += vy * warpAmp; + *zr += vz * warpAmp; +} + +// ==================== +// Public API +// ==================== + +fnl_state fnlCreateState() +{ + fnl_state newState; + newState.seed = 1337; + newState.frequency = 0.01f; + newState.noise_type = FNL_NOISE_OPENSIMPLEX2; + newState.rotation_type_3d = FNL_ROTATION_NONE; + newState.fractal_type = FNL_FRACTAL_NONE; + newState.octaves = 3; + newState.lacunarity = 2.0f; + newState.gain = 0.5f; + newState.weighted_strength = 0.0f; + newState.ping_pong_strength = 2.0f; + newState.cellular_distance_func = FNL_CELLULAR_DISTANCE_EUCLIDEANSQ; + newState.cellular_return_type = FNL_CELLULAR_RETURN_VALUE_DISTANCE; + newState.cellular_jitter_mod = 1.0f; + newState.domain_warp_amp = 30.0f; + newState.domain_warp_type = FNL_DOMAIN_WARP_OPENSIMPLEX2; + return newState; +} + +float fnlGetNoise2D(fnl_state *state, FNLfloat x, FNLfloat y) +{ + _fnlTransformNoiseCoordinate2D(state, &x, &y); + + switch (state->fractal_type) + { + default: + return _fnlGenNoiseSingle2D(state, state->seed, x, y); + case FNL_FRACTAL_FBM: + return _fnlGenFractalFBM2D(state, x, y); + case FNL_FRACTAL_RIDGED: + return _fnlGenFractalRidged2D(state, x, y); + case FNL_FRACTAL_PINGPONG: + return _fnlGenFractalPingPong2D(state, x, y); + } +} + +float fnlGetNoise3D(fnl_state *state, FNLfloat x, FNLfloat y, FNLfloat z) +{ + _fnlTransformNoiseCoordinate3D(state, &x, &y, &z); + + // Select a noise type + switch (state->fractal_type) + { + default: + return _fnlGenNoiseSingle3D(state, state->seed, x, y, z); + case FNL_FRACTAL_FBM: + return _fnlGenFractalFBM3D(state, x, y, z); + case FNL_FRACTAL_RIDGED: + return _fnlGenFractalRidged3D(state, x, y, z); + case FNL_FRACTAL_PINGPONG: + return _fnlGenFractalPingPong3D(state, x, y, z); + } +} + +void fnlDomainWarp2D(fnl_state *state, FNLfloat *x, FNLfloat *y) +{ + switch (state->fractal_type) + { + default: + _fnlDomainWarpSingle2D(state, x, y); + break; + case FNL_FRACTAL_DOMAIN_WARP_PROGRESSIVE: + _fnlDomainWarpFractalProgressive2D(state, x, y); + break; + case FNL_FRACTAL_DOMAIN_WARP_INDEPENDENT: + _fnlDomainWarpFractalIndependent2D(state, x, y); + break; + } +} + +void fnlDomainWarp3D(fnl_state *state, FNLfloat *x, FNLfloat *y, FNLfloat *z) +{ + switch (state->fractal_type) + { + default: + _fnlDomainWarpSingle3D(state, x, y, z); + break; + case FNL_FRACTAL_DOMAIN_WARP_PROGRESSIVE: + _fnlDomainWarpFractalProgressive3D(state, x, y, z); + break; + case FNL_FRACTAL_DOMAIN_WARP_INDEPENDENT: + _fnlDomainWarpFractalIndependent3D(state, x, y, z); + break; + } +} + +#endif // FNL_IMPL + +#if defined(__cplusplus) +} +#endif + +#endif // FASTNOISELITE_H diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index 8b21d766..05f4e47e 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -4,6 +4,8 @@ #include #include +#include +#include #include // GLM @@ -27,6 +29,7 @@ using namespace glm; #include "voxels/Chunks.h" #include "voxels/Block.h" #include "voxels/WorldGenerator.h" +#include "voxels/ChunksController.h" #include "files/files.h" #include "files/WorldFiles.h" #include "lighting/LightSolver.h" @@ -67,6 +70,7 @@ void setup_definitions() { Block* block = new Block(0,0); block->drawGroup = 1; block->lightPassing = true; + block->skyLightPassing = true; block->obstacle = false; Block::blocks[block->id] = block; @@ -96,6 +100,28 @@ void setup_definitions() { // PLANKS block = new Block(5,6); Block::blocks[block->id] = block; + + // WOOD + block = new Block(6,7); + block->textureFaces[2] = 8; + block->textureFaces[3] = 8; + Block::blocks[block->id] = block; + + // LEAVES + block = new Block(7,9); + Block::blocks[block->id] = block; + + // ACTUAL STONE + block = new Block(8,10); + Block::blocks[block->id] = block; + + // WATER + block = new Block(9,11); + block->drawGroup = 4; + block->lightPassing = true; + block->skyLightPassing = false; + block->obstacle = false; + Block::blocks[block->id] = block; } // Shaders, textures, renderers @@ -131,8 +157,70 @@ int initialize_assets() { return 0; } +void draw_chunk(size_t index, Camera* camera){ + Chunk* chunk = chunks->chunks[index]; + Mesh* mesh = chunks->meshes[index]; + if (mesh == nullptr) + return; + + // Simple frustum culling (culling chunks behind the camera in 2D - XZ) + if (occlusion){ + const float cameraX = camera->position.x; + const float cameraZ = camera->position.z; + const float camDirX = camera->dir.x; + const float camDirZ = camera->dir.z; + + bool unoccluded = false; + do { + if ((chunk->x*CHUNK_W-cameraX)*camDirX + (chunk->z*CHUNK_D-cameraZ)*camDirZ >= 0.0){ + unoccluded = true; break; + } + if (((chunk->x+1)*CHUNK_W-cameraX)*camDirX + (chunk->z*CHUNK_D-cameraZ)*camDirZ >= 0.0){ + unoccluded = true; break; + } + if (((chunk->x+1)*CHUNK_W-cameraX)*camDirX + ((chunk->z+1)*CHUNK_D-cameraZ)*camDirZ >= 0.0){ + unoccluded = true; break; + } + if ((chunk->x*CHUNK_W-cameraX)*camDirX + ((chunk->z+1)*CHUNK_D-cameraZ)*camDirZ >= 0.0){ + unoccluded = true; break; + } + } while (false); + if (!unoccluded) + return; + } + + mat4 model = glm::translate(mat4(1.0f), vec3(chunk->x*CHUNK_W+0.5f, chunk->y*CHUNK_H+0.5f, chunk->z*CHUNK_D+0.5f)); + shader->uniformMatrix("u_model", model); + mesh->draw(GL_TRIANGLES); +} + +float find_most_distant_sqr(float px, float pz, float distance_limit2){ + float max_dist2 = -1.0f; + for (size_t i = 0; i < chunks->volume; i++){ + Chunk* chunk = chunks->chunks[i]; + if (chunk == nullptr) + continue; + float dist2 = (chunk->x - px) * (chunk->z - pz); + if (dist2 > max_dist2 && dist2 < distance_limit2){ + max_dist2 = dist2; + } + } + return max_dist2; +} + +float _camera_cx; +float _camera_cz; + +bool chunks_comparator(size_t i, size_t j) { + Chunk* a = chunks->chunks[i]; + Chunk* b = chunks->chunks[j]; + return ((a->x + 0.5f - _camera_cx)*(a->x + 0.5f - _camera_cx) + (a->z + 0.5f - _camera_cz)*(a->z + 0.5f - _camera_cz) + > + (b->x + 0.5f - _camera_cx)*(b->x + 0.5f - _camera_cx) + (b->z + 0.5f - _camera_cz)*(b->z + 0.5f - _camera_cz)); +} + void draw_world(Camera* camera){ - glClearColor(0.7f,0.85f,1.0f,1); + glClearColor(0.7f,0.71f,0.73f,1); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // Draw VAO @@ -141,50 +229,37 @@ void draw_world(Camera* camera){ shader->uniformMatrix("u_view", camera->getView()); shader->uniform1f("u_gamma", 1.6f); shader->uniform3f("u_skyLightColor", 1.8f,1.8f,1.8f); - shader->uniform3f("u_fogColor", 0.7f,0.85f,1.0f); + shader->uniform3f("u_fogColor", 0.7f,0.71f,0.73f); + shader->uniform3f("u_cameraPos", camera->position.x,camera->position.y,camera->position.z); texture->bind(); - mat4 model(1.0f); - const float cameraX = camera->position.x; - const float cameraZ = camera->position.z; - const float camDirX = camera->dir.x; - const float camDirZ = camera->dir.z; + std::vector indices; for (size_t i = 0; i < chunks->volume; i++){ Chunk* chunk = chunks->chunks[i]; if (chunk == nullptr) continue; - Mesh* mesh = chunks->meshes[i]; - if (mesh == nullptr) - continue; + if (chunks->meshes[i] != nullptr) + indices.push_back(i); + } - // Simple frustum culling (culling chunks behind the camera in 2D - XZ) - if (occlusion){ - bool unoccluded = false; - do { - if ((chunk->x*CHUNK_W-cameraX)*camDirX + (chunk->z*CHUNK_D-cameraZ)*camDirZ >= 0.0){ - unoccluded = true; break; - } - if (((chunk->x+1)*CHUNK_W-cameraX)*camDirX + (chunk->z*CHUNK_D-cameraZ)*camDirZ >= 0.0){ - unoccluded = true; break; - } - if (((chunk->x+1)*CHUNK_W-cameraX)*camDirX + ((chunk->z+1)*CHUNK_D-cameraZ)*camDirZ >= 0.0){ - unoccluded = true; break; - } - if ((chunk->x*CHUNK_W-cameraX)*camDirX + ((chunk->z+1)*CHUNK_D-cameraZ)*camDirZ >= 0.0){ - unoccluded = true; break; - } - } while (false); - if (!unoccluded) - continue; - } + std::sort(indices.begin(), indices.end(), chunks_comparator); - model = glm::translate(mat4(1.0f), vec3(chunk->x*CHUNK_W+0.5f, chunk->y*CHUNK_H+0.5f, chunk->z*CHUNK_D+0.5f)); - shader->uniformMatrix("u_model", model); - mesh->draw(GL_TRIANGLES); + + float px = camera->position.x / (float)CHUNK_W; + float pz = camera->position.z / (float)CHUNK_D; + + _camera_cx = px; + _camera_cz = pz; + + + for (size_t i = 0; i < indices.size(); i++){ + draw_chunk(indices[i], camera); } crosshairShader->use(); + crosshairShader->uniform1f("u_ar", (float)Window::height / (float)Window::width); + crosshairShader->uniform1f("u_scale", 1.0f / ((float)Window::height / 1000.0f)); crosshair->draw(GL_LINES); linesShader->use(); @@ -233,30 +308,39 @@ int main() { return result; } + Camera* camera = new Camera(vec3(-320,255,32), radians(90.0f)); + wfile = new WorldFiles("world/", REGION_VOL * (CHUNK_VOL * 2 + 8)); - chunks = new Chunks(32,1,32, 0,0,0); - VoxelRenderer renderer(1024*1024); - lineBatch = new LineBatch(4096); - PhysicsSolver physics(vec3(0,-16.0f,0)); - - Lighting::initialize(chunks); - - crosshair = new Mesh(vertices, 4, attrs); - Camera* camera = new Camera(vec3(32,32,32), radians(90.0f)); - Hitbox* hitbox = new Hitbox(vec3(32,120,32), vec3(0.2f,0.9f,0.2f)); - - float lastTime = glfwGetTime(); - float delta = 0.0f; + chunks = new Chunks(34,1,34, 0,0,0); float camX = 0.0f; float camY = 0.0f; - float playerSpeed = 4.0f; + wfile->readPlayer(camera->position, camX, camY); + camera->rotation = mat4(1.0f); + camera->rotate(camY, camX, 0); + + Hitbox* hitbox = new Hitbox(vec3(camera->position.x,camera->position.y+1,camera->position.z), vec3(0.2f,0.9f,0.2f)); + + VoxelRenderer renderer(1024*1024); + lineBatch = new LineBatch(4096); + PhysicsSolver physics(vec3(0,-16.0f,0)); + + Lighting lighting(chunks); + + crosshair = new Mesh(vertices, 4, attrs); + + ChunksController chunksController(chunks, &lighting); + + float lastTime = glfwGetTime(); + float delta = 0.0f; + + float playerSpeed = 5.0f; int choosenBlock = 1; long frame = 0; - glfwSwapInterval(0); + glfwSwapInterval(1); while (!Window::isShouldClose()){ frame++; @@ -264,8 +348,8 @@ int main() { delta = currentTime - lastTime; lastTime = currentTime; - //if (frame % 240 == 0) - // std::cout << delta << std::endl; + if (frame % 240 == 0) + std::cout << 1.0/delta << std::endl; if (Events::jpressed(GLFW_KEY_O)){ occlusion = !occlusion; @@ -278,7 +362,7 @@ int main() { Events::toogleCursor(); } - for (int i = 1; i < 6; i++){ + for (int i = 1; i < 10; i++){ if (Events::jpressed(GLFW_KEY_0+i)){ choosenBlock = i; } @@ -334,8 +418,8 @@ int main() { hitbox->velocity.z = dir.z * speed; chunks->setCenter(wfile, camera->position.x,0,camera->position.z); - chunks->_buildMeshes(&renderer); - chunks->loadVisible(wfile); + chunksController._buildMeshes(&renderer, frame); + chunksController.loadVisible(wfile); if (Events::_cursor_locked){ camY += -Events::deltaY / Window::height * 2; @@ -365,7 +449,7 @@ int main() { int y = (int)iend.y; int z = (int)iend.z; chunks->set(x,y,z, 0); - Lighting::onBlockSet(x,y,z,0); + lighting.onBlockSet(x,y,z,0); } if (Events::jclicked(GLFW_MOUSE_BUTTON_2)){ int x = (int)(iend.x)+(int)(norm.x); @@ -373,7 +457,7 @@ int main() { int z = (int)(iend.z)+(int)(norm.z); if (!physics.isBlockInside(x,y,z, hitbox)){ chunks->set(x, y, z, choosenBlock); - Lighting::onBlockSet(x,y,z, choosenBlock); + lighting.onBlockSet(x,y,z, choosenBlock); } } } @@ -384,10 +468,10 @@ int main() { Events::pullEvents(); } + wfile->writePlayer(hitbox->position, camX, camY); write_world(); close_world(); - Lighting::finalize(); finalize_assets(); Window::terminate(); return 0; diff --git a/src/voxels/Block.h b/src/voxels/Block.h index 09d4108f..cef274cf 100644 --- a/src/voxels/Block.h +++ b/src/voxels/Block.h @@ -11,6 +11,7 @@ public: unsigned char emission[3]; unsigned char drawGroup = 0; bool lightPassing = false; + bool skyLightPassing = false; bool obstacle = true; Block(unsigned int id, int texture); diff --git a/src/voxels/Chunk.cpp b/src/voxels/Chunk.cpp index c0d05860..c9dc4037 100644 --- a/src/voxels/Chunk.cpp +++ b/src/voxels/Chunk.cpp @@ -27,3 +27,11 @@ bool Chunk::isEmpty(){ } return true; } + +Chunk* Chunk::clone() const { + Chunk* other = new Chunk(x,y,z); + for (int i = 0; i < CHUNK_VOL; i++) + other->voxels[i] = voxels[i]; + other->lightmap->set(lightmap); + return other; +} diff --git a/src/voxels/Chunk.h b/src/voxels/Chunk.h index 24449092..d2a972a3 100644 --- a/src/voxels/Chunk.h +++ b/src/voxels/Chunk.h @@ -15,10 +15,15 @@ public: voxel* voxels; Lightmap* lightmap; bool modified = true; + bool ready = false; + bool accepted = false; + bool generated = false; Chunk(int x, int y, int z); ~Chunk(); bool isEmpty(); + + Chunk* clone() const; }; #endif /* VOXELS_CHUNK_H_ */ diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp index 2592e460..2887473d 100644 --- a/src/voxels/Chunks.cpp +++ b/src/voxels/Chunks.cpp @@ -6,14 +6,8 @@ #include "../lighting/Lightmap.h" #include "../files/WorldFiles.h" -#include "../lighting/Lighting.h" -#include "../graphics/VoxelRenderer.h" #include "../graphics/Mesh.h" -#include - -using namespace glm; - #include #include @@ -38,77 +32,6 @@ Chunks::~Chunks(){ delete[] chunks; } -bool Chunks::_buildMeshes(VoxelRenderer* renderer) { - int nearX = 0; - int nearY = 0; - int nearZ = 0; - int minDistance = 1000000000; - for (unsigned int y = 0; y < h; y++){ - for (unsigned int z = 1; z < d-1; z++){ - for (unsigned int x = 1; x < w-1; x++){ - int index = (y * d + z) * w + x; - Chunk* chunk = chunks[index]; - if (chunk == nullptr) - continue; - Mesh* mesh = meshes[index]; - if (mesh != nullptr && !chunk->modified) - continue; - int lx = x - w / 2; - int ly = y - h / 2; - int lz = z - d / 2; - int distance = (lx * lx + ly * ly + lz * lz); - if (distance < minDistance){ - minDistance = distance; - nearX = x; - nearY = y; - nearZ = z; - } - } - } - } - - int index = (nearY * d + nearZ) * w + nearX; - - Chunk* closes[27]; - - Chunk* chunk = chunks[index]; - if (chunk == nullptr) - return false; - Mesh* mesh = meshes[index]; - if (mesh == nullptr || chunk->modified){ - if (mesh != nullptr) - delete mesh; - if (chunk->isEmpty()){ - meshes[index] = nullptr; - return false; - } - chunk->modified = false; - for (int i = 0; i < 27; i++) - closes[i] = nullptr; - for (size_t j = 0; j < volume; j++){ - Chunk* other = chunks[j]; - if (other == nullptr) - continue; - - int ox = other->x - chunk->x; - int oy = other->y - chunk->y; - int oz = other->z - chunk->z; - - if (abs(ox) > 1 || abs(oy) > 1 || abs(oz) > 1) - continue; - - ox += 1; - oy += 1; - oz += 1; - closes[(oy * 3 + oz) * 3 + ox] = other; - } - mesh = renderer->render(chunk, (const Chunk**)closes); - meshes[index] = mesh; - return true; - } - return false; -} - voxel* Chunks::get(int x, int y, int z){ x -= ox * CHUNK_W; y -= oy * CHUNK_H; @@ -158,6 +81,27 @@ unsigned char Chunks::getLight(int x, int y, int z, int channel){ return chunk->lightmap->get(lx,ly,lz, channel); } +unsigned short Chunks::getLight(int x, int y, int z){ + x -= ox * CHUNK_W; + y -= oy * CHUNK_H; + z -= oz * CHUNK_D; + int cx = x / CHUNK_W; + int cy = y / CHUNK_H; + int cz = z / CHUNK_D; + if (x < 0) cx--; + if (y < 0) cy--; + if (z < 0) cz--; + if (cx < 0 || cy < 0 || cz < 0 || cx >= w || cy >= h || cz >= d) + return 0; + Chunk* chunk = chunks[(cy * d + cz) * w + cx]; + if (chunk == nullptr) + return 0; + int lx = x - cx * CHUNK_W; + int ly = y - cy * CHUNK_H; + int lz = z - cz * CHUNK_D; + return chunk->lightmap->get(lx,ly,lz); +} + Chunk* Chunks::getChunkByVoxel(int x, int y, int z){ x -= ox * CHUNK_W; y -= oy * CHUNK_H; @@ -317,46 +261,6 @@ void Chunks::setCenter(WorldFiles* worldFiles, int x, int y, int z) { translate(worldFiles, cx,cy,cz); } -bool Chunks::loadVisible(WorldFiles* worldFiles){ - int nearX = 0; - int nearY = 0; - int nearZ = 0; - int minDistance = (w/2)*(w/2); - for (unsigned int y = 0; y < h; y++){ - for (unsigned int z = 1; z < d-1; z++){ - for (unsigned int x = 1; x < w-1; x++){ - int index = (y * d + z) * w + x; - Chunk* chunk = chunks[index]; - if (chunk != nullptr) - continue; - int lx = x - w / 2; - int ly = y - h / 2; - int lz = z - d / 2; - int distance = (lx * lx + ly * ly + lz * lz); - if (distance < minDistance){ - minDistance = distance; - nearX = x; - nearY = y; - nearZ = z; - } - } - } - } - - int index = (nearY * d + nearZ) * w + nearX; - Chunk* chunk = chunks[index]; - if (chunk != nullptr) - return false; - chunk = new Chunk(nearX+ox,nearY+oy,nearZ+oz); - if (!worldFiles->getChunk(chunk->x, chunk->z, (char*)chunk->voxels)){ - WorldGenerator::generate(chunk->voxels, chunk->x, chunk->y, chunk->z); - } - - chunks[index] = chunk; - Lighting::onChunkLoaded(ox+nearX, oy+nearY, oz+nearZ); - return true; -} - void Chunks::translate(WorldFiles* worldFiles, int dx, int dy, int dz){ for (unsigned int i = 0; i < volume; i++){ chunksSecond[i] = nullptr; @@ -395,3 +299,33 @@ void Chunks::translate(WorldFiles* worldFiles, int dx, int dy, int dz){ oy += dy; oz += dz; } + +void Chunks::_setOffset(int x, int y, int z){ + ox = x; + oy = y; + oz = z; +} + +bool Chunks::putChunk(Chunk* chunk) { + int x = chunk->x; + int y = chunk->y; + int z = chunk->z; + x -= ox; + y -= oy; + z -= oz; + if (x < 0 || y < 0 || z < 0 || x >= w || y >= h || z >= d) + return false; + chunks[(y * d + z) * w + x] = chunk; + return true; +} + +void Chunks::clear(bool freeMemory){ + for (size_t i = 0; i < volume; i++){ + if (freeMemory){ + delete chunks[i]; + delete meshes[i]; + } + chunks[i] = nullptr; + meshes[i] = nullptr; + } +} diff --git a/src/voxels/Chunks.h b/src/voxels/Chunks.h index 2c5641b8..bdd5efbb 100644 --- a/src/voxels/Chunks.h +++ b/src/voxels/Chunks.h @@ -26,20 +26,25 @@ public: Chunks(int w, int h, int d, int ox, int oy, int oz); ~Chunks(); + bool putChunk(Chunk* chunk); + Chunk* getChunk(int x, int y, int z); Chunk* getChunkByVoxel(int x, int y, int z); voxel* get(int x, int y, int z); + unsigned short getLight(int x, int y, int z); unsigned char getLight(int x, int y, int z, int channel); void set(int x, int y, int z, int id); voxel* rayCast(vec3 start, vec3 dir, float maxLength, vec3& end, vec3& norm, vec3& iend); bool isObstacle(int x, int y, int z); + // does not move chunks inside + void _setOffset(int x, int y, int z); + void setCenter(WorldFiles* worldFiles, int x, int y, int z); void translate(WorldFiles* worldFiles, int x, int y, int z); - bool loadVisible(WorldFiles* worldFiles); - bool _buildMeshes(VoxelRenderer* renderer); + void clear(bool freeMemory); }; #endif /* VOXELS_CHUNKS_H_ */ diff --git a/src/voxels/ChunksController.cpp b/src/voxels/ChunksController.cpp new file mode 100644 index 00000000..3024c346 --- /dev/null +++ b/src/voxels/ChunksController.cpp @@ -0,0 +1,209 @@ +#include "ChunksController.h" +#include "Chunk.h" +#include "Chunks.h" +#include "WorldGenerator.h" +#include "../graphics/Mesh.h" +#include "../graphics/VoxelRenderer.h" +#include "../lighting/Lighting.h" +#include "../files/WorldFiles.h" +#include "ChunksLoader.h" +#include + +#define LOADERS_COUNT 3 + +ChunksController::ChunksController(Chunks* chunks, Lighting* lighting) : chunks(chunks), lighting(lighting){ + loaders = new ChunksLoader*[LOADERS_COUNT]; + for (int i = 0; i < LOADERS_COUNT; i++){ + loaders[i] = new ChunksLoader(); + } +} + +ChunksController::~ChunksController(){ + for (int i = 0; i < LOADERS_COUNT; i++) + delete loaders[i]; + delete[] loaders; +} + +bool ChunksController::loadVisible(WorldFiles* worldFiles){ + const int w = chunks->w; + const int h = chunks->h; + const int d = chunks->d; + const int ox = chunks->ox; + const int oy = chunks->oy; + const int oz = chunks->oz; + int nearX = 0; + int nearY = 0; + int nearZ = 0; + int minDistance = (w/2)*(w/2); + for (int y = 0; y < h; y++){ + for (int z = 2; z < d-2; z++){ + for (int x = 2; x < w-2; x++){ + int index = (y * d + z) * w + x; + Chunk* chunk = chunks->chunks[index]; + if (chunk != nullptr) + continue; + int lx = x - w / 2; + int ly = y - h / 2; + int lz = z - d / 2; + int distance = (lx * lx + ly * ly + lz * lz); + if (distance < minDistance){ + minDistance = distance; + nearX = x; + nearY = y; + nearZ = z; + } + } + } + } + + int index = (nearY * d + nearZ) * w + nearX; + Chunk* chunk = chunks->chunks[index]; + if (chunk != nullptr) + return false; + + ChunksLoader* freeLoader = nullptr; + for (int i = 0; i < LOADERS_COUNT; i++){ + ChunksLoader* loader = loaders[i]; + if (loader->isBusy()) + continue; + freeLoader = loader; + break; + } + if (freeLoader == nullptr) + return false; + chunk = new Chunk(nearX+ox,nearY+oy,nearZ+oz); + if (worldFiles->getChunk(chunk->x, chunk->z, (char*)chunk->voxels)) + chunk->generated = true; + + chunks->chunks[index] = chunk; + + Chunk* closes[27]; + for (int i = 0; i < 27; i++) + closes[i] = nullptr; + for (size_t j = 0; j < chunks->volume; j++){ + Chunk* other = chunks->chunks[j]; + if (other == nullptr) + continue; + if (!other->ready) + continue; + + int ox = other->x - chunk->x; + int oy = other->y - chunk->y; + int oz = other->z - chunk->z; + + if (abs(ox) > 1 || abs(oy) > 1 || abs(oz) > 1) + continue; + + ox += 1; + oy += 1; + oz += 1; + closes[(oy * 3 + oz) * 3 + ox] = other; + } + freeLoader->perform(chunk, (const Chunk**)closes); + return true; +} + +bool ChunksController::_buildMeshes(VoxelRenderer* renderer, int tick) { + const int w = chunks->w; + const int h = chunks->h; + const int d = chunks->d; + + int nearX = 0; + int nearY = 0; + int nearZ = 0; + int minDistance = 1000000000; + for (int y = 0; y < h; y++){ + for (int z = 1; z < d-1; z++){ + for (int x = 1; x < w-1; x++){ + int index = (y * d + z) * w + x; + Chunk* chunk = chunks->chunks[index]; + if (chunk == nullptr) + continue; + Mesh* mesh = chunks->meshes[index]; + if (mesh != nullptr && !chunk->modified) + continue; + if (!chunk->ready){ + continue; + } + int lx = x - w / 2; + int ly = y - h / 2; + int lz = z - d / 2; + int distance = (lx * lx + ly * ly + lz * lz); + if (distance < minDistance){ + minDistance = distance; + nearX = x; + nearY = y; + nearZ = z; + } + } + } + } + + int index = (nearY * d + nearZ) * w + nearX; + + + Chunk* chunk = chunks->chunks[index]; + if (chunk == nullptr){ + for (int y = 0; y < h; y++){ + for (int z = 1; z < d-1; z++){ + for (int x = 1; x < w-1; x++){ + int index = (y * d + z) * w + x; + chunk = chunks->chunks[index]; + if (chunk != nullptr && chunk->ready && !chunk->accepted){ + int lx = x - w / 2; + int ly = y - h / 2; + int lz = z - d / 2; + int distance = (lx * lx + ly * ly + lz * lz); + lighting->onChunkLoaded(chunk->x, chunk->y, chunk->z, false); + for (int i = 0; i < chunks->volume; i++){ + Chunk* other = chunks->chunks[i]; + if (other) + other->modified = true; + } + chunk->accepted = true; + std::cout << "1: built mesh for " << chunk << std::endl; + return true; + } + } + } + } + return false; + } + Mesh* mesh = chunks->meshes[index]; + if (mesh == nullptr || chunk->modified){ + Chunk* closes[27]; + if (mesh != nullptr) + delete mesh; + if (chunk->isEmpty()){ + chunks->meshes[index] = nullptr; + return false; + } + chunk->modified = false; + for (int i = 0; i < 27; i++) + closes[i] = nullptr; + for (size_t j = 0; j < chunks->volume; j++){ + Chunk* other = chunks->chunks[j]; + if (other == nullptr) + continue; + if (!other->ready) + continue; + + int ox = other->x - chunk->x; + int oy = other->y - chunk->y; + int oz = other->z - chunk->z; + + if (abs(ox) > 1 || abs(oy) > 1 || abs(oz) > 1) + continue; + + ox += 1; + oy += 1; + oz += 1; + closes[(oy * 3 + oz) * 3 + ox] = other; + } + mesh = renderer->render(chunk, (const Chunk**)closes); + chunks->meshes[index] = mesh; + //std::cout << "2: built mesh for " << chunk << std::endl; + return true; + } + return false; +} diff --git a/src/voxels/ChunksController.h b/src/voxels/ChunksController.h new file mode 100644 index 00000000..56bcab80 --- /dev/null +++ b/src/voxels/ChunksController.h @@ -0,0 +1,23 @@ +#ifndef VOXELS_CHUNKSCONTROLLER_H_ +#define VOXELS_CHUNKSCONTROLLER_H_ + +class Chunks; +class Lighting; +class WorldFiles; +class VoxelRenderer; +class ChunksLoader; + +class ChunksController { +private: + Chunks* chunks; + Lighting* lighting; + ChunksLoader** loaders; +public: + ChunksController(Chunks* chunks, Lighting* lighting); + ~ChunksController(); + + bool loadVisible(WorldFiles* worldFiles); + bool _buildMeshes(VoxelRenderer* renderer, int tick); +}; + +#endif /* VOXELS_CHUNKSCONTROLLER_H_ */ diff --git a/src/voxels/ChunksLoader.cpp b/src/voxels/ChunksLoader.cpp new file mode 100644 index 00000000..c055158c --- /dev/null +++ b/src/voxels/ChunksLoader.cpp @@ -0,0 +1,64 @@ +#include "ChunksLoader.h" +#include + +#include "Chunk.h" +#include "Chunks.h" +#include "WorldGenerator.h" +#include "../lighting/Lighting.h" + +#include + +void ChunksLoader::_thread(){ + Chunks chunks(3,3,3, -1,-1,-1); + Lighting lighting(&chunks); + while (working){ + if (current == nullptr){ + std::this_thread::sleep_for(std::chrono::milliseconds(1)); + continue; + } + Chunk* chunk = current; + //std::cout << "LOADER: received chunk " << chunk->x << " " << chunk->y << " " << chunk->z << std::endl; + + chunks._setOffset(chunk->x-1, chunk->y-1, chunk->z-1); + + if (!chunk->generated){ + WorldGenerator::generate(chunk->voxels, chunk->x, chunk->y, chunk->z); + //std::cout << "LOADER: generated chunk" << std::endl; + } + + /*for (int i = 0; i < 27; i++){ + Chunk* other = closes[i]; + if (other == nullptr) + continue; + chunks.putChunk(other); + }*/ + chunks.putChunk(chunk); + lighting.onChunkLoaded(chunk->x, chunk->y, chunk->z, true); + chunks.clear(false); + for (int i = 0; i < 27; i++){ + Chunk* other = closes[i]; + delete other; + } + chunk->ready = true; + current = nullptr; + //std::cout << "LOADER: success" << std::endl; + } +} + +void ChunksLoader::perform(Chunk* chunk, const Chunk** cs){ + if (isBusy()){ + std::cerr << "performing while busy" << std::endl; + return; + } + if (closes == nullptr){ + closes = new Chunk*[27]; + } + for (int i = 0; i < 27; i++){ + const Chunk* other = cs[i]; + if (other == nullptr) + closes[i] = nullptr; + else + closes[i] = other->clone(); + } + current = chunk; +} diff --git a/src/voxels/ChunksLoader.h b/src/voxels/ChunksLoader.h new file mode 100644 index 00000000..5eef4bc6 --- /dev/null +++ b/src/voxels/ChunksLoader.h @@ -0,0 +1,36 @@ +#ifndef VOXELS_CHUNKSLOADER_H_ +#define VOXELS_CHUNKSLOADER_H_ + +#include +#include + +class Chunk; + +class ChunksLoader final { +private: + std::thread loaderThread; + void _thread(); + std::atomic current {nullptr}; + std::atomic closes {nullptr}; + std::atomic working {true}; +public: + ChunksLoader() : loaderThread{} { + loaderThread = std::thread{&ChunksLoader::_thread, this}; + } + ~ChunksLoader(){ + working = false; + loaderThread.join(); + } + + bool isBusy(){ + return current != nullptr; + } + + void perform(Chunk* chunk, const Chunk** closes); + + void stop(){ + working = false; + } +}; + +#endif /* VOXELS_CHUNKSLOADER_H_ */ diff --git a/src/voxels/WorldGenerator.cpp b/src/voxels/WorldGenerator.cpp index 849dd84b..0e27ff3e 100644 --- a/src/voxels/WorldGenerator.cpp +++ b/src/voxels/WorldGenerator.cpp @@ -5,29 +5,129 @@ #include #include #include +#define FNL_IMPL +#include "../maths/FastNoiseLite.h" +#include + +class PseudoRandom { + unsigned seed; +public: + PseudoRandom(){ + seed = (unsigned)time(0); + } + + int rand(){ + seed = (8253729 * seed + 2396403); + return seed % 32768; + } + + void setSeed(int number){ + seed = (unsigned)number+8253729; + rand(); + } +}; + +float calc_height(fnl_state *noise, int real_x, int real_z){ + const float s = 0.2f; + float height = fnlGetNoise3D(noise, real_x*0.0125f*s*32,real_z*0.0125f*s*32, 0.0f); + height += fnlGetNoise3D(noise, real_x*0.025f*s*32,real_z*0.025f*s*32, 0.0f)*0.5f; + height += fnlGetNoise3D(noise, real_x*0.05f*s*32,real_z*0.05f*s*32, 0.0f)*0.25f; + height += fnlGetNoise3D(noise, real_x*0.1f*s*32,real_z*0.1f*s*32, 0.0f)*0.225f; + height += fnlGetNoise3D(noise, real_x*0.2f*s*32,real_z*0.2f*s*32, 0.0f)*0.125f; + height += fnlGetNoise3D(noise, real_x*0.4f*s*32,real_z*0.4f*s*32, 0.0f)*0.125f*0.5F; + height = height * 0.5f + 0.5f; + height *= height; + height *= (140.0f)*0.12f/s; + height += (42)*0.12f/s; + return height; +} + +float calc_height_faster(fnl_state *noise, int real_x, int real_z){ + const float s = 0.2f; + float height = fnlGetNoise3D(noise, real_x*0.0125f*s*32,real_z*0.0125f*s*32, 0.0f); + height += fnlGetNoise3D(noise, real_x*0.025f*s*32,real_z*0.025f*s*32, 0.0f)*0.5f; + height += fnlGetNoise3D(noise, real_x*0.05f*s*32,real_z*0.05f*s*32, 0.0f)*0.25f; + height += fnlGetNoise3D(noise, real_x*0.1f*s*32,real_z*0.1f*s*32, 0.0f)*0.225f; + height += fnlGetNoise3D(noise, real_x*0.2f*s*32,real_z*0.2f*s*32, 0.0f)*0.125f; + //height += fnlGetNoise3D(noise, real_x*0.4f*s*32,real_z*0.4f*s*32, 0.0f)*0.125f*0.5F; + height = height * 0.5f + 0.5f; + height *= height; + height *= (140.0f)*0.12f/s; + height += (42)*0.12f/s; + return height; +} +#include +int generate_tree(fnl_state *noise, PseudoRandom* random, const float* heights, int real_x, int real_y, int real_z, int tileSize){ + const int tileX = floor((double)real_x/(double)tileSize); + const int tileY = floor((double)real_z/(double)tileSize); + random->setSeed(tileX*4325261+tileY*12160951+tileSize*9431111); + + bool gentree = fnlGetNoise3D(noise, tileX*3.0f+633, 0.0, tileY*3.0f) > -0.1f && (random->rand() % 10) < 7; + if (!gentree) + return 0; + + const int randomX = (random->rand() % (tileSize/2)) - tileSize/4; + const int randomZ = (random->rand() % (tileSize/2)) - tileSize/4; + int centerX = tileX * tileSize + tileSize/2 + randomX; + int centerY = tileY * tileSize + tileSize/2 + randomZ; + int height = (int)calc_height_faster(noise, centerX, centerY); + if (height < 55) + return 0; + int lx = real_x - centerX; + int radius = random->rand() % 4 + 3; + int ly = real_y - height - 3 * radius; + int lz = real_z - centerY; + if (lx == 0 && lz == 0 && real_y - height < 4*radius) + return 6; + if (lx*lx+ly*ly/2+lz*lz < radius*radius) + return 7; + return 0; +} void WorldGenerator::generate(voxel* voxels, int cx, int cy, int cz){ - const float s = 0.25f; + fnl_state noise = fnlCreateState(); + noise.noise_type = FNL_NOISE_OPENSIMPLEX2; + + PseudoRandom random; + + float heights[CHUNK_VOL]; + for (int z = 0; z < CHUNK_D; z++){ for (int x = 0; x < CHUNK_W; x++){ int real_x = x + cx * CHUNK_W; int real_z = z + cz * CHUNK_D; - float height = glm::perlin(glm::vec3(real_x*0.0125f*s,real_z*0.0125f*s, 0.0f)); - height += glm::perlin(glm::vec3(real_x*0.025f*s,real_z*0.025f*s, 0.0f))*0.5f; - height += glm::perlin(glm::vec3(real_x*0.05f*s,real_z*0.05f*s, 0.0f))*0.25f; - height += glm::perlin(glm::vec3(real_x*0.1f*s,real_z*0.1f*s, 0.0f))*0.225f; - height += glm::perlin(glm::vec3(real_x*0.2f*s,real_z*0.2f*s, 0.0f))*0.125f; - height = height * 0.5f + 0.5f; - height *= height; - height *= 140.0f; - height += 48; + float height = calc_height(&noise, real_x, real_z); + heights[z*CHUNK_W+x] = height; + } + } + + for (int z = 0; z < CHUNK_D; z++){ + for (int x = 0; x < CHUNK_W; x++){ + int real_x = x + cx * CHUNK_W; + int real_z = z + cz * CHUNK_D; + float height = heights[z*CHUNK_W+x]; + for (int y = 0; y < CHUNK_H; y++){ int real_y = y + cy * CHUNK_H; - int id = 0; + int id = real_y < 55 ? 9 : 0; if (real_y == (int)height) id = 2; - else if (real_y < height) - id = 1; + else if (real_y < height){ + if (real_y < height-6) + id = 8; + else + id = 1; + } else { + int tree = generate_tree(&noise, &random, heights, real_x, real_y, real_z, 16); + if (tree) + id = tree; + else if ((tree = generate_tree(&noise, &random, heights, real_x, real_y, real_z, 19))){ + id = tree; + }else if ((tree = generate_tree(&noise, &random, heights, real_x, real_y, real_z, 23))){ + id = tree; + } + } + if (real_y <= 2) id = 2; voxels[(y * CHUNK_D + z) * CHUNK_W + x].id = id; From 4651ab776bde68c3bd58a726fc942462e544f7c9 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 28 Feb 2022 03:56:02 +0300 Subject: [PATCH 02/31] Reference counting for Chunk | changed ChunksLoader --- src/voxels/Chunk.cpp | 9 +++++++++ src/voxels/Chunk.h | 3 +++ src/voxels/Chunks.cpp | 4 ++-- src/voxels/ChunksLoader.cpp | 14 ++++---------- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/voxels/Chunk.cpp b/src/voxels/Chunk.cpp index c9dc4037..a4e645b0 100644 --- a/src/voxels/Chunk.cpp +++ b/src/voxels/Chunk.cpp @@ -35,3 +35,12 @@ Chunk* Chunk::clone() const { other->lightmap->set(lightmap); return other; } + +void Chunk::incref(){ + references++; +} + +void Chunk::decref(){ + if (--references <= 0) + delete this; +} diff --git a/src/voxels/Chunk.h b/src/voxels/Chunk.h index d2a972a3..850530f7 100644 --- a/src/voxels/Chunk.h +++ b/src/voxels/Chunk.h @@ -18,12 +18,15 @@ public: bool ready = false; bool accepted = false; bool generated = false; + int references = 1; Chunk(int x, int y, int z); ~Chunk(); bool isEmpty(); Chunk* clone() const; + void incref(); + void decref(); }; #endif /* VOXELS_CHUNK_H_ */ diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp index 2887473d..73c4d875 100644 --- a/src/voxels/Chunks.cpp +++ b/src/voxels/Chunks.cpp @@ -278,7 +278,7 @@ void Chunks::translate(WorldFiles* worldFiles, int dx, int dy, int dz){ Mesh* mesh = meshes[(y * d + z) * w + x]; if (nx < 0 || ny < 0 || nz < 0 || nx >= w || ny >= h || nz >= d){ worldFiles->put((const char*)chunk->voxels, chunk->x, chunk->z); - delete chunk; + chunk->decref(); delete mesh; continue; } @@ -322,7 +322,7 @@ bool Chunks::putChunk(Chunk* chunk) { void Chunks::clear(bool freeMemory){ for (size_t i = 0; i < volume; i++){ if (freeMemory){ - delete chunks[i]; + chunks[i]->decref(); delete meshes[i]; } chunks[i] = nullptr; diff --git a/src/voxels/ChunksLoader.cpp b/src/voxels/ChunksLoader.cpp index c055158c..24bfd29c 100644 --- a/src/voxels/ChunksLoader.cpp +++ b/src/voxels/ChunksLoader.cpp @@ -17,30 +17,24 @@ void ChunksLoader::_thread(){ continue; } Chunk* chunk = current; - //std::cout << "LOADER: received chunk " << chunk->x << " " << chunk->y << " " << chunk->z << std::endl; + chunk->incref(); chunks._setOffset(chunk->x-1, chunk->y-1, chunk->z-1); if (!chunk->generated){ WorldGenerator::generate(chunk->voxels, chunk->x, chunk->y, chunk->z); - //std::cout << "LOADER: generated chunk" << std::endl; } - /*for (int i = 0; i < 27; i++){ - Chunk* other = closes[i]; - if (other == nullptr) - continue; - chunks.putChunk(other); - }*/ chunks.putChunk(chunk); lighting.onChunkLoaded(chunk->x, chunk->y, chunk->z, true); chunks.clear(false); for (int i = 0; i < 27; i++){ Chunk* other = closes[i]; - delete other; + //delete other; } chunk->ready = true; current = nullptr; + chunk->decref(); //std::cout << "LOADER: success" << std::endl; } } @@ -58,7 +52,7 @@ void ChunksLoader::perform(Chunk* chunk, const Chunk** cs){ if (other == nullptr) closes[i] = nullptr; else - closes[i] = other->clone(); + closes[i] = (Chunk*)other;//->clone(); } current = chunk; } From 4c2fd0fce2d453c7e9c34e79a4da8119631a7a28 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 28 Feb 2022 04:19:40 +0300 Subject: [PATCH 03/31] used 'closes' chunks in ChunksLoader lights calculations --- src/voxels/ChunksLoader.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/voxels/ChunksLoader.cpp b/src/voxels/ChunksLoader.cpp index 24bfd29c..67cfc08f 100644 --- a/src/voxels/ChunksLoader.cpp +++ b/src/voxels/ChunksLoader.cpp @@ -18,6 +18,13 @@ void ChunksLoader::_thread(){ } Chunk* chunk = current; chunk->incref(); + for (size_t i = 0; i < 27; i++){ + Chunk* other = closes[i]; + if (other){ + other->incref(); + chunks.putChunk(other); + } + } chunks._setOffset(chunk->x-1, chunk->y-1, chunk->z-1); @@ -30,7 +37,8 @@ void ChunksLoader::_thread(){ chunks.clear(false); for (int i = 0; i < 27; i++){ Chunk* other = closes[i]; - //delete other; + if (other) + other->decref(); } chunk->ready = true; current = nullptr; From 2a158bfb4601a74e10ef51bf84009e1f8625ff99 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 28 Feb 2022 16:22:31 +0300 Subject: [PATCH 04/31] Updated makefiles for Linux build --- Debug/makefile | 22 ++++++++++++++++++---- Debug/src/files/subdir.mk | 4 ++-- Debug/src/graphics/subdir.mk | 4 ++-- Debug/src/lighting/subdir.mk | 4 ++-- Debug/src/loaders/subdir.mk | 4 ++-- Debug/src/physics/subdir.mk | 4 ++-- Debug/src/subdir.mk | 4 ++-- Debug/src/voxels/subdir.mk | 10 ++++++++-- Debug/src/window/subdir.mk | 4 ++-- 9 files changed, 40 insertions(+), 20 deletions(-) diff --git a/Debug/makefile b/Debug/makefile index a25ebf8b..6d4fc22f 100644 --- a/Debug/makefile +++ b/Debug/makefile @@ -42,16 +42,30 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + +BUILD_ARTIFACT_NAME := voxel_engine +BUILD_ARTIFACT_EXTENSION := +BUILD_ARTIFACT_PREFIX := +BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ARTIFACT_EXTENSION),.$(BUILD_ARTIFACT_EXTENSION),) + # Add inputs and outputs from these tool invocations to the build variables # All Target -all: voxel_engine +all: main-build + +# Main-build Target +main-build: voxel_engine # Tool invocations -voxel_engine: $(OBJS) $(USER_OBJS) +voxel_engine: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: Cross G++ Linker' - g++ -o "voxel_engine" $(OBJS) $(USER_OBJS) $(LIBS) + g++ -pthread -o "voxel_engine" $(OBJS) $(USER_OBJS) $(LIBS) @echo 'Finished building target: $@' @echo ' ' @@ -60,6 +74,6 @@ clean: -$(RM) $(CC_DEPS)$(C++_DEPS)$(EXECUTABLES)$(OBJS)$(C_UPPER_DEPS)$(CXX_DEPS)$(C_DEPS)$(CPP_DEPS) voxel_engine -@echo ' ' -.PHONY: all clean dependents +.PHONY: all clean dependents main-build -include ../makefile.targets diff --git a/Debug/src/files/subdir.mk b/Debug/src/files/subdir.mk index 0bdaaaf4..42a70dfe 100644 --- a/Debug/src/files/subdir.mk +++ b/Debug/src/files/subdir.mk @@ -17,10 +17,10 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -src/files/%.o: ../src/files/%.cpp +src/files/%.o: ../src/files/%.cpp src/files/subdir.mk @echo 'Building file: $<' @echo 'Invoking: Cross G++ Compiler' - g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Debug/src/graphics/subdir.mk b/Debug/src/graphics/subdir.mk index 2fe4a7d3..35070f37 100644 --- a/Debug/src/graphics/subdir.mk +++ b/Debug/src/graphics/subdir.mk @@ -26,10 +26,10 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -src/graphics/%.o: ../src/graphics/%.cpp +src/graphics/%.o: ../src/graphics/%.cpp src/graphics/subdir.mk @echo 'Building file: $<' @echo 'Invoking: Cross G++ Compiler' - g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Debug/src/lighting/subdir.mk b/Debug/src/lighting/subdir.mk index eb50981a..aed4c28a 100644 --- a/Debug/src/lighting/subdir.mk +++ b/Debug/src/lighting/subdir.mk @@ -20,10 +20,10 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -src/lighting/%.o: ../src/lighting/%.cpp +src/lighting/%.o: ../src/lighting/%.cpp src/lighting/subdir.mk @echo 'Building file: $<' @echo 'Invoking: Cross G++ Compiler' - g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Debug/src/loaders/subdir.mk b/Debug/src/loaders/subdir.mk index c2345669..771a7f80 100644 --- a/Debug/src/loaders/subdir.mk +++ b/Debug/src/loaders/subdir.mk @@ -14,10 +14,10 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -src/loaders/%.o: ../src/loaders/%.cpp +src/loaders/%.o: ../src/loaders/%.cpp src/loaders/subdir.mk @echo 'Building file: $<' @echo 'Invoking: Cross G++ Compiler' - g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Debug/src/physics/subdir.mk b/Debug/src/physics/subdir.mk index 70832091..0be00411 100644 --- a/Debug/src/physics/subdir.mk +++ b/Debug/src/physics/subdir.mk @@ -17,10 +17,10 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -src/physics/%.o: ../src/physics/%.cpp +src/physics/%.o: ../src/physics/%.cpp src/physics/subdir.mk @echo 'Building file: $<' @echo 'Invoking: Cross G++ Compiler' - g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Debug/src/subdir.mk b/Debug/src/subdir.mk index 8ae370c6..e4dbf713 100644 --- a/Debug/src/subdir.mk +++ b/Debug/src/subdir.mk @@ -14,10 +14,10 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -src/%.o: ../src/%.cpp +src/%.o: ../src/%.cpp src/subdir.mk @echo 'Building file: $<' @echo 'Invoking: Cross G++ Compiler' - g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Debug/src/voxels/subdir.mk b/Debug/src/voxels/subdir.mk index e5ed377e..f4dc0a33 100644 --- a/Debug/src/voxels/subdir.mk +++ b/Debug/src/voxels/subdir.mk @@ -7,6 +7,8 @@ CPP_SRCS += \ ../src/voxels/Block.cpp \ ../src/voxels/Chunk.cpp \ ../src/voxels/Chunks.cpp \ +../src/voxels/ChunksController.cpp \ +../src/voxels/ChunksLoader.cpp \ ../src/voxels/WorldGenerator.cpp \ ../src/voxels/voxel.cpp @@ -14,6 +16,8 @@ OBJS += \ ./src/voxels/Block.o \ ./src/voxels/Chunk.o \ ./src/voxels/Chunks.o \ +./src/voxels/ChunksController.o \ +./src/voxels/ChunksLoader.o \ ./src/voxels/WorldGenerator.o \ ./src/voxels/voxel.o @@ -21,15 +25,17 @@ CPP_DEPS += \ ./src/voxels/Block.d \ ./src/voxels/Chunk.d \ ./src/voxels/Chunks.d \ +./src/voxels/ChunksController.d \ +./src/voxels/ChunksLoader.d \ ./src/voxels/WorldGenerator.d \ ./src/voxels/voxel.d # Each subdirectory must supply rules for building sources it contributes -src/voxels/%.o: ../src/voxels/%.cpp +src/voxels/%.o: ../src/voxels/%.cpp src/voxels/subdir.mk @echo 'Building file: $<' @echo 'Invoking: Cross G++ Compiler' - g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Debug/src/window/subdir.mk b/Debug/src/window/subdir.mk index c8685f7a..d7e6dc9f 100644 --- a/Debug/src/window/subdir.mk +++ b/Debug/src/window/subdir.mk @@ -20,10 +20,10 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -src/window/%.o: ../src/window/%.cpp +src/window/%.o: ../src/window/%.cpp src/window/subdir.mk @echo 'Building file: $<' @echo 'Invoking: Cross G++ Compiler' - g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' From b7e8ff5bea2bd4c472f7599217c61fd802f1959c Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 2 Mar 2022 23:45:09 +0300 Subject: [PATCH 05/31] 'Player' class, separated main file Moved render code to world_render.h, declarations code (assets and blocks) to declarations.h --- Debug/makefile | 1 + Debug/sources.mk | 1 + Debug/src/objects/subdir.mk | 24 ++++ src/declarations.h | 119 ++++++++++++++++ src/files/WorldFiles.cpp | 21 ++- src/files/WorldFiles.h | 7 +- src/lighting/Lighting.cpp | 8 +- src/objects/Player.cpp | 10 ++ src/objects/Player.h | 19 +++ src/voxel_engine.cpp | 273 +++--------------------------------- src/world_render.h | 152 ++++++++++++++++++++ 11 files changed, 370 insertions(+), 265 deletions(-) create mode 100644 Debug/src/objects/subdir.mk create mode 100644 src/declarations.h create mode 100644 src/objects/Player.cpp create mode 100644 src/objects/Player.h create mode 100644 src/world_render.h diff --git a/Debug/makefile b/Debug/makefile index 6d4fc22f..cbc3aa03 100644 --- a/Debug/makefile +++ b/Debug/makefile @@ -11,6 +11,7 @@ RM := rm -rf -include src/window/subdir.mk -include src/voxels/subdir.mk -include src/physics/subdir.mk +-include src/objects/subdir.mk -include src/loaders/subdir.mk -include src/lighting/subdir.mk -include src/graphics/subdir.mk diff --git a/Debug/sources.mk b/Debug/sources.mk index 580fe4b9..8671876e 100644 --- a/Debug/sources.mk +++ b/Debug/sources.mk @@ -27,6 +27,7 @@ src/files \ src/graphics \ src/lighting \ src/loaders \ +src/objects \ src/physics \ src \ src/voxels \ diff --git a/Debug/src/objects/subdir.mk b/Debug/src/objects/subdir.mk new file mode 100644 index 00000000..4757b8dd --- /dev/null +++ b/Debug/src/objects/subdir.mk @@ -0,0 +1,24 @@ +################################################################################ +# Automatically-generated file. Do not edit! +################################################################################ + +# Add inputs and outputs from these tool invocations to the build variables +CPP_SRCS += \ +../src/objects/Player.cpp + +OBJS += \ +./src/objects/Player.o + +CPP_DEPS += \ +./src/objects/Player.d + + +# Each subdirectory must supply rules for building sources it contributes +src/objects/%.o: ../src/objects/%.cpp src/objects/subdir.mk + @echo 'Building file: $<' + @echo 'Invoking: Cross G++ Compiler' + g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" + @echo 'Finished building: $<' + @echo ' ' + + diff --git a/src/declarations.h b/src/declarations.h new file mode 100644 index 00000000..412d2afb --- /dev/null +++ b/src/declarations.h @@ -0,0 +1,119 @@ +#ifndef DECLARATIONS_CPP +#define DECLARATIONS_CPP + +#include + +#include "graphics/Shader.h" +#include "graphics/Texture.h" +#include "window/Window.h" + +#include "voxels/Block.h" + + +Shader *shader, *linesShader, *crosshairShader; +Texture *texture; + + +// Shaders, textures, renderers +int initialize_assets() { + shader = load_shader("res/main.glslv", "res/main.glslf"); + if (shader == nullptr){ + std::cerr << "failed to load shader" << std::endl; + Window::terminate(); + return 1; + } + + crosshairShader = load_shader("res/crosshair.glslv", "res/crosshair.glslf"); + if (crosshairShader == nullptr){ + std::cerr << "failed to load crosshair shader" << std::endl; + Window::terminate(); + return 1; + } + + linesShader = load_shader("res/lines.glslv", "res/lines.glslf"); + if (linesShader == nullptr){ + std::cerr << "failed to load lines shader" << std::endl; + Window::terminate(); + return 1; + } + + texture = load_texture("res/block.png"); + if (texture == nullptr){ + std::cerr << "failed to load texture" << std::endl; + delete shader; + Window::terminate(); + return 1; + } + return 0; +} + +// Deleting GL objects like shaders, textures +void finalize_assets(){ + delete shader; + delete texture; + delete crosshairShader; + delete linesShader; +} + + +// All in-game definitions (blocks, items, etc..) +void setup_definitions() { + // AIR + Block* block = new Block(0,0); + block->drawGroup = 1; + block->lightPassing = true; + block->skyLightPassing = true; + block->obstacle = false; + Block::blocks[block->id] = block; + + // STONE + block = new Block(1,2); + Block::blocks[block->id] = block; + + // GRASS + block = new Block(2,4); + block->textureFaces[2] = 2; + block->textureFaces[3] = 1; + Block::blocks[block->id] = block; + + // LAMP + block = new Block(3,3); + block->emission[0] = 15; + block->emission[1] = 14; + block->emission[2] = 13; + Block::blocks[block->id] = block; + + // GLASS + block = new Block(4,5); + block->drawGroup = 2; + block->lightPassing = true; + Block::blocks[block->id] = block; + + // PLANKS + block = new Block(5,6); + Block::blocks[block->id] = block; + + // WOOD + block = new Block(6,7); + block->textureFaces[2] = 8; + block->textureFaces[3] = 8; + Block::blocks[block->id] = block; + + // LEAVES + block = new Block(7,9); + Block::blocks[block->id] = block; + + // ACTUAL STONE + block = new Block(8,10); + Block::blocks[block->id] = block; + + // WATER + block = new Block(9,11); + block->drawGroup = 4; + block->lightPassing = true; + block->skyLightPassing = false; + block->obstacle = false; + Block::blocks[block->id] = block; +} +#endif // DECLARATIONS_CPP + diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index f0c56e9c..17fee0f0 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -1,6 +1,9 @@ #include "WorldFiles.h" #include "files.h" +#include "../window/Camera.h" +#include "../objects/Player.h" +#include "../physics/Hitbox.h" #include "../voxels/Chunk.h" union { @@ -185,9 +188,11 @@ void WorldFiles::write(){ } } -void WorldFiles::writePlayer(glm::vec3 position, float camX, float camY){ +void WorldFiles::writePlayer(Player* player){ char dst[1+3*4 + 1+2*4]; + glm::vec3 position = player->hitbox->position; + size_t offset = 0; dst[offset++] = SECTION_POSITION; float2Bytes(position.x, dst, offset); offset += 4; @@ -195,19 +200,20 @@ void WorldFiles::writePlayer(glm::vec3 position, float camX, float camY){ float2Bytes(position.z, dst, offset); offset += 4; dst[offset++] = SECTION_ROTATION; - float2Bytes(camX, dst, offset); offset += 4; - float2Bytes(camY, dst, offset); offset += 4; + float2Bytes(player->camX, dst, offset); offset += 4; + float2Bytes(player->camY, dst, offset); offset += 4; write_binary_file(getPlayerFile(), (const char*)dst, sizeof(dst)); } -bool WorldFiles::readPlayer(glm::vec3& position, float& camX, float& camY) { +bool WorldFiles::readPlayer(Player* player) { size_t length = 0; char* data = read_binary_file(getPlayerFile(), length); if (data == nullptr){ std::cerr << "could not to read player.bin" << std::endl; return false; } + glm::vec3 position = player->hitbox->position; size_t offset = 0; while (offset < length){ char section = data[offset++]; @@ -218,12 +224,13 @@ bool WorldFiles::readPlayer(glm::vec3& position, float& camX, float& camY) { position.z = bytes2Float(data, offset); offset += 4; break; case SECTION_ROTATION: - camX = bytes2Float(data, offset); offset += 4; - camY = bytes2Float(data, offset); offset += 4; + player->camX = bytes2Float(data, offset); offset += 4; + player->camY = bytes2Float(data, offset); offset += 4; break; } } - std::cout << position.x << " " << position.y << " " << position.z << std::endl; + player->hitbox->position = position; + player->camera->position = position + vec3(0, 1, 0); return true; } diff --git a/src/files/WorldFiles.h b/src/files/WorldFiles.h index 88b93f37..e79aed04 100644 --- a/src/files/WorldFiles.h +++ b/src/files/WorldFiles.h @@ -3,7 +3,8 @@ #include #include -#include + +class Player; #define REGION_SIZE_BIT 5 #define REGION_SIZE (1 << (REGION_SIZE_BIT)) @@ -27,12 +28,12 @@ public: void put(const char* chunkData, int x, int y); - bool readPlayer(glm::vec3& position, float& camX, float& camY); + bool readPlayer(Player* player); bool readChunk(int x, int y, char* out); bool getChunk(int x, int y, char* out); void readRegion(char* fileContent); unsigned int writeRegion(char* out, int x, int y, char** region); - void writePlayer(glm::vec3 position, float camX, float camY); + void writePlayer(Player* player); void write(); std::string getRegionFile(int x, int y); diff --git a/src/lighting/Lighting.cpp b/src/lighting/Lighting.cpp index 2e1282cb..12bca112 100644 --- a/src/lighting/Lighting.cpp +++ b/src/lighting/Lighting.cpp @@ -15,7 +15,10 @@ Lighting::Lighting(Chunks* chunks){ } Lighting::~Lighting(){ - delete solverR, solverG, solverB, solverS; + delete solverR; + delete solverG; + delete solverB; + delete solverS; } void Lighting::clear(){ @@ -38,7 +41,6 @@ void Lighting::onChunkLoaded(int cx, int cy, int cz, bool sky){ for (int z = 0; z < CHUNK_D; z++){ for (int x = 0; x < CHUNK_W; x++){ int gx = x + cx * CHUNK_W; - int gy = cy * CHUNK_H; int gz = z + cz * CHUNK_D; int light = chunk->lightmap->getS(x,0,z); @@ -195,7 +197,7 @@ void Lighting::onBlockSet(int x, int y, int z, int id){ if (chunks->getLight(x,y+1,z, 3) == 0xF){ for (int i = y; i >= 0; i--){ voxel* vox = chunks->get(x,i,z); - if (vox == nullptr || vox->id != 0 && Block::blocks[id]->skyLightPassing) + if ((vox == nullptr || vox->id != 0) && Block::blocks[id]->skyLightPassing) break; solverS->add(x,i,z, 0xF); } diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp new file mode 100644 index 00000000..5acec728 --- /dev/null +++ b/src/objects/Player.cpp @@ -0,0 +1,10 @@ +#include "Player.h" +#include "../physics/Hitbox.h" + +#include + +Player::Player(glm::vec3 position, float speed, Camera* camera) : + speed(speed), + camera(camera){ + hitbox = new Hitbox(position, vec3(0.2f,0.9f,0.2f)); +} diff --git a/src/objects/Player.h b/src/objects/Player.h new file mode 100644 index 00000000..335cb5cd --- /dev/null +++ b/src/objects/Player.h @@ -0,0 +1,19 @@ +#ifndef SRC_OBJECTS_PLAYER_H_ +#define SRC_OBJECTS_PLAYER_H_ + +#include + +class Camera; +class Hitbox; + +class Player { +public: + float speed; + Camera* camera; + Hitbox* hitbox; + float camX, camY; + Player(glm::vec3 position, float speed, Camera* camera); + ~Player(); +}; + +#endif /* SRC_OBJECTS_PLAYER_H_ */ diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index 05f4e47e..53b8b785 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -4,7 +4,6 @@ #include #include -#include #include #include @@ -38,245 +37,19 @@ using namespace glm; #include "physics/Hitbox.h" #include "physics/PhysicsSolver.h" +#include "objects/Player.h" + +#include "declarations.h" +#include "world_render.h" + int WIDTH = 1280; int HEIGHT = 720; -float vertices[] = { - // x y - -0.01f,-0.01f, - 0.01f, 0.01f, - - -0.01f, 0.01f, - 0.01f,-0.01f, -}; - -int attrs[] = { - 2, 0 //null terminator -}; - -Mesh *crosshair; -Shader *shader, *linesShader, *crosshairShader; -Texture *texture; -LineBatch *lineBatch; - Chunks* chunks; WorldFiles* wfile; bool occlusion = false; -// All in-game definitions (blocks, items, etc..) -void setup_definitions() { - // AIR - Block* block = new Block(0,0); - block->drawGroup = 1; - block->lightPassing = true; - block->skyLightPassing = true; - block->obstacle = false; - Block::blocks[block->id] = block; - - // STONE - block = new Block(1,2); - Block::blocks[block->id] = block; - - // GRASS - block = new Block(2,4); - block->textureFaces[2] = 2; - block->textureFaces[3] = 1; - Block::blocks[block->id] = block; - - // LAMP - block = new Block(3,3); - block->emission[0] = 15; - block->emission[1] = 14; - block->emission[2] = 13; - Block::blocks[block->id] = block; - - // GLASS - block = new Block(4,5); - block->drawGroup = 2; - block->lightPassing = true; - Block::blocks[block->id] = block; - - // PLANKS - block = new Block(5,6); - Block::blocks[block->id] = block; - - // WOOD - block = new Block(6,7); - block->textureFaces[2] = 8; - block->textureFaces[3] = 8; - Block::blocks[block->id] = block; - - // LEAVES - block = new Block(7,9); - Block::blocks[block->id] = block; - - // ACTUAL STONE - block = new Block(8,10); - Block::blocks[block->id] = block; - - // WATER - block = new Block(9,11); - block->drawGroup = 4; - block->lightPassing = true; - block->skyLightPassing = false; - block->obstacle = false; - Block::blocks[block->id] = block; -} - -// Shaders, textures, renderers -int initialize_assets() { - shader = load_shader("res/main.glslv", "res/main.glslf"); - if (shader == nullptr){ - std::cerr << "failed to load shader" << std::endl; - Window::terminate(); - return 1; - } - - crosshairShader = load_shader("res/crosshair.glslv", "res/crosshair.glslf"); - if (crosshairShader == nullptr){ - std::cerr << "failed to load crosshair shader" << std::endl; - Window::terminate(); - return 1; - } - - linesShader = load_shader("res/lines.glslv", "res/lines.glslf"); - if (linesShader == nullptr){ - std::cerr << "failed to load lines shader" << std::endl; - Window::terminate(); - return 1; - } - - texture = load_texture("res/block.png"); - if (texture == nullptr){ - std::cerr << "failed to load texture" << std::endl; - delete shader; - Window::terminate(); - return 1; - } - return 0; -} - -void draw_chunk(size_t index, Camera* camera){ - Chunk* chunk = chunks->chunks[index]; - Mesh* mesh = chunks->meshes[index]; - if (mesh == nullptr) - return; - - // Simple frustum culling (culling chunks behind the camera in 2D - XZ) - if (occlusion){ - const float cameraX = camera->position.x; - const float cameraZ = camera->position.z; - const float camDirX = camera->dir.x; - const float camDirZ = camera->dir.z; - - bool unoccluded = false; - do { - if ((chunk->x*CHUNK_W-cameraX)*camDirX + (chunk->z*CHUNK_D-cameraZ)*camDirZ >= 0.0){ - unoccluded = true; break; - } - if (((chunk->x+1)*CHUNK_W-cameraX)*camDirX + (chunk->z*CHUNK_D-cameraZ)*camDirZ >= 0.0){ - unoccluded = true; break; - } - if (((chunk->x+1)*CHUNK_W-cameraX)*camDirX + ((chunk->z+1)*CHUNK_D-cameraZ)*camDirZ >= 0.0){ - unoccluded = true; break; - } - if ((chunk->x*CHUNK_W-cameraX)*camDirX + ((chunk->z+1)*CHUNK_D-cameraZ)*camDirZ >= 0.0){ - unoccluded = true; break; - } - } while (false); - if (!unoccluded) - return; - } - - mat4 model = glm::translate(mat4(1.0f), vec3(chunk->x*CHUNK_W+0.5f, chunk->y*CHUNK_H+0.5f, chunk->z*CHUNK_D+0.5f)); - shader->uniformMatrix("u_model", model); - mesh->draw(GL_TRIANGLES); -} - -float find_most_distant_sqr(float px, float pz, float distance_limit2){ - float max_dist2 = -1.0f; - for (size_t i = 0; i < chunks->volume; i++){ - Chunk* chunk = chunks->chunks[i]; - if (chunk == nullptr) - continue; - float dist2 = (chunk->x - px) * (chunk->z - pz); - if (dist2 > max_dist2 && dist2 < distance_limit2){ - max_dist2 = dist2; - } - } - return max_dist2; -} - -float _camera_cx; -float _camera_cz; - -bool chunks_comparator(size_t i, size_t j) { - Chunk* a = chunks->chunks[i]; - Chunk* b = chunks->chunks[j]; - return ((a->x + 0.5f - _camera_cx)*(a->x + 0.5f - _camera_cx) + (a->z + 0.5f - _camera_cz)*(a->z + 0.5f - _camera_cz) - > - (b->x + 0.5f - _camera_cx)*(b->x + 0.5f - _camera_cx) + (b->z + 0.5f - _camera_cz)*(b->z + 0.5f - _camera_cz)); -} - -void draw_world(Camera* camera){ - glClearColor(0.7f,0.71f,0.73f,1); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - - // Draw VAO - shader->use(); - shader->uniformMatrix("u_proj", camera->getProjection()); - shader->uniformMatrix("u_view", camera->getView()); - shader->uniform1f("u_gamma", 1.6f); - shader->uniform3f("u_skyLightColor", 1.8f,1.8f,1.8f); - shader->uniform3f("u_fogColor", 0.7f,0.71f,0.73f); - shader->uniform3f("u_cameraPos", camera->position.x,camera->position.y,camera->position.z); - texture->bind(); - - std::vector indices; - - for (size_t i = 0; i < chunks->volume; i++){ - Chunk* chunk = chunks->chunks[i]; - if (chunk == nullptr) - continue; - if (chunks->meshes[i] != nullptr) - indices.push_back(i); - } - - std::sort(indices.begin(), indices.end(), chunks_comparator); - - - float px = camera->position.x / (float)CHUNK_W; - float pz = camera->position.z / (float)CHUNK_D; - - _camera_cx = px; - _camera_cz = pz; - - - for (size_t i = 0; i < indices.size(); i++){ - draw_chunk(indices[i], camera); - } - - crosshairShader->use(); - crosshairShader->uniform1f("u_ar", (float)Window::height / (float)Window::width); - crosshairShader->uniform1f("u_scale", 1.0f / ((float)Window::height / 1000.0f)); - crosshair->draw(GL_LINES); - - linesShader->use(); - linesShader->uniformMatrix("u_projview", camera->getProjection()*camera->getView()); - glLineWidth(2.0f); - lineBatch->render(); -} - -// Deleting GL objects like shaders, textures -void finalize_assets(){ - delete shader; - delete texture; - delete crosshair; - delete crosshairShader; - delete linesShader; - delete lineBatch; -} // Save all world data to files void write_world(){ @@ -313,30 +86,24 @@ int main() { wfile = new WorldFiles("world/", REGION_VOL * (CHUNK_VOL * 2 + 8)); chunks = new Chunks(34,1,34, 0,0,0); - float camX = 0.0f; - float camY = 0.0f; - wfile->readPlayer(camera->position, camX, camY); + Player* player = new Player(vec3(camera->position), 5.0f, camera); + wfile->readPlayer(player); camera->rotation = mat4(1.0f); - camera->rotate(camY, camX, 0); - - Hitbox* hitbox = new Hitbox(vec3(camera->position.x,camera->position.y+1,camera->position.z), vec3(0.2f,0.9f,0.2f)); + camera->rotate(player->camY, player->camX, 0); VoxelRenderer renderer(1024*1024); - lineBatch = new LineBatch(4096); PhysicsSolver physics(vec3(0,-16.0f,0)); Lighting lighting(chunks); - crosshair = new Mesh(vertices, 4, attrs); + init_renderer(); ChunksController chunksController(chunks, &lighting); float lastTime = glfwGetTime(); float delta = 0.0f; - float playerSpeed = 5.0f; - int choosenBlock = 1; long frame = 0; @@ -369,10 +136,11 @@ int main() { } // Controls + Hitbox* hitbox = player->hitbox; bool sprint = Events::pressed(GLFW_KEY_LEFT_CONTROL); bool shift = Events::pressed(GLFW_KEY_LEFT_SHIFT) && hitbox->grounded && !sprint; - float speed = playerSpeed; + float speed = player->speed; int substeps = (int)(delta * 1000); substeps = (substeps <= 0 ? 1 : (substeps > 100 ? 100 : substeps)); physics.step(chunks, hitbox, delta, substeps, shift); @@ -422,18 +190,18 @@ int main() { chunksController.loadVisible(wfile); if (Events::_cursor_locked){ - camY += -Events::deltaY / Window::height * 2; - camX += -Events::deltaX / Window::height * 2; + player->camY += -Events::deltaY / Window::height * 2; + player->camX += -Events::deltaX / Window::height * 2; - if (camY < -radians(89.0f)){ - camY = -radians(89.0f); + if (player->camY < -radians(89.0f)){ + player->camY = -radians(89.0f); } - if (camY > radians(89.0f)){ - camY = radians(89.0f); + if (player->camY > radians(89.0f)){ + player->camY = radians(89.0f); } camera->rotation = mat4(1.0f); - camera->rotate(camY, camX, 0); + camera->rotate(player->camY, player->camX, 0); } { @@ -462,16 +230,17 @@ int main() { } } } - draw_world(camera); + draw_world(camera, shader, texture, crosshairShader, linesShader, chunks, occlusion); Window::swapBuffers(); Events::pullEvents(); } - wfile->writePlayer(hitbox->position, camX, camY); + wfile->writePlayer(player); write_world(); close_world(); + finalize_renderer(); finalize_assets(); Window::terminate(); return 0; diff --git a/src/world_render.h b/src/world_render.h new file mode 100644 index 00000000..630736da --- /dev/null +++ b/src/world_render.h @@ -0,0 +1,152 @@ +#ifndef WORLD_RENDERER_CPP +#define WORLD_RENDERER_CPP + +#include +#include +#include + +#include +#include +#include + +#include "window/Window.h" +#include "window/Camera.h" +#include "graphics/Mesh.h" +#include "graphics/Shader.h" +#include "graphics/Texture.h" +#include "graphics/LineBatch.h" +#include "voxels/Chunks.h" +#include "voxels/Chunk.h" + +float _camera_cx; +float _camera_cz; +Chunks* _chunks; + +Mesh *crosshair; + +float vertices[] = { + // x y + -0.01f,-0.01f, + 0.01f, 0.01f, + + -0.01f, 0.01f, + 0.01f,-0.01f, +}; + +int attrs[] = { + 2, 0 //null terminator +}; + +LineBatch *lineBatch; + +void init_renderer(){ + crosshair = new Mesh(vertices, 4, attrs); + lineBatch = new LineBatch(4096); +} + + +void finalize_renderer(){ + delete crosshair; + delete lineBatch; +} + +void draw_chunk(size_t index, Camera* camera, Shader* shader, bool occlusion){ + Chunk* chunk = _chunks->chunks[index]; + Mesh* mesh = _chunks->meshes[index]; + if (mesh == nullptr) + return; + + // Simple frustum culling (culling chunks behind the camera in 2D - XZ) + if (occlusion){ + const float cameraX = camera->position.x; + const float cameraZ = camera->position.z; + const float camDirX = camera->dir.x; + const float camDirZ = camera->dir.z; + + bool unoccluded = false; + do { + if ((chunk->x*CHUNK_W-cameraX)*camDirX + (chunk->z*CHUNK_D-cameraZ)*camDirZ >= 0.0){ + unoccluded = true; break; + } + if (((chunk->x+1)*CHUNK_W-cameraX)*camDirX + (chunk->z*CHUNK_D-cameraZ)*camDirZ >= 0.0){ + unoccluded = true; break; + } + if (((chunk->x+1)*CHUNK_W-cameraX)*camDirX + ((chunk->z+1)*CHUNK_D-cameraZ)*camDirZ >= 0.0){ + unoccluded = true; break; + } + if ((chunk->x*CHUNK_W-cameraX)*camDirX + ((chunk->z+1)*CHUNK_D-cameraZ)*camDirZ >= 0.0){ + unoccluded = true; break; + } + } while (false); + if (!unoccluded) + return; + } + + mat4 model = glm::translate(mat4(1.0f), vec3(chunk->x*CHUNK_W+0.5f, chunk->y*CHUNK_H+0.5f, chunk->z*CHUNK_D+0.5f)); + shader->uniformMatrix("u_model", model); + mesh->draw(GL_TRIANGLES); +} + +bool chunks_comparator(size_t i, size_t j) { + Chunk* a = _chunks->chunks[i]; + Chunk* b = _chunks->chunks[j]; + return ((a->x + 0.5f - _camera_cx)*(a->x + 0.5f - _camera_cx) + (a->z + 0.5f - _camera_cz)*(a->z + 0.5f - _camera_cz) + > + (b->x + 0.5f - _camera_cx)*(b->x + 0.5f - _camera_cx) + (b->z + 0.5f - _camera_cz)*(b->z + 0.5f - _camera_cz)); +} + + +void draw_world(Camera* camera, Shader* shader, Texture* texture, + Shader* crosshairShader, Shader* linesShader, + Chunks* chunks, bool occlusion){ + glClearColor(0.7f,0.71f,0.73f,1); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + + _chunks = chunks; + + // Draw VAO + shader->use(); + shader->uniformMatrix("u_proj", camera->getProjection()); + shader->uniformMatrix("u_view", camera->getView()); + shader->uniform1f("u_gamma", 1.6f); + shader->uniform3f("u_skyLightColor", 1.8f,1.8f,1.8f); + shader->uniform3f("u_fogColor", 0.7f,0.71f,0.73f); + shader->uniform3f("u_cameraPos", camera->position.x,camera->position.y,camera->position.z); + texture->bind(); + + std::vector indices; + + for (size_t i = 0; i < chunks->volume; i++){ + Chunk* chunk = chunks->chunks[i]; + if (chunk == nullptr) + continue; + if (chunks->meshes[i] != nullptr) + indices.push_back(i); + } + + std::sort(indices.begin(), indices.end(), chunks_comparator); + + + float px = camera->position.x / (float)CHUNK_W; + float pz = camera->position.z / (float)CHUNK_D; + + _camera_cx = px; + _camera_cz = pz; + + + for (size_t i = 0; i < indices.size(); i++){ + draw_chunk(indices[i], camera, shader, occlusion); + } + + crosshairShader->use(); + crosshairShader->uniform1f("u_ar", (float)Window::height / (float)Window::width); + crosshairShader->uniform1f("u_scale", 1.0f / ((float)Window::height / 1000.0f)); + crosshair->draw(GL_LINES); + + linesShader->use(); + linesShader->uniformMatrix("u_projview", camera->getProjection()*camera->getView()); + glLineWidth(2.0f); + lineBatch->render(); +} + +#endif // WORLD_RENDERER_CPP From 2aba3e91db17c445496d069c4eddcf5054a4cf09 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 3 Mar 2022 18:14:34 +0300 Subject: [PATCH 06/31] 'Assets', some refactor --- Debug/src/graphics/subdir.mk | 13 +- Debug/src/objects/subdir.mk | 4 - Debug/src/subdir.mk | 9 +- Debug_win/sources.mk | 19 +-- Debug_win/src/graphics/subdir.mk | 43 +++--- Debug_win/src/objects/subdir.mk | 20 +++ Debug_win/src/subdir.mk | 13 +- res/ascii.png | Bin 0 -> 2027 bytes res/block (copy).png | Bin 0 -> 8247 bytes src/Assets.cpp | 31 ++++ src/Assets.h | 22 +++ src/declarations.h | 77 +++++----- src/graphics/Batch2D.cpp | 18 +++ src/graphics/Batch2D.h | 27 ++++ src/graphics/Mesh.cpp | 7 +- src/objects/Player.cpp | 4 +- src/objects/Player.h | 1 + src/voxel_engine.cpp | 248 +++++++++++++++++-------------- src/world_render.h | 7 +- 19 files changed, 350 insertions(+), 213 deletions(-) create mode 100644 Debug_win/src/objects/subdir.mk create mode 100644 res/ascii.png create mode 100644 res/block (copy).png create mode 100644 src/Assets.cpp create mode 100644 src/Assets.h create mode 100644 src/graphics/Batch2D.cpp create mode 100644 src/graphics/Batch2D.h diff --git a/Debug/src/graphics/subdir.mk b/Debug/src/graphics/subdir.mk index 35070f37..995ec1bb 100644 --- a/Debug/src/graphics/subdir.mk +++ b/Debug/src/graphics/subdir.mk @@ -1,28 +1,27 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - # Add inputs and outputs from these tool invocations to the build variables CPP_SRCS += \ ../src/graphics/LineBatch.cpp \ ../src/graphics/Mesh.cpp \ ../src/graphics/Shader.cpp \ ../src/graphics/Texture.cpp \ -../src/graphics/VoxelRenderer.cpp +../src/graphics/VoxelRenderer.cpp \ +../src/graphics/Batch2D.cpp OBJS += \ ./src/graphics/LineBatch.o \ ./src/graphics/Mesh.o \ ./src/graphics/Shader.o \ ./src/graphics/Texture.o \ -./src/graphics/VoxelRenderer.o +./src/graphics/VoxelRenderer.o \ +./src/graphics/Batch2D.o CPP_DEPS += \ ./src/graphics/LineBatch.d \ ./src/graphics/Mesh.d \ ./src/graphics/Shader.d \ ./src/graphics/Texture.d \ -./src/graphics/VoxelRenderer.d +./src/graphics/VoxelRenderer.d \ +./src/graphics/Batch2D.d # Each subdirectory must supply rules for building sources it contributes diff --git a/Debug/src/objects/subdir.mk b/Debug/src/objects/subdir.mk index 4757b8dd..1b72aeb0 100644 --- a/Debug/src/objects/subdir.mk +++ b/Debug/src/objects/subdir.mk @@ -1,7 +1,3 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - # Add inputs and outputs from these tool invocations to the build variables CPP_SRCS += \ ../src/objects/Player.cpp diff --git a/Debug/src/subdir.mk b/Debug/src/subdir.mk index e4dbf713..e6fcb3f3 100644 --- a/Debug/src/subdir.mk +++ b/Debug/src/subdir.mk @@ -4,13 +4,16 @@ # Add inputs and outputs from these tool invocations to the build variables CPP_SRCS += \ -../src/voxel_engine.cpp +../src/voxel_engine.cpp \ +../src/Assets.cpp OBJS += \ -./src/voxel_engine.o +./src/voxel_engine.o \ +./src/Assets.o CPP_DEPS += \ -./src/voxel_engine.d +./src/voxel_engine.d \ +./src/Assets.d # Each subdirectory must supply rules for building sources it contributes diff --git a/Debug_win/sources.mk b/Debug_win/sources.mk index bb746f07..26037f00 100644 --- a/Debug_win/sources.mk +++ b/Debug_win/sources.mk @@ -22,13 +22,14 @@ CPP_DEPS := C_DEPS := # Every subdirectory with source files must be described here -SUBDIRS := \ -src \ -src/files \ -src/graphics \ -src/lighting \ -src/loaders \ -src/physics \ -src/voxels \ -src/window \ +SUBDIRS := \ +src \ +src/files \ +src/graphics \ +src/lighting \ +src/loaders \ +src/physics \ +src/voxels \ +src/objects \ +src/window \ diff --git a/Debug_win/src/graphics/subdir.mk b/Debug_win/src/graphics/subdir.mk index 2e37caee..2b3a0102 100644 --- a/Debug_win/src/graphics/subdir.mk +++ b/Debug_win/src/graphics/subdir.mk @@ -1,28 +1,27 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - # Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../src/graphics/LineBatch.cpp \ -../src/graphics/Mesh.cpp \ -../src/graphics/Shader.cpp \ -../src/graphics/Texture.cpp \ -../src/graphics/VoxelRenderer.cpp +CPP_SRCS += \ +../src/graphics/LineBatch.cpp \ +../src/graphics/Mesh.cpp \ +../src/graphics/Shader.cpp \ +../src/graphics/Texture.cpp \ +../src/graphics/VoxelRenderer.cpp \ +../src/graphics/Batch2D.cpp -OBJS += \ -./src/graphics/LineBatch.o \ -./src/graphics/Mesh.o \ -./src/graphics/Shader.o \ -./src/graphics/Texture.o \ -./src/graphics/VoxelRenderer.o +OBJS += \ +./src/graphics/LineBatch.o \ +./src/graphics/Mesh.o \ +./src/graphics/Shader.o \ +./src/graphics/Texture.o \ +./src/graphics/VoxelRenderer.o \ +./src/graphics/Batch2D.o -CPP_DEPS += \ -./src/graphics/LineBatch.d \ -./src/graphics/Mesh.d \ -./src/graphics/Shader.d \ -./src/graphics/Texture.d \ -./src/graphics/VoxelRenderer.d +CPP_DEPS += \ +./src/graphics/LineBatch.d \ +./src/graphics/Mesh.d \ +./src/graphics/Shader.d \ +./src/graphics/Texture.d \ +./src/graphics/VoxelRenderer.d \ +./src/graphics/Batch2D.d # Each subdirectory must supply rules for building sources it contributes diff --git a/Debug_win/src/objects/subdir.mk b/Debug_win/src/objects/subdir.mk new file mode 100644 index 00000000..ce3e7c3d --- /dev/null +++ b/Debug_win/src/objects/subdir.mk @@ -0,0 +1,20 @@ +# Add inputs and outputs from these tool invocations to the build variables +CPP_SRCS += \ +../src/objects/Player.cpp + +OBJS += \ +./src/objects/Player.o + +CPP_DEPS += \ +./src/objects/Player.d + + +# Each subdirectory must supply rules for building sources it contributes +src/objects/%.o: ../src/objects/%.cpp src/objects/subdir.mk + @echo 'Building file: $<' + @echo 'Invoking: GCC C++ Compiler' + g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" + @echo 'Finished building: $<' + @echo ' ' + + diff --git a/Debug_win/src/subdir.mk b/Debug_win/src/subdir.mk index d41d8884..a0330fab 100644 --- a/Debug_win/src/subdir.mk +++ b/Debug_win/src/subdir.mk @@ -1,16 +1,15 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - # Add inputs and outputs from these tool invocations to the build variables CPP_SRCS += \ -../src/voxel_engine.cpp +../src/voxel_engine.cpp \ +../src/Assets.cpp OBJS += \ -./src/voxel_engine.o +./src/voxel_engine.o \ +./src/Assets.o CPP_DEPS += \ -./src/voxel_engine.d +./src/voxel_engine.d \ +./src/Assets.d # Each subdirectory must supply rules for building sources it contributes diff --git a/res/ascii.png b/res/ascii.png new file mode 100644 index 0000000000000000000000000000000000000000..3278f04cf6ece29ea3c3b9f7ed7d042702092dc8 GIT binary patch literal 2027 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 +#include + +class Texture; +class Shader; + +class Assets { + std::unordered_map textures; + std::unordered_map shaders; +public: + ~Assets(); + Texture* getTexture(std::string name); + void store(Texture* texture, std::string name); + + Shader* getShader(std::string name); + void store(Shader* shader, std::string name); +}; + +#endif /* SRC_ASSETS_H_ */ diff --git a/src/declarations.h b/src/declarations.h index 412d2afb..ae6edc38 100644 --- a/src/declarations.h +++ b/src/declarations.h @@ -1,8 +1,8 @@ -#ifndef DECLARATIONS_CPP -#define DECLARATIONS_CPP +#ifndef DECLARATIONS_H +#define DECLARATIONS_H #include - +#include "Assets.h" #include "graphics/Shader.h" #include "graphics/Texture.h" #include "window/Window.h" @@ -10,49 +10,42 @@ #include "voxels/Block.h" -Shader *shader, *linesShader, *crosshairShader; -Texture *texture; - - // Shaders, textures, renderers -int initialize_assets() { - shader = load_shader("res/main.glslv", "res/main.glslf"); + +bool _load_shader(Assets* assets, std::string vertex_file, std::string fragment_file, std::string name){ + Shader* shader = load_shader(vertex_file, fragment_file); if (shader == nullptr){ - std::cerr << "failed to load shader" << std::endl; - Window::terminate(); - return 1; + std::cerr << "failed to load shader '" << name << "'" << std::endl; + return false; } - - crosshairShader = load_shader("res/crosshair.glslv", "res/crosshair.glslf"); - if (crosshairShader == nullptr){ - std::cerr << "failed to load crosshair shader" << std::endl; - Window::terminate(); - return 1; - } - - linesShader = load_shader("res/lines.glslv", "res/lines.glslf"); - if (linesShader == nullptr){ - std::cerr << "failed to load lines shader" << std::endl; - Window::terminate(); - return 1; - } - - texture = load_texture("res/block.png"); - if (texture == nullptr){ - std::cerr << "failed to load texture" << std::endl; - delete shader; - Window::terminate(); - return 1; - } - return 0; + assets->store(shader, name); + return true; } -// Deleting GL objects like shaders, textures -void finalize_assets(){ - delete shader; - delete texture; - delete crosshairShader; - delete linesShader; +bool _load_texture(Assets* assets, std::string filename, std::string name){ + Texture* texture = load_texture(filename); + if (texture == nullptr){ + std::cerr << "failed to load texture '" << name << "'" << std::endl; + return false; + } + assets->store(texture, name); + return true; +} + +int initialize_assets(Assets* assets) { +#define LOAD_SHADER(VERTEX, FRAGMENT, NAME) \ + if (!_load_shader(assets, VERTEX, FRAGMENT, NAME))\ + return 1; +#define LOAD_TEXTURE(FILENAME, NAME) \ + if (!_load_texture(assets, FILENAME, NAME))\ + return 1; + + LOAD_SHADER("res/main.glslv", "res/main.glslf", "main"); + LOAD_SHADER("res/crosshair.glslv", "res/crosshair.glslf", "crosshair"); + LOAD_SHADER("res/lines.glslv", "res/lines.glslf", "lines"); + + LOAD_TEXTURE("res/block.png", "block"); + return 0; } @@ -115,5 +108,5 @@ void setup_definitions() { block->obstacle = false; Block::blocks[block->id] = block; } -#endif // DECLARATIONS_CPP +#endif // DECLARATIONS_H diff --git a/src/graphics/Batch2D.cpp b/src/graphics/Batch2D.cpp new file mode 100644 index 00000000..e6b43770 --- /dev/null +++ b/src/graphics/Batch2D.cpp @@ -0,0 +1,18 @@ +#include "Batch2D.h" +#include "Mesh.h" + +Batch2D::Batch2D(size_t capacity) : capacity(capacity), + offset(0), + color(1.0f, 1.0f, 1.0f, 1.0f){ + const int attrs[] = { + 2, 2, 4, 0 //null terminator + }; + + buffer = new float[capacity]; + mesh = new Mesh(nullptr, 0, attrs); +} + +Batch2D::~Batch2D(){ + delete buffer; + delete mesh; +} diff --git a/src/graphics/Batch2D.h b/src/graphics/Batch2D.h new file mode 100644 index 00000000..7e756eda --- /dev/null +++ b/src/graphics/Batch2D.h @@ -0,0 +1,27 @@ +#ifndef SRC_GRAPHICS_BATCH2D_H_ +#define SRC_GRAPHICS_BATCH2D_H_ + +#include +#include + +class Mesh; + +class Batch2D { + float* buffer; + size_t capacity; + size_t offset; + glm::vec4 color; + Mesh* mesh; + + void vertex(float x, float y, + float u, float v, + float r, float g, float b, float a); +public: + Batch2D(size_t capacity); + ~Batch2D(); + + void rect(float x, float y, float w, float h); + void render(); +}; + +#endif /* SRC_GRAPHICS_BATCH2D_H_ */ diff --git a/src/graphics/Mesh.cpp b/src/graphics/Mesh.cpp index 678115f0..ef99560f 100644 --- a/src/graphics/Mesh.cpp +++ b/src/graphics/Mesh.cpp @@ -12,7 +12,12 @@ Mesh::Mesh(const float* buffer, size_t vertices, const int* attrs) : vertices(ve glBindVertexArray(vao); glBindBuffer(GL_ARRAY_BUFFER, vbo); - glBufferData(GL_ARRAY_BUFFER, sizeof(float) * vertexSize * vertices, buffer, GL_STATIC_DRAW); + if (buffer){ + glBufferData(GL_ARRAY_BUFFER, sizeof(float) * vertexSize * vertices, buffer, GL_STATIC_DRAW); + } else { + glBufferData(GL_ARRAY_BUFFER, 0, {}, GL_STATIC_DRAW); + } + // attributes int offset = 0; diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp index 5acec728..2633c2ca 100644 --- a/src/objects/Player.cpp +++ b/src/objects/Player.cpp @@ -5,6 +5,8 @@ Player::Player(glm::vec3 position, float speed, Camera* camera) : speed(speed), - camera(camera){ + camera(camera), + choosenBlock(1), + camX(0.0f), camY(0.0f){ hitbox = new Hitbox(position, vec3(0.2f,0.9f,0.2f)); } diff --git a/src/objects/Player.h b/src/objects/Player.h index 335cb5cd..66174cb6 100644 --- a/src/objects/Player.h +++ b/src/objects/Player.h @@ -11,6 +11,7 @@ public: float speed; Camera* camera; Hitbox* hitbox; + int choosenBlock; float camX, camY; Player(glm::vec3 position, float speed, Camera* camera); ~Player(); diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index 53b8b785..fa117aff 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -1,3 +1,5 @@ +// Install dependencies: +// sudo apt install libgl-dev libglew-dev libglfw3-dev libpng-dev libglm-dev #include #define GLEW_STATIC @@ -37,22 +39,15 @@ using namespace glm; #include "physics/Hitbox.h" #include "physics/PhysicsSolver.h" +#include "Assets.h" #include "objects/Player.h" #include "declarations.h" #include "world_render.h" -int WIDTH = 1280; -int HEIGHT = 720; - -Chunks* chunks; -WorldFiles* wfile; - -bool occlusion = false; - // Save all world data to files -void write_world(){ +void write_world(WorldFiles* wfile, Chunks* chunks){ for (unsigned int i = 0; i < chunks->volume; i++){ Chunk* chunk = chunks->chunks[i]; if (chunk == nullptr) @@ -64,27 +59,134 @@ void write_world(){ } // Deleting world data from memory -void close_world(){ +void close_world(WorldFiles* wfile, Chunks* chunks){ delete chunks; delete wfile; } +void update_controls(PhysicsSolver* physics, + Chunks* chunks, + Player* player, + float delta){ + // Controls + Camera* camera = player->camera; + Hitbox* hitbox = player->hitbox; + bool sprint = Events::pressed(GLFW_KEY_LEFT_CONTROL); + bool shift = Events::pressed(GLFW_KEY_LEFT_SHIFT) && hitbox->grounded && !sprint; + + float speed = player->speed; + int substeps = (int)(delta * 1000); + substeps = (substeps <= 0 ? 1 : (substeps > 100 ? 100 : substeps)); + physics->step(chunks, hitbox, delta, substeps, shift); + camera->position.x = hitbox->position.x; + camera->position.y = hitbox->position.y + 0.5f; + camera->position.z = hitbox->position.z; + + float dt = min(1.0f, delta * 16); + if (shift){ + speed *= 0.25f; + camera->position.y -= 0.2f; + camera->zoom = 0.9f * dt + camera->zoom * (1.0f - dt); + } else if (sprint){ + speed *= 1.5f; + camera->zoom = 1.1f * dt + camera->zoom * (1.0f - dt); + } else { + camera->zoom = dt + camera->zoom * (1.0f - dt); + } + if (Events::pressed(GLFW_KEY_SPACE) && hitbox->grounded){ + hitbox->velocity.y = 6.0f; + } + + vec3 dir(0,0,0); + if (Events::pressed(GLFW_KEY_W)){ + dir.x += camera->dir.x; + dir.z += camera->dir.z; + } + if (Events::pressed(GLFW_KEY_S)){ + dir.x -= camera->dir.x; + dir.z -= camera->dir.z; + } + if (Events::pressed(GLFW_KEY_D)){ + dir.x += camera->right.x; + dir.z += camera->right.z; + } + if (Events::pressed(GLFW_KEY_A)){ + dir.x -= camera->right.x; + dir.z -= camera->right.z; + } + if (length(dir) > 0.0f) + dir = normalize(dir); + hitbox->velocity.x = dir.x * speed; + hitbox->velocity.z = dir.z * speed; + + if (Events::_cursor_locked){ + player->camY += -Events::deltaY / Window::height * 2; + player->camX += -Events::deltaX / Window::height * 2; + + if (player->camY < -radians(89.0f)){ + player->camY = -radians(89.0f); + } + if (player->camY > radians(89.0f)){ + player->camY = radians(89.0f); + } + + camera->rotation = mat4(1.0f); + camera->rotate(player->camY, player->camX, 0); + } +} + +void update_interaction(Chunks* chunks, PhysicsSolver* physics, Player* player, Lighting* lighting){ + Camera* camera = player->camera; + { + vec3 end; + vec3 norm; + vec3 iend; + voxel* vox = chunks->rayCast(camera->position, camera->front, 10.0f, end, norm, iend); + if (vox != nullptr){ + lineBatch->box(iend.x+0.5f, iend.y+0.5f, iend.z+0.5f, 1.005f,1.005f,1.005f, 0,0,0,0.5f); + + if (Events::jclicked(GLFW_MOUSE_BUTTON_1)){ + int x = (int)iend.x; + int y = (int)iend.y; + int z = (int)iend.z; + chunks->set(x,y,z, 0); + lighting->onBlockSet(x,y,z,0); + } + if (Events::jclicked(GLFW_MOUSE_BUTTON_2)){ + int x = (int)(iend.x)+(int)(norm.x); + int y = (int)(iend.y)+(int)(norm.y); + int z = (int)(iend.z)+(int)(norm.z); + if (!physics->isBlockInside(x,y,z, player->hitbox)){ + chunks->set(x, y, z, player->choosenBlock); + lighting->onBlockSet(x,y,z, player->choosenBlock); + } + } + } + } +} + +int WIDTH = 1280; +int HEIGHT = 720; + int main() { setup_definitions(); Window::initialize(WIDTH, HEIGHT, "Window 2.0"); Events::initialize(); - int result = initialize_assets(); + std::cout << "-- loading assets" << std::endl; + Assets* assets = new Assets(); + int result = initialize_assets(assets); if (result){ + delete assets; Window::terminate(); return result; } + std::cout << "-- loading world" << std::endl; - Camera* camera = new Camera(vec3(-320,255,32), radians(90.0f)); - - wfile = new WorldFiles("world/", REGION_VOL * (CHUNK_VOL * 2 + 8)); - chunks = new Chunks(34,1,34, 0,0,0); + Camera *camera = new Camera(vec3(-320,255,32), radians(90.0f)); + WorldFiles *wfile = new WorldFiles("world/", REGION_VOL * (CHUNK_VOL * 2 + 8)); + Chunks *chunks = new Chunks(34,1,34, 0,0,0); Player* player = new Player(vec3(camera->position), 5.0f, camera); @@ -92,9 +194,10 @@ int main() { camera->rotation = mat4(1.0f); camera->rotate(player->camY, player->camX, 0); + std::cout << "-- preparing systems" << std::endl; + VoxelRenderer renderer(1024*1024); PhysicsSolver physics(vec3(0,-16.0f,0)); - Lighting lighting(chunks); init_renderer(); @@ -104,20 +207,20 @@ int main() { float lastTime = glfwGetTime(); float delta = 0.0f; - int choosenBlock = 1; long frame = 0; + bool occlusion = false; + glfwSwapInterval(1); + std::cout << "-- initializing finished" << std::endl; + while (!Window::isShouldClose()){ frame++; float currentTime = glfwGetTime(); delta = currentTime - lastTime; lastTime = currentTime; - if (frame % 240 == 0) - std::cout << 1.0/delta << std::endl; - if (Events::jpressed(GLFW_KEY_O)){ occlusion = !occlusion; } @@ -131,117 +234,32 @@ int main() { for (int i = 1; i < 10; i++){ if (Events::jpressed(GLFW_KEY_0+i)){ - choosenBlock = i; + player->choosenBlock = i; } } - // Controls - Hitbox* hitbox = player->hitbox; - bool sprint = Events::pressed(GLFW_KEY_LEFT_CONTROL); - bool shift = Events::pressed(GLFW_KEY_LEFT_SHIFT) && hitbox->grounded && !sprint; - - float speed = player->speed; - int substeps = (int)(delta * 1000); - substeps = (substeps <= 0 ? 1 : (substeps > 100 ? 100 : substeps)); - physics.step(chunks, hitbox, delta, substeps, shift); - camera->position.x = hitbox->position.x; - camera->position.y = hitbox->position.y + 0.5f; - camera->position.z = hitbox->position.z; - - float dt = min(1.0f, delta * 16); - if (shift){ - speed *= 0.25f; - camera->position.y -= 0.2f; - camera->zoom = 0.9f * dt + camera->zoom * (1.0f - dt); - } else if (sprint){ - speed *= 1.5f; - camera->zoom = 1.1f * dt + camera->zoom * (1.0f - dt); - } else { - camera->zoom = dt + camera->zoom * (1.0f - dt); - } - if (Events::pressed(GLFW_KEY_SPACE) && hitbox->grounded){ - hitbox->velocity.y = 6.0f; - } - - vec3 dir(0,0,0); - if (Events::pressed(GLFW_KEY_W)){ - dir.x += camera->dir.x; - dir.z += camera->dir.z; - } - if (Events::pressed(GLFW_KEY_S)){ - dir.x -= camera->dir.x; - dir.z -= camera->dir.z; - } - if (Events::pressed(GLFW_KEY_D)){ - dir.x += camera->right.x; - dir.z += camera->right.z; - } - if (Events::pressed(GLFW_KEY_A)){ - dir.x -= camera->right.x; - dir.z -= camera->right.z; - } - if (length(dir) > 0.0f) - dir = normalize(dir); - hitbox->velocity.x = dir.x * speed; - hitbox->velocity.z = dir.z * speed; + update_controls(&physics, chunks, player, delta); + update_interaction(chunks, &physics, player, &lighting); chunks->setCenter(wfile, camera->position.x,0,camera->position.z); chunksController._buildMeshes(&renderer, frame); chunksController.loadVisible(wfile); - if (Events::_cursor_locked){ - player->camY += -Events::deltaY / Window::height * 2; - player->camX += -Events::deltaX / Window::height * 2; - - if (player->camY < -radians(89.0f)){ - player->camY = -radians(89.0f); - } - if (player->camY > radians(89.0f)){ - player->camY = radians(89.0f); - } - - camera->rotation = mat4(1.0f); - camera->rotate(player->camY, player->camX, 0); - } - - { - vec3 end; - vec3 norm; - vec3 iend; - voxel* vox = chunks->rayCast(camera->position, camera->front, 10.0f, end, norm, iend); - if (vox != nullptr){ - lineBatch->box(iend.x+0.5f, iend.y+0.5f, iend.z+0.5f, 1.005f,1.005f,1.005f, 0,0,0,0.5f); - - if (Events::jclicked(GLFW_MOUSE_BUTTON_1)){ - int x = (int)iend.x; - int y = (int)iend.y; - int z = (int)iend.z; - chunks->set(x,y,z, 0); - lighting.onBlockSet(x,y,z,0); - } - if (Events::jclicked(GLFW_MOUSE_BUTTON_2)){ - int x = (int)(iend.x)+(int)(norm.x); - int y = (int)(iend.y)+(int)(norm.y); - int z = (int)(iend.z)+(int)(norm.z); - if (!physics.isBlockInside(x,y,z, hitbox)){ - chunks->set(x, y, z, choosenBlock); - lighting.onBlockSet(x,y,z, choosenBlock); - } - } - } - } - draw_world(camera, shader, texture, crosshairShader, linesShader, chunks, occlusion); + draw_world(camera, assets, chunks, occlusion); Window::swapBuffers(); Events::pullEvents(); } + std::cout << "-- saving world" << std::endl; wfile->writePlayer(player); - write_world(); - close_world(); + write_world(wfile, chunks); + close_world(wfile, chunks); + std::cout << "-- shutting down" << std::endl; + + delete assets; finalize_renderer(); - finalize_assets(); Window::terminate(); return 0; } diff --git a/src/world_render.h b/src/world_render.h index 630736da..ef8344ab 100644 --- a/src/world_render.h +++ b/src/world_render.h @@ -96,8 +96,7 @@ bool chunks_comparator(size_t i, size_t j) { } -void draw_world(Camera* camera, Shader* shader, Texture* texture, - Shader* crosshairShader, Shader* linesShader, +void draw_world(Camera* camera, Assets* assets, Chunks* chunks, bool occlusion){ glClearColor(0.7f,0.71f,0.73f,1); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -105,6 +104,10 @@ void draw_world(Camera* camera, Shader* shader, Texture* texture, _chunks = chunks; // Draw VAO + Texture* texture = assets->getTexture("block"); + Shader* shader = assets->getShader("main"); + Shader* crosshairShader = assets->getShader("crosshair"); + Shader* linesShader = assets->getShader("lines"); shader->use(); shader->uniformMatrix("u_proj", camera->getProjection()); shader->uniformMatrix("u_view", camera->getView()); From 10931372ccf937fa71f73f5207089108d593a448 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 3 Mar 2022 21:36:23 +0300 Subject: [PATCH 07/31] Fixed PhysicsSolver, added zoom, linear_damping --- Debug/sources.mk | 2 +- Debug/src/graphics/subdir.mk | 16 ++++--- Debug/src/objects/subdir.mk | 4 ++ Debug/src/subdir.mk | 12 ++--- src/physics/Hitbox.cpp | 2 +- src/physics/Hitbox.h | 1 + src/physics/PhysicsSolver.cpp | 10 ++++- src/voxel_engine.cpp | 82 ++++++++++++++++++++++------------- 8 files changed, 83 insertions(+), 46 deletions(-) diff --git a/Debug/sources.mk b/Debug/sources.mk index 8671876e..fb65165d 100644 --- a/Debug/sources.mk +++ b/Debug/sources.mk @@ -23,13 +23,13 @@ CPP_DEPS := # Every subdirectory with source files must be described here SUBDIRS := \ +src \ src/files \ src/graphics \ src/lighting \ src/loaders \ src/objects \ src/physics \ -src \ src/voxels \ src/window \ diff --git a/Debug/src/graphics/subdir.mk b/Debug/src/graphics/subdir.mk index 995ec1bb..db314574 100644 --- a/Debug/src/graphics/subdir.mk +++ b/Debug/src/graphics/subdir.mk @@ -1,27 +1,31 @@ +################################################################################ +# Automatically-generated file. Do not edit! +################################################################################ + # Add inputs and outputs from these tool invocations to the build variables CPP_SRCS += \ +../src/graphics/Batch2D.cpp \ ../src/graphics/LineBatch.cpp \ ../src/graphics/Mesh.cpp \ ../src/graphics/Shader.cpp \ ../src/graphics/Texture.cpp \ -../src/graphics/VoxelRenderer.cpp \ -../src/graphics/Batch2D.cpp +../src/graphics/VoxelRenderer.cpp OBJS += \ +./src/graphics/Batch2D.o \ ./src/graphics/LineBatch.o \ ./src/graphics/Mesh.o \ ./src/graphics/Shader.o \ ./src/graphics/Texture.o \ -./src/graphics/VoxelRenderer.o \ -./src/graphics/Batch2D.o +./src/graphics/VoxelRenderer.o CPP_DEPS += \ +./src/graphics/Batch2D.d \ ./src/graphics/LineBatch.d \ ./src/graphics/Mesh.d \ ./src/graphics/Shader.d \ ./src/graphics/Texture.d \ -./src/graphics/VoxelRenderer.d \ -./src/graphics/Batch2D.d +./src/graphics/VoxelRenderer.d # Each subdirectory must supply rules for building sources it contributes diff --git a/Debug/src/objects/subdir.mk b/Debug/src/objects/subdir.mk index 1b72aeb0..4757b8dd 100644 --- a/Debug/src/objects/subdir.mk +++ b/Debug/src/objects/subdir.mk @@ -1,3 +1,7 @@ +################################################################################ +# Automatically-generated file. Do not edit! +################################################################################ + # Add inputs and outputs from these tool invocations to the build variables CPP_SRCS += \ ../src/objects/Player.cpp diff --git a/Debug/src/subdir.mk b/Debug/src/subdir.mk index e6fcb3f3..5919ac83 100644 --- a/Debug/src/subdir.mk +++ b/Debug/src/subdir.mk @@ -4,16 +4,16 @@ # Add inputs and outputs from these tool invocations to the build variables CPP_SRCS += \ -../src/voxel_engine.cpp \ -../src/Assets.cpp +../src/Assets.cpp \ +../src/voxel_engine.cpp OBJS += \ -./src/voxel_engine.o \ -./src/Assets.o +./src/Assets.o \ +./src/voxel_engine.o CPP_DEPS += \ -./src/voxel_engine.d \ -./src/Assets.d +./src/Assets.d \ +./src/voxel_engine.d # Each subdirectory must supply rules for building sources it contributes diff --git a/src/physics/Hitbox.cpp b/src/physics/Hitbox.cpp index ea9d1a8e..bcea1811 100644 --- a/src/physics/Hitbox.cpp +++ b/src/physics/Hitbox.cpp @@ -1,4 +1,4 @@ #include "Hitbox.h" -Hitbox::Hitbox(vec3 position, vec3 halfsize) : position(position), halfsize(halfsize), velocity(0.0f,0.0f,0.0f) { +Hitbox::Hitbox(vec3 position, vec3 halfsize) : position(position), halfsize(halfsize), velocity(0.0f,0.0f,0.0f), linear_damping(0.1f) { } diff --git a/src/physics/Hitbox.h b/src/physics/Hitbox.h index 2e86ee4b..5fe3e8d3 100644 --- a/src/physics/Hitbox.h +++ b/src/physics/Hitbox.h @@ -12,6 +12,7 @@ public: vec3 position; vec3 halfsize; vec3 velocity; + float linear_damping; bool grounded = false; Hitbox(vec3 position, vec3 halfsize); diff --git a/src/physics/PhysicsSolver.cpp b/src/physics/PhysicsSolver.cpp index 240a3aa5..4ae16b85 100644 --- a/src/physics/PhysicsSolver.cpp +++ b/src/physics/PhysicsSolver.cpp @@ -4,7 +4,7 @@ #include -#define E 0.01 +#define E 0.03 PhysicsSolver::PhysicsSolver(vec3 gravity) : gravity(gravity) { } @@ -12,6 +12,7 @@ PhysicsSolver::PhysicsSolver(vec3 gravity) : gravity(gravity) { void PhysicsSolver::step(Chunks* chunks, Hitbox* hitbox, float delta, unsigned substeps, bool shifting) { for (unsigned i = 0; i < substeps; i++){ float dt = delta / (float)substeps; + float linear_damping = hitbox->linear_damping; vec3& pos = hitbox->position; vec3& half = hitbox->halfsize; vec3& vel = hitbox->velocity; @@ -76,6 +77,7 @@ void PhysicsSolver::step(Chunks* chunks, Hitbox* hitbox, float delta, unsigned s hitbox->grounded = false; if (vel.y < 0.0){ for (int x = floor(pos.x-half.x+E); x <= floor(pos.x+half.x-E); x++){ + bool broken = false; for (int z = floor(pos.z-half.z+E); z <= floor(pos.z+half.z-E); z++){ int y = floor(pos.y-half.y-E); if (chunks->isObstacle(x,y,z)){ @@ -85,9 +87,12 @@ void PhysicsSolver::step(Chunks* chunks, Hitbox* hitbox, float delta, unsigned s vel.x *= max(0.0, 1.0 - dt * f); vel.z *= max(0.0, 1.0 - dt * f); hitbox->grounded = true; + broken = true; break; } } + if (broken) + break; } } if (vel.y > 0.0){ @@ -103,6 +108,9 @@ void PhysicsSolver::step(Chunks* chunks, Hitbox* hitbox, float delta, unsigned s } } + vel.x *= max(0.0, 1.0 - dt * linear_damping); + vel.z *= max(0.0, 1.0 - dt * linear_damping); + pos.x += vel.x * dt; pos.y += vel.y * dt; pos.z += vel.z * dt; diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index fa117aff..fffadb09 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -64,15 +64,27 @@ void close_world(WorldFiles* wfile, Chunks* chunks){ delete wfile; } +#define CROUCH_SPEED_MUL 0.25f +#define CROUCH_SHIFT_Y -0.2f +#define RUN_SPEED_MUL 1.5f +#define CROUCH_ZOOM 0.9f +#define RUN_ZOOM 1.1f +#define C_ZOOM 0.5f +#define ZOOM_SPEED 16.0f +#define DEFAULT_AIR_DAMPING 0.1f +#define PLAYER_NOT_ONGROUND_DAMPING 18.0f + void update_controls(PhysicsSolver* physics, Chunks* chunks, Player* player, float delta){ + // Controls Camera* camera = player->camera; Hitbox* hitbox = player->hitbox; bool sprint = Events::pressed(GLFW_KEY_LEFT_CONTROL); bool shift = Events::pressed(GLFW_KEY_LEFT_SHIFT) && hitbox->grounded && !sprint; + bool zoom = Events::pressed(GLFW_KEY_C); float speed = player->speed; int substeps = (int)(delta * 1000); @@ -82,17 +94,20 @@ void update_controls(PhysicsSolver* physics, camera->position.y = hitbox->position.y + 0.5f; camera->position.z = hitbox->position.z; - float dt = min(1.0f, delta * 16); + float dt = min(1.0f, delta * ZOOM_SPEED); if (shift){ - speed *= 0.25f; - camera->position.y -= 0.2f; - camera->zoom = 0.9f * dt + camera->zoom * (1.0f - dt); + speed *= CROUCH_SPEED_MUL; + camera->position.y += CROUCH_SHIFT_Y; + camera->zoom = CROUCH_ZOOM * dt + camera->zoom * (1.0f - dt); } else if (sprint){ - speed *= 1.5f; - camera->zoom = 1.1f * dt + camera->zoom * (1.0f - dt); + speed *= RUN_SPEED_MUL; + camera->zoom = RUN_ZOOM * dt + camera->zoom * (1.0f - dt); } else { camera->zoom = dt + camera->zoom * (1.0f - dt); } + if (zoom) + camera->zoom = C_ZOOM * dt + camera->zoom * (1.0f - dt); + if (Events::pressed(GLFW_KEY_SPACE) && hitbox->grounded){ hitbox->velocity.y = 6.0f; } @@ -114,10 +129,17 @@ void update_controls(PhysicsSolver* physics, dir.x -= camera->right.x; dir.z -= camera->right.z; } - if (length(dir) > 0.0f) + + hitbox->linear_damping = DEFAULT_AIR_DAMPING; + if (length(dir) > 0.0f){ dir = normalize(dir); - hitbox->velocity.x = dir.x * speed; - hitbox->velocity.z = dir.z * speed; + + if (!hitbox->grounded) + hitbox->linear_damping = PLAYER_NOT_ONGROUND_DAMPING; + + hitbox->velocity.x += dir.x * speed * delta * 16; + hitbox->velocity.z += dir.z * speed * delta * 16; + } if (Events::_cursor_locked){ player->camY += -Events::deltaY / Window::height * 2; @@ -137,29 +159,27 @@ void update_controls(PhysicsSolver* physics, void update_interaction(Chunks* chunks, PhysicsSolver* physics, Player* player, Lighting* lighting){ Camera* camera = player->camera; - { - vec3 end; - vec3 norm; - vec3 iend; - voxel* vox = chunks->rayCast(camera->position, camera->front, 10.0f, end, norm, iend); - if (vox != nullptr){ - lineBatch->box(iend.x+0.5f, iend.y+0.5f, iend.z+0.5f, 1.005f,1.005f,1.005f, 0,0,0,0.5f); + vec3 end; + vec3 norm; + vec3 iend; + voxel* vox = chunks->rayCast(camera->position, camera->front, 10.0f, end, norm, iend); + if (vox != nullptr){ + lineBatch->box(iend.x+0.5f, iend.y+0.5f, iend.z+0.5f, 1.005f,1.005f,1.005f, 0,0,0,0.5f); - if (Events::jclicked(GLFW_MOUSE_BUTTON_1)){ - int x = (int)iend.x; - int y = (int)iend.y; - int z = (int)iend.z; - chunks->set(x,y,z, 0); - lighting->onBlockSet(x,y,z,0); - } - if (Events::jclicked(GLFW_MOUSE_BUTTON_2)){ - int x = (int)(iend.x)+(int)(norm.x); - int y = (int)(iend.y)+(int)(norm.y); - int z = (int)(iend.z)+(int)(norm.z); - if (!physics->isBlockInside(x,y,z, player->hitbox)){ - chunks->set(x, y, z, player->choosenBlock); - lighting->onBlockSet(x,y,z, player->choosenBlock); - } + if (Events::jclicked(GLFW_MOUSE_BUTTON_1)){ + int x = (int)iend.x; + int y = (int)iend.y; + int z = (int)iend.z; + chunks->set(x,y,z, 0); + lighting->onBlockSet(x,y,z,0); + } + if (Events::jclicked(GLFW_MOUSE_BUTTON_2)){ + int x = (int)(iend.x)+(int)(norm.x); + int y = (int)(iend.y)+(int)(norm.y); + int z = (int)(iend.z)+(int)(norm.z); + if (!physics->isBlockInside(x,y,z, player->hitbox)){ + chunks->set(x, y, z, player->choosenBlock); + lighting->onBlockSet(x,y,z, player->choosenBlock); } } } From b598e9ee035b1fe7b773d37e865cbc81c9be3986 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 3 Mar 2022 22:05:34 +0300 Subject: [PATCH 08/31] Added gitignore --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..6bf13089 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +Debug/src/*.d +Debug/src/*.o +Debug/src/*/*.d +Debug/src/*/*.o + +Debug/voxel_engine From cdc8a26a30777fc3bfc09756fdbff4a98275cd6e Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 3 Mar 2022 23:16:34 +0300 Subject: [PATCH 09/31] Added camera shaking --- src/objects/Player.h | 2 ++ src/voxel_engine.cpp | 40 +++++++++++++++++++++++++++------------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/src/objects/Player.h b/src/objects/Player.h index 66174cb6..4dbd7cbe 100644 --- a/src/objects/Player.h +++ b/src/objects/Player.h @@ -13,6 +13,8 @@ public: Hitbox* hitbox; int choosenBlock; float camX, camY; + float cameraShaking = 0.0f; + float cameraShakingTimer = 0.0f; Player(glm::vec3 position, float speed, Camera* camera); ~Player(); }; diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index fffadb09..341b6d69 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -1,6 +1,7 @@ // Install dependencies: // sudo apt install libgl-dev libglew-dev libglfw3-dev libpng-dev libglm-dev #include +#include #define GLEW_STATIC #include @@ -73,12 +74,28 @@ void close_world(WorldFiles* wfile, Chunks* chunks){ #define ZOOM_SPEED 16.0f #define DEFAULT_AIR_DAMPING 0.1f #define PLAYER_NOT_ONGROUND_DAMPING 18.0f +#define CAMERA_SHAKING_OFFSET 0.027f +#define CAMERA_SHAKING_SPEED 1.8f +#define CAMERA_SHAKING_DELTA_K 3.0f void update_controls(PhysicsSolver* physics, Chunks* chunks, Player* player, float delta){ + if (Events::jpressed(GLFW_KEY_ESCAPE)){ + Window::setShouldClose(true); + } + if (Events::jpressed(GLFW_KEY_TAB)){ + Events::toogleCursor(); + } + + for (int i = 1; i < 10; i++){ + if (Events::jpressed(GLFW_KEY_0+i)){ + player->choosenBlock = i; + } + } + // Controls Camera* camera = player->camera; Hitbox* hitbox = player->hitbox; @@ -94,6 +111,15 @@ void update_controls(PhysicsSolver* physics, camera->position.y = hitbox->position.y + 0.5f; camera->position.z = hitbox->position.z; + // Camera shaking + float factor = hitbox->grounded ? length(vec2(hitbox->velocity.x, hitbox->velocity.z)) : 0.0f; + player->cameraShakingTimer += delta * factor * CAMERA_SHAKING_SPEED; + float shakeTimer = player->cameraShakingTimer; + player->cameraShaking = player->cameraShaking * (1.0f - delta * CAMERA_SHAKING_DELTA_K) + factor * delta * CAMERA_SHAKING_DELTA_K; + camera->position += camera->right * sin(shakeTimer) * CAMERA_SHAKING_OFFSET * player->cameraShaking; + camera->position += camera->up * abs(cos(shakeTimer)) * CAMERA_SHAKING_OFFSET * player->cameraShaking; + + // Field of view manipulations float dt = min(1.0f, delta * ZOOM_SPEED); if (shift){ speed *= CROUCH_SPEED_MUL; @@ -188,6 +214,7 @@ void update_interaction(Chunks* chunks, PhysicsSolver* physics, Player* player, int WIDTH = 1280; int HEIGHT = 720; + int main() { setup_definitions(); @@ -245,19 +272,6 @@ int main() { occlusion = !occlusion; } - if (Events::jpressed(GLFW_KEY_ESCAPE)){ - Window::setShouldClose(true); - } - if (Events::jpressed(GLFW_KEY_TAB)){ - Events::toogleCursor(); - } - - for (int i = 1; i < 10; i++){ - if (Events::jpressed(GLFW_KEY_0+i)){ - player->choosenBlock = i; - } - } - update_controls(&physics, chunks, player, delta); update_interaction(chunks, &physics, player, &lighting); From 1dd9a72fb353ce94453f2913aa422956be9b1724 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Fri, 4 Mar 2022 16:53:55 +0300 Subject: [PATCH 10/31] Fixed zoom, changed camera shaking parameters --- src/graphics/VoxelRenderer.cpp | 13 +++++++++++- src/objects/Player.h | 1 + src/physics/PhysicsSolver.cpp | 3 ++- src/voxel_engine.cpp | 37 +++++++++++++++++++++------------- 4 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/graphics/VoxelRenderer.cpp b/src/graphics/VoxelRenderer.cpp index 850c9c48..fde67308 100644 --- a/src/graphics/VoxelRenderer.cpp +++ b/src/graphics/VoxelRenderer.cpp @@ -295,7 +295,7 @@ Mesh* VoxelRenderer::render(Chunk* chunk, const Chunk** chunks){ for (int z = 0; z < CHUNK_D; z++){ for (int x = 0; x < CHUNK_W; x++){ voxel vox = chunk->voxels[(y * CHUNK_D + z) * CHUNK_W + x]; - if (vox.id == 9) + if (vox.id == 9 || vox.id == 4) continue; _renderBlock(buffer, x, y, z, chunks, vox, index); } @@ -312,5 +312,16 @@ Mesh* VoxelRenderer::render(Chunk* chunk, const Chunk** chunks){ } } } + + for (int y = 0; y < CHUNK_H; y++){ + for (int z = 0; z < CHUNK_D; z++){ + for (int x = 0; x < CHUNK_W; x++){ + voxel vox = chunk->voxels[(y * CHUNK_D + z) * CHUNK_W + x]; + if (vox.id != 4) + continue; + _renderBlock(buffer, x, y, z, chunks, vox, index); + } + } + } return new Mesh(buffer, index / VERTEX_SIZE, chunk_attrs); } diff --git a/src/objects/Player.h b/src/objects/Player.h index 4dbd7cbe..72a5c19d 100644 --- a/src/objects/Player.h +++ b/src/objects/Player.h @@ -15,6 +15,7 @@ public: float camX, camY; float cameraShaking = 0.0f; float cameraShakingTimer = 0.0f; + glm::vec3 interpVel {0.0f, 0.0f, 0.0f}; Player(glm::vec3 position, float speed, Camera* camera); ~Player(); }; diff --git a/src/physics/PhysicsSolver.cpp b/src/physics/PhysicsSolver.cpp index 4ae16b85..50e0732e 100644 --- a/src/physics/PhysicsSolver.cpp +++ b/src/physics/PhysicsSolver.cpp @@ -5,6 +5,7 @@ #include #define E 0.03 +#define DEFAULT_FRICTION 10.0 PhysicsSolver::PhysicsSolver(vec3 gravity) : gravity(gravity) { } @@ -83,7 +84,7 @@ void PhysicsSolver::step(Chunks* chunks, Hitbox* hitbox, float delta, unsigned s if (chunks->isObstacle(x,y,z)){ vel.y *= 0.0; pos.y = y + 1 + half.y; - int f = 18.0; + int f = DEFAULT_FRICTION; vel.x *= max(0.0, 1.0 - dt * f); vel.z *= max(0.0, 1.0 - dt * f); hitbox->grounded = true; diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index 341b6d69..1bec7494 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -70,13 +70,14 @@ void close_world(WorldFiles* wfile, Chunks* chunks){ #define RUN_SPEED_MUL 1.5f #define CROUCH_ZOOM 0.9f #define RUN_ZOOM 1.1f -#define C_ZOOM 0.5f +#define C_ZOOM 0.1f #define ZOOM_SPEED 16.0f #define DEFAULT_AIR_DAMPING 0.1f -#define PLAYER_NOT_ONGROUND_DAMPING 18.0f -#define CAMERA_SHAKING_OFFSET 0.027f -#define CAMERA_SHAKING_SPEED 1.8f -#define CAMERA_SHAKING_DELTA_K 3.0f +#define PLAYER_NOT_ONGROUND_DAMPING 10.0f +#define CAMERA_SHAKING_OFFSET 0.025f +#define CAMERA_SHAKING_OFFSET_Y 0.031f +#define CAMERA_SHAKING_SPEED 1.6f +#define CAMERA_SHAKING_DELTA_K 10.0f void update_controls(PhysicsSolver* physics, Chunks* chunks, @@ -112,27 +113,35 @@ void update_controls(PhysicsSolver* physics, camera->position.z = hitbox->position.z; // Camera shaking + player->interpVel = player->interpVel * (1.0f - delta * 5) + hitbox->velocity * delta * 0.1f; + if (hitbox->grounded && player->interpVel.y < 0.0f){ + player->interpVel.y *= -30.0f; + } float factor = hitbox->grounded ? length(vec2(hitbox->velocity.x, hitbox->velocity.z)) : 0.0f; player->cameraShakingTimer += delta * factor * CAMERA_SHAKING_SPEED; float shakeTimer = player->cameraShakingTimer; player->cameraShaking = player->cameraShaking * (1.0f - delta * CAMERA_SHAKING_DELTA_K) + factor * delta * CAMERA_SHAKING_DELTA_K; camera->position += camera->right * sin(shakeTimer) * CAMERA_SHAKING_OFFSET * player->cameraShaking; - camera->position += camera->up * abs(cos(shakeTimer)) * CAMERA_SHAKING_OFFSET * player->cameraShaking; + camera->position += camera->up * abs(cos(shakeTimer)) * CAMERA_SHAKING_OFFSET_Y * player->cameraShaking; + camera->position -= player->interpVel * 0.05f; // Field of view manipulations float dt = min(1.0f, delta * ZOOM_SPEED); + if (dt > 1.0f) + dt = 1.0f; + float zoomValue = 1.0f; if (shift){ speed *= CROUCH_SPEED_MUL; camera->position.y += CROUCH_SHIFT_Y; - camera->zoom = CROUCH_ZOOM * dt + camera->zoom * (1.0f - dt); + zoomValue = CROUCH_ZOOM; } else if (sprint){ speed *= RUN_SPEED_MUL; - camera->zoom = RUN_ZOOM * dt + camera->zoom * (1.0f - dt); - } else { - camera->zoom = dt + camera->zoom * (1.0f - dt); + zoomValue = RUN_ZOOM; } if (zoom) - camera->zoom = C_ZOOM * dt + camera->zoom * (1.0f - dt); + zoomValue *= C_ZOOM; + + camera->zoom = zoomValue * dt + camera->zoom * (1.0f - dt); if (Events::pressed(GLFW_KEY_SPACE) && hitbox->grounded){ hitbox->velocity.y = 6.0f; @@ -163,8 +172,8 @@ void update_controls(PhysicsSolver* physics, if (!hitbox->grounded) hitbox->linear_damping = PLAYER_NOT_ONGROUND_DAMPING; - hitbox->velocity.x += dir.x * speed * delta * 16; - hitbox->velocity.z += dir.z * speed * delta * 16; + hitbox->velocity.x += dir.x * speed * delta * 9; + hitbox->velocity.z += dir.z * speed * delta * 9; } if (Events::_cursor_locked){ @@ -236,7 +245,7 @@ int main() { Chunks *chunks = new Chunks(34,1,34, 0,0,0); - Player* player = new Player(vec3(camera->position), 5.0f, camera); + Player* player = new Player(vec3(camera->position), 4.0f, camera); wfile->readPlayer(player); camera->rotation = mat4(1.0f); camera->rotate(player->camY, player->camX, 0); From b6c328fe1df3efbbff2d8f6cc01174b4ee519537 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Fri, 4 Mar 2022 17:44:14 +0300 Subject: [PATCH 11/31] Added flight mode ('F' button) --- src/declarations.h | 2 ++ src/objects/Player.h | 1 + src/physics/PhysicsSolver.cpp | 8 ++++---- src/physics/PhysicsSolver.h | 2 +- src/voxel_engine.cpp | 23 ++++++++++++++++++++--- src/voxels/Block.h | 1 + src/voxels/Chunks.cpp | 2 +- 7 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/declarations.h b/src/declarations.h index ae6edc38..b49304bf 100644 --- a/src/declarations.h +++ b/src/declarations.h @@ -57,6 +57,7 @@ void setup_definitions() { block->lightPassing = true; block->skyLightPassing = true; block->obstacle = false; + block->selectable = false; Block::blocks[block->id] = block; // STONE @@ -106,6 +107,7 @@ void setup_definitions() { block->lightPassing = true; block->skyLightPassing = false; block->obstacle = false; + block->selectable = false; Block::blocks[block->id] = block; } #endif // DECLARATIONS_H diff --git a/src/objects/Player.h b/src/objects/Player.h index 72a5c19d..d3e4e081 100644 --- a/src/objects/Player.h +++ b/src/objects/Player.h @@ -11,6 +11,7 @@ public: float speed; Camera* camera; Hitbox* hitbox; + bool flight = false; int choosenBlock; float camX, camY; float cameraShaking = 0.0f; diff --git a/src/physics/PhysicsSolver.cpp b/src/physics/PhysicsSolver.cpp index 50e0732e..11dc1f8a 100644 --- a/src/physics/PhysicsSolver.cpp +++ b/src/physics/PhysicsSolver.cpp @@ -10,16 +10,16 @@ PhysicsSolver::PhysicsSolver(vec3 gravity) : gravity(gravity) { } -void PhysicsSolver::step(Chunks* chunks, Hitbox* hitbox, float delta, unsigned substeps, bool shifting) { +void PhysicsSolver::step(Chunks* chunks, Hitbox* hitbox, float delta, unsigned substeps, bool shifting, float gravityScale) { for (unsigned i = 0; i < substeps; i++){ float dt = delta / (float)substeps; float linear_damping = hitbox->linear_damping; vec3& pos = hitbox->position; vec3& half = hitbox->halfsize; vec3& vel = hitbox->velocity; - vel.x += gravity.x*dt; - vel.y += gravity.y*dt; - vel.z += gravity.z*dt; + vel.x += gravity.x*dt * gravityScale; + vel.y += gravity.y*dt * gravityScale; + vel.z += gravity.z*dt * gravityScale; float px = pos.x; float pz = pos.z; diff --git a/src/physics/PhysicsSolver.h b/src/physics/PhysicsSolver.h index 467d78d7..469d73a8 100644 --- a/src/physics/PhysicsSolver.h +++ b/src/physics/PhysicsSolver.h @@ -14,7 +14,7 @@ class PhysicsSolver { vec3 gravity; public: PhysicsSolver(vec3 gravity); - void step(Chunks* chunks, Hitbox* hitbox, float delta, unsigned substeps, bool shifting); + void step(Chunks* chunks, Hitbox* hitbox, float delta, unsigned substeps, bool shifting, float gravityScale); bool isBlockInside(int x, int y, int z, Hitbox* hitbox); }; diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index 1bec7494..e2603903 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -78,6 +78,7 @@ void close_world(WorldFiles* wfile, Chunks* chunks){ #define CAMERA_SHAKING_OFFSET_Y 0.031f #define CAMERA_SHAKING_SPEED 1.6f #define CAMERA_SHAKING_DELTA_K 10.0f +#define FLIGHT_SPEED_MUL 5.0f void update_controls(PhysicsSolver* physics, Chunks* chunks, @@ -105,9 +106,12 @@ void update_controls(PhysicsSolver* physics, bool zoom = Events::pressed(GLFW_KEY_C); float speed = player->speed; + if (player->flight){ + speed *= FLIGHT_SPEED_MUL; + } int substeps = (int)(delta * 1000); substeps = (substeps <= 0 ? 1 : (substeps > 100 ? 100 : substeps)); - physics->step(chunks, hitbox, delta, substeps, shift); + physics->step(chunks, hitbox, delta, substeps, shift, player->flight ? 0.0f : 1.0f); camera->position.x = hitbox->position.x; camera->position.y = hitbox->position.y + 0.5f; camera->position.z = hitbox->position.z; @@ -123,7 +127,11 @@ void update_controls(PhysicsSolver* physics, player->cameraShaking = player->cameraShaking * (1.0f - delta * CAMERA_SHAKING_DELTA_K) + factor * delta * CAMERA_SHAKING_DELTA_K; camera->position += camera->right * sin(shakeTimer) * CAMERA_SHAKING_OFFSET * player->cameraShaking; camera->position += camera->up * abs(cos(shakeTimer)) * CAMERA_SHAKING_OFFSET_Y * player->cameraShaking; - camera->position -= player->interpVel * 0.05f; + camera->position -= min(player->interpVel * 0.05f, 1.0f); + + if (Events::jpressed(GLFW_KEY_F)){ + player->flight = !player->flight; + } // Field of view manipulations float dt = min(1.0f, delta * ZOOM_SPEED); @@ -140,7 +148,6 @@ void update_controls(PhysicsSolver* physics, } if (zoom) zoomValue *= C_ZOOM; - camera->zoom = zoomValue * dt + camera->zoom * (1.0f - dt); if (Events::pressed(GLFW_KEY_SPACE) && hitbox->grounded){ @@ -166,6 +173,16 @@ void update_controls(PhysicsSolver* physics, } hitbox->linear_damping = DEFAULT_AIR_DAMPING; + if (player->flight){ + hitbox->linear_damping = PLAYER_NOT_ONGROUND_DAMPING; + hitbox->velocity.y *= 1.0f - delta * 9; + if (Events::pressed(GLFW_KEY_SPACE)){ + hitbox->velocity.y += speed * delta * 9; + } + if (Events::pressed(GLFW_KEY_LEFT_SHIFT)){ + hitbox->velocity.y -= speed * delta * 9; + } + } if (length(dir) > 0.0f){ dir = normalize(dir); diff --git a/src/voxels/Block.h b/src/voxels/Block.h index cef274cf..58010e70 100644 --- a/src/voxels/Block.h +++ b/src/voxels/Block.h @@ -13,6 +13,7 @@ public: bool lightPassing = false; bool skyLightPassing = false; bool obstacle = true; + bool selectable = true; Block(unsigned int id, int texture); }; diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp index 73c4d875..6c7a32a0 100644 --- a/src/voxels/Chunks.cpp +++ b/src/voxels/Chunks.cpp @@ -192,7 +192,7 @@ voxel* Chunks::rayCast(vec3 a, vec3 dir, float maxDist, vec3& end, vec3& norm, v while (t <= maxDist){ voxel* voxel = get(ix, iy, iz); - if (voxel == nullptr || voxel->id){ + if (voxel == nullptr || Block::blocks[voxel->id]->selectable){ end.x = px + t * dx; end.y = py + t * dy; end.z = pz + t * dz; From 1055bb3b273f1250757f5687cf9c35ed39e5ae1a Mon Sep 17 00:00:00 2001 From: MihailRis Date: Fri, 4 Mar 2022 17:52:13 +0300 Subject: [PATCH 12/31] Fixed gravity --- voxel_engine.cpp | 326 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 326 insertions(+) create mode 100644 voxel_engine.cpp diff --git a/voxel_engine.cpp b/voxel_engine.cpp new file mode 100644 index 00000000..0b2e3b30 --- /dev/null +++ b/voxel_engine.cpp @@ -0,0 +1,326 @@ +// Install dependencies: +// sudo apt install libgl-dev libglew-dev libglfw3-dev libpng-dev libglm-dev +#include +#include + +#define GLEW_STATIC +#include +#include + +#include +#include + +// GLM +#include +#include +#include + +using namespace glm; + +#include "graphics/Shader.h" +#include "graphics/Texture.h" +#include "graphics/Mesh.h" +#include "graphics/VoxelRenderer.h" +#include "graphics/LineBatch.h" +#include "window/Window.h" +#include "window/Events.h" +#include "window/Camera.h" +#include "loaders/png_loading.h" +#include "voxels/voxel.h" +#include "voxels/Chunk.h" +#include "voxels/Chunks.h" +#include "voxels/Block.h" +#include "voxels/WorldGenerator.h" +#include "voxels/ChunksController.h" +#include "files/files.h" +#include "files/WorldFiles.h" +#include "lighting/LightSolver.h" +#include "lighting/Lightmap.h" +#include "lighting/Lighting.h" +#include "physics/Hitbox.h" +#include "physics/PhysicsSolver.h" + +#include "Assets.h" +#include "objects/Player.h" + +#include "declarations.h" +#include "world_render.h" + + +// Save all world data to files +void write_world(WorldFiles* wfile, Chunks* chunks){ + for (unsigned int i = 0; i < chunks->volume; i++){ + Chunk* chunk = chunks->chunks[i]; + if (chunk == nullptr) + continue; + wfile->put((const char*)chunk->voxels, chunk->x, chunk->z); + } + + wfile->write(); +} + +// Deleting world data from memory +void close_world(WorldFiles* wfile, Chunks* chunks){ + delete chunks; + delete wfile; +} + +#define CROUCH_SPEED_MUL 0.25f +#define CROUCH_SHIFT_Y -0.2f +#define RUN_SPEED_MUL 1.5f +#define CROUCH_ZOOM 0.9f +#define RUN_ZOOM 1.1f +#define C_ZOOM 0.1f +#define ZOOM_SPEED 16.0f +#define DEFAULT_AIR_DAMPING 0.1f +#define PLAYER_NOT_ONGROUND_DAMPING 10.0f +#define CAMERA_SHAKING_OFFSET 0.025f +#define CAMERA_SHAKING_OFFSET_Y 0.031f +#define CAMERA_SHAKING_SPEED 1.6f +#define CAMERA_SHAKING_DELTA_K 10.0f +#define FLIGHT_SPEED_MUL 5.0f +#define JUMP_FORCE 7.0f + +void update_controls(PhysicsSolver* physics, + Chunks* chunks, + Player* player, + float delta){ + + if (Events::jpressed(GLFW_KEY_ESCAPE)){ + Window::setShouldClose(true); + } + if (Events::jpressed(GLFW_KEY_TAB)){ + Events::toogleCursor(); + } + + for (int i = 1; i < 10; i++){ + if (Events::jpressed(GLFW_KEY_0+i)){ + player->choosenBlock = i; + } + } + + // Controls + Camera* camera = player->camera; + Hitbox* hitbox = player->hitbox; + bool sprint = Events::pressed(GLFW_KEY_LEFT_CONTROL); + bool shift = Events::pressed(GLFW_KEY_LEFT_SHIFT) && hitbox->grounded && !sprint; + bool zoom = Events::pressed(GLFW_KEY_C); + + float speed = player->speed; + if (player->flight){ + speed *= FLIGHT_SPEED_MUL; + } + int substeps = (int)(delta * 1000); + substeps = (substeps <= 0 ? 1 : (substeps > 100 ? 100 : substeps)); + physics->step(chunks, hitbox, delta, substeps, shift, player->flight ? 0.0f : 1.0f); + camera->position.x = hitbox->position.x; + camera->position.y = hitbox->position.y + 0.5f; + camera->position.z = hitbox->position.z; + + // Camera shaking + player->interpVel = player->interpVel * (1.0f - delta * 5) + hitbox->velocity * delta * 0.1f; + if (hitbox->grounded && player->interpVel.y < 0.0f){ + player->interpVel.y *= -30.0f; + } + float factor = hitbox->grounded ? length(vec2(hitbox->velocity.x, hitbox->velocity.z)) : 0.0f; + player->cameraShakingTimer += delta * factor * CAMERA_SHAKING_SPEED; + float shakeTimer = player->cameraShakingTimer; + player->cameraShaking = player->cameraShaking * (1.0f - delta * CAMERA_SHAKING_DELTA_K) + factor * delta * CAMERA_SHAKING_DELTA_K; + camera->position += camera->right * sin(shakeTimer) * CAMERA_SHAKING_OFFSET * player->cameraShaking; + camera->position += camera->up * abs(cos(shakeTimer)) * CAMERA_SHAKING_OFFSET_Y * player->cameraShaking; + camera->position -= min(player->interpVel * 0.05f, 1.0f); + + if (Events::jpressed(GLFW_KEY_F)){ + player->flight = !player->flight; + } + + // Field of view manipulations + float dt = min(1.0f, delta * ZOOM_SPEED); + if (dt > 1.0f) + dt = 1.0f; + float zoomValue = 1.0f; + if (shift){ + speed *= CROUCH_SPEED_MUL; + camera->position.y += CROUCH_SHIFT_Y; + zoomValue = CROUCH_ZOOM; + } else if (sprint){ + speed *= RUN_SPEED_MUL; + zoomValue = RUN_ZOOM; + } + if (zoom) + zoomValue *= C_ZOOM; + camera->zoom = zoomValue * dt + camera->zoom * (1.0f - dt); + + if (Events::pressed(GLFW_KEY_SPACE) && hitbox->grounded){ + hitbox->velocity.y = JUMP_FORCE; + } + + vec3 dir(0,0,0); + if (Events::pressed(GLFW_KEY_W)){ + dir.x += camera->dir.x; + dir.z += camera->dir.z; + } + if (Events::pressed(GLFW_KEY_S)){ + dir.x -= camera->dir.x; + dir.z -= camera->dir.z; + } + if (Events::pressed(GLFW_KEY_D)){ + dir.x += camera->right.x; + dir.z += camera->right.z; + } + if (Events::pressed(GLFW_KEY_A)){ + dir.x -= camera->right.x; + dir.z -= camera->right.z; + } + + hitbox->linear_damping = DEFAULT_AIR_DAMPING; + if (player->flight){ + hitbox->linear_damping = PLAYER_NOT_ONGROUND_DAMPING; + hitbox->velocity.y *= 1.0f - delta * 9; + if (Events::pressed(GLFW_KEY_SPACE)){ + hitbox->velocity.y += speed * delta * 9; + } + if (Events::pressed(GLFW_KEY_LEFT_SHIFT)){ + hitbox->velocity.y -= speed * delta * 9; + } + } + if (length(dir) > 0.0f){ + dir = normalize(dir); + + if (!hitbox->grounded) + hitbox->linear_damping = PLAYER_NOT_ONGROUND_DAMPING; + + hitbox->velocity.x += dir.x * speed * delta * 9; + hitbox->velocity.z += dir.z * speed * delta * 9; + } + + if (Events::_cursor_locked){ + player->camY += -Events::deltaY / Window::height * 2; + player->camX += -Events::deltaX / Window::height * 2; + + if (player->camY < -radians(89.0f)){ + player->camY = -radians(89.0f); + } + if (player->camY > radians(89.0f)){ + player->camY = radians(89.0f); + } + + camera->rotation = mat4(1.0f); + camera->rotate(player->camY, player->camX, 0); + } +} + +void update_interaction(Chunks* chunks, PhysicsSolver* physics, Player* player, Lighting* lighting){ + Camera* camera = player->camera; + vec3 end; + vec3 norm; + vec3 iend; + voxel* vox = chunks->rayCast(camera->position, camera->front, 10.0f, end, norm, iend); + if (vox != nullptr){ + lineBatch->box(iend.x+0.5f, iend.y+0.5f, iend.z+0.5f, 1.005f,1.005f,1.005f, 0,0,0,0.5f); + + if (Events::jclicked(GLFW_MOUSE_BUTTON_1)){ + int x = (int)iend.x; + int y = (int)iend.y; + int z = (int)iend.z; + chunks->set(x,y,z, 0); + lighting->onBlockSet(x,y,z,0); + } + if (Events::jclicked(GLFW_MOUSE_BUTTON_2)){ + int x = (int)(iend.x)+(int)(norm.x); + int y = (int)(iend.y)+(int)(norm.y); + int z = (int)(iend.z)+(int)(norm.z); + if (!physics->isBlockInside(x,y,z, player->hitbox)){ + chunks->set(x, y, z, player->choosenBlock); + lighting->onBlockSet(x,y,z, player->choosenBlock); + } + } + } +} + +int WIDTH = 1280; +int HEIGHT = 720; + + +int main() { + setup_definitions(); + + Window::initialize(WIDTH, HEIGHT, "Window 2.0"); + Events::initialize(); + + std::cout << "-- loading assets" << std::endl; + Assets* assets = new Assets(); + int result = initialize_assets(assets); + if (result){ + delete assets; + Window::terminate(); + return result; + } + std::cout << "-- loading world" << std::endl; + + Camera *camera = new Camera(vec3(-320,255,32), radians(90.0f)); + WorldFiles *wfile = new WorldFiles("world/", REGION_VOL * (CHUNK_VOL * 2 + 8)); + Chunks *chunks = new Chunks(34,1,34, 0,0,0); + + + Player* player = new Player(vec3(camera->position), 4.0f, camera); + wfile->readPlayer(player); + camera->rotation = mat4(1.0f); + camera->rotate(player->camY, player->camX, 0); + + std::cout << "-- preparing systems" << std::endl; + + VoxelRenderer renderer(1024*1024); + PhysicsSolver physics(vec3(0,-9.8f*2.0f,0)); + Lighting lighting(chunks); + + init_renderer(); + + ChunksController chunksController(chunks, &lighting); + + float lastTime = glfwGetTime(); + float delta = 0.0f; + + long frame = 0; + + bool occlusion = false; + + glfwSwapInterval(1); + + std::cout << "-- initializing finished" << std::endl; + + while (!Window::isShouldClose()){ + frame++; + float currentTime = glfwGetTime(); + delta = currentTime - lastTime; + lastTime = currentTime; + + if (Events::jpressed(GLFW_KEY_O)){ + occlusion = !occlusion; + } + + update_controls(&physics, chunks, player, delta); + update_interaction(chunks, &physics, player, &lighting); + + chunks->setCenter(wfile, camera->position.x,0,camera->position.z); + chunksController._buildMeshes(&renderer, frame); + chunksController.loadVisible(wfile); + + draw_world(camera, assets, chunks, occlusion); + + Window::swapBuffers(); + Events::pullEvents(); + } + std::cout << "-- saving world" << std::endl; + + wfile->writePlayer(player); + write_world(wfile, chunks); + close_world(wfile, chunks); + + std::cout << "-- shutting down" << std::endl; + + delete assets; + finalize_renderer(); + Window::terminate(); + return 0; +} From 9150e6d3e32a6c8016903fd8761791a300a3e33e Mon Sep 17 00:00:00 2001 From: MihailRis Date: Fri, 4 Mar 2022 17:54:59 +0300 Subject: [PATCH 13/31] Delete voxel_engine.cpp --- voxel_engine.cpp | 326 ----------------------------------------------- 1 file changed, 326 deletions(-) delete mode 100644 voxel_engine.cpp diff --git a/voxel_engine.cpp b/voxel_engine.cpp deleted file mode 100644 index 0b2e3b30..00000000 --- a/voxel_engine.cpp +++ /dev/null @@ -1,326 +0,0 @@ -// Install dependencies: -// sudo apt install libgl-dev libglew-dev libglfw3-dev libpng-dev libglm-dev -#include -#include - -#define GLEW_STATIC -#include -#include - -#include -#include - -// GLM -#include -#include -#include - -using namespace glm; - -#include "graphics/Shader.h" -#include "graphics/Texture.h" -#include "graphics/Mesh.h" -#include "graphics/VoxelRenderer.h" -#include "graphics/LineBatch.h" -#include "window/Window.h" -#include "window/Events.h" -#include "window/Camera.h" -#include "loaders/png_loading.h" -#include "voxels/voxel.h" -#include "voxels/Chunk.h" -#include "voxels/Chunks.h" -#include "voxels/Block.h" -#include "voxels/WorldGenerator.h" -#include "voxels/ChunksController.h" -#include "files/files.h" -#include "files/WorldFiles.h" -#include "lighting/LightSolver.h" -#include "lighting/Lightmap.h" -#include "lighting/Lighting.h" -#include "physics/Hitbox.h" -#include "physics/PhysicsSolver.h" - -#include "Assets.h" -#include "objects/Player.h" - -#include "declarations.h" -#include "world_render.h" - - -// Save all world data to files -void write_world(WorldFiles* wfile, Chunks* chunks){ - for (unsigned int i = 0; i < chunks->volume; i++){ - Chunk* chunk = chunks->chunks[i]; - if (chunk == nullptr) - continue; - wfile->put((const char*)chunk->voxels, chunk->x, chunk->z); - } - - wfile->write(); -} - -// Deleting world data from memory -void close_world(WorldFiles* wfile, Chunks* chunks){ - delete chunks; - delete wfile; -} - -#define CROUCH_SPEED_MUL 0.25f -#define CROUCH_SHIFT_Y -0.2f -#define RUN_SPEED_MUL 1.5f -#define CROUCH_ZOOM 0.9f -#define RUN_ZOOM 1.1f -#define C_ZOOM 0.1f -#define ZOOM_SPEED 16.0f -#define DEFAULT_AIR_DAMPING 0.1f -#define PLAYER_NOT_ONGROUND_DAMPING 10.0f -#define CAMERA_SHAKING_OFFSET 0.025f -#define CAMERA_SHAKING_OFFSET_Y 0.031f -#define CAMERA_SHAKING_SPEED 1.6f -#define CAMERA_SHAKING_DELTA_K 10.0f -#define FLIGHT_SPEED_MUL 5.0f -#define JUMP_FORCE 7.0f - -void update_controls(PhysicsSolver* physics, - Chunks* chunks, - Player* player, - float delta){ - - if (Events::jpressed(GLFW_KEY_ESCAPE)){ - Window::setShouldClose(true); - } - if (Events::jpressed(GLFW_KEY_TAB)){ - Events::toogleCursor(); - } - - for (int i = 1; i < 10; i++){ - if (Events::jpressed(GLFW_KEY_0+i)){ - player->choosenBlock = i; - } - } - - // Controls - Camera* camera = player->camera; - Hitbox* hitbox = player->hitbox; - bool sprint = Events::pressed(GLFW_KEY_LEFT_CONTROL); - bool shift = Events::pressed(GLFW_KEY_LEFT_SHIFT) && hitbox->grounded && !sprint; - bool zoom = Events::pressed(GLFW_KEY_C); - - float speed = player->speed; - if (player->flight){ - speed *= FLIGHT_SPEED_MUL; - } - int substeps = (int)(delta * 1000); - substeps = (substeps <= 0 ? 1 : (substeps > 100 ? 100 : substeps)); - physics->step(chunks, hitbox, delta, substeps, shift, player->flight ? 0.0f : 1.0f); - camera->position.x = hitbox->position.x; - camera->position.y = hitbox->position.y + 0.5f; - camera->position.z = hitbox->position.z; - - // Camera shaking - player->interpVel = player->interpVel * (1.0f - delta * 5) + hitbox->velocity * delta * 0.1f; - if (hitbox->grounded && player->interpVel.y < 0.0f){ - player->interpVel.y *= -30.0f; - } - float factor = hitbox->grounded ? length(vec2(hitbox->velocity.x, hitbox->velocity.z)) : 0.0f; - player->cameraShakingTimer += delta * factor * CAMERA_SHAKING_SPEED; - float shakeTimer = player->cameraShakingTimer; - player->cameraShaking = player->cameraShaking * (1.0f - delta * CAMERA_SHAKING_DELTA_K) + factor * delta * CAMERA_SHAKING_DELTA_K; - camera->position += camera->right * sin(shakeTimer) * CAMERA_SHAKING_OFFSET * player->cameraShaking; - camera->position += camera->up * abs(cos(shakeTimer)) * CAMERA_SHAKING_OFFSET_Y * player->cameraShaking; - camera->position -= min(player->interpVel * 0.05f, 1.0f); - - if (Events::jpressed(GLFW_KEY_F)){ - player->flight = !player->flight; - } - - // Field of view manipulations - float dt = min(1.0f, delta * ZOOM_SPEED); - if (dt > 1.0f) - dt = 1.0f; - float zoomValue = 1.0f; - if (shift){ - speed *= CROUCH_SPEED_MUL; - camera->position.y += CROUCH_SHIFT_Y; - zoomValue = CROUCH_ZOOM; - } else if (sprint){ - speed *= RUN_SPEED_MUL; - zoomValue = RUN_ZOOM; - } - if (zoom) - zoomValue *= C_ZOOM; - camera->zoom = zoomValue * dt + camera->zoom * (1.0f - dt); - - if (Events::pressed(GLFW_KEY_SPACE) && hitbox->grounded){ - hitbox->velocity.y = JUMP_FORCE; - } - - vec3 dir(0,0,0); - if (Events::pressed(GLFW_KEY_W)){ - dir.x += camera->dir.x; - dir.z += camera->dir.z; - } - if (Events::pressed(GLFW_KEY_S)){ - dir.x -= camera->dir.x; - dir.z -= camera->dir.z; - } - if (Events::pressed(GLFW_KEY_D)){ - dir.x += camera->right.x; - dir.z += camera->right.z; - } - if (Events::pressed(GLFW_KEY_A)){ - dir.x -= camera->right.x; - dir.z -= camera->right.z; - } - - hitbox->linear_damping = DEFAULT_AIR_DAMPING; - if (player->flight){ - hitbox->linear_damping = PLAYER_NOT_ONGROUND_DAMPING; - hitbox->velocity.y *= 1.0f - delta * 9; - if (Events::pressed(GLFW_KEY_SPACE)){ - hitbox->velocity.y += speed * delta * 9; - } - if (Events::pressed(GLFW_KEY_LEFT_SHIFT)){ - hitbox->velocity.y -= speed * delta * 9; - } - } - if (length(dir) > 0.0f){ - dir = normalize(dir); - - if (!hitbox->grounded) - hitbox->linear_damping = PLAYER_NOT_ONGROUND_DAMPING; - - hitbox->velocity.x += dir.x * speed * delta * 9; - hitbox->velocity.z += dir.z * speed * delta * 9; - } - - if (Events::_cursor_locked){ - player->camY += -Events::deltaY / Window::height * 2; - player->camX += -Events::deltaX / Window::height * 2; - - if (player->camY < -radians(89.0f)){ - player->camY = -radians(89.0f); - } - if (player->camY > radians(89.0f)){ - player->camY = radians(89.0f); - } - - camera->rotation = mat4(1.0f); - camera->rotate(player->camY, player->camX, 0); - } -} - -void update_interaction(Chunks* chunks, PhysicsSolver* physics, Player* player, Lighting* lighting){ - Camera* camera = player->camera; - vec3 end; - vec3 norm; - vec3 iend; - voxel* vox = chunks->rayCast(camera->position, camera->front, 10.0f, end, norm, iend); - if (vox != nullptr){ - lineBatch->box(iend.x+0.5f, iend.y+0.5f, iend.z+0.5f, 1.005f,1.005f,1.005f, 0,0,0,0.5f); - - if (Events::jclicked(GLFW_MOUSE_BUTTON_1)){ - int x = (int)iend.x; - int y = (int)iend.y; - int z = (int)iend.z; - chunks->set(x,y,z, 0); - lighting->onBlockSet(x,y,z,0); - } - if (Events::jclicked(GLFW_MOUSE_BUTTON_2)){ - int x = (int)(iend.x)+(int)(norm.x); - int y = (int)(iend.y)+(int)(norm.y); - int z = (int)(iend.z)+(int)(norm.z); - if (!physics->isBlockInside(x,y,z, player->hitbox)){ - chunks->set(x, y, z, player->choosenBlock); - lighting->onBlockSet(x,y,z, player->choosenBlock); - } - } - } -} - -int WIDTH = 1280; -int HEIGHT = 720; - - -int main() { - setup_definitions(); - - Window::initialize(WIDTH, HEIGHT, "Window 2.0"); - Events::initialize(); - - std::cout << "-- loading assets" << std::endl; - Assets* assets = new Assets(); - int result = initialize_assets(assets); - if (result){ - delete assets; - Window::terminate(); - return result; - } - std::cout << "-- loading world" << std::endl; - - Camera *camera = new Camera(vec3(-320,255,32), radians(90.0f)); - WorldFiles *wfile = new WorldFiles("world/", REGION_VOL * (CHUNK_VOL * 2 + 8)); - Chunks *chunks = new Chunks(34,1,34, 0,0,0); - - - Player* player = new Player(vec3(camera->position), 4.0f, camera); - wfile->readPlayer(player); - camera->rotation = mat4(1.0f); - camera->rotate(player->camY, player->camX, 0); - - std::cout << "-- preparing systems" << std::endl; - - VoxelRenderer renderer(1024*1024); - PhysicsSolver physics(vec3(0,-9.8f*2.0f,0)); - Lighting lighting(chunks); - - init_renderer(); - - ChunksController chunksController(chunks, &lighting); - - float lastTime = glfwGetTime(); - float delta = 0.0f; - - long frame = 0; - - bool occlusion = false; - - glfwSwapInterval(1); - - std::cout << "-- initializing finished" << std::endl; - - while (!Window::isShouldClose()){ - frame++; - float currentTime = glfwGetTime(); - delta = currentTime - lastTime; - lastTime = currentTime; - - if (Events::jpressed(GLFW_KEY_O)){ - occlusion = !occlusion; - } - - update_controls(&physics, chunks, player, delta); - update_interaction(chunks, &physics, player, &lighting); - - chunks->setCenter(wfile, camera->position.x,0,camera->position.z); - chunksController._buildMeshes(&renderer, frame); - chunksController.loadVisible(wfile); - - draw_world(camera, assets, chunks, occlusion); - - Window::swapBuffers(); - Events::pullEvents(); - } - std::cout << "-- saving world" << std::endl; - - wfile->writePlayer(player); - write_world(wfile, chunks); - close_world(wfile, chunks); - - std::cout << "-- shutting down" << std::endl; - - delete assets; - finalize_renderer(); - Window::terminate(); - return 0; -} From 10125808c0f57dba5254b6fb262ff4988ebf6942 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Fri, 4 Mar 2022 17:55:49 +0300 Subject: [PATCH 14/31] Fixed gravity --- src/voxel_engine.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index e2603903..0b2e3b30 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -79,6 +79,7 @@ void close_world(WorldFiles* wfile, Chunks* chunks){ #define CAMERA_SHAKING_SPEED 1.6f #define CAMERA_SHAKING_DELTA_K 10.0f #define FLIGHT_SPEED_MUL 5.0f +#define JUMP_FORCE 7.0f void update_controls(PhysicsSolver* physics, Chunks* chunks, @@ -151,7 +152,7 @@ void update_controls(PhysicsSolver* physics, camera->zoom = zoomValue * dt + camera->zoom * (1.0f - dt); if (Events::pressed(GLFW_KEY_SPACE) && hitbox->grounded){ - hitbox->velocity.y = 6.0f; + hitbox->velocity.y = JUMP_FORCE; } vec3 dir(0,0,0); @@ -270,7 +271,7 @@ int main() { std::cout << "-- preparing systems" << std::endl; VoxelRenderer renderer(1024*1024); - PhysicsSolver physics(vec3(0,-16.0f,0)); + PhysicsSolver physics(vec3(0,-9.8f*2.0f,0)); Lighting lighting(chunks); init_renderer(); From 30c2d9889e25270bbc53eb0866769f3109b47167 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sun, 6 Mar 2022 01:20:51 +0300 Subject: [PATCH 15/31] Fixed lighting artifacts, improved chunks loading speed - No more dark lines while loading chunks - Less lighting recalculations - Less chunks mesh rebuilding --- src/voxels/Chunk.h | 3 +-- src/voxels/ChunksController.cpp | 27 ++------------------------- src/voxels/ChunksLoader.cpp | 29 +++++++++++++++-------------- src/voxels/ChunksLoader.h | 2 +- 4 files changed, 19 insertions(+), 42 deletions(-) diff --git a/src/voxels/Chunk.h b/src/voxels/Chunk.h index 850530f7..0f67e884 100644 --- a/src/voxels/Chunk.h +++ b/src/voxels/Chunk.h @@ -16,8 +16,7 @@ public: Lightmap* lightmap; bool modified = true; bool ready = false; - bool accepted = false; - bool generated = false; + bool loaded = false; int references = 1; Chunk(int x, int y, int z); ~Chunk(); diff --git a/src/voxels/ChunksController.cpp b/src/voxels/ChunksController.cpp index 3024c346..8cdf29d1 100644 --- a/src/voxels/ChunksController.cpp +++ b/src/voxels/ChunksController.cpp @@ -73,7 +73,7 @@ bool ChunksController::loadVisible(WorldFiles* worldFiles){ return false; chunk = new Chunk(nearX+ox,nearY+oy,nearZ+oz); if (worldFiles->getChunk(chunk->x, chunk->z, (char*)chunk->voxels)) - chunk->generated = true; + chunk->loaded = true; chunks->chunks[index] = chunk; @@ -99,7 +99,7 @@ bool ChunksController::loadVisible(WorldFiles* worldFiles){ oz += 1; closes[(oy * 3 + oz) * 3 + ox] = other; } - freeLoader->perform(chunk, (const Chunk**)closes); + freeLoader->perform(chunk, (Chunk**)closes); return true; } @@ -144,29 +144,6 @@ bool ChunksController::_buildMeshes(VoxelRenderer* renderer, int tick) { Chunk* chunk = chunks->chunks[index]; if (chunk == nullptr){ - for (int y = 0; y < h; y++){ - for (int z = 1; z < d-1; z++){ - for (int x = 1; x < w-1; x++){ - int index = (y * d + z) * w + x; - chunk = chunks->chunks[index]; - if (chunk != nullptr && chunk->ready && !chunk->accepted){ - int lx = x - w / 2; - int ly = y - h / 2; - int lz = z - d / 2; - int distance = (lx * lx + ly * ly + lz * lz); - lighting->onChunkLoaded(chunk->x, chunk->y, chunk->z, false); - for (int i = 0; i < chunks->volume; i++){ - Chunk* other = chunks->chunks[i]; - if (other) - other->modified = true; - } - chunk->accepted = true; - std::cout << "1: built mesh for " << chunk << std::endl; - return true; - } - } - } - } return false; } Mesh* mesh = chunks->meshes[index]; diff --git a/src/voxels/ChunksLoader.cpp b/src/voxels/ChunksLoader.cpp index 67cfc08f..89963760 100644 --- a/src/voxels/ChunksLoader.cpp +++ b/src/voxels/ChunksLoader.cpp @@ -8,6 +8,8 @@ #include +#define CLOSES_C 27 + void ChunksLoader::_thread(){ Chunks chunks(3,3,3, -1,-1,-1); Lighting lighting(&chunks); @@ -17,25 +19,22 @@ void ChunksLoader::_thread(){ continue; } Chunk* chunk = current; - chunk->incref(); - for (size_t i = 0; i < 27; i++){ + chunks._setOffset(chunk->x-1, chunk->y-1, chunk->z-1); + for (size_t i = 0; i < CLOSES_C; i++){ Chunk* other = closes[i]; if (other){ - other->incref(); chunks.putChunk(other); } } - chunks._setOffset(chunk->x-1, chunk->y-1, chunk->z-1); - - if (!chunk->generated){ + if (!chunk->loaded){ WorldGenerator::generate(chunk->voxels, chunk->x, chunk->y, chunk->z); } chunks.putChunk(chunk); lighting.onChunkLoaded(chunk->x, chunk->y, chunk->z, true); chunks.clear(false); - for (int i = 0; i < 27; i++){ + for (int i = 0; i < CLOSES_C; i++){ Chunk* other = closes[i]; if (other) other->decref(); @@ -43,24 +42,26 @@ void ChunksLoader::_thread(){ chunk->ready = true; current = nullptr; chunk->decref(); - //std::cout << "LOADER: success" << std::endl; } } -void ChunksLoader::perform(Chunk* chunk, const Chunk** cs){ +void ChunksLoader::perform(Chunk* chunk, Chunk** closes_passed){ if (isBusy()){ std::cerr << "performing while busy" << std::endl; return; } + chunk->incref(); if (closes == nullptr){ - closes = new Chunk*[27]; + closes = new Chunk*[CLOSES_C]; } - for (int i = 0; i < 27; i++){ - const Chunk* other = cs[i]; + for (int i = 0; i < CLOSES_C; i++){ + Chunk* other = closes_passed[i]; if (other == nullptr) closes[i] = nullptr; - else - closes[i] = (Chunk*)other;//->clone(); + else { + other->incref(); + closes[i] = other; + } } current = chunk; } diff --git a/src/voxels/ChunksLoader.h b/src/voxels/ChunksLoader.h index 5eef4bc6..ac779b54 100644 --- a/src/voxels/ChunksLoader.h +++ b/src/voxels/ChunksLoader.h @@ -26,7 +26,7 @@ public: return current != nullptr; } - void perform(Chunk* chunk, const Chunk** closes); + void perform(Chunk* chunk, Chunk** closes_passed); void stop(){ working = false; From 07e2fe8b3ba9e5aa97d337f3d68267ed90269793 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sun, 6 Mar 2022 02:38:20 +0300 Subject: [PATCH 16/31] Fixed 'onground' && turning-off flight mode if onground --- src/physics/PhysicsSolver.cpp | 2 +- src/voxel_engine.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/physics/PhysicsSolver.cpp b/src/physics/PhysicsSolver.cpp index 11dc1f8a..1549b112 100644 --- a/src/physics/PhysicsSolver.cpp +++ b/src/physics/PhysicsSolver.cpp @@ -11,6 +11,7 @@ PhysicsSolver::PhysicsSolver(vec3 gravity) : gravity(gravity) { } void PhysicsSolver::step(Chunks* chunks, Hitbox* hitbox, float delta, unsigned substeps, bool shifting, float gravityScale) { + hitbox->grounded = false; for (unsigned i = 0; i < substeps; i++){ float dt = delta / (float)substeps; float linear_damping = hitbox->linear_damping; @@ -75,7 +76,6 @@ void PhysicsSolver::step(Chunks* chunks, Hitbox* hitbox, float delta, unsigned s } } - hitbox->grounded = false; if (vel.y < 0.0){ for (int x = floor(pos.x-half.x+E); x <= floor(pos.x+half.x-E); x++){ bool broken = false; diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index 0b2e3b30..50552026 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -117,6 +117,8 @@ void update_controls(PhysicsSolver* physics, camera->position.y = hitbox->position.y + 0.5f; camera->position.z = hitbox->position.z; + if (player->flight && hitbox->grounded) + player->flight = false; // Camera shaking player->interpVel = player->interpVel * (1.0f - delta * 5) + hitbox->velocity * delta * 0.1f; if (hitbox->grounded && player->interpVel.y < 0.0f){ @@ -132,6 +134,10 @@ void update_controls(PhysicsSolver* physics, if (Events::jpressed(GLFW_KEY_F)){ player->flight = !player->flight; + if (player->flight){ + hitbox->velocity.y += 1; + hitbox->grounded = false; + } } // Field of view manipulations From 35f8ebe79c2a3ca3b94d93c668ad2caffc3ce49d Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sun, 6 Mar 2022 03:01:08 +0300 Subject: [PATCH 17/31] Fixed first chunks lighting concurrency problem --- src/voxels/ChunksController.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/voxels/ChunksController.cpp b/src/voxels/ChunksController.cpp index 8cdf29d1..b7bad1ce 100644 --- a/src/voxels/ChunksController.cpp +++ b/src/voxels/ChunksController.cpp @@ -61,16 +61,24 @@ bool ChunksController::loadVisible(WorldFiles* worldFiles){ if (chunk != nullptr) return false; + static int _totalLoaded = 0; + ChunksLoader* freeLoader = nullptr; for (int i = 0; i < LOADERS_COUNT; i++){ ChunksLoader* loader = loaders[i]; - if (loader->isBusy()) + if (loader->isBusy()){ + // Use only one loader at start to prevent near chunks lighting artifacts + if (_totalLoaded < 4){ + break; + } continue; + } freeLoader = loader; break; } if (freeLoader == nullptr) return false; + _totalLoaded++; chunk = new Chunk(nearX+ox,nearY+oy,nearZ+oz); if (worldFiles->getChunk(chunk->x, chunk->z, (char*)chunk->voxels)) chunk->loaded = true; From f0a74dd8219b2c117bdd5ea00a9d463a72fdce85 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sun, 6 Mar 2022 03:15:50 +0300 Subject: [PATCH 18/31] More efficient chunk loaders handling --- src/voxel_engine.cpp | 5 ++++- src/voxels/ChunksController.cpp | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index 50552026..d03b9e7b 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -310,7 +310,10 @@ int main() { chunks->setCenter(wfile, camera->position.x,0,camera->position.z); chunksController._buildMeshes(&renderer, frame); - chunksController.loadVisible(wfile); + + int freeLoaders = chunksController.countFreeLoaders(); + for (int i = 0; i < freeLoaders; i++) + chunksController.loadVisible(wfile); draw_world(camera, assets, chunks, occlusion); diff --git a/src/voxels/ChunksController.cpp b/src/voxels/ChunksController.cpp index b7bad1ce..c6039f1c 100644 --- a/src/voxels/ChunksController.cpp +++ b/src/voxels/ChunksController.cpp @@ -24,6 +24,18 @@ ChunksController::~ChunksController(){ delete[] loaders; } +int ChunksController::countFreeLoaders(){ + if (_totalLoaded < 4) + return loaders[0]->isBusy() ? 0 : 1; + + int count = 0; + for (int i = 0; i < LOADERS_COUNT; i++){ + if (!loaders[i]->isBusy()) + count++; + } + return count; +} + bool ChunksController::loadVisible(WorldFiles* worldFiles){ const int w = chunks->w; const int h = chunks->h; @@ -61,16 +73,10 @@ bool ChunksController::loadVisible(WorldFiles* worldFiles){ if (chunk != nullptr) return false; - static int _totalLoaded = 0; - ChunksLoader* freeLoader = nullptr; for (int i = 0; i < LOADERS_COUNT; i++){ ChunksLoader* loader = loaders[i]; if (loader->isBusy()){ - // Use only one loader at start to prevent near chunks lighting artifacts - if (_totalLoaded < 4){ - break; - } continue; } freeLoader = loader; @@ -187,7 +193,6 @@ bool ChunksController::_buildMeshes(VoxelRenderer* renderer, int tick) { } mesh = renderer->render(chunk, (const Chunk**)closes); chunks->meshes[index] = mesh; - //std::cout << "2: built mesh for " << chunk << std::endl; return true; } return false; From cbfa073550a39eb4d2b028467ab0ea78a2baea2a Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sun, 6 Mar 2022 03:18:04 +0300 Subject: [PATCH 19/31] More efficient chunk loaders handling (fixed) --- src/voxels/ChunksController.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/voxels/ChunksController.h b/src/voxels/ChunksController.h index 56bcab80..15189ab7 100644 --- a/src/voxels/ChunksController.h +++ b/src/voxels/ChunksController.h @@ -12,10 +12,12 @@ private: Chunks* chunks; Lighting* lighting; ChunksLoader** loaders; + int _totalLoaded = 0; public: ChunksController(Chunks* chunks, Lighting* lighting); ~ChunksController(); + int countFreeLoaders(); bool loadVisible(WorldFiles* worldFiles); bool _buildMeshes(VoxelRenderer* renderer, int tick); }; From 551d4cac855ddbe760c8e2a51349c0363f3a5ffd Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sun, 6 Mar 2022 03:24:05 +0300 Subject: [PATCH 20/31] Automatic number of loaders selecting --- src/voxels/ChunksController.cpp | 14 ++++++++------ src/voxels/ChunksController.h | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/voxels/ChunksController.cpp b/src/voxels/ChunksController.cpp index c6039f1c..b2e55ea3 100644 --- a/src/voxels/ChunksController.cpp +++ b/src/voxels/ChunksController.cpp @@ -8,18 +8,20 @@ #include "../files/WorldFiles.h" #include "ChunksLoader.h" #include +#include -#define LOADERS_COUNT 3 ChunksController::ChunksController(Chunks* chunks, Lighting* lighting) : chunks(chunks), lighting(lighting){ - loaders = new ChunksLoader*[LOADERS_COUNT]; - for (int i = 0; i < LOADERS_COUNT; i++){ + loadersCount = std::thread::hardware_concurrency() - 1; + loaders = new ChunksLoader*[loadersCount]; + for (int i = 0; i < loadersCount; i++){ loaders[i] = new ChunksLoader(); } + std::cout << "created " << loadersCount << " loaders" << std::endl; } ChunksController::~ChunksController(){ - for (int i = 0; i < LOADERS_COUNT; i++) + for (int i = 0; i < loadersCount; i++) delete loaders[i]; delete[] loaders; } @@ -29,7 +31,7 @@ int ChunksController::countFreeLoaders(){ return loaders[0]->isBusy() ? 0 : 1; int count = 0; - for (int i = 0; i < LOADERS_COUNT; i++){ + for (int i = 0; i < loadersCount; i++){ if (!loaders[i]->isBusy()) count++; } @@ -74,7 +76,7 @@ bool ChunksController::loadVisible(WorldFiles* worldFiles){ return false; ChunksLoader* freeLoader = nullptr; - for (int i = 0; i < LOADERS_COUNT; i++){ + for (int i = 0; i < loadersCount; i++){ ChunksLoader* loader = loaders[i]; if (loader->isBusy()){ continue; diff --git a/src/voxels/ChunksController.h b/src/voxels/ChunksController.h index 15189ab7..15656065 100644 --- a/src/voxels/ChunksController.h +++ b/src/voxels/ChunksController.h @@ -12,6 +12,7 @@ private: Chunks* chunks; Lighting* lighting; ChunksLoader** loaders; + int loadersCount; int _totalLoaded = 0; public: ChunksController(Chunks* chunks, Lighting* lighting); From aa08a0bc6be732e862dbf0bd42bcb7200c575dfe Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sun, 6 Mar 2022 22:19:44 +0300 Subject: [PATCH 21/31] Chunk is invisible until being surrounded by chunks in every direction --- src/voxels/Chunk.h | 1 + src/voxels/ChunksController.cpp | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/voxels/Chunk.h b/src/voxels/Chunk.h index 0f67e884..14d1689c 100644 --- a/src/voxels/Chunk.h +++ b/src/voxels/Chunk.h @@ -17,6 +17,7 @@ public: bool modified = true; bool ready = false; bool loaded = false; + int surrounding = 0; int references = 1; Chunk(int x, int y, int z); ~Chunk(); diff --git a/src/voxels/ChunksController.cpp b/src/voxels/ChunksController.cpp index b2e55ea3..16d484a5 100644 --- a/src/voxels/ChunksController.cpp +++ b/src/voxels/ChunksController.cpp @@ -13,6 +13,8 @@ ChunksController::ChunksController(Chunks* chunks, Lighting* lighting) : chunks(chunks), lighting(lighting){ loadersCount = std::thread::hardware_concurrency() - 1; + if (loadersCount <= 0) + loadersCount = 1; loaders = new ChunksLoader*[loadersCount]; for (int i = 0; i < loadersCount; i++){ loaders[i] = new ChunksLoader(); @@ -54,8 +56,17 @@ bool ChunksController::loadVisible(WorldFiles* worldFiles){ for (int x = 2; x < w-2; x++){ int index = (y * d + z) * w + x; Chunk* chunk = chunks->chunks[index]; - if (chunk != nullptr) + if (chunk != nullptr){ + int surrounding = 0; + for (int oz = -1; oz <= 1; oz++){ + for (int ox = -1; ox <= 1; ox++){ + Chunk* other = chunks->getChunk(chunk->x+ox, chunk->y, chunk->z+oz); + if (other != nullptr) surrounding++; + } + } + chunk->surrounding = surrounding; continue; + } int lx = x - w / 2; int ly = y - h / 2; int lz = z - d / 2; @@ -138,7 +149,7 @@ bool ChunksController::_buildMeshes(VoxelRenderer* renderer, int tick) { Mesh* mesh = chunks->meshes[index]; if (mesh != nullptr && !chunk->modified) continue; - if (!chunk->ready){ + if (!chunk->ready || chunk->surrounding < 9){ continue; } int lx = x - w / 2; From 4661ace697404bea4f354d0b65ba185518e75777 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 7 Mar 2022 01:35:59 +0300 Subject: [PATCH 22/31] Removed one loader limit for first 4 chunks loading --- src/voxels/ChunksController.cpp | 8 +++----- src/voxels/ChunksController.h | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/voxels/ChunksController.cpp b/src/voxels/ChunksController.cpp index 16d484a5..d288181e 100644 --- a/src/voxels/ChunksController.cpp +++ b/src/voxels/ChunksController.cpp @@ -10,6 +10,8 @@ #include #include +#define MIN_SURROUNDING 9 + ChunksController::ChunksController(Chunks* chunks, Lighting* lighting) : chunks(chunks), lighting(lighting){ loadersCount = std::thread::hardware_concurrency() - 1; @@ -29,9 +31,6 @@ ChunksController::~ChunksController(){ } int ChunksController::countFreeLoaders(){ - if (_totalLoaded < 4) - return loaders[0]->isBusy() ? 0 : 1; - int count = 0; for (int i = 0; i < loadersCount; i++){ if (!loaders[i]->isBusy()) @@ -97,7 +96,6 @@ bool ChunksController::loadVisible(WorldFiles* worldFiles){ } if (freeLoader == nullptr) return false; - _totalLoaded++; chunk = new Chunk(nearX+ox,nearY+oy,nearZ+oz); if (worldFiles->getChunk(chunk->x, chunk->z, (char*)chunk->voxels)) chunk->loaded = true; @@ -149,7 +147,7 @@ bool ChunksController::_buildMeshes(VoxelRenderer* renderer, int tick) { Mesh* mesh = chunks->meshes[index]; if (mesh != nullptr && !chunk->modified) continue; - if (!chunk->ready || chunk->surrounding < 9){ + if (!chunk->ready || chunk->surrounding < MIN_SURROUNDING){ continue; } int lx = x - w / 2; diff --git a/src/voxels/ChunksController.h b/src/voxels/ChunksController.h index 15656065..d31d925f 100644 --- a/src/voxels/ChunksController.h +++ b/src/voxels/ChunksController.h @@ -13,7 +13,6 @@ private: Lighting* lighting; ChunksLoader** loaders; int loadersCount; - int _totalLoaded = 0; public: ChunksController(Chunks* chunks, Lighting* lighting); ~ChunksController(); From e5fd0582d6dbce82ccf2cdd9b94e57f9b6526af2 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 8 Mar 2022 20:36:11 +0300 Subject: [PATCH 23/31] Fixed segfault on exit in case of chunk loaders are busy --- src/voxels/Chunks.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp index 6c7a32a0..0591f2f0 100644 --- a/src/voxels/Chunks.cpp +++ b/src/voxels/Chunks.cpp @@ -27,7 +27,8 @@ Chunks::Chunks(int w, int h, int d, int ox, int oy, int oz) : w(w), h(h), d(d), Chunks::~Chunks(){ for (size_t i = 0; i < volume; i++){ - delete chunks[i]; + if (chunks[i]) + chunks[i]->decref(); } delete[] chunks; } From 667eb6bab5654529d4da638a4249969f87077578 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 8 Mar 2022 21:01:36 +0300 Subject: [PATCH 24/31] Added Events::finalize --- src/voxel_engine.cpp | 1 + src/window/Events.cpp | 5 +++++ src/window/Events.h | 1 + 3 files changed, 7 insertions(+) diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index d03b9e7b..dfb7dc3c 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -330,6 +330,7 @@ int main() { delete assets; finalize_renderer(); + Events::finalize(); Window::terminate(); return 0; } diff --git a/src/window/Events.cpp b/src/window/Events.cpp index 6e323f1c..18d0e0b0 100644 --- a/src/window/Events.cpp +++ b/src/window/Events.cpp @@ -70,6 +70,11 @@ int Events::initialize(){ return 0; } +void Events::finalize(){ + delete[] _keys; + delete[] _frames; +} + bool Events::pressed(int keycode){ if (keycode < 0 || keycode >= _MOUSE_BUTTONS) return false; diff --git a/src/window/Events.h b/src/window/Events.h index 414a06bc..996d4a03 100644 --- a/src/window/Events.h +++ b/src/window/Events.h @@ -18,6 +18,7 @@ public: static bool _cursor_started; static int initialize(); + static void finalize(); static void pullEvents(); static bool pressed(int keycode); From 32878de5f38b548fe6351dfb962fe38a508b41ad Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 12 Mar 2022 00:50:46 +0300 Subject: [PATCH 25/31] Small render fixes --- src/voxels/ChunksController.cpp | 2 +- src/world_render.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/voxels/ChunksController.cpp b/src/voxels/ChunksController.cpp index d288181e..33888407 100644 --- a/src/voxels/ChunksController.cpp +++ b/src/voxels/ChunksController.cpp @@ -60,7 +60,7 @@ bool ChunksController::loadVisible(WorldFiles* worldFiles){ for (int oz = -1; oz <= 1; oz++){ for (int ox = -1; ox <= 1; ox++){ Chunk* other = chunks->getChunk(chunk->x+ox, chunk->y, chunk->z+oz); - if (other != nullptr) surrounding++; + if (other != nullptr && other->ready) surrounding++; } } chunk->surrounding = surrounding; diff --git a/src/world_render.h b/src/world_render.h index ef8344ab..d2909d9a 100644 --- a/src/world_render.h +++ b/src/world_render.h @@ -127,15 +127,14 @@ void draw_world(Camera* camera, Assets* assets, indices.push_back(i); } - std::sort(indices.begin(), indices.end(), chunks_comparator); - - float px = camera->position.x / (float)CHUNK_W; float pz = camera->position.z / (float)CHUNK_D; _camera_cx = px; _camera_cz = pz; + std::sort(indices.begin(), indices.end(), chunks_comparator); + for (size_t i = 0; i < indices.size(); i++){ draw_chunk(indices[i], camera, shader, occlusion); @@ -149,6 +148,8 @@ 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->render(); } From b0a15a7c8c5d1f19a731a4c17fb8d97e59db77be Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 12 Mar 2022 16:51:34 +0300 Subject: [PATCH 26/31] New defines | implemented Player destructor --- src/objects/Player.cpp | 4 ++++ src/voxel_engine.cpp | 13 +++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp index 2633c2ca..b8e2b37a 100644 --- a/src/objects/Player.cpp +++ b/src/objects/Player.cpp @@ -10,3 +10,7 @@ Player::Player(glm::vec3 position, float speed, Camera* camera) : camX(0.0f), camY(0.0f){ hitbox = new Hitbox(position, vec3(0.2f,0.9f,0.2f)); } + +Player::~Player(){ + delete hitbox; +} diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index dfb7dc3c..74b8a0e5 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -247,11 +247,16 @@ void update_interaction(Chunks* chunks, PhysicsSolver* physics, Player* player, int WIDTH = 1280; int HEIGHT = 720; +#define GRAVITY 19.6f +#define DEFAULT_PLAYER_SPEED 4.0f + +vec3 spawnpoint(-320, 255, 32); + int main() { setup_definitions(); - Window::initialize(WIDTH, HEIGHT, "Window 2.0"); + Window::initialize(WIDTH, HEIGHT, "VoxelEngine Part-11"); Events::initialize(); std::cout << "-- loading assets" << std::endl; @@ -264,12 +269,12 @@ int main() { } std::cout << "-- loading world" << std::endl; - Camera *camera = new Camera(vec3(-320,255,32), radians(90.0f)); + Camera *camera = new Camera(spawnpoint, radians(90.0f)); WorldFiles *wfile = new WorldFiles("world/", REGION_VOL * (CHUNK_VOL * 2 + 8)); Chunks *chunks = new Chunks(34,1,34, 0,0,0); - Player* player = new Player(vec3(camera->position), 4.0f, camera); + Player* player = new Player(vec3(camera->position), DEFAULT_PLAYER_SPEED, camera); wfile->readPlayer(player); camera->rotation = mat4(1.0f); camera->rotate(player->camY, player->camX, 0); @@ -277,7 +282,7 @@ int main() { std::cout << "-- preparing systems" << std::endl; VoxelRenderer renderer(1024*1024); - PhysicsSolver physics(vec3(0,-9.8f*2.0f,0)); + PhysicsSolver physics(vec3(0,-GRAVITY,0)); Lighting lighting(chunks); init_renderer(); From b9fff9d1acf98378f14def648483f1601c824c3f Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 12 Mar 2022 19:30:47 +0300 Subject: [PATCH 27/31] Small help to code rationality --- src/voxel_engine.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index 74b8a0e5..a5de8ece 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -86,9 +86,6 @@ void update_controls(PhysicsSolver* physics, Player* player, float delta){ - if (Events::jpressed(GLFW_KEY_ESCAPE)){ - Window::setShouldClose(true); - } if (Events::jpressed(GLFW_KEY_TAB)){ Events::toogleCursor(); } @@ -306,6 +303,10 @@ int main() { delta = currentTime - lastTime; lastTime = currentTime; + if (Events::jpressed(GLFW_KEY_ESCAPE)){ + Window::setShouldClose(true); + } + if (Events::jpressed(GLFW_KEY_O)){ occlusion = !occlusion; } From d2024e52570cc7ca75c31cbeffcfc0bea14c4375 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 12 Mar 2022 23:14:45 +0300 Subject: [PATCH 28/31] Fixed Windows MinGW building --- Debug_win/makefile | 5 +- Debug_win/sources.mk | 1 + Debug_win/src/voxels/subdir.mk | 14 +- src/_mingw_threads/mingw.invoke.h | 109 +++++++++ src/_mingw_threads/mingw.thread.h | 360 ++++++++++++++++++++++++++++++ src/loaders/png_loading.cpp | 3 +- src/voxels/ChunksController.cpp | 6 + src/voxels/ChunksLoader.h | 6 + 8 files changed, 497 insertions(+), 7 deletions(-) create mode 100644 src/_mingw_threads/mingw.invoke.h create mode 100644 src/_mingw_threads/mingw.thread.h diff --git a/Debug_win/makefile b/Debug_win/makefile index d5069440..3cb199b9 100644 --- a/Debug_win/makefile +++ b/Debug_win/makefile @@ -11,6 +11,7 @@ RM := rm -rf -include src/window/subdir.mk -include src/voxels/subdir.mk -include src/physics/subdir.mk +-include src/objects/subdir.mk -include src/loaders/subdir.mk -include src/lighting/subdir.mk -include src/graphics/subdir.mk @@ -58,14 +59,14 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART # All Target all: main-build -# Main-build Target +# Main-build Target -std=c++0x main-build: VOXEL_ENGINE.exe # Tool invocations VOXEL_ENGINE.exe: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: MinGW C++ Linker' - g++ -o "VOXEL_ENGINE.exe" $(OBJS) $(USER_OBJS) $(LIBS) -static-libgcc -static-libstdc++ + g++ -lpthread -o "VOXEL_ENGINE.exe" $(OBJS) $(USER_OBJS) $(LIBS) -static-libgcc -static-libstdc++ @echo 'Finished building target: $@' @echo ' ' diff --git a/Debug_win/sources.mk b/Debug_win/sources.mk index 26037f00..e5164945 100644 --- a/Debug_win/sources.mk +++ b/Debug_win/sources.mk @@ -29,6 +29,7 @@ src/graphics \ src/lighting \ src/loaders \ src/physics \ +src/objects \ src/voxels \ src/objects \ src/window \ diff --git a/Debug_win/src/voxels/subdir.mk b/Debug_win/src/voxels/subdir.mk index 16309601..c1481c5f 100644 --- a/Debug_win/src/voxels/subdir.mk +++ b/Debug_win/src/voxels/subdir.mk @@ -6,21 +6,27 @@ CPP_SRCS += \ ../src/voxels/Block.cpp \ ../src/voxels/Chunk.cpp \ -../src/voxels/Chunks.cpp \ +../src/voxels/Chunks.cpp \ +../src/voxels/ChunksController.cpp \ +../src/voxels/ChunksLoader.cpp \ ../src/voxels/WorldGenerator.cpp \ ../src/voxels/voxel.cpp OBJS += \ ./src/voxels/Block.o \ ./src/voxels/Chunk.o \ -./src/voxels/Chunks.o \ +./src/voxels/Chunks.o \ +./src/voxels/ChunksController.o \ +./src/voxels/ChunksLoader.o \ ./src/voxels/WorldGenerator.o \ ./src/voxels/voxel.o CPP_DEPS += \ ./src/voxels/Block.d \ ./src/voxels/Chunk.d \ -./src/voxels/Chunks.d \ +./src/voxels/Chunks.d \ +./src/voxels/ChunksController.d \ +./src/voxels/ChunksLoader.d \ ./src/voxels/WorldGenerator.d \ ./src/voxels/voxel.d @@ -29,7 +35,7 @@ CPP_DEPS += \ src/voxels/%.o: ../src/voxels/%.cpp src/voxels/subdir.mk @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" + g++ -D _WIN32_WINNT=0501 -pthread -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/src/_mingw_threads/mingw.invoke.h b/src/_mingw_threads/mingw.invoke.h new file mode 100644 index 00000000..d5c9dd38 --- /dev/null +++ b/src/_mingw_threads/mingw.invoke.h @@ -0,0 +1,109 @@ +/// \file mingw.invoke.h +/// \brief Lightweight `invoke` implementation, for C++11 and C++14. +/// +/// (c) 2018-2019 by Nathaniel J. McClatchey, San Jose, CA, United States +/// \author Nathaniel J. McClatchey, PhD +/// +/// \copyright Simplified (2-clause) BSD License. +/// +/// \note This file may become part of the mingw-w64 runtime package. If/when +/// this happens, the appropriate license will be added, i.e. this code will +/// become dual-licensed, and the current BSD 2-clause license will stay. + +#ifndef MINGW_INVOKE_H_ +#define MINGW_INVOKE_H_ + +#include // For std::result_of, etc. +#include // For std::forward +#include // For std::reference_wrapper + +namespace mingw_stdthread +{ +namespace detail +{ +// For compatibility, implement std::invoke for C++11 and C++14 +#if __cplusplus < 201703L + template + struct Invoker + { + template + inline static typename std::result_of::type invoke (F&& f, Args&&... args) + { + return std::forward(f)(std::forward(args)...); + } + }; + template + struct InvokerHelper; + + template<> + struct InvokerHelper + { + template + inline static auto get (T1&& t1) -> decltype(*std::forward(t1)) + { + return *std::forward(t1); + } + + template + inline static auto get (const std::reference_wrapper& t1) -> decltype(t1.get()) + { + return t1.get(); + } + }; + + template<> + struct InvokerHelper + { + template + inline static auto get (T1&& t1) -> decltype(std::forward(t1)) + { + return std::forward(t1); + } + }; + + template<> + struct Invoker + { + template + inline static auto invoke (F T::* f, T1&& t1, Args&&... args) ->\ + decltype((InvokerHelper::type>::value>::get(std::forward(t1)).*f)(std::forward(args)...)) + { + return (InvokerHelper::type>::value>::get(std::forward(t1)).*f)(std::forward(args)...); + } + }; + + template<> + struct Invoker + { + template + inline static auto invoke (F T::* f, T1&& t1, Args&&... args) ->\ + decltype(InvokerHelper::type>::value>::get(t1).*f) + { + return InvokerHelper::type>::value>::get(t1).*f; + } + }; + + template + struct InvokeResult + { + typedef Invoker::type>::value, + std::is_member_object_pointer::type>::value && + (sizeof...(Args) == 1)> invoker; + inline static auto invoke (F&& f, Args&&... args) -> decltype(invoker::invoke(std::forward(f), std::forward(args)...)) + { + return invoker::invoke(std::forward(f), std::forward(args)...); + } + }; + + template + auto invoke (F&& f, Args&&... args) -> decltype(InvokeResult::invoke(std::forward(f), std::forward(args)...)) + { + return InvokeResult::invoke(std::forward(f), std::forward(args)...); + } +#else + using std::invoke; +#endif +} // Namespace "detail" +} // Namespace "mingw_stdthread" + +#endif diff --git a/src/_mingw_threads/mingw.thread.h b/src/_mingw_threads/mingw.thread.h new file mode 100644 index 00000000..6d61a004 --- /dev/null +++ b/src/_mingw_threads/mingw.thread.h @@ -0,0 +1,360 @@ +/** +* @file mingw.thread.h +* @brief std::thread implementation for MinGW +* (c) 2013-2016 by Mega Limited, Auckland, New Zealand +* @author Alexander Vassilev +* +* @copyright Simplified (2-clause) BSD License. +* You should have received a copy of the license along with this +* program. +* +* This code is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +* @note +* This file may become part of the mingw-w64 runtime package. If/when this happens, +* the appropriate license will be added, i.e. this code will become dual-licensed, +* and the current BSD 2-clause license will stay. +*/ + +#ifndef WIN32STDTHREAD_H +#define WIN32STDTHREAD_H + +#if !defined(__cplusplus) || (__cplusplus < 201103L) +#error A C++11 compiler is required! +#endif + +// Use the standard classes for std::, if available. +#include + +#include // For std::size_t +#include // Detect error type. +#include // For std::terminate +#include // For std::system_error +#include // For std::hash +#include // For std::tuple +#include // For sleep timing. +#include // For std::unique_ptr +#include // Stream output for thread ids. +#include // For std::swap, std::forward + +#include "mingw.invoke.h" + +#if (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)) +#pragma message "The Windows API that MinGW-w32 provides is not fully compatible\ + with Microsoft's API. We'll try to work around this, but we can make no\ + guarantees. This problem does not exist in MinGW-w64." +#include // No further granularity can be expected. +#else +#include // For WaitForSingleObject +#include // For CloseHandle, etc. +#include // For GetNativeSystemInfo +#include // For GetCurrentThreadId +#endif +#include // For _beginthreadex + +#ifndef NDEBUG +#include +#endif + +#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0501) +#error To use the MinGW-std-threads library, you will need to define the macro _WIN32_WINNT to be 0x0501 (Windows XP) or higher. +#endif + +// Instead of INVALID_HANDLE_VALUE, _beginthreadex returns 0. +namespace mingw_stdthread +{ +namespace detail +{ + template + struct IntSeq {}; + + template + struct GenIntSeq : GenIntSeq { }; + + template + struct GenIntSeq<0, S...> { typedef IntSeq type; }; + +// Use a template specialization to avoid relying on compiler optimization +// when determining the parameter integer sequence. + template + class ThreadFuncCall; +// We can't define the Call struct in the function - the standard forbids template methods in that case + template + class ThreadFuncCall, Args...> + { + static_assert(sizeof...(S) == sizeof...(Args), "Args must match."); + using Tuple = std::tuple::type...>; + typename std::decay::type mFunc; + Tuple mArgs; + + public: + ThreadFuncCall(Func&& aFunc, Args&&... aArgs) + : mFunc(std::forward(aFunc)), + mArgs(std::forward(aArgs)...) + { + } + + void callFunc() + { + detail::invoke(std::move(mFunc), std::move(std::get(mArgs)) ...); + } + }; + +// Allow construction of threads without exposing implementation. + class ThreadIdTool; +} // Namespace "detail" + +class thread +{ +public: + class id + { + DWORD mId = 0; + friend class thread; + friend class std::hash; + friend class detail::ThreadIdTool; + explicit id(DWORD aId) noexcept : mId(aId){} + public: + id (void) noexcept = default; + friend bool operator==(id x, id y) noexcept {return x.mId == y.mId; } + friend bool operator!=(id x, id y) noexcept {return x.mId != y.mId; } + friend bool operator< (id x, id y) noexcept {return x.mId < y.mId; } + friend bool operator<=(id x, id y) noexcept {return x.mId <= y.mId; } + friend bool operator> (id x, id y) noexcept {return x.mId > y.mId; } + friend bool operator>=(id x, id y) noexcept {return x.mId >= y.mId; } + + template + friend std::basic_ostream<_CharT, _Traits>& + operator<<(std::basic_ostream<_CharT, _Traits>& __out, id __id) + { + if (__id.mId == 0) + { + return __out << "(invalid std::thread::id)"; + } + else + { + return __out << __id.mId; + } + } + }; +private: + static constexpr HANDLE kInvalidHandle = nullptr; + static constexpr DWORD kInfinite = 0xffffffffl; + HANDLE mHandle; + id mThreadId; + + template + static unsigned __stdcall threadfunc(void* arg) + { + std::unique_ptr call(static_cast(arg)); + call->callFunc(); + return 0; + } + + static unsigned int _hardware_concurrency_helper() noexcept + { + SYSTEM_INFO sysinfo; +// This is one of the few functions used by the library which has a nearly- +// equivalent function defined in earlier versions of Windows. Include the +// workaround, just as a reminder that it does exist. +#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) + ::GetNativeSystemInfo(&sysinfo); +#else + ::GetSystemInfo(&sysinfo); +#endif + return sysinfo.dwNumberOfProcessors; + } +public: + typedef HANDLE native_handle_type; + id get_id() const noexcept {return mThreadId;} + native_handle_type native_handle() const {return mHandle;} + thread(): mHandle(kInvalidHandle), mThreadId(){} + + thread(thread&& other) + :mHandle(other.mHandle), mThreadId(other.mThreadId) + { + other.mHandle = kInvalidHandle; + other.mThreadId = id{}; + } + + thread(const thread &other)=delete; + + template + explicit thread(Func&& func, Args&&... args) : mHandle(), mThreadId() + { + using ArgSequence = typename detail::GenIntSeq::type; + using Call = detail::ThreadFuncCall; + auto call = new Call( + std::forward(func), std::forward(args)...); + unsigned id_receiver; + auto int_handle = _beginthreadex(NULL, 0, threadfunc, + static_cast(call), 0, &id_receiver); + if (int_handle == 0) + { + mHandle = kInvalidHandle; + int errnum = errno; + delete call; +// Note: Should only throw EINVAL, EAGAIN, EACCES + throw std::system_error(errnum, std::generic_category()); + } else { + mThreadId.mId = id_receiver; + mHandle = reinterpret_cast(int_handle); + } + } + + bool joinable() const {return mHandle != kInvalidHandle;} + +// Note: Due to lack of synchronization, this function has a race condition +// if called concurrently, which leads to undefined behavior. The same applies +// to all other member functions of this class, but this one is mentioned +// explicitly. + void join() + { + using namespace std; + if (get_id() == id(GetCurrentThreadId())) + throw system_error(make_error_code(errc::resource_deadlock_would_occur)); + if (mHandle == kInvalidHandle) + throw system_error(make_error_code(errc::no_such_process)); + if (!joinable()) + throw system_error(make_error_code(errc::invalid_argument)); + WaitForSingleObject(mHandle, kInfinite); + CloseHandle(mHandle); + mHandle = kInvalidHandle; + mThreadId = id{}; + } + + ~thread() + { + if (joinable()) + { +#ifndef NDEBUG + std::printf("Error: Must join() or detach() a thread before \ +destroying it.\n"); +#endif + std::terminate(); + } + } + thread& operator=(const thread&) = delete; + thread& operator=(thread&& other) noexcept + { + if (joinable()) + { +#ifndef NDEBUG + std::printf("Error: Must join() or detach() a thread before \ +moving another thread to it.\n"); +#endif + std::terminate(); + } + swap(std::forward(other)); + return *this; + } + void swap(thread&& other) noexcept + { + std::swap(mHandle, other.mHandle); + std::swap(mThreadId.mId, other.mThreadId.mId); + } + + static unsigned int hardware_concurrency() noexcept + { + static unsigned int cached = _hardware_concurrency_helper(); + return cached; + } + + void detach() + { + if (!joinable()) + { + using namespace std; + throw system_error(make_error_code(errc::invalid_argument)); + } + if (mHandle != kInvalidHandle) + { + CloseHandle(mHandle); + mHandle = kInvalidHandle; + } + mThreadId = id{}; + } +}; + +namespace detail +{ + class ThreadIdTool + { + public: + static thread::id make_id (DWORD base_id) noexcept + { + return thread::id(base_id); + } + }; +} // Namespace "detail" + +namespace this_thread +{ + inline thread::id get_id() noexcept + { + return detail::ThreadIdTool::make_id(GetCurrentThreadId()); + } + inline void yield() noexcept {Sleep(0);} + template< class Rep, class Period > + void sleep_for( const std::chrono::duration& sleep_duration) + { + static constexpr DWORD kInfinite = 0xffffffffl; + using namespace std::chrono; + using rep = milliseconds::rep; + rep ms = duration_cast(sleep_duration).count(); + while (ms > 0) + { + constexpr rep kMaxRep = static_cast(kInfinite - 1); + auto sleepTime = (ms < kMaxRep) ? ms : kMaxRep; + Sleep(static_cast(sleepTime)); + ms -= sleepTime; + } + } + template + void sleep_until(const std::chrono::time_point& sleep_time) + { + sleep_for(sleep_time-Clock::now()); + } +} +} // Namespace mingw_stdthread + +namespace std +{ +// Because of quirks of the compiler, the common "using namespace std;" +// directive would flatten the namespaces and introduce ambiguity where there +// was none. Direct specification (std::), however, would be unaffected. +// Take the safe option, and include only in the presence of MinGW's win32 +// implementation. +#if defined(__MINGW32__ ) && !defined(_GLIBCXX_HAS_GTHREADS) +using mingw_stdthread::thread; +// Remove ambiguity immediately, to avoid problems arising from the above. +//using std::thread; +namespace this_thread +{ +using namespace mingw_stdthread::this_thread; +} +#elif !defined(MINGW_STDTHREAD_REDUNDANCY_WARNING) // Skip repetition +#define MINGW_STDTHREAD_REDUNDANCY_WARNING +#pragma message "This version of MinGW seems to include a win32 port of\ + pthreads, and probably already has C++11 std threading classes implemented,\ + based on pthreads. These classes, found in namespace std, are not overridden\ + by the mingw-std-thread library. If you would still like to use this\ + implementation (as it is more lightweight), use the classes provided in\ + namespace mingw_stdthread." +#endif + +// Specialize hash for this implementation's thread::id, even if the +// std::thread::id already has a hash. +template<> +struct hash +{ + typedef mingw_stdthread::thread::id argument_type; + typedef size_t result_type; + size_t operator() (const argument_type & i) const noexcept + { + return i.mId; + } +}; +} +#endif // WIN32STDTHREAD_H diff --git a/src/loaders/png_loading.cpp b/src/loaders/png_loading.cpp index e3df6f0d..0a02b04a 100644 --- a/src/loaders/png_loading.cpp +++ b/src/loaders/png_loading.cpp @@ -4,8 +4,9 @@ #include #include "../graphics/Texture.h" -// comment line below for use spng instead of libpng +#ifndef _WIN32 #define LIBPNG +#endif #ifdef LIBPNG #include diff --git a/src/voxels/ChunksController.cpp b/src/voxels/ChunksController.cpp index 33888407..39a366d2 100644 --- a/src/voxels/ChunksController.cpp +++ b/src/voxels/ChunksController.cpp @@ -8,7 +8,13 @@ #include "../files/WorldFiles.h" #include "ChunksLoader.h" #include + +#ifdef _WIN32 +#define _WIN32_WINNT 0x0501 +#include "../_mingw_threads/mingw.thread.h" +#else #include +#endif #define MIN_SURROUNDING 9 diff --git a/src/voxels/ChunksLoader.h b/src/voxels/ChunksLoader.h index ac779b54..bf6a6f98 100644 --- a/src/voxels/ChunksLoader.h +++ b/src/voxels/ChunksLoader.h @@ -1,7 +1,13 @@ #ifndef VOXELS_CHUNKSLOADER_H_ #define VOXELS_CHUNKSLOADER_H_ +#ifdef _WIN32 +#define _WIN32_WINNT 0x0501 +#include "../_mingw_threads/mingw.thread.h" +#else #include +#endif + #include class Chunk; From cce4fefa2a7c8209cd7c2a45bf3ae04ed4bb5e6d Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 12 Mar 2022 23:21:18 +0300 Subject: [PATCH 29/31] Delete mingw.invoke.h --- src/_mingw_threads/mingw.invoke.h | 109 ------------------------------ 1 file changed, 109 deletions(-) delete mode 100644 src/_mingw_threads/mingw.invoke.h diff --git a/src/_mingw_threads/mingw.invoke.h b/src/_mingw_threads/mingw.invoke.h deleted file mode 100644 index d5c9dd38..00000000 --- a/src/_mingw_threads/mingw.invoke.h +++ /dev/null @@ -1,109 +0,0 @@ -/// \file mingw.invoke.h -/// \brief Lightweight `invoke` implementation, for C++11 and C++14. -/// -/// (c) 2018-2019 by Nathaniel J. McClatchey, San Jose, CA, United States -/// \author Nathaniel J. McClatchey, PhD -/// -/// \copyright Simplified (2-clause) BSD License. -/// -/// \note This file may become part of the mingw-w64 runtime package. If/when -/// this happens, the appropriate license will be added, i.e. this code will -/// become dual-licensed, and the current BSD 2-clause license will stay. - -#ifndef MINGW_INVOKE_H_ -#define MINGW_INVOKE_H_ - -#include // For std::result_of, etc. -#include // For std::forward -#include // For std::reference_wrapper - -namespace mingw_stdthread -{ -namespace detail -{ -// For compatibility, implement std::invoke for C++11 and C++14 -#if __cplusplus < 201703L - template - struct Invoker - { - template - inline static typename std::result_of::type invoke (F&& f, Args&&... args) - { - return std::forward(f)(std::forward(args)...); - } - }; - template - struct InvokerHelper; - - template<> - struct InvokerHelper - { - template - inline static auto get (T1&& t1) -> decltype(*std::forward(t1)) - { - return *std::forward(t1); - } - - template - inline static auto get (const std::reference_wrapper& t1) -> decltype(t1.get()) - { - return t1.get(); - } - }; - - template<> - struct InvokerHelper - { - template - inline static auto get (T1&& t1) -> decltype(std::forward(t1)) - { - return std::forward(t1); - } - }; - - template<> - struct Invoker - { - template - inline static auto invoke (F T::* f, T1&& t1, Args&&... args) ->\ - decltype((InvokerHelper::type>::value>::get(std::forward(t1)).*f)(std::forward(args)...)) - { - return (InvokerHelper::type>::value>::get(std::forward(t1)).*f)(std::forward(args)...); - } - }; - - template<> - struct Invoker - { - template - inline static auto invoke (F T::* f, T1&& t1, Args&&... args) ->\ - decltype(InvokerHelper::type>::value>::get(t1).*f) - { - return InvokerHelper::type>::value>::get(t1).*f; - } - }; - - template - struct InvokeResult - { - typedef Invoker::type>::value, - std::is_member_object_pointer::type>::value && - (sizeof...(Args) == 1)> invoker; - inline static auto invoke (F&& f, Args&&... args) -> decltype(invoker::invoke(std::forward(f), std::forward(args)...)) - { - return invoker::invoke(std::forward(f), std::forward(args)...); - } - }; - - template - auto invoke (F&& f, Args&&... args) -> decltype(InvokeResult::invoke(std::forward(f), std::forward(args)...)) - { - return InvokeResult::invoke(std::forward(f), std::forward(args)...); - } -#else - using std::invoke; -#endif -} // Namespace "detail" -} // Namespace "mingw_stdthread" - -#endif From c2ca744f9a1368b8442732aea6cc3b614427cc53 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 12 Mar 2022 23:21:26 +0300 Subject: [PATCH 30/31] Delete mingw.thread.h --- src/_mingw_threads/mingw.thread.h | 360 ------------------------------ 1 file changed, 360 deletions(-) delete mode 100644 src/_mingw_threads/mingw.thread.h diff --git a/src/_mingw_threads/mingw.thread.h b/src/_mingw_threads/mingw.thread.h deleted file mode 100644 index 6d61a004..00000000 --- a/src/_mingw_threads/mingw.thread.h +++ /dev/null @@ -1,360 +0,0 @@ -/** -* @file mingw.thread.h -* @brief std::thread implementation for MinGW -* (c) 2013-2016 by Mega Limited, Auckland, New Zealand -* @author Alexander Vassilev -* -* @copyright Simplified (2-clause) BSD License. -* You should have received a copy of the license along with this -* program. -* -* This code is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -* @note -* This file may become part of the mingw-w64 runtime package. If/when this happens, -* the appropriate license will be added, i.e. this code will become dual-licensed, -* and the current BSD 2-clause license will stay. -*/ - -#ifndef WIN32STDTHREAD_H -#define WIN32STDTHREAD_H - -#if !defined(__cplusplus) || (__cplusplus < 201103L) -#error A C++11 compiler is required! -#endif - -// Use the standard classes for std::, if available. -#include - -#include // For std::size_t -#include // Detect error type. -#include // For std::terminate -#include // For std::system_error -#include // For std::hash -#include // For std::tuple -#include // For sleep timing. -#include // For std::unique_ptr -#include // Stream output for thread ids. -#include // For std::swap, std::forward - -#include "mingw.invoke.h" - -#if (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)) -#pragma message "The Windows API that MinGW-w32 provides is not fully compatible\ - with Microsoft's API. We'll try to work around this, but we can make no\ - guarantees. This problem does not exist in MinGW-w64." -#include // No further granularity can be expected. -#else -#include // For WaitForSingleObject -#include // For CloseHandle, etc. -#include // For GetNativeSystemInfo -#include // For GetCurrentThreadId -#endif -#include // For _beginthreadex - -#ifndef NDEBUG -#include -#endif - -#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0501) -#error To use the MinGW-std-threads library, you will need to define the macro _WIN32_WINNT to be 0x0501 (Windows XP) or higher. -#endif - -// Instead of INVALID_HANDLE_VALUE, _beginthreadex returns 0. -namespace mingw_stdthread -{ -namespace detail -{ - template - struct IntSeq {}; - - template - struct GenIntSeq : GenIntSeq { }; - - template - struct GenIntSeq<0, S...> { typedef IntSeq type; }; - -// Use a template specialization to avoid relying on compiler optimization -// when determining the parameter integer sequence. - template - class ThreadFuncCall; -// We can't define the Call struct in the function - the standard forbids template methods in that case - template - class ThreadFuncCall, Args...> - { - static_assert(sizeof...(S) == sizeof...(Args), "Args must match."); - using Tuple = std::tuple::type...>; - typename std::decay::type mFunc; - Tuple mArgs; - - public: - ThreadFuncCall(Func&& aFunc, Args&&... aArgs) - : mFunc(std::forward(aFunc)), - mArgs(std::forward(aArgs)...) - { - } - - void callFunc() - { - detail::invoke(std::move(mFunc), std::move(std::get(mArgs)) ...); - } - }; - -// Allow construction of threads without exposing implementation. - class ThreadIdTool; -} // Namespace "detail" - -class thread -{ -public: - class id - { - DWORD mId = 0; - friend class thread; - friend class std::hash; - friend class detail::ThreadIdTool; - explicit id(DWORD aId) noexcept : mId(aId){} - public: - id (void) noexcept = default; - friend bool operator==(id x, id y) noexcept {return x.mId == y.mId; } - friend bool operator!=(id x, id y) noexcept {return x.mId != y.mId; } - friend bool operator< (id x, id y) noexcept {return x.mId < y.mId; } - friend bool operator<=(id x, id y) noexcept {return x.mId <= y.mId; } - friend bool operator> (id x, id y) noexcept {return x.mId > y.mId; } - friend bool operator>=(id x, id y) noexcept {return x.mId >= y.mId; } - - template - friend std::basic_ostream<_CharT, _Traits>& - operator<<(std::basic_ostream<_CharT, _Traits>& __out, id __id) - { - if (__id.mId == 0) - { - return __out << "(invalid std::thread::id)"; - } - else - { - return __out << __id.mId; - } - } - }; -private: - static constexpr HANDLE kInvalidHandle = nullptr; - static constexpr DWORD kInfinite = 0xffffffffl; - HANDLE mHandle; - id mThreadId; - - template - static unsigned __stdcall threadfunc(void* arg) - { - std::unique_ptr call(static_cast(arg)); - call->callFunc(); - return 0; - } - - static unsigned int _hardware_concurrency_helper() noexcept - { - SYSTEM_INFO sysinfo; -// This is one of the few functions used by the library which has a nearly- -// equivalent function defined in earlier versions of Windows. Include the -// workaround, just as a reminder that it does exist. -#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) - ::GetNativeSystemInfo(&sysinfo); -#else - ::GetSystemInfo(&sysinfo); -#endif - return sysinfo.dwNumberOfProcessors; - } -public: - typedef HANDLE native_handle_type; - id get_id() const noexcept {return mThreadId;} - native_handle_type native_handle() const {return mHandle;} - thread(): mHandle(kInvalidHandle), mThreadId(){} - - thread(thread&& other) - :mHandle(other.mHandle), mThreadId(other.mThreadId) - { - other.mHandle = kInvalidHandle; - other.mThreadId = id{}; - } - - thread(const thread &other)=delete; - - template - explicit thread(Func&& func, Args&&... args) : mHandle(), mThreadId() - { - using ArgSequence = typename detail::GenIntSeq::type; - using Call = detail::ThreadFuncCall; - auto call = new Call( - std::forward(func), std::forward(args)...); - unsigned id_receiver; - auto int_handle = _beginthreadex(NULL, 0, threadfunc, - static_cast(call), 0, &id_receiver); - if (int_handle == 0) - { - mHandle = kInvalidHandle; - int errnum = errno; - delete call; -// Note: Should only throw EINVAL, EAGAIN, EACCES - throw std::system_error(errnum, std::generic_category()); - } else { - mThreadId.mId = id_receiver; - mHandle = reinterpret_cast(int_handle); - } - } - - bool joinable() const {return mHandle != kInvalidHandle;} - -// Note: Due to lack of synchronization, this function has a race condition -// if called concurrently, which leads to undefined behavior. The same applies -// to all other member functions of this class, but this one is mentioned -// explicitly. - void join() - { - using namespace std; - if (get_id() == id(GetCurrentThreadId())) - throw system_error(make_error_code(errc::resource_deadlock_would_occur)); - if (mHandle == kInvalidHandle) - throw system_error(make_error_code(errc::no_such_process)); - if (!joinable()) - throw system_error(make_error_code(errc::invalid_argument)); - WaitForSingleObject(mHandle, kInfinite); - CloseHandle(mHandle); - mHandle = kInvalidHandle; - mThreadId = id{}; - } - - ~thread() - { - if (joinable()) - { -#ifndef NDEBUG - std::printf("Error: Must join() or detach() a thread before \ -destroying it.\n"); -#endif - std::terminate(); - } - } - thread& operator=(const thread&) = delete; - thread& operator=(thread&& other) noexcept - { - if (joinable()) - { -#ifndef NDEBUG - std::printf("Error: Must join() or detach() a thread before \ -moving another thread to it.\n"); -#endif - std::terminate(); - } - swap(std::forward(other)); - return *this; - } - void swap(thread&& other) noexcept - { - std::swap(mHandle, other.mHandle); - std::swap(mThreadId.mId, other.mThreadId.mId); - } - - static unsigned int hardware_concurrency() noexcept - { - static unsigned int cached = _hardware_concurrency_helper(); - return cached; - } - - void detach() - { - if (!joinable()) - { - using namespace std; - throw system_error(make_error_code(errc::invalid_argument)); - } - if (mHandle != kInvalidHandle) - { - CloseHandle(mHandle); - mHandle = kInvalidHandle; - } - mThreadId = id{}; - } -}; - -namespace detail -{ - class ThreadIdTool - { - public: - static thread::id make_id (DWORD base_id) noexcept - { - return thread::id(base_id); - } - }; -} // Namespace "detail" - -namespace this_thread -{ - inline thread::id get_id() noexcept - { - return detail::ThreadIdTool::make_id(GetCurrentThreadId()); - } - inline void yield() noexcept {Sleep(0);} - template< class Rep, class Period > - void sleep_for( const std::chrono::duration& sleep_duration) - { - static constexpr DWORD kInfinite = 0xffffffffl; - using namespace std::chrono; - using rep = milliseconds::rep; - rep ms = duration_cast(sleep_duration).count(); - while (ms > 0) - { - constexpr rep kMaxRep = static_cast(kInfinite - 1); - auto sleepTime = (ms < kMaxRep) ? ms : kMaxRep; - Sleep(static_cast(sleepTime)); - ms -= sleepTime; - } - } - template - void sleep_until(const std::chrono::time_point& sleep_time) - { - sleep_for(sleep_time-Clock::now()); - } -} -} // Namespace mingw_stdthread - -namespace std -{ -// Because of quirks of the compiler, the common "using namespace std;" -// directive would flatten the namespaces and introduce ambiguity where there -// was none. Direct specification (std::), however, would be unaffected. -// Take the safe option, and include only in the presence of MinGW's win32 -// implementation. -#if defined(__MINGW32__ ) && !defined(_GLIBCXX_HAS_GTHREADS) -using mingw_stdthread::thread; -// Remove ambiguity immediately, to avoid problems arising from the above. -//using std::thread; -namespace this_thread -{ -using namespace mingw_stdthread::this_thread; -} -#elif !defined(MINGW_STDTHREAD_REDUNDANCY_WARNING) // Skip repetition -#define MINGW_STDTHREAD_REDUNDANCY_WARNING -#pragma message "This version of MinGW seems to include a win32 port of\ - pthreads, and probably already has C++11 std threading classes implemented,\ - based on pthreads. These classes, found in namespace std, are not overridden\ - by the mingw-std-thread library. If you would still like to use this\ - implementation (as it is more lightweight), use the classes provided in\ - namespace mingw_stdthread." -#endif - -// Specialize hash for this implementation's thread::id, even if the -// std::thread::id already has a hash. -template<> -struct hash -{ - typedef mingw_stdthread::thread::id argument_type; - typedef size_t result_type; - size_t operator() (const argument_type & i) const noexcept - { - return i.mId; - } -}; -} -#endif // WIN32STDTHREAD_H From 8a3287d9b4aea13a3ee733cb6179f74e5f2b3dcd Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 12 Mar 2022 23:23:08 +0300 Subject: [PATCH 31/31] Updates in #include --- src/voxels/ChunksController.cpp | 2 +- src/voxels/ChunksLoader.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/voxels/ChunksController.cpp b/src/voxels/ChunksController.cpp index 39a366d2..d64ed858 100644 --- a/src/voxels/ChunksController.cpp +++ b/src/voxels/ChunksController.cpp @@ -11,7 +11,7 @@ #ifdef _WIN32 #define _WIN32_WINNT 0x0501 -#include "../_mingw_threads/mingw.thread.h" +#include #else #include #endif diff --git a/src/voxels/ChunksLoader.h b/src/voxels/ChunksLoader.h index bf6a6f98..aff93ec7 100644 --- a/src/voxels/ChunksLoader.h +++ b/src/voxels/ChunksLoader.h @@ -3,7 +3,7 @@ #ifdef _WIN32 #define _WIN32_WINNT 0x0501 -#include "../_mingw_threads/mingw.thread.h" +#include #else #include #endif