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

Merge branch 'main' into release-0.27

Browse Source
This commit is contained in:
MihailRis 2025-03-20 23:11:31 +03:00
commit 09aee223a0
61 changed files with 306 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/macos.yml vendored
View File

@ -17,12 +17,7 @@ jobs:
- name: Install dependencies from brew
run: |
brew install glfw3 glew libpng openal-soft luajit libvorbis skypjack/entt/entt googletest
- name: Install specific version of GLM
run: |
curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/5c7655a866646aa4b857c002b8ae5465b9d26f65/Formula/g/glm.rb
brew install --formula glm.rb
brew install glfw3 glew libpng openal-soft luajit libvorbis skypjack/entt/entt googletest glm
- name: Configure
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_TESTS=ON -DVOXELENGINE_BUILD_APPDIR=1

11
.github/workflows/windows-clang.yml vendored
View File

@ -28,9 +28,7 @@ jobs:
msystem: clang64
install: >-
mingw-w64-clang-x86_64-toolchain
mingw-w64-clang-x86_64-cmake
mingw-w64-clang-x86_64-make
mingw-w64-clang-x86_64-luajit
mingw-w64-clang-x86_64-cmake
git
- name: Set up vcpkg
shell: msys2 {0}
@ -41,11 +39,12 @@ jobs:
./vcpkg integrate install
cd ..
- name: Configure project with CMake and vcpkg
env:
VCPKG_DEFAULT_TRIPLET: x64-mingw-static
VCPKG_DEFAULT_HOST_TRIPLET: x64-mingw-static
shell: msys2 {0}
run: |
export VCPKG_DEFAULT_TRIPLET=x64-mingw-static
export VCPKG_DEFAULT_HOST_TRIPLET=x64-mingw-static
export VCPKG_ROOT=./vcpkg
export VCPKG_ROOT=$(pwd)/vcpkg
mkdir build
cd build
cmake -G "MinGW Makefiles" -DVCPKG_TARGET_TRIPLET=x64-mingw-static -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake ..

69
CMakeLists.txt
View File

@ -1,84 +1,47 @@
cmake_minimum_required(VERSION 3.26)
project(VoxelEngine)
option(VOXELENGINE_BUILD_APPDIR "" OFF)
option(VOXELENGINE_BUILD_TESTS "" OFF)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
execute_process(COMMAND ${CMAKE_COMMAND} --version)
option(VOXELENGINE_BUILD_APPDIR "Pack linux build" OFF)
option(VOXELENGINE_BUILD_TESTS "Build tests" OFF)
# Need for static compilation on Windows with MSVC clang TODO: Make single build
# on Windows to avoid dependence on combinations of platforms and compilers and
# make it independent
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
# We use two types linking: for clang build is static (vcpkg triplet
# x64-windows-static) and for msvc build is dynamic linking (vcpkg triplet
# x64-windows) By default CMAKE_MSVC_RUNTIME_LIBRARY set by
# MultiThreaded$<$<CONFIG:Debug>:Debug>DLL
if(VCPKG_TARGET_TRIPLET MATCHES "static")
# Need for MSVC clang
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
endif()
endif()
add_subdirectory(src)
add_executable(${PROJECT_NAME} src/main.cpp)
target_include_directories(${PROJECT_NAME}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
add_executable(VoxelEngine src/main.cpp)
if(VOXELENGINE_BUILD_APPDIR)
include(${CMAKE_CURRENT_SOURCE_DIR}/dev/cmake/BuildAppdir.cmake)
endif()
if(MSVC)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE
Release
CACHE STRING "Build type" FORCE)
endif()
if((CMAKE_BUILD_TYPE EQUAL "Release") OR (CMAKE_BUILD_TYPE EQUAL
"RelWithDebInfo"))
target_compile_options(${PROJECT_NAME} PRIVATE /W4 /MT /O2)
else()
target_compile_options(${PROJECT_NAME} PRIVATE /W4)
endif()
set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} /source-charset:UTF-8 /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR"
)
else()
target_compile_options(
${PROJECT_NAME}
PRIVATE -Wall
-Wextra
# additional warnings
-Wformat-nonliteral
-Wcast-align
-Wpointer-arith
-Wundef
-Wwrite-strings
-Wno-unused-parameter)
if(CMAKE_BUILD_TYPE MATCHES "Debug")
target_compile_options(${PROJECT_NAME} PRIVATE -Og)
endif()
if(WIN32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
endif()
endif()
target_link_libraries(VoxelEngine PRIVATE VoxelEngineSrc
$<$<PLATFORM_ID:Windows>:winmm>)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie")
endif()
if(WIN32)
target_link_libraries(${PROJECT_NAME} VoxelEngineSrc winmm)
endif()
target_link_libraries(${PROJECT_NAME} VoxelEngineSrc ${CMAKE_DL_LIBS})
target_link_options(VoxelEngine PRIVATE $<$<CXX_COMPILER_ID:GNU>:-no-pie>)
# Deploy res to build dir
add_custom_command(
TARGET ${PROJECT_NAME}
TARGET VoxelEngine
POST_BUILD
COMMAND
${CMAKE_COMMAND} -E copy_directory_if_different
${CMAKE_CURRENT_SOURCE_DIR}/res $<TARGET_FILE_DIR:${PROJECT_NAME}>/res)
COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different
${CMAKE_CURRENT_SOURCE_DIR}/res $<TARGET_FILE_DIR:VoxelEngine>/res)
if(VOXELENGINE_BUILD_TESTS)
enable_testing()

52
CMakePresets.json
View File

