commit c461394a

Poul Sander · 2025-09-17 20:23
c461394a74e092c533933d9b33f0ac028477f43c patch · browse files
parent 5df3e7f59fa671b61be75530341d28a99ffc4b56

Grid size is now adjustable and remembered.

Changed files

M	source/code/editor/SagoTextureSelector.cpp before
M	source/code/editor/SagoTextureSelector.hpp before

diff --git a/source/code/editor/SagoTextureSelector.cpp b/source/code/editor/SagoTextureSelector.cpp index 91fef74..51643d0 100644 --- a/source/code/editor/SagoTextureSelector.cpp +++ b/source/code/editor/SagoTextureSelector.cpp

@@ -29,6 +29,9 @@ https://github.com/sago007/saland

#include <SDL_image.h>

#include "../../sago/SagoMisc.hpp"

#include "../global.hpp"

+#include "../common.h"

+const char* const editor_texture_grid_size = "editor_texture_grid_size";

class ChangeSDLColor

@@ -183,6 +186,10 @@ void SagoTextureSelector::runSpriteSelectorFrame(SDL_Renderer* target) {

void SagoTextureSelector::runTextureSelectorFrame(SDL_Renderer* target) {

ImGui::Begin("TextureList", nullptr, ImGuiWindowFlags_NoCollapse);

+ if (ImGui::SliderInt("grid size", &grid_size, 0, 100))

+ {

+ Config::getInstance()->setInt(editor_texture_grid_size, grid_size);

+ }

static char filter[256] = "";

ImGui::InputText("Filter", filter, IM_ARRAYSIZE(filter));

ImGui::Separator();

@@ -193,7 +200,6 @@ void SagoTextureSelector::runTextureSelectorFrame(SDL_Renderer* target) {

}

ImGui::End();

ImGui::Begin("TextureViewer");

@@ -207,7 +213,10 @@ void SagoTextureSelector::runTextureSelectorFrame(SDL_Renderer* target) {

ImGui::Image((ImTextureID)(intptr_t)current_texture, ImVec2((float)tex_w, (float)tex_h));

ChangeSDLColor color(target);

color.setRed();

- addLinesToCanvas(target, current_texture, 32, 32, p.x, p.y);

+ if (grid_size)

+ {

+ addLinesToCanvas(target, current_texture, grid_size, grid_size, p.x, p.y);

+ }

ImGui::EndChild();

}

ImGui::End();

@@ -217,6 +226,7 @@ void SagoTextureSelector::runTextureSelectorFrame(SDL_Renderer* target) {

SagoTextureSelector::SagoTextureSelector() {

+ grid_size = Config::getInstance()->getInt(editor_texture_grid_size, 32);

}

SagoTextureSelector::~SagoTextureSelector() {

diff --git a/source/code/editor/SagoTextureSelector.hpp b/source/code/editor/SagoTextureSelector.hpp index b822d8a..3d876b7 100644 --- a/source/code/editor/SagoTextureSelector.hpp +++ b/source/code/editor/SagoTextureSelector.hpp

@@ -49,4 +49,5 @@ private:

std::map<std::string,SagoSprite> sprites;

std::string selected_texture;

std::string selected_sprite;

+ int grid_size = 32;

};

\ No newline at end of file