diff --git a/src/assets/Assets.cpp b/src/assets/Assets.cpp index c7ef6946..993e7360 100644 --- a/src/assets/Assets.cpp +++ b/src/assets/Assets.cpp @@ -1,7 +1,6 @@ #include "Assets.hpp" -Assets::~Assets() { -} +Assets::~Assets() = default; const std::vector& Assets::getAnimations() { return animations; diff --git a/src/assets/Assets.hpp b/src/assets/Assets.hpp index 4474301e..d30f8187 100644 --- a/src/assets/Assets.hpp +++ b/src/assets/Assets.hpp @@ -68,7 +68,7 @@ class Assets { std::unordered_map assets; std::vector setupFuncs; public: - Assets() {} + Assets() = default; Assets(const Assets&) = delete; ~Assets(); diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp index b6a36e42..56887994 100644 --- a/src/audio/audio.cpp +++ b/src/audio/audio.cpp @@ -266,7 +266,7 @@ speakerid_t audio::play( } auto speaker = speaker_ptr.get(); speakerid_t id = nextId++; - speakers.emplace(id, std::move(speaker_ptr)); + speakers.try_emplace(id, std::move(speaker_ptr)); speaker->setPosition(position); speaker->setVolume(volume); speaker->setPitch(pitch); @@ -295,8 +295,8 @@ speakerid_t audio::play( } auto speaker = speaker_ptr.get(); speakerid_t id = nextId++; - streams.emplace(id, stream); - speakers.emplace(id, std::move(speaker_ptr)); + streams.try_emplace(id, stream); + speakers.try_emplace(id, std::move(speaker_ptr)); stream->bindSpeaker(id); speaker->setPosition(position); diff --git a/src/coders/xml.hpp b/src/coders/xml.hpp index c70ce9c2..4af2e4b1 100644 --- a/src/coders/xml.hpp +++ b/src/coders/xml.hpp @@ -23,7 +23,7 @@ namespace xml { std::string name; std::string text; public: - Attribute() {}; + Attribute() = default; Attribute(std::string name, std::string text); const std::string& getName() const; diff --git a/src/content/Content.cpp b/src/content/Content.cpp index 11e204d6..2e5612a4 100644 --- a/src/content/Content.cpp +++ b/src/content/Content.cpp @@ -46,8 +46,7 @@ Content::Content( } } -Content::~Content() { -} +Content::~Content() = default; const rigging::SkeletonConfig* Content::getSkeleton(const std::string& id) const { auto found = skeletons.find(id); diff --git a/src/content/ContentBuilder.cpp b/src/content/ContentBuilder.cpp index 6f7b730b..76f3052c 100644 --- a/src/content/ContentBuilder.cpp +++ b/src/content/ContentBuilder.cpp @@ -2,7 +2,7 @@ #include "../objects/rigging.hpp" -ContentBuilder::~ContentBuilder() {} +ContentBuilder::~ContentBuilder() = default; void ContentBuilder::add(std::unique_ptr pack) { packs[pack->getId()] = std::move(pack); diff --git a/src/content/ContentPack.cpp b/src/content/ContentPack.cpp index 8388e30c..0c88c7b0 100644 --- a/src/content/ContentPack.cpp +++ b/src/content/ContentPack.cpp @@ -142,5 +142,4 @@ ContentPackRuntime::ContentPackRuntime( { } -ContentPackRuntime::~ContentPackRuntime() { -} +ContentPackRuntime::~ContentPackRuntime() = default; diff --git a/src/content/PacksManager.cpp b/src/content/PacksManager.cpp index c8bb4e05..675efee9 100644 --- a/src/content/PacksManager.cpp +++ b/src/content/PacksManager.cpp @@ -5,8 +5,7 @@ #include #include -PacksManager::PacksManager() { -} +PacksManager::PacksManager() = default; void PacksManager::setSources(std::vector sources) { this->sources = sources; @@ -19,7 +18,7 @@ void PacksManager::scan() { for (auto& folder : sources) { ContentPack::scanFolder(folder, packsList); for (auto& pack : packsList) { - packs.emplace(pack.id, pack); + packs.try_emplace(pack.id, pack); } } } diff --git a/src/data/dynamic.hpp b/src/data/dynamic.hpp index 90f4fe69..6299a1c7 100644 --- a/src/data/dynamic.hpp +++ b/src/data/dynamic.hpp @@ -41,7 +41,7 @@ namespace dynamic { public: std::vector values; - List() {} + List() = default; List(std::vector values) : values(std::move(values)) {} std::string str(size_t index) const; @@ -79,7 +79,7 @@ namespace dynamic { public: std::unordered_map values; - Map() {} + Map() = default; Map(std::unordered_map values) : values(std::move(values)) {}; diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index 0d2f96c5..31868e81 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -47,8 +47,7 @@ WorldFiles::WorldFiles(const fs::path& directory, const DebugSettings& settings) regions.doWriteLights = doWriteLights; } -WorldFiles::~WorldFiles() { -} +WorldFiles::~WorldFiles() = default; void WorldFiles::createDirectories() { fs::create_directories(directory / fs::path("data")); diff --git a/src/files/WorldRegions.cpp b/src/files/WorldRegions.cpp index 92feacda..642453f8 100644 --- a/src/files/WorldRegions.cpp +++ b/src/files/WorldRegions.cpp @@ -56,8 +56,7 @@ WorldRegion::WorldRegion() sizes(std::make_unique(REGION_CHUNKS_COUNT)) {} -WorldRegion::~WorldRegion() { -} +WorldRegion::~WorldRegion() = default; void WorldRegion::setUnsaved(bool unsaved) { this->unsaved = unsaved; @@ -98,8 +97,7 @@ WorldRegions::WorldRegions(const fs::path& directory) : directory(directory) { layers[REGION_LAYER_ENTITIES].folder = directory/fs::path("entities"); } -WorldRegions::~WorldRegions() { -} +WorldRegions::~WorldRegions() = default; WorldRegion* WorldRegions::getRegion(int x, int z, int layer) { RegionsLayer& regions = layers[layer]; diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp index b18492fd..4de80069 100644 --- a/src/frontend/ContentGfxCache.cpp +++ b/src/frontend/ContentGfxCache.cpp @@ -38,8 +38,7 @@ ContentGfxCache::ContentGfxCache(const Content* content, Assets* assets) : conte } } -ContentGfxCache::~ContentGfxCache() { -} +ContentGfxCache::~ContentGfxCache() = default; const Content* ContentGfxCache::getContent() const { return content; diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp index 067b71a3..e5cadff5 100644 --- a/src/frontend/LevelFrontend.cpp +++ b/src/frontend/LevelFrontend.cpp @@ -81,8 +81,7 @@ LevelFrontend::LevelFrontend( ); } -LevelFrontend::~LevelFrontend() { -} +LevelFrontend::~LevelFrontend() = default; Level* LevelFrontend::getLevel() const { return level; diff --git a/src/graphics/core/Atlas.cpp b/src/graphics/core/Atlas.cpp index 7d8f7a31..6823757d 100644 --- a/src/graphics/core/Atlas.cpp +++ b/src/graphics/core/Atlas.cpp @@ -19,8 +19,7 @@ Atlas::Atlas( } } -Atlas::~Atlas() { -} +Atlas::~Atlas() = default; void Atlas::prepare() { texture = Texture::from(image.get()); diff --git a/src/graphics/core/Atlas.hpp b/src/graphics/core/Atlas.hpp index 8e8a7b33..827f6d0a 100644 --- a/src/graphics/core/Atlas.hpp +++ b/src/graphics/core/Atlas.hpp @@ -47,7 +47,7 @@ class AtlasBuilder { std::vector entries; std::set names; public: - AtlasBuilder() {} + AtlasBuilder() = default; void add(const std::string& name, std::unique_ptr image); bool has(const std::string& name) const; const std::set& getNames() { return names; }; diff --git a/src/graphics/core/Font.cpp b/src/graphics/core/Font.cpp index 14a05296..ca94bd8b 100644 --- a/src/graphics/core/Font.cpp +++ b/src/graphics/core/Font.cpp @@ -12,8 +12,7 @@ Font::Font(std::vector> pages, int lineHeight, int yoff : lineHeight(lineHeight), yoffset(yoffset), pages(std::move(pages)) { } -Font::~Font(){ -} +Font::~Font() = default; int Font::getYOffset() const { return yoffset; diff --git a/src/graphics/core/ImageData.cpp b/src/graphics/core/ImageData.cpp index 6499afb4..ee40bafc 100644 --- a/src/graphics/core/ImageData.cpp +++ b/src/graphics/core/ImageData.cpp @@ -41,8 +41,7 @@ ImageData::ImageData(ImageFormat format, uint width, uint height, const ubyte* d std::memcpy(this->data.get(), data, width * height * pixsize); } -ImageData::~ImageData() { -} +ImageData::~ImageData() = default; void ImageData::flipX() { switch (format) { diff --git a/src/graphics/core/PostProcessing.cpp b/src/graphics/core/PostProcessing.cpp index 0498c5e7..7352c3b5 100644 --- a/src/graphics/core/PostProcessing.cpp +++ b/src/graphics/core/PostProcessing.cpp @@ -18,8 +18,7 @@ PostProcessing::PostProcessing() { quadMesh = std::make_unique(vertices, 6, attrs); } -PostProcessing::~PostProcessing() { -} +PostProcessing::~PostProcessing() = default; void PostProcessing::use(DrawContext& context) { const auto& vp = context.getViewport(); diff --git a/src/graphics/core/Shader.cpp b/src/graphics/core/Shader.cpp index 62d82ee3..7f551fb5 100644 --- a/src/graphics/core/Shader.cpp +++ b/src/graphics/core/Shader.cpp @@ -32,7 +32,7 @@ uint Shader::getUniformLocation(const std::string& name) { auto found = uniformLocations.find(name); if (found == uniformLocations.end()) { uint location = glGetUniformLocation(id, name.c_str()); - uniformLocations.emplace(name, location); + uniformLocations.try_emplace(name, location); return location; } return found->second; diff --git a/src/graphics/core/TextureAnimation.hpp b/src/graphics/core/TextureAnimation.hpp index ac6eb3b7..839566bd 100644 --- a/src/graphics/core/TextureAnimation.hpp +++ b/src/graphics/core/TextureAnimation.hpp @@ -22,7 +22,7 @@ struct Frame { class TextureAnimation { public: TextureAnimation(Texture* srcTex, Texture* dstTex) : srcTexture(srcTex), dstTexture(dstTex) {}; - ~TextureAnimation() {}; + ~TextureAnimation() = default; void addFrame(const Frame& frame) { frames.emplace_back(frame); }; diff --git a/src/graphics/render/ModelBatch.cpp b/src/graphics/render/ModelBatch.cpp index c5130402..468fcbd5 100644 --- a/src/graphics/render/ModelBatch.cpp +++ b/src/graphics/render/ModelBatch.cpp @@ -64,8 +64,7 @@ ModelBatch::ModelBatch(size_t capacity, Assets* assets, Chunks* chunks) blank = Texture::from(&image); } -ModelBatch::~ModelBatch() { -} +ModelBatch::~ModelBatch() = default; void ModelBatch::draw(const model::Mesh& mesh, const glm::mat4& matrix, const glm::mat3& rotation, glm::vec3 tint, diff --git a/src/graphics/render/Skybox.cpp b/src/graphics/render/Skybox.cpp index 49310609..029f0b8b 100644 --- a/src/graphics/render/Skybox.cpp +++ b/src/graphics/render/Skybox.cpp @@ -55,8 +55,7 @@ Skybox::Skybox(uint size, Shader* shader) }); } -Skybox::~Skybox() { -} +Skybox::~Skybox() = default; void Skybox::drawBackground(Camera* camera, Assets* assets, int width, int height) { auto backShader = assets->get("background"); diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index a16922d1..d9175be6 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -75,8 +75,7 @@ WorldRenderer::WorldRenderer(Engine* engine, LevelFrontend* frontend, Player* pl ); } -WorldRenderer::~WorldRenderer() { -} +WorldRenderer::~WorldRenderer() = default; bool WorldRenderer::drawChunk( size_t index, diff --git a/src/graphics/ui/GUI.cpp b/src/graphics/ui/GUI.cpp index 13f32a38..40ae9bf5 100644 --- a/src/graphics/ui/GUI.cpp +++ b/src/graphics/ui/GUI.cpp @@ -44,8 +44,7 @@ GUI::GUI() { container->add(tooltip); } -GUI::~GUI() { -} +GUI::~GUI() = default; std::shared_ptr GUI::getMenu() { return menu; diff --git a/src/items/Inventories.cpp b/src/items/Inventories.cpp index 65e93535..d14dcb0a 100644 --- a/src/items/Inventories.cpp +++ b/src/items/Inventories.cpp @@ -8,8 +8,7 @@ Inventories::Inventories(Level& level) : level(level) { } -Inventories::~Inventories() { -} +Inventories::~Inventories() = default; std::shared_ptr Inventories::create(size_t size) { int64_t id = level.getWorld()->getNextInventoryId(); diff --git a/src/lighting/Lighting.cpp b/src/lighting/Lighting.cpp index 6d2d5cc4..1236d7dd 100644 --- a/src/lighting/Lighting.cpp +++ b/src/lighting/Lighting.cpp @@ -20,8 +20,7 @@ Lighting::Lighting(const Content* content, Chunks* chunks) solverS = std::make_unique(indices, chunks, 3); } -Lighting::~Lighting(){ -} +Lighting::~Lighting() = default; void Lighting::clear(){ for (size_t index = 0; index < chunks->volume; index++){ diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp index ae39208a..c8ba37fe 100644 --- a/src/logic/ChunksController.cpp +++ b/src/logic/ChunksController.cpp @@ -30,8 +30,7 @@ ChunksController::ChunksController(Level* level, uint padding) generator(WorldGenerators::createGenerator(level->getWorld()->getGenerator(), level->content)) { } -ChunksController::~ChunksController(){ -} +ChunksController::~ChunksController() = default; void ChunksController::update(int64_t maxDuration) { int64_t mcstotal = 0; diff --git a/src/logic/CommandsInterpreter.hpp b/src/logic/CommandsInterpreter.hpp index 7d7d8508..f9295978 100644 --- a/src/logic/CommandsInterpreter.hpp +++ b/src/logic/CommandsInterpreter.hpp @@ -55,7 +55,7 @@ namespace cmd { std::string description; executor_func executor; public: - Command() {} + Command() = default; Command( std::string name, diff --git a/src/maths/FrustumCulling.hpp b/src/maths/FrustumCulling.hpp index f8372c14..1f3f3e67 100644 --- a/src/maths/FrustumCulling.hpp +++ b/src/maths/FrustumCulling.hpp @@ -5,7 +5,7 @@ class Frustum { public: - Frustum() {}; + Frustum() = default; void update(glm::mat4 projview); bool isBoxVisible(const glm::vec3& minp, const glm::vec3& maxp) const; diff --git a/src/maths/rays.hpp b/src/maths/rays.hpp index d781881e..339c109b 100644 --- a/src/maths/rays.hpp +++ b/src/maths/rays.hpp @@ -21,7 +21,7 @@ class AABBFaces { public: std::array, AABBFACES_COUNT> faces; // every face is min-point and opposite corner point - AABBFaces(){}; + AABBFaces() = default; AABBFaces(const rayvec3& parentBoxPos, const AABB& parentBox); }; diff --git a/src/util/ThreadPool.hpp b/src/util/ThreadPool.hpp index 6b098b09..594885f2 100644 --- a/src/util/ThreadPool.hpp +++ b/src/util/ThreadPool.hpp @@ -28,8 +28,8 @@ struct ThreadPoolResult { template class Worker { public: - Worker() {} - virtual ~Worker() {} + Worker() = default; + virtual ~Worker() = default; virtual R operator()(const std::shared_ptr&) = 0; }; diff --git a/src/window/input.hpp b/src/window/input.hpp index 7c966087..fe991e4b 100644 --- a/src/window/input.hpp +++ b/src/window/input.hpp @@ -142,7 +142,7 @@ struct Binding { bool state = false; bool justChange = false; - Binding(){} + Binding() = default; Binding(inputtype type, int code) : type(type), code(code) {} bool active() const {