@ -14,6 +14,34 @@
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"VOXELENGINE_BUILD_TESTS": "ON"
}
},
{
"name": "default-ninja-gnu-linux",
"condition": {
"type": "equals",
"rhs": "${hostSystemName}",
"lhs": "Linux"
},
"generator": "Ninja Multi-Config",
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"VOXELENGINE_BUILD_TESTS": "ON",
"VOXELENGINE_BUILD_APPDIR": "ON"
}
},
{
"name": "default-ninja-clang-macos",
"condition": {
"type": "equals",
"rhs": "${hostSystemName}",
"lhs": "Darwin"
},
"generator": "Ninja",
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"VOXELENGINE_BUILD_TESTS": "ON",
"VOXELENGINE_BUILD_APPDIR": "ON"
}
}
],
"buildPresets": [
@ -21,6 +49,16 @@
"name": "default-vs-msvc-windows",
"configurePreset": "default-vs-msvc-windows",
"configuration": "Debug"
},
{
"name": "default-ninja-gnu-linux",
"configurePreset": "default-ninja-gnu-linux",
"configuration": "Debug"
},
{
"name": "default-ninja-clang-macos",
"configurePreset": "default-ninja-clang-macos",
"configuration": "Debug"
}
],
"testPresets": [
@ -30,6 +68,20 @@
"output": {
"outputOnFailure": true
}
},
{
"name": "default-ninja-gnu-linux",
"configurePreset": "default-ninja-gnu-linux",
"output": {
"outputOnFailure": true
}
},
{
"name": "default-ninja-clang-macos",
"configurePreset": "default-ninja-clang-macos",
"output": {
"outputOnFailure": true
}
}
]
}

154
src/CMakeLists.txt
View File

@ -1,87 +1,123 @@
project(VoxelEngineSrc)
set(CMAKE_CXX_STANDARD 17)
file(GLOB_RECURSE headers ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp)
file(GLOB_RECURSE sources ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
list(REMOVE_ITEM sources ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp)
file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
list(REMOVE_ITEM SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS})
add_library(VoxelEngineSrc STATIC ${sources} ${headers})
find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)
find_package(glm REQUIRED)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
# specific for vcpkg
find_package(OpenAL CONFIG REQUIRED)
set(OPENAL_LIBRARY OpenAL::OpenAL)
else()
find_package(OpenAL REQUIRED)
endif()
find_package(ZLIB REQUIRED)
find_package(PNG REQUIRED)
find_package(CURL REQUIRED)
find_package(glfw3 REQUIRED)
if(NOT APPLE)
find_package(EnTT REQUIRED)
endif()
set(LIBS "")
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
# Use directly linking to lib instead PkgConfig (because pkg-config dont
# install on windows as default) TODO: Do it with findLua.
if(MSVC)
set(LUA_INCLUDE_DIR
"$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/include/luajit"
)
find_package(Lua REQUIRED)
else()
# Used for mingw-clang cross compiling from msys2
set(LIBS ${LIBS} luajit-5.1)
endif()
find_package(glfw3 REQUIRED)
find_package(glm REQUIRED)
find_package(vorbis REQUIRED)
set(VORBISLIB Vorbis::vorbis Vorbis::vorbisfile)
if(VCPKG_TARGET_TRIPLET MATCHES "static")
add_library(luajit STATIC IMPORTED)
set_target_properties(
luajit
PROPERTIES
IMPORTED_LOCATION
"$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/lib/libluajit-5.1.a"
INTERFACE_INCLUDE_DIRECTORIES
"$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/include/"
)
else()
add_library(luajit SHARED IMPORTED)
set_target_properties(
luajit
PROPERTIES
IMPORTED_LOCATION
"$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/bin/lua51.dll"
IMPORTED_IMPLIB
"$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/lib/lua51.lib"
INTERFACE_INCLUDE_DIRECTORIES
"$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/include/luajit"
)
endif()
elseif(APPLE)
find_package(PkgConfig)
pkg_check_modules(LUAJIT REQUIRED luajit)
pkg_check_modules(VORBIS REQUIRED vorbis vorbisfile)
set(LUA_INCLUDE_DIR "/opt/homebrew/include/luajit-2.1")
set(LUA_LIBRARIES "/opt/homebrew/lib/libluajit-5.1.a")
message(STATUS "LUA Libraries: ${LUA_LIBRARIES}")
message(STATUS "LUA Include Dir: ${LUA_INCLUDE_DIR}")
set(VORBISLIB ${VORBIS_LDFLAGS})
message(STATUS "Vorbis Lib: ${VORBIS_LDFLAGS}")
add_library(luajit::luajit ALIAS luajit)
else()
find_package(PkgConfig)
pkg_check_modules(LUAJIT REQUIRED luajit)
pkg_check_modules(VORBIS REQUIRED vorbis vorbisfile)
set(LUA_LIBRARIES ${LUAJIT_LIBRARIES})
set(LUA_INCLUDE_DIR ${LUAJIT_INCLUDE_DIRS})
set(VORBISLIB ${VORBIS_LDFLAGS})
pkg_check_modules(luajit REQUIRED IMPORTED_TARGET luajit)
pkg_check_modules(vorbis REQUIRED IMPORTED_TARGET vorbis)
pkg_check_modules(vorbisfile REQUIRED IMPORTED_TARGET vorbisfile)
add_library(Vorbis::vorbis ALIAS PkgConfig::vorbis)
add_library(Vorbis::vorbisfile ALIAS PkgConfig::vorbisfile)
add_library(luajit::luajit ALIAS PkgConfig::luajit)
endif()
if(UNIX)
find_package(glfw3 3.3 REQUIRED)
find_package(Threads REQUIRED)
set(LIBS ${LIBS} Threads::Threads)
endif()
target_include_directories(VoxelEngineSrc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${LUA_INCLUDE_DIR})
include_directories(${CURL_INCLUDE_DIR})
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(
${PROJECT_NAME}
${LIBS}
glfw
OpenGL::GL
${OPENAL_LIBRARY}
GLEW::GLEW
ZLIB::ZLIB
PNG::PNG
CURL::libcurl
${VORBISLIB}
${LUA_LIBRARIES}
${CMAKE_DL_LIBS})
VoxelEngineSrc
PRIVATE glfw
OpenGL::GL
GLEW::GLEW
ZLIB::ZLIB
PNG::PNG
CURL::libcurl
OpenAL::OpenAL
Vorbis::vorbis
Vorbis::vorbisfile
luajit::luajit
PUBLIC glm::glm # Need public for src/delegates.hpp, which including to
# main.cpp
)
target_compile_options(
VoxelEngineSrc
PUBLIC $<$<CXX_COMPILER_ID:MSVC>:
/utf-8
/MP
/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
/W4
/wd4244 # conversion from 'a' to 'T', possible loss of data
/wd4267 # conversion from 'size_t' to 'int', possible loss of data
/wd4245 # conversion from 'int' to 'const size_t', signed/unsigned
# mismatch
/wd4100 # unreferenced formal parameter
/wd4458 # declaration of 'var' hides class member
/wd4101 # 'var': unreferenced local variable
/wd4388 # 'token' : signed/unsigned mismatch
/wd4018 # '>': signed/unsigned mismatch
>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:
-Wall
-Wextra
# additional warnings
-Wformat-nonliteral
-Wcast-align
-Wpointer-arith
-Wundef
-Wwrite-strings
-Wno-unused-parameter
-Wno-sign-compare
-Wno-unknown-pragmas
$<$<CONFIG:Debug>:-Og>
>)
target_link_options(
VoxelEngineSrc
PUBLIC
$<$<CXX_COMPILER_ID:GNU>:
-no-pie
>
# Need for static compilation on Windows with clang TODO: Make single build
# on Windows to avoid dependence on combinations of platforms and compilers
# and make it independent
$<$<PLATFORM_ID:Windows>:$<$<CXX_COMPILER_ID:Clang>:-static>>)

