From 9522aedeec25276bea175c9c85c450d64748d04b Mon Sep 17 00:00:00 2001 From: MihailRis Date: Fri, 10 May 2024 12:34:05 +0300 Subject: [PATCH] quick check with linters --- src/audio/AL/ALAudio.cpp | 2 +- src/audio/audio.cpp | 5 +- src/content/Content.cpp | 4 +- src/content/ContentLoader.cpp | 8 ++-- src/content/PacksManager.cpp | 2 +- src/data/dynamic.cpp | 3 -- src/files/WorldConverter.cpp | 2 +- src/files/WorldRegions.cpp | 2 +- src/frontend/hud.cpp | 2 +- src/frontend/hud.hpp | 2 +- src/frontend/screens/LevelScreen.cpp | 4 +- src/graphics/core/Framebuffer.cpp | 6 +-- src/graphics/core/ImageData.cpp | 6 +-- src/graphics/core/TextureAnimation.cpp | 3 +- src/graphics/render/BlocksPreview.cpp | 4 +- src/graphics/render/BlocksRenderer.cpp | 4 +- src/graphics/render/WorldRenderer.cpp | 19 ++++---- src/graphics/render/WorldRenderer.hpp | 4 +- src/graphics/ui/GUI.cpp | 8 ++-- src/graphics/ui/GUI.hpp | 2 +- src/graphics/ui/elements/Button.cpp | 2 +- src/graphics/ui/elements/CheckBox.cpp | 4 +- src/graphics/ui/elements/Container.cpp | 2 +- src/graphics/ui/elements/InputBindBox.cpp | 2 +- src/graphics/ui/elements/InventoryView.cpp | 2 +- src/graphics/ui/elements/InventoryView.hpp | 4 +- src/graphics/ui/elements/Label.cpp | 3 +- src/graphics/ui/elements/TextBox.cpp | 9 ++-- src/graphics/ui/elements/TrackBar.cpp | 4 +- src/graphics/ui/elements/UINode.cpp | 2 +- src/graphics/ui/gui_util.cpp | 21 +------- src/graphics/ui/gui_util.hpp | 17 +------ src/graphics/ui/gui_xml.cpp | 2 +- src/lighting/Lightmap.cpp | 2 +- src/lighting/Lightmap.hpp | 2 +- src/logic/ChunksController.cpp | 1 - src/logic/EngineController.cpp | 3 +- src/logic/PlayerController.cpp | 2 +- src/logic/scripting/lua/libaudio.cpp | 4 +- src/logic/scripting/lua/libcore.cpp | 4 +- src/logic/scripting/lua/libgui.cpp | 2 +- src/logic/scripting/lua/libhud.cpp | 8 ++-- src/logic/scripting/lua/libinventory.cpp | 2 +- src/logic/scripting/lua/libpack.cpp | 4 +- src/physics/PhysicsSolver.cpp | 56 +++++++++++----------- src/util/ThreadPool.hpp | 6 +-- src/util/stringutil.cpp | 3 +- src/voxels/Block.cpp | 14 +++--- src/voxels/Chunks.cpp | 4 +- src/voxels/Chunks.hpp | 2 +- src/window/Events.cpp | 10 ++-- src/window/Events.hpp | 10 ++-- src/window/Window.cpp | 4 +- src/world/Level.cpp | 2 +- src/world/LevelEvents.cpp | 2 +- 55 files changed, 129 insertions(+), 184 deletions(-) diff --git a/src/audio/AL/ALAudio.cpp b/src/audio/AL/ALAudio.cpp index d4b2fe25..f6a999f1 100644 --- a/src/audio/AL/ALAudio.cpp +++ b/src/audio/AL/ALAudio.cpp @@ -475,5 +475,5 @@ void ALAudio::setListener(glm::vec3 position, glm::vec3 velocity, glm::vec3 at, AL_CHECK(alListenerf(AL_GAIN, get_channel(0)->getVolume())); } -void ALAudio::update(double delta) { +void ALAudio::update(double) { } diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp index 27ac9de1..ab46836e 100644 --- a/src/audio/audio.cpp +++ b/src/audio/audio.cpp @@ -72,9 +72,6 @@ size_t PCMStream::readFully(char* buffer, size_t bufferSize, bool loop) { if (loop) { seek(0); } - if (bufferSize == 0) { - return size; - } } while (loop); return size; } @@ -94,7 +91,7 @@ public: seekable(seekable) {} - size_t read(char* buffer, size_t bufferSize) override { + size_t read(char*, size_t bufferSize) override { if (closed) { return 0; } diff --git a/src/content/Content.cpp b/src/content/Content.cpp index df9e4d3f..4ba19fe3 100644 --- a/src/content/Content.cpp +++ b/src/content/Content.cpp @@ -95,9 +95,7 @@ Content* ContentBuilder::build() { } blockDefsIndices.push_back(def); - if (groups->find(def->drawGroup) == groups->end()) { - groups->insert(def->drawGroup); - } + groups->insert(def->drawGroup); } std::vector itemDefsIndices; diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index ff77e76a..9878d9ef 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -228,15 +228,15 @@ void ContentLoader::loadCustomBlockModel(Block& def, dynamic::Map* primitives) { def.modelBoxes.push_back(modelbox); if (boxarr->size() == 7) - for (uint i = 6; i < 12; i++) { + for (uint j = 6; j < 12; j++) { def.modelTextures.push_back(boxarr->str(6)); } else if (boxarr->size() == 12) - for (uint i = 6; i < 12; i++) { - def.modelTextures.push_back(boxarr->str(i)); + for (uint j = 6; j < 12; j++) { + def.modelTextures.push_back(boxarr->str(j)); } else - for (uint i = 6; i < 12; i++) { + for (uint j = 6; j < 12; j++) { def.modelTextures.push_back("notfound"); } } diff --git a/src/content/PacksManager.cpp b/src/content/PacksManager.cpp index c1d4ea14..c8bb4e05 100644 --- a/src/content/PacksManager.cpp +++ b/src/content/PacksManager.cpp @@ -74,7 +74,7 @@ static bool resolve_dependencies ( const ContentPack* pack, const std::unordered_map& packs, std::vector& allNames, - std::vector& added, + const std::vector& added, std::queue& queue, bool resolveWeaks ) { diff --git a/src/data/dynamic.cpp b/src/data/dynamic.cpp index f1782688..cbfe6a7b 100644 --- a/src/data/dynamic.cpp +++ b/src/data/dynamic.cpp @@ -82,9 +82,6 @@ bool List::flag(size_t index) const { } Value* List::getValueWriteable(size_t index) { - if (index > values.size()) { - throw std::runtime_error("index error"); - } return &values.at(index); } diff --git a/src/files/WorldConverter.cpp b/src/files/WorldConverter.cpp index 37bc5cee..602c26de 100644 --- a/src/files/WorldConverter.cpp +++ b/src/files/WorldConverter.cpp @@ -70,7 +70,7 @@ std::shared_ptr WorldConverter::startTask( auto pool = std::make_shared>( "converter-pool", [=](){return std::make_shared(converter);}, - [=](int& _) {} + [=](int&) {} ); while (!converter->tasks.empty()) { const convert_task& task = converter->tasks.front(); diff --git a/src/files/WorldRegions.cpp b/src/files/WorldRegions.cpp index 151e8914..55f3b3d2 100644 --- a/src/files/WorldRegions.cpp +++ b/src/files/WorldRegions.cpp @@ -114,9 +114,9 @@ WorldRegion* WorldRegions::getRegion(int x, int z, int layer) { } WorldRegion* WorldRegions::getOrCreateRegion(int x, int z, int layer) { - RegionsLayer& regions = layers[layer]; WorldRegion* region = getRegion(x, z, layer); if (region == nullptr) { + RegionsLayer& regions = layers[layer]; std::lock_guard lock(regions.mutex); region = new WorldRegion(); regions.regions[glm::ivec2(x, z)].reset(region); diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index 89a09061..c22d8fe5 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -416,7 +416,7 @@ void Hud::add(HudElement element) { elements.push_back(element); } -void Hud::onRemove(HudElement& element) { +void Hud::onRemove(const HudElement& element) { auto document = element.getDocument(); if (document) { Inventory* inventory = nullptr; diff --git a/src/frontend/hud.hpp b/src/frontend/hud.hpp index 0b8a50e0..bbc71b06 100644 --- a/src/frontend/hud.hpp +++ b/src/frontend/hud.hpp @@ -162,7 +162,7 @@ public: void openPermanent(UiDocument* doc); void add(HudElement element); - void onRemove(HudElement& element); + void onRemove(const HudElement& element); void remove(std::shared_ptr node); Player* getPlayer() const; diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index 0eaaf820..94dc2239 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -38,7 +38,7 @@ LevelScreen::LevelScreen(Engine* engine, Level* level) : Screen(engine) { worldRenderer = std::make_unique(engine, frontend.get(), controller->getPlayer()); hud = std::make_unique(engine, frontend.get(), controller->getPlayer()); - keepAlive(settings.graphics.backlight.observe([=](bool flag) { + keepAlive(settings.graphics.backlight.observe([=](bool) { controller->getLevel()->chunks->saveAndClear(); })); keepAlive(settings.camera.fov.observe([=](double value) { @@ -137,7 +137,7 @@ void LevelScreen::update(float delta) { hud->update(hudVisible); } -void LevelScreen::draw(float delta) { +void LevelScreen::draw(float) { auto camera = controller->getPlayer()->currentCamera; Viewport viewport(Window::width, Window::height); diff --git a/src/graphics/core/Framebuffer.cpp b/src/graphics/core/Framebuffer.cpp index c9a59bcf..b0a452f4 100644 --- a/src/graphics/core/Framebuffer.cpp +++ b/src/graphics/core/Framebuffer.cpp @@ -6,9 +6,9 @@ Framebuffer::Framebuffer(uint fbo, uint depth, std::unique_ptr texture) : fbo(fbo), depth(depth), texture(std::move(texture)) { - if (texture) { - width = texture->getWidth(); - height = texture->getHeight(); + if (this->texture) { + width = this->texture->getWidth(); + height = this->texture->getHeight(); } else { width = 0; height = 0; diff --git a/src/graphics/core/ImageData.cpp b/src/graphics/core/ImageData.cpp index a7f3939b..1052a629 100644 --- a/src/graphics/core/ImageData.cpp +++ b/src/graphics/core/ImageData.cpp @@ -35,11 +35,10 @@ ImageData::~ImageData() { } void ImageData::flipX() { - uint size; switch (format) { case ImageFormat::rgb888: case ImageFormat::rgba8888: { - size = (format == ImageFormat::rgba8888) ? 4 : 3; + uint size = (format == ImageFormat::rgba8888) ? 4 : 3; ubyte* pixels = (ubyte*)data; for (uint y = 0; y < height; y++) { for (uint x = 0; x < width/2; x++) { @@ -58,11 +57,10 @@ void ImageData::flipX() { } void ImageData::flipY() { - uint size; switch (format) { case ImageFormat::rgb888: case ImageFormat::rgba8888: { - size = (format == ImageFormat::rgba8888) ? 4 : 3; + uint size = (format == ImageFormat::rgba8888) ? 4 : 3; ubyte* pixels = (ubyte*)data; for (uint y = 0; y < height/2; y++) { for (uint x = 0; x < width; x++) { diff --git a/src/graphics/core/TextureAnimation.cpp b/src/graphics/core/TextureAnimation.cpp index c4ee09b4..f6cbbef2 100644 --- a/src/graphics/core/TextureAnimation.cpp +++ b/src/graphics/core/TextureAnimation.cpp @@ -38,8 +38,7 @@ void TextureAnimator::update(float delta) { uint elemDstId = elem.dstTexture->getId(); uint elemSrcId = elem.srcTexture->getId(); - if (changedTextures.find(elemDstId) == changedTextures.end()) - changedTextures.insert(elemDstId); + changedTextures.insert(elemDstId); glBindFramebuffer(GL_FRAMEBUFFER, fboD); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, elemDstId, 0); diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp index 026c246e..96a8a718 100644 --- a/src/graphics/render/BlocksPreview.cpp +++ b/src/graphics/render/BlocksPreview.cpp @@ -64,7 +64,7 @@ std::unique_ptr BlocksPreview::draw( offset.y += (1.0f - hitbox).y * 0.5f; shader->uniformMatrix("u_apply", glm::translate(glm::mat4(1.0f), offset)); for (size_t i = 0; i < def->modelBoxes.size(); i++) { - const UVRegion (&texfaces)[6] = { + const UVRegion (&boxtexfaces)[6] = { def->modelUVs[i * 6], def->modelUVs[i * 6 + 1], def->modelUVs[i * 6 + 2], @@ -75,7 +75,7 @@ std::unique_ptr BlocksPreview::draw( batch->cube( def->modelBoxes[i].a * glm::vec3(1.0f, 1.0f, -1.0f) * pmul, def->modelBoxes[i].size() * pmul, - texfaces, glm::vec4(1.0f), !def->rt.emissive + boxtexfaces, glm::vec4(1.0f), !def->rt.emissive ); } diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp index 232250f4..23fc87c3 100644 --- a/src/graphics/render/BlocksRenderer.cpp +++ b/src/graphics/render/BlocksRenderer.cpp @@ -210,10 +210,10 @@ void BlocksRenderer::blockXSprite(int x, int y, int z, face(vec3(x + xs, y, z + zs), w, size.y, 0, vec3(1, 0, -1), vec3(0, 1, 0), vec3(), - texface1, lights, vec4(tint)); + texface2, lights, vec4(tint)); face(vec3(x + xs, y, z + zs), w, size.y, 0, vec3(-1, 0, 1), vec3(0, 1, 0), vec3(), - texface1, lights, vec4(tint)); + texface2, lights, vec4(tint)); } // HINT: texture faces order: {east, west, bottom, top, south, north} diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index c70bd589..d23bd139 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -42,10 +42,10 @@ bool WorldRenderer::showChunkBorders = false; WorldRenderer::WorldRenderer(Engine* engine, LevelFrontend* frontend, Player* player) : engine(engine), level(frontend->getLevel()), - player(player) + player(player), + frustumCulling(std::make_unique()), + lineBatch(std::make_unique()) { - frustumCulling = std::make_unique(); - lineBatch = std::make_unique(); renderer = std::make_unique( level, frontend->getContentGfxCache(), @@ -55,7 +55,7 @@ WorldRenderer::WorldRenderer(Engine* engine, LevelFrontend* frontend, Player* pl auto& settings = engine->getSettings(); level->events->listen(EVT_CHUNK_HIDDEN, - [this](lvl_event_type type, Chunk* chunk) { + [this](lvl_event_type, Chunk* chunk) { renderer->unload(chunk); } ); @@ -142,7 +142,7 @@ void WorldRenderer::drawChunks(Chunks* chunks, Camera* camera, Shader* shader) { } void WorldRenderer::renderLevel( - const DrawContext& ctx, + const DrawContext&, Camera* camera, const EngineSettings& settings ) { @@ -196,7 +196,7 @@ void WorldRenderer::renderBlockSelection(Camera* camera, Shader* linesShader) { const glm::vec3 point = PlayerController::selectedPointPosition; const glm::vec3 norm = PlayerController::selectedBlockNormal; - std::vector& hitboxes = block->rotatable + const std::vector& hitboxes = block->rotatable ? block->rt.hitboxes[PlayerController::selectedBlockStates] : block->hitboxes; @@ -217,8 +217,7 @@ void WorldRenderer::renderBlockSelection(Camera* camera, Shader* linesShader) { void WorldRenderer::renderDebugLines( const DrawContext& pctx, Camera* camera, - Shader* linesShader, - const EngineSettings& settings + Shader* linesShader ) { DrawContext ctx = pctx.sub(); const auto& viewport = ctx.getViewport(); @@ -276,7 +275,7 @@ void WorldRenderer::draw( const Viewport& vp = pctx.getViewport(); camera->aspect = vp.getWidth() / static_cast(vp.getHeight()); - EngineSettings& settings = engine->getSettings(); + const EngineSettings& settings = engine->getSettings(); skybox->refresh(pctx, level->getWorld()->daytime, 1.0f+fog*2.0f, 4); Assets* assets = engine->getAssets(); @@ -305,7 +304,7 @@ void WorldRenderer::draw( } if (hudVisible && player->debug) { - renderDebugLines(wctx, camera, linesShader, settings); + renderDebugLines(wctx, camera, linesShader); } } diff --git a/src/graphics/render/WorldRenderer.hpp b/src/graphics/render/WorldRenderer.hpp index 99445392..b99be9ae 100644 --- a/src/graphics/render/WorldRenderer.hpp +++ b/src/graphics/render/WorldRenderer.hpp @@ -48,12 +48,10 @@ class WorldRenderer { /// @param context graphics context /// @param camera active camera /// @param linesShader shader used - /// @param settings engine settings void renderDebugLines( const DrawContext& context, Camera* camera, - Shader* linesShader, - const EngineSettings& settings + Shader* linesShader ); public: static bool showChunkBorders; diff --git a/src/graphics/ui/GUI.cpp b/src/graphics/ui/GUI.cpp index ed978673..403d940f 100644 --- a/src/graphics/ui/GUI.cpp +++ b/src/graphics/ui/GUI.cpp @@ -44,10 +44,8 @@ void GUI::onAssetsLoad(Assets* assets) { ), "core:root"); } -/** Mouse related input and logic handling - * @param delta delta time -*/ -void GUI::actMouse(float delta) { +// @brief Mouse related input and logic handling +void GUI::actMouse() { auto hover = container->getAt(Events::cursor, nullptr); if (this->hover && this->hover != hover) { this->hover->setHover(false); @@ -125,7 +123,7 @@ void GUI::act(float delta, const Viewport& vp) { auto prevfocus = focus; if (!Events::_cursor_locked) { - actMouse(delta); + actMouse(); } if (focus) { diff --git a/src/graphics/ui/GUI.hpp b/src/graphics/ui/GUI.hpp index 66cf8633..20c14efb 100644 --- a/src/graphics/ui/GUI.hpp +++ b/src/graphics/ui/GUI.hpp @@ -62,7 +62,7 @@ namespace gui { std::unique_ptr uicamera; std::shared_ptr menu; std::queue postRunnables; - void actMouse(float delta); + void actMouse(); void actFocused(); public: GUI(); diff --git a/src/graphics/ui/elements/Button.cpp b/src/graphics/ui/elements/Button.cpp index 1beacc06..fd6c510d 100644 --- a/src/graphics/ui/elements/Button.cpp +++ b/src/graphics/ui/elements/Button.cpp @@ -75,7 +75,7 @@ void Button::refresh() { } } -void Button::drawBackground(const DrawContext* pctx, Assets* assets) { +void Button::drawBackground(const DrawContext* pctx, Assets*) { glm::vec2 pos = calcPos(); auto batch = pctx->getBatch2D(); batch->texture(nullptr); diff --git a/src/graphics/ui/elements/CheckBox.cpp b/src/graphics/ui/elements/CheckBox.cpp index 56e7344b..16a2d9e6 100644 --- a/src/graphics/ui/elements/CheckBox.cpp +++ b/src/graphics/ui/elements/CheckBox.cpp @@ -10,7 +10,7 @@ CheckBox::CheckBox(bool checked) : UINode(glm::vec2(32.0f)), checked(checked) { setColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.5f)); } -void CheckBox::draw(const DrawContext* pctx, Assets* assets) { +void CheckBox::draw(const DrawContext* pctx, Assets*) { if (supplier) { checked = supplier(); } @@ -21,7 +21,7 @@ void CheckBox::draw(const DrawContext* pctx, Assets* assets) { batch->rect(pos.x, pos.y, size.x, size.y); } -void CheckBox::mouseRelease(GUI*, int x, int y) { +void CheckBox::mouseRelease(GUI*, int, int) { checked = !checked; if (consumer) { consumer(checked); diff --git a/src/graphics/ui/elements/Container.cpp b/src/graphics/ui/elements/Container.cpp index a95ef9ac..51341aa3 100644 --- a/src/graphics/ui/elements/Container.cpp +++ b/src/graphics/ui/elements/Container.cpp @@ -93,7 +93,7 @@ void Container::draw(const DrawContext* pctx, Assets* assets) { } } -void Container::drawBackground(const DrawContext* pctx, Assets* assets) { +void Container::drawBackground(const DrawContext* pctx, Assets*) { glm::vec4 color = calcColor(); if (color.a <= 0.001f) return; diff --git a/src/graphics/ui/elements/InputBindBox.cpp b/src/graphics/ui/elements/InputBindBox.cpp index ad9485dd..fef06652 100644 --- a/src/graphics/ui/elements/InputBindBox.cpp +++ b/src/graphics/ui/elements/InputBindBox.cpp @@ -15,7 +15,7 @@ InputBindBox::InputBindBox(Binding& binding, glm::vec4 padding) setScrollable(false); } -void InputBindBox::drawBackground(const DrawContext* pctx, Assets* assets) { +void InputBindBox::drawBackground(const DrawContext* pctx, Assets*) { glm::vec2 pos = calcPos(); auto batch = pctx->getBatch2D(); batch->texture(nullptr); diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index e6941437..1ca82a72 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -116,7 +116,7 @@ void SlotView::draw(const DrawContext* pctx, Assets* assets) { const int slotSize = InventoryView::SLOT_SIZE; - ItemStack& stack = *bound; + const ItemStack& stack = *bound; glm::vec4 tint(1.0f); glm::vec2 pos = calcPos(); glm::vec4 color = getColor(); diff --git a/src/graphics/ui/elements/InventoryView.hpp b/src/graphics/ui/elements/InventoryView.hpp index 416d6a9e..8e3006d7 100644 --- a/src/graphics/ui/elements/InventoryView.hpp +++ b/src/graphics/ui/elements/InventoryView.hpp @@ -47,7 +47,7 @@ namespace gui { }; class SlotView : public gui::UINode { - const Content* content; + const Content* content = nullptr; SlotLayout layout; bool highlighted = false; @@ -77,7 +77,7 @@ namespace gui { }; class InventoryView : public gui::Container { - const Content* content; + const Content* content = nullptr; std::shared_ptr inventory; diff --git a/src/graphics/ui/elements/Label.cpp b/src/graphics/ui/elements/Label.cpp index 73fb8b83..a7bb198d 100644 --- a/src/graphics/ui/elements/Label.cpp +++ b/src/graphics/ui/elements/Label.cpp @@ -26,8 +26,9 @@ void LabelCache::update(const std::wstring& text, bool multiline, bool wrap) { if (font == nullptr) { wrap = false; } - size_t len = 0; + if (multiline) { + size_t len = 0; for (size_t i = 0; i < text.length(); i++, len++) { if (text[i] == L'\n') { lines.push_back(LineScheme {i+1, false}); diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp index 2ffa5773..022a0732 100644 --- a/src/graphics/ui/elements/TextBox.cpp +++ b/src/graphics/ui/elements/TextBox.cpp @@ -56,13 +56,12 @@ void TextBox::draw(const DrawContext* pctx, Assets* assets) { batch->setColor(glm::vec4(0.8f, 0.9f, 1.0f, 0.25f)); int start = font->calcWidth(input, selectionStart-label->getTextLineOffset(startLine)); int end = font->calcWidth(input, selectionEnd-label->getTextLineOffset(endLine)); - int startY = label->getLineYOffset(startLine); - int endY = label->getLineYOffset(startLine); + int lineY = label->getLineYOffset(startLine); if (startLine == endLine) { - batch->rect(lcoord.x + start, lcoord.y+startY, end-start, lineHeight); + batch->rect(lcoord.x + start, lcoord.y+lineY, end-start, lineHeight); } else { - batch->rect(lcoord.x + start, lcoord.y+endY, label->getSize().x-start-padding.z-padding.x-2, lineHeight); + batch->rect(lcoord.x + start, lcoord.y+lineY, label->getSize().x-start-padding.z-padding.x-2, lineHeight); for (uint i = startLine+1; i < endLine; i++) { batch->rect(lcoord.x, lcoord.y+label->getLineYOffset(i), label->getSize().x-padding.z-padding.x-2, lineHeight); } @@ -71,7 +70,7 @@ void TextBox::draw(const DrawContext* pctx, Assets* assets) { } } -void TextBox::drawBackground(const DrawContext* pctx, Assets* assets) { +void TextBox::drawBackground(const DrawContext* pctx, Assets*) { glm::vec2 pos = calcPos(); auto batch = pctx->getBatch2D(); diff --git a/src/graphics/ui/elements/TrackBar.cpp b/src/graphics/ui/elements/TrackBar.cpp index 7a2b4f74..73da4caf 100644 --- a/src/graphics/ui/elements/TrackBar.cpp +++ b/src/graphics/ui/elements/TrackBar.cpp @@ -23,7 +23,7 @@ TrackBar::TrackBar( setHoverColor(glm::vec4(0.01f, 0.02f, 0.03f, 0.5f)); } -void TrackBar::draw(const DrawContext* pctx, Assets* assets) { +void TrackBar::draw(const DrawContext* pctx, Assets*) { if (supplier) { value = supplier(); } @@ -48,7 +48,7 @@ void TrackBar::setConsumer(doubleconsumer consumer) { this->consumer = consumer; } -void TrackBar::mouseMove(GUI*, int x, int y) { +void TrackBar::mouseMove(GUI*, int x, int) { glm::vec2 pos = calcPos(); value = x - trackWidth/2; value -= pos.x; diff --git a/src/graphics/ui/elements/UINode.cpp b/src/graphics/ui/elements/UINode.cpp index 8bfd5298..98e2eb18 100644 --- a/src/graphics/ui/elements/UINode.cpp +++ b/src/graphics/ui/elements/UINode.cpp @@ -64,7 +64,7 @@ UINode* UINode::listenAction(onaction action) { return this; } -void UINode::click(GUI*, int x, int y) { +void UINode::click(GUI*, int, int) { pressed = true; } diff --git a/src/graphics/ui/gui_util.cpp b/src/graphics/ui/gui_util.cpp index fda2913d..5e1e2c64 100644 --- a/src/graphics/ui/gui_util.cpp +++ b/src/graphics/ui/gui_util.cpp @@ -14,25 +14,6 @@ using namespace gui; -std::shared_ptr" - )); -} - -std::shared_ptr" - )); -} - std::shared_ptr guiutil::create(const std::string& source, scriptenv env) { if (env == nullptr) { env = scripting::get_root_environment(); @@ -52,7 +33,7 @@ void guiutil::alert(GUI* gui, const std::wstring& text, runnable on_hidden) { panel->add(label); panel->add(std::make_shared