4
src/coders/BasicParser.inl
View File

@ -6,7 +6,7 @@
#include "util/stringutil.hpp"
namespace {
int is_box(int c) {
inline int is_box(int c) {
switch (c) {
case 'B':
case 'b':
@ -21,7 +21,7 @@ namespace {
return 10;
}
double power(double base, int64_t power) {
inline double power(double base, int64_t power) {
double result = 1.0;
for (int64_t i = 0; i < power; i++) {
result *= base;

1
src/coders/toml.cpp
View File

@ -30,7 +30,6 @@ class TomlReader : BasicParser<char> {
// todo: extract common part
std::string parseMultilineString() {
pos += 2;
char next = peek();
std::stringstream ss;
while (hasNext()) {

4
src/coders/vec3.cpp
View File

@ -68,7 +68,7 @@ static model::Mesh build_mesh(
const glm::vec2* uvs = nullptr;
const glm::vec3* normals = nullptr;
int coordsIndex, uvsIndex, normalsIndex;
int coordsIndex = 0, uvsIndex = 0, normalsIndex = 0;
for (int i = 0; i < attrs.size(); i++) {
const auto& attr = attrs[i];
@ -204,7 +204,7 @@ File vec3::load(
// Header
reader.checkMagic("\0\0VEC3\0\0", 8);
int version = reader.getInt16();
int reserved = reader.getInt16();
[[maybe_unused]] int reserved = reader.getInt16();
if (version > VERSION) {
throw std::runtime_error("unsupported VEC3 version");
}

10
src/content/ContentReport.cpp
View File

@ -41,13 +41,13 @@ static void process_blocks_data(
continue;
}
if (def->dataStruct == nullptr) {
ContentIssue issue {ContentIssueType::BLOCK_DATA_LAYOUTS_UPDATE};
ContentIssue issue {ContentIssueType::BLOCK_DATA_LAYOUTS_UPDATE, {}};
report.issues.push_back(issue);
report.dataLoss.push_back(name + ": discard data");
continue;
}
if (layout != *def->dataStruct) {
ContentIssue issue {ContentIssueType::BLOCK_DATA_LAYOUTS_UPDATE};
ContentIssue issue {ContentIssueType::BLOCK_DATA_LAYOUTS_UPDATE, {}};
report.issues.push_back(issue);
report.dataLayoutsUpdated = true;
}
@ -111,10 +111,10 @@ static void build_issues(
) {
auto type = report.getContentType();
if (report.hasContentReorder()) {
issues.push_back(ContentIssue {ContentIssueType::REORDER, type});
issues.push_back(ContentIssue {ContentIssueType::REORDER, {type}});
}
if (report.hasMissingContent()) {
issues.push_back(ContentIssue {ContentIssueType::MISSING, type});
issues.push_back(ContentIssue {ContentIssueType::MISSING, {type}});
}
}
@ -126,7 +126,7 @@ void ContentReport::buildIssues() {
for (int layer = REGION_LAYER_VOXELS;
layer < REGION_LAYERS_COUNT;
layer++) {
ContentIssue issue {ContentIssueType::REGION_FORMAT_UPDATE};
ContentIssue issue {ContentIssueType::REGION_FORMAT_UPDATE, {}};
issue.regionLayer = static_cast<RegionLayerIndex>(layer);
issues.push_back(issue);
}

1
src/content/loading/GeneratorLoader.cpp
View File

@ -7,6 +7,7 @@
#include "io/io.hpp"
#include "io/engine_paths.hpp"
#include "logic/scripting/scripting.hpp"
#include "util/stringutil.hpp"
#include "world/generator/GeneratorDef.hpp"
#include "world/generator/VoxelFragment.hpp"
#include "debug/Logger.hpp"

4
src/data/StructLayout.hpp
View File

@ -245,11 +245,11 @@ namespace data {
return totalSize;
}
[[nodiscard]] const auto begin() const {
[[nodiscard]] auto begin() const {
return fields.begin();
}
[[nodiscard]] const auto end() const {
[[nodiscard]] auto end() const {
return fields.end();
}

1
src/frontend/hud.cpp
View File

@ -310,7 +310,6 @@ void Hud::updateWorldGenDebug() {
}
void Hud::update(bool visible) {
const auto& level = frontend.getLevel();
const auto& chunks = *player.chunks;
const auto& menu = gui.getMenu();

1
src/frontend/menu.cpp
View File

@ -38,7 +38,6 @@ bool menus::call(Engine& engine, runnable func) {
if (engine.isHeadless()) {
throw std::runtime_error("menus::call(...) in headless mode");
}
auto gui = engine.getGUI();
try {
func();
return true;

1
src/frontend/screens/LevelScreen.cpp
View File

@ -154,7 +154,6 @@ void LevelScreen::saveDecorations() {
void LevelScreen::saveWorldPreview() {
try {
logger.info() << "saving world preview";
const auto& paths = engine.getPaths();
auto player = playerController->getPlayer();
auto& settings = engine.getSettings();
int previewSize = settings.ui.worldPreviewSize.get();

1
src/graphics/core/Font.cpp
View File

@ -153,7 +153,6 @@ static inline void draw_text(
}
batch.texture(font.getPage(0));
for (size_t i = 0; i < text.length(); i++) {
uint c = text[i];
size_t styleIndex = styles->map.at(
std::min(styles->map.size() - 1, i + styleMapOffset)
);

9
src/graphics/render/BlocksRenderer.cpp
View File

@ -329,8 +329,6 @@ void BlocksRenderer::blockCube(
bool lights,
bool ao
) {
ubyte group = block.drawGroup;
glm::ivec3 X(1, 0, 0);
glm::ivec3 Y(0, 1, 0);
glm::ivec3 Z(0, 0, 1);
@ -557,7 +555,7 @@ SortingMeshData BlocksRenderer::renderTranslucent(
y + 0.5f,
z + chunk->z * CHUNK_D + 0.5f
),
util::Buffer<float>(indexSize * CHUNK_VERTEX_SIZE)};
util::Buffer<float>(indexSize * CHUNK_VERTEX_SIZE), 0};
totalSize += entry.vertexData.size();
@ -593,7 +591,8 @@ SortingMeshData BlocksRenderer::renderTranslucent(
sortingMesh.entries.size() > 1) {
SortingMeshEntry newEntry {
sortingMesh.entries[0].position,
util::Buffer<float>(totalSize)
util::Buffer<float>(totalSize),
0
};
size_t offset = 0;
for (const auto& entry : sortingMesh.entries) {
@ -643,7 +642,7 @@ void BlocksRenderer::build(const Chunk* chunk, const Chunks* chunks) {
vertexOffset = 0;
indexOffset = indexSize = 0;
sortingMesh = std::move(renderTranslucent(voxels, beginEnds));
sortingMesh = renderTranslucent(voxels, beginEnds);
overflow = false;
vertexOffset = 0;

9
src/graphics/render/ChunksRenderer.cpp
View File

@ -19,7 +19,6 @@ static debug::Logger logger("chunks-render");
size_t ChunksRenderer::visibleChunks = 0;
class RendererWorker : public util::Worker<std::shared_ptr<Chunk>, RendererResult> {
const Level& level;
const Chunks& chunks;
BlocksRenderer renderer;
public:
@ -29,8 +28,7 @@ public:
const ContentGfxCache& cache,
const EngineSettings& settings
)
: level(level),
chunks(chunks),
: chunks(chunks),
renderer(
settings.graphics.denseRender.get()
? settings.graphics.chunkMaxVerticesDense.get()
@ -45,7 +43,7 @@ public:
renderer.build(chunk.get(), &chunks);
if (renderer.isCancelled()) {
return RendererResult {
glm::ivec2(chunk->x, chunk->z), true, MeshData()};
glm::ivec2(chunk->x, chunk->z), true, ChunkMeshData {}};
}
auto meshData = renderer.createMesh();
return RendererResult {
@ -61,8 +59,7 @@ ChunksRenderer::ChunksRenderer(
const ContentGfxCache& cache,
const EngineSettings& settings
)
: level(*level),
chunks(chunks),
: chunks(chunks),
assets(assets),
frustum(frustum),
settings(settings),

1
src/graphics/render/ChunksRenderer.hpp
View File

@ -42,7 +42,6 @@ struct RendererResult {
};
class ChunksRenderer {
const Level& level;
const Chunks& chunks;
const Assets& assets;
const Frustum& frustum;

7
src/graphics/render/Decorator.cpp
View File

@ -40,11 +40,10 @@ Decorator::Decorator(
const Assets& assets,
Player& player
)
: engine(engine),
level(*controller.getLevel()),
renderer(renderer),
: level(*controller.getLevel()),
assets(assets),
player(player) {
player(player),
renderer(renderer) {
controller.getBlocksController()->listenBlockInteraction(
[this](auto player, const auto& pos, const auto& def, BlockInteraction type) {
if (type == BlockInteraction::placing && def.particles) {

3
src/graphics/render/Decorator.hpp
View File

@ -18,11 +18,10 @@ class Block;
class Engine;
class LevelController;
class WorldRenderer;
class Weather;
struct Weather;
struct WeatherPreset;
class Decorator {
Engine& engine;
const Level& level;
const Assets& assets;
Player& player;

2
src/graphics/render/Emitter.cpp
View File

@ -19,7 +19,7 @@ Emitter::Emitter(
)
: level(level),
origin(std::move(origin)),
prototype({this, 0, {}, preset.velocity, preset.lifetime, region}),
prototype({this, 0, {}, preset.velocity, preset.lifetime, region, 0, 0}),
texture(texture),
count(count),
preset(std::move(preset)) {

7
src/graphics/render/ModelBatch.cpp
View File

@ -51,11 +51,10 @@ ModelBatch::ModelBatch(
const Chunks& chunks,
const EngineSettings& settings
)
: batch(std::make_unique<MainBatch>(capacity)),
assets(assets),
: assets(assets),
chunks(chunks),
settings(settings) {
}
settings(settings),
batch(std::make_unique<MainBatch>(capacity)) {}
ModelBatch::~ModelBatch() = default;

8
src/graphics/render/ParticlesRenderer.cpp
View File

@ -21,11 +21,10 @@ ParticlesRenderer::ParticlesRenderer(
const Chunks& chunks,
const GraphicsSettings* settings
)
: batch(std::make_unique<MainBatch>(4096)),
level(level),
chunks(chunks),
: chunks(chunks),
assets(assets),
settings(settings) {
settings(settings),
batch(std::make_unique<MainBatch>(4096)) {
}
ParticlesRenderer::~ParticlesRenderer() = default;
@ -171,7 +170,6 @@ void ParticlesRenderer::render(const Camera& camera, float delta) {
continue;
}
auto texture = emitter.getTexture();
const auto& found = particles.find(texture);
std::vector<Particle>* vec;
vec = &particles[texture];
emitter.update(delta, camera.position, *vec);

1
src/graphics/render/ParticlesRenderer.hpp
View File

@ -16,7 +16,6 @@ class Level;
struct GraphicsSettings;
class ParticlesRenderer {
const Level& level;
const Chunks& chunks;
const Assets& assets;
const GraphicsSettings* settings;

8
src/graphics/render/PrecipitationRenderer.cpp
View File

@ -18,15 +18,13 @@
PrecipitationRenderer::PrecipitationRenderer(
const Assets& assets,
const Level& level,
const Level&,
const Chunks& chunks,
const GraphicsSettings* settings
const GraphicsSettings*
)
: batch(std::make_unique<MainBatch>(4096)),
level(level),
chunks(chunks),
assets(assets),
settings(settings) {
assets(assets) {
}
PrecipitationRenderer::~PrecipitationRenderer() = default;

2
src/graphics/render/PrecipitationRenderer.hpp
View File

@ -12,10 +12,8 @@ struct WeatherPreset;
class PrecipitationRenderer {
std::unique_ptr<MainBatch> batch;
const Level& level;
const Chunks& chunks;
const Assets& assets;
const GraphicsSettings* settings;
float timer = 0.0f;
int getHeightAt(int x, int z);

8
src/graphics/render/WorldRenderer.cpp
View File

@ -72,10 +72,6 @@ WorldRenderer::WorldRenderer(
modelBatch(std::make_unique<ModelBatch>(
MODEL_BATCH_CAPACITY, assets, *player.chunks, engine.getSettings()
)),
particles(std::make_unique<ParticlesRenderer>(
assets, level, *player.chunks, &engine.getSettings().graphics
)),
texts(std::make_unique<TextsRenderer>(*batch3d, assets, *frustumCulling)),
guides(std::make_unique<GuidesRenderer>()),
chunks(std::make_unique<ChunksRenderer>(
&level,
@ -85,6 +81,10 @@ WorldRenderer::WorldRenderer(
frontend.getContentGfxCache(),
engine.getSettings()
)),
particles(std::make_unique<ParticlesRenderer>(
assets, level, *player.chunks, &engine.getSettings().graphics
)),
texts(std::make_unique<TextsRenderer>(*batch3d, assets, *frustumCulling)),
blockWraps(
std::make_unique<BlockWrapsRenderer>(assets, level, *player.chunks)
),

8
src/graphics/render/WorldRenderer.hpp
View File

@ -43,10 +43,10 @@ class WorldRenderer {
std::unique_ptr<Frustum> frustumCulling;
std::unique_ptr<LineBatch> lineBatch;
std::unique_ptr<Batch3D> batch3d;
std::unique_ptr<ChunksRenderer> chunks;
std::unique_ptr<GuidesRenderer> guides;
std::unique_ptr<Skybox> skybox;
std::unique_ptr<ModelBatch> modelBatch;
std::unique_ptr<GuidesRenderer> guides;
std::unique_ptr<ChunksRenderer> chunks;
std::unique_ptr<Skybox> skybox;
Weather weather {};
float timer = 0.0f;
@ -73,8 +73,8 @@ class WorldRenderer {
float fogFactor
);
public:
std::unique_ptr<TextsRenderer> texts;
std::unique_ptr<ParticlesRenderer> particles;
std::unique_ptr<TextsRenderer> texts;
std::unique_ptr<BlockWrapsRenderer> blockWraps;
std::unique_ptr<PrecipitationRenderer> precipitation;

2
src/graphics/ui/elements/InputBindBox.hpp
View File

@ -7,9 +7,9 @@ namespace gui {
class InputBindBox : public Panel {
protected:
Binding& binding;
glm::vec4 focusedColor {0.1f, 0.15f, 0.35f, 0.75f};
std::shared_ptr<Label> label;
Binding& binding;
public:
InputBindBox(Binding& binding, glm::vec4 padding=glm::vec4(6.0f));

2
src/graphics/ui/elements/InventoryView.hpp
View File

@ -12,7 +12,7 @@
class Font;
class Assets;
class ItemDef;
struct ItemDef;
class Batch2D;
class DrawContext;
class Content;

6
src/graphics/ui/elements/Label.cpp
View File

@ -1,12 +1,13 @@
#include "Label.hpp"
#include <utility>
#include "assets/Assets.hpp"
#include "graphics/core/DrawContext.hpp"
#include "graphics/core/Batch2D.hpp"
#include "graphics/core/Font.hpp"
#include "assets/Assets.hpp"
#include "graphics/ui/markdown.hpp"
#include "util/stringutil.hpp"
#include "../markdown.hpp"
using namespace gui;
@ -60,7 +61,6 @@ void LabelCache::update(std::wstring_view text, bool multiline, bool wrap) {
}
}
if (font != nullptr) {
int lineHeight = font->getLineHeight();
int maxWidth = 0;
for (int i = 0; i < lines.size() - 1; i++) {
const auto& next = lines[i + 1];

12
src/graphics/ui/elements/TextBox.cpp
View File

@ -1,15 +1,16 @@
#include "TextBox.hpp"
#include <algorithm>
#include <sstream>
#include <utility>
#include <algorithm>
#include "Label.hpp"
#include "devtools/syntax_highlighting.hpp"
#include "graphics/core/DrawContext.hpp"
#include "graphics/core/Batch2D.hpp"
#include "graphics/core/Font.hpp"
#include "assets/Assets.hpp"
#include "devtools/syntax_highlighting.hpp"
#include "graphics/core/Batch2D.hpp"
#include "graphics/core/DrawContext.hpp"
#include "graphics/core/Font.hpp"
#include "graphics/ui/markdown.hpp"
#include "util/stringutil.hpp"
#include "window/Events.hpp"
#include "window/Window.hpp"
@ -602,7 +603,6 @@ void TextBox::onFocus(GUI* gui) {
}
void TextBox::reposition() {
auto size = getSize();
UINode::reposition();
refreshLabel();
}

6
src/graphics/ui/gui_util.cpp
View File

@ -46,7 +46,7 @@ void guiutil::alert(
auto menuPtr = engine.getGUI()->getMenu();
auto& menu = *menuPtr;
runnable on_hidden_final = [on_hidden, &menu, &engine]() {
runnable on_hidden_final = [on_hidden, &menu]() {
menu.removePage("<alert>");
if (on_hidden) {
on_hidden();
@ -103,7 +103,7 @@ void guiutil::confirm(
auto menu = engine.getGUI()->getMenu();
runnable on_confirm_final = [on_confirm, menu, &engine]() {
runnable on_confirm_final = [on_confirm, menu]() {
menu->removePage("<confirm>");
if (on_confirm) {
on_confirm();
@ -112,7 +112,7 @@ void guiutil::confirm(
}
};
runnable on_deny_final = [on_deny, menu, &engine]() {
runnable on_deny_final = [on_deny, menu]() {
menu->removePage("<confirm>");
if (on_deny) {
on_deny();

4
src/io/memory_ostream.hpp
View File

@ -9,8 +9,8 @@
class memory_buffer : public std::streambuf {
public:
explicit memory_buffer(size_t initial_size = 64)
: capacity(initial_size),
buffer(std::make_unique<char[]>(initial_size)) {
: buffer(std::make_unique<char[]>(initial_size)),
capacity(initial_size) {
setp(buffer.get(), buffer.get() + initial_size);
}

2
src/io/path.cpp
View File

@ -59,8 +59,6 @@ path path::normalized() const {
}
parts.push(std::move(token));
}
bool started = false;
path = "";
while (!parts.empty()) {
const auto& token = parts.top();

3
src/logic/PlayerController.cpp
View File

@ -217,8 +217,7 @@ PlayerController::PlayerController(
Player& player,
BlocksController& blocksController
)
: settings(settings),
level(level),
: level(level),
player(player),
camControl(player, settings.camera),
blocksController(blocksController) {

1
src/logic/PlayerController.hpp
View File

@ -47,7 +47,6 @@ public:
};
class PlayerController {
const EngineSettings& settings;
Level& level;
Player& player;
PlayerInput input {};

3
src/logic/scripting/lua/libs/libblock.cpp
View File

@ -145,7 +145,7 @@ static int get_axis(lua::State* L) {
}
auto z = lua::tointeger(L, 3);
glm::ivec3 defAxis;
glm::ivec3 defAxis {};
defAxis[n] = 1;
auto vox = blocks_agent::get(*level->chunks, x, y, z);
@ -562,6 +562,7 @@ static int set_field(
return lua::pushinteger(L,
dataStruct.setUnicode(dst, value.asString(), field));
}
[[fallthrough]];
case data::FieldType::I8:
case data::FieldType::I16:
case data::FieldType::I32:

3
src/logic/scripting/lua/libs/libgeneration.cpp
View File

@ -13,7 +13,6 @@
using namespace scripting;
static int l_save_fragment(lua::State* L) {
const auto& paths = engine->getPaths();
auto fragment = lua::touserdata<lua::LuaVoxelFragment>(L, 1);
auto file = lua::require_string(L, 2);
auto map = fragment->getFragment()->serialize();
@ -55,13 +54,11 @@ static int l_get_generators(lua::State* L) {
lua::createtable(L, 0, 0);
int i = 1;
for (const auto& pack : packs) {
auto pairs = ContentLoader::scanContent(pack, ContentType::GENERATOR);
for (const auto& [name, caption] : pairs) {
lua::pushstring(L, caption);
lua::setfield(L, name);
i++;
}
}
return 1;

2
src/logic/scripting/lua/libs/libgui.cpp
View File

@ -783,7 +783,7 @@ static int l_gui_escape_markup(lua::State* L) {
auto lang = lua::require_string(L, 1);
std::string text = lua::require_string(L, 2);
if (std::strcmp(lang, "md") == 0) {
text = std::move(markdown::escape<char>(text));
text = markdown::escape<char>(text);
}
return lua::pushstring(L, text);
}

1
src/logic/scripting/lua/libs/libinventory.cpp
View File

@ -227,7 +227,6 @@ static int l_has_data(lua::State* L, ItemStack& stack) {
static int l_set_data(lua::State* L, ItemStack& stack) {
auto key = lua::require_string(L, 3);
auto value = lua::tovalue(L, 4);
auto& fields = stack.getFields();
stack.setField(key, std::move(value));
return 0;
}

2
src/logic/scripting/lua/libs/libpack.cpp
View File

@ -235,7 +235,7 @@ static int l_pack_assemble(lua::State* L) {
auto manager = engine->createPacksManager(worldFolder);
manager.scan();
try {
ids = std::move(manager.assemble(ids));
ids = manager.assemble(ids);
} catch (const contentpack_error& err) {
throw std::runtime_error(
std::string(err.what()) + " [" + err.getPackId() + "]"

1
src/logic/scripting/lua/libs/libparticles.cpp
View File

@ -59,7 +59,6 @@ static int l_get_origin(lua::State* L) {
static int l_set_origin(lua::State* L) {
u64id_t id = lua::touinteger(L, 1);
if (auto emitter = renderer->particles->getEmitter(id)) {
EmitterOrigin origin;
if (lua::istable(L, 2)) {
emitter->setOrigin(lua::tovec3(L, 2));
} else {

4
src/logic/scripting/lua/libs/libworld.cpp
View File

@ -149,9 +149,7 @@ static int l_get_chunk_data(lua::State* L) {
static void integrate_chunk_client(Chunk& chunk) {
int x = chunk.x;
int z = chunk.z;
auto chunksController = controller->getChunksController();
Lighting& lighting = *chunksController->lighting;
chunk.flags.loadedLights = false;
chunk.flags.lighted = false;
chunk.lightmap.clear();

1
src/logic/scripting/lua/usertypes/lua_type_heightmap.cpp
View File

@ -50,7 +50,6 @@ const float* LuaHeightmap::getValues() const {
}
static int l_dump(lua::State* L) {
const auto& paths = scripting::engine->getPaths();
if (auto heightmap = touserdata<LuaHeightmap>(L, 1)) {
io::path file = require_string(L, 2);
uint w = heightmap->getWidth();

47
src/maths/FastNoiseLite.h
View File

@ -21,41 +21,26 @@
// 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
// .'',;: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
// ....';: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
// . .....';:cldxkO0000Okxol:;,''',,;::cccc:;,,'.......'',;:cldxxkkxxdolc:;;,'.......';coxOKXNWWWNXKOkxddddxxkkkkkkxdoollllooddxxxxkkk
// ....',;:codxkO000OOxdoc:;,''',,,;;;;,''.......',,;:clodkO00000Okxolc::;,,''..',;:ldxOKXNWWWNNK0OkkkkkkkkkkkxxddooooodxxkOOOOO000
// ....',;;clodxkkOOOkkdolc:;,,,,,,,,'..........,;:clodxkO0KKXKK0Okxdolcc::;;,,,;;:codkO0XXNNNNXKK0OOOOOkkkkxxdoollloodxkO0KKKXXXXX
//

2
src/maths/Heightmap.hpp
View File

@ -16,8 +16,8 @@ enum class InterpolationType {
std::optional<InterpolationType> InterpolationType_from(std::string_view str);
class Heightmap {
std::vector<float> buffer;
uint width, height;
std::vector<float> buffer;
public:
Heightmap(uint width, uint height)
: width(width), height(height) {

10
src/network/Network.cpp
View File

@ -85,7 +85,8 @@ public:
OnReject onReject,
long maxSize
) override {
Request request {RequestType::GET, url, onResponse, onReject, maxSize};
Request request {
RequestType::GET, url, onResponse, onReject, maxSize, false, ""};
processRequest(std::move(request));
}
@ -96,7 +97,8 @@ public:
OnReject onReject=nullptr,
long maxSize=0
) override {
Request request {RequestType::POST, url, onResponse, onReject, maxSize};
Request request {
RequestType::POST, url, onResponse, onReject, maxSize, false, ""};
request.data = data;
processRequest(std::move(request));
}
@ -288,7 +290,6 @@ static std::string to_string(const sockaddr_in& addr, bool port=true) {
class SocketConnection : public Connection {
SOCKET descriptor;
bool open = true;
sockaddr_in addr;
size_t totalUpload = 0;
size_t totalDownload = 0;
@ -453,7 +454,8 @@ public:
throw std::runtime_error(gai_strerror(res));
}
sockaddr_in serverAddress = *(sockaddr_in*)addrinfo->ai_addr;
sockaddr_in serverAddress;
std::memcpy(&serverAddress, addrinfo->ai_addr, sizeof(sockaddr_in));
serverAddress.sin_port = htons(port);
freeaddrinfo(addrinfo);

12
src/util/HandlersList.hpp
View File

@ -1,15 +1,15 @@
#pragma once
#include <mutex>
#include <vector>
#include <algorithm>
#include <mutex>
#include <unordered_map>
#include <vector>
#include "typedefs.hpp"
#include "delegates.hpp"
#include "typedefs.hpp"
namespace util {
template<class...Types>
template <class... Types>
class HandlersList {
int nextid = 1;
std::unordered_map<int, std::function<bool(Types...)>> handlers;
@ -35,7 +35,7 @@ namespace util {
int id = nextid++;
handlers[id] = std::move(handler);
order.push_back(id);
return observer_handler(new int(id), [this](int* id) { //-V508
return observer_handler(new int(id), [this](int* id) { //-V508
std::lock_guard lock(mutex);
handlers.erase(*id);
order.erase(
@ -45,7 +45,7 @@ namespace util {
});
}
void notify(Types...args) {
void notify(Types... args) {
std::vector<int> orderCopy;
decltype(handlers) handlersCopy;
{

8
src/util/platform.cpp
View File

@ -9,6 +9,9 @@
#include "stringutil.hpp"
#include "typedefs.hpp"
#include "debug/Logger.hpp"
static debug::Logger logger("platform");
#ifdef _WIN32
#include <Windows.h>
@ -103,6 +106,9 @@ void platform::open_folder(const std::filesystem::path& folder) {
ShellExecuteW(NULL, L"open", folder.wstring().c_str(), NULL, NULL, SW_SHOWDEFAULT);
#else
auto cmd = "xdg-open " + util::quote(folder.u8string());
system(cmd.c_str());
if (int res = system(cmd.c_str())) {
logger.warning() << "'" << cmd << "' returned code " << res;
}
#endif
}

1
src/voxels/blocks_agent.hpp
View File

@ -13,6 +13,7 @@
#include "content/Content.hpp"
#include "maths/voxmaths.hpp"
#include <algorithm>
#include <set>
#include <algorithm>
#include <stdint.h>

3
src/world/Level.cpp
View File

@ -21,8 +21,7 @@ Level::Level(
const Content& content,
EngineSettings& settings
)
: settings(settings),
world(std::move(worldPtr)),
: world(std::move(worldPtr)),
content(content),
chunks(std::make_unique<GlobalChunks>(*this)),
physics(std::make_unique<PhysicsSolver>(glm::vec3(0, -22.6f, 0))),

1
src/world/Level.hpp
View File

@ -20,7 +20,6 @@ struct EngineSettings;
/// @brief A level, contains chunks and objects
class Level {
const EngineSettings& settings;
std::unique_ptr<World> world;
public:
const Content& content;

6
src/world/files/WorldConverter.cpp
View File

@ -54,7 +54,6 @@ void WorldConverter::addRegionsTasks(
}
void WorldConverter::createUpgradeTasks() {
const auto& regions = wfile->getRegions();
for (auto& issue : report->getIssues()) {
if (issue.issueType != ContentIssueType::REGION_FORMAT_UPDATE) {
continue;
@ -83,7 +82,6 @@ void WorldConverter::createConvertTasks() {
}
};
const auto& regions = wfile->getRegions();
for (auto& issue : report->getIssues()) {
switch (issue.issueType) {
case ContentIssueType::BLOCK_DATA_LAYOUTS_UPDATE:
@ -97,13 +95,13 @@ void WorldConverter::createConvertTasks() {
}
}
tasks.push(ConvertTask {ConvertTaskType::PLAYER, wfile->getPlayerFile()});
tasks.push(ConvertTask {
ConvertTaskType::PLAYER, wfile->getPlayerFile(), 0, 0, {}});
}
void WorldConverter::createBlockFieldsConvertTasks() {
// blocks data conversion requires correct block indices
// so it must be done AFTER voxels conversion
const auto& regions = wfile->getRegions();
for (auto& issue : report->getIssues()) {
switch (issue.issueType) {
case ContentIssueType::BLOCK_DATA_LAYOUTS_UPDATE:

3
src/world/files/compatibility.cpp
View File

@ -43,7 +43,7 @@ util::Buffer<ubyte> compatibility::convert_region_2to3(
const util::Buffer<ubyte>& src, RegionLayerIndex layer
) {
const size_t REGION_CHUNKS = 1024;
const size_t HEADER_SIZE = 10;
// const size_t HEADER_SIZE = 10;
const size_t OFFSET_TABLE_SIZE = REGION_CHUNKS * sizeof(uint32_t);
const ubyte COMPRESS_NONE = 0;
const ubyte COMPRESS_EXTRLE8 = 1;
@ -61,7 +61,6 @@ util::Buffer<ubyte> compatibility::convert_region_2to3(
}
uint32_t offsets[REGION_CHUNKS] {};
size_t chunkIndex = 0;
auto tablePtr = reinterpret_cast<const uint32_t*>(
ptr + src.size() - OFFSET_TABLE_SIZE

2
src/world/generator/GeneratorDef.cpp
View File

@ -8,7 +8,7 @@
VoxelStructure::VoxelStructure(
VoxelStructureMeta meta,
std::unique_ptr<VoxelFragment> structure
) : fragments({std::move(structure)}), meta(std::move(meta)) {}
) : meta(std::move(meta)), fragments({std::move(structure)}) {}
GeneratorDef::GeneratorDef(std::string name)
: name(std::move(name)), caption(util::id_to_caption(name)) {

6
src/world/generator/WorldGenerator.cpp
View File

@ -437,7 +437,6 @@ void WorldGenerator::generate(voxel* voxels, int chunkX, int chunkZ) {
std::memset(voxels, 0, sizeof(voxel) * CHUNK_VOL);
const auto& indices = content.getIndices()->blocks;
const auto& biomes = prototype.biomes.get();
for (uint z = 0; z < CHUNK_D; z++) {
for (uint x = 0; x < CHUNK_W; x++) {
@ -456,6 +455,7 @@ void WorldGenerator::generate(voxel* voxels, int chunkX, int chunkZ) {
generatePlacements(prototype, voxels, chunkX, chunkZ);
generatePlants(prototype, values, voxels, chunkX, chunkZ, biomes);
[[maybe_unused]] const auto& indices = content.getIndices()->blocks;
for (uint i = 0; i < CHUNK_VOL; i++) {
blockid_t& id = voxels[i].id;
if (id == BLOCK_STRUCT_AIR) {
@ -609,3 +609,7 @@ WorldGenDebugInfo WorldGenerator::createDebugInfo() const {
std::move(values)
};
}
uint64_t WorldGenerator::getSeed() const {
return seed;
}

2
src/world/generator/WorldGenerator.hpp
View File

@ -134,4 +134,6 @@ public:
void generate(voxel* voxels, int x, int z);
WorldGenDebugInfo createDebugInfo() const;
uint64_t getSeed() const;
};

16
test/CMakeLists.txt
View File

@ -1,26 +1,22 @@
project(VoxelEngineTest)
set(CMAKE_CXX_STANDARD 17)
file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
file(GLOB_RECURSE sources ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
find_package(GTest)
add_executable(${PROJECT_NAME} ${SOURCES})
add_executable(VoxelEngineTest ${sources})
target_include_directories(${PROJECT_NAME}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../src)
target_link_libraries(${PROJECT_NAME} VoxelEngineSrc GTest::gtest_main)
target_link_libraries(VoxelEngineTest PRIVATE VoxelEngineSrc GTest::gtest_main)
# HACK: copy res to test/ folder for fixing problem compatibility MultiConfig
# and non MultiConfig builds. Delete in future and use only root res folder Also
# this resolve problem with ctests, because it set cwd to
# CMAKE_CURRENT_BINARY_DIR
# ${CMAKE_CURRENT_BINARY_DIR}
add_custom_command(
TARGET ${PROJECT_NAME}
TARGET VoxelEngineTest
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different
${CMAKE_SOURCE_DIR}/res ${CMAKE_CURRENT_BINARY_DIR}/res)
include(GoogleTest)
gtest_discover_tests(${PROJECT_NAME})
gtest_discover_tests(VoxelEngineTest)

3
test/coders/lua_parsing.cpp
View File

@ -1,7 +1,8 @@
#include "coders/lua_parsing.hpp"
#include <gtest/gtest.h>
#include "coders/commons.hpp"
#include "coders/lua_parsing.hpp"
#include "io/io.hpp"
#include "io/devices/StdfsDevice.hpp"
#include "util/stringutil.hpp"

54
vctest/CMakeLists.txt
View File

@ -1,42 +1,22 @@
project(vctest)
set(CMAKE_CXX_STANDARD 17)
add_executable(vctest ${CMAKE_CURRENT_LIST_DIR}/main.cpp)
file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
# Needed for header-only source util/ArgsReader.hpp
target_include_directories(vctest PRIVATE ${CMAKE_SOURCE_DIR}/src)
add_executable(${PROJECT_NAME} ${SOURCES})
target_compile_options(
vctest
PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/W4>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:
-Wall
-Wextra
-Wformat-nonliteral
-Wcast-align
-Wpointer-arith
-Wundef
-Wwrite-strings
-Wno-unused-parameter
>)
if(MSVC)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE
Release
CACHE STRING "Build type" FORCE)
endif()
if((CMAKE_BUILD_TYPE EQUAL "Release") OR (CMAKE_BUILD_TYPE EQUAL
"RelWithDebInfo"))
set(CMAKE_MSVC_RUNTIME_LIBRARY
"MultiThreaded$<$<CONFIG:Release>:Release>")
target_compile_options(${PROJECT_NAME} PRIVATE /W4 /MT /O2)
else()
target_compile_options(${PROJECT_NAME} PRIVATE /W4)
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
else()
target_compile_options(
${PROJECT_NAME}
PRIVATE -Wall
-Wextra
-Wformat-nonliteral
-Wcast-align
-Wpointer-arith
-Wundef
-Wwrite-strings
-Wno-unused-parameter)
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie")
endif()
target_include_directories(
${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../src ${CMAKE_DL_LIBS})
target_link_options(vctest PRIVATE $<$<CXX_COMPILER_ID:GNU>:-no-pie>)