Compare commits

..

3 Commits

Author SHA1 Message Date
a4c9774c28 Merge pull request 'lju/apply-loaded-pattern' (#4) from lju/apply-loaded-pattern into main
Reviewed-on: #4
2026-01-14 20:51:40 +00:00
3e7e7e2547 patern_preview/world: Place selection into the world 2026-01-14 17:34:15 +01:00
5c9b60163a patern_preview: Adding patern preview
This adds a preview of the patern placement, checking out of bound
2026-01-14 17:19:50 +01:00
11 changed files with 147 additions and 14 deletions

View File

@@ -75,6 +75,8 @@ set(SRC_CXX_FILES "./src/main.cpp"
"./src/selection_menu.cpp"
"./src/selection.cpp"
"./src/paterns_menu.cpp"
"./src/patern_preview.cpp"
"./src/snapping.cpp"
"${rlImGui_SOURCE_DIR}/rlImGui.cpp"
"${imgui_SOURCE_DIR}/imgui.cpp"
"${imgui_SOURCE_DIR}/imgui_draw.cpp"

View File

@@ -22,6 +22,7 @@ class SelectionMenu;
class ControlMenu;
class Selection;
class PaternsMenu;
class PaternPreview;
typedef struct ctx {
std::shared_ptr<World> world = nullptr;
@@ -32,6 +33,7 @@ typedef struct ctx {
std::shared_ptr<ControlMenu> control_menu = nullptr;
std::shared_ptr<Selection> selection = nullptr;
std::shared_ptr<PaternsMenu> paterns_menu = nullptr;
std::shared_ptr<PaternPreview> patern_preview = nullptr;
nlohmann::json config_json;
std::filesystem::path program_dir;
} ctx;

View File

@@ -0,0 +1,33 @@
/*
* File name: patern_preview.hpp
* Author: lejulien
* Date created: 01-01-1970 00:59:59
// Date modified: 12-01-2026 21:30:10
* ------
*/
#pragma once
#include <memory>
#include <raylib.h>
#include <context.hpp>
namespace gol {
class PaternPreview {
public:
PaternPreview(std::shared_ptr<ctx>);
~PaternPreview() = default;
void update();
void display();
void start();
private:
bool is_started = false;
std::shared_ptr<ctx> context_;
Vector2 mouse_pos_ = {0, 0};
bool is_unplacable_ = false;
};
} // namespace gol

View File

@@ -30,6 +30,7 @@ private:
std::shared_ptr<ctx> context_ = nullptr;
std::map<std::string,std::string> paterns_paths_list_;
std::vector<std::string> paterns_name_list_;
public:
int patern_width_ = 0;
int patern_height_ = 0;
std::vector<uint32_t> loaded_patern_;

View File

@@ -1,5 +1,5 @@
/*
* File name: selection.cpp
* File name: snapping.hpp
* Author: lejulien
* Date created: 01-01-1970 00:59:59
// Date modified: 12-01-2026 21:30:10
@@ -13,12 +13,6 @@
#include <raylib.h>
#include <cmath>
Vector2 snapToGrid(Vector2 screen, int cell_size) {
return {static_cast<float>(round(screen.x / cell_size) * cell_size),
static_cast<float>(round(screen.y / cell_size) * cell_size)};
}
Vector2 snapToGrid(Vector2 screen, int cell_size);
Vector2i screenToGrid(Vector2 screen, int cell_size) {
return {static_cast<int>(round(screen.x / cell_size)),
static_cast<int>(round(screen.y / cell_size))};
}
Vector2i screenToGrid(Vector2 screen, int cell_size);

View File

@@ -37,6 +37,7 @@ public:
void setCell(int x, int y);
void resize(int width, int height); // destructive
std::vector<uint32_t> getSelection(Vector2i &origin, Vector2i &size);
void setSelection(Vector2i &origin, Vector2i &size, std::vector<uint32_t> &data);
// Private members
private:

View File

@@ -25,6 +25,7 @@
#include <selection_menu.hpp>
#include <selection.hpp>
#include <paterns_menu.hpp>
#include <patern_preview.hpp>
int main(int ac, char **av) {
std::shared_ptr<gol::ctx> context = std::make_shared<gol::ctx>();
@@ -107,6 +108,7 @@ int main(int ac, char **av) {
context->selection_menu = std::make_shared<gol::SelectionMenu>(context);
context->selection = std::make_shared<gol::Selection>(context);
context->paterns_menu = std::make_shared<gol::PaternsMenu>(context);
context->patern_preview = std::make_shared<gol::PaternPreview>(context);
// Speed handling values
float sim_speed = 1.0f;
@@ -136,6 +138,7 @@ int main(int ac, char **av) {
// Selection behaviour
context->selection->update();
context->patern_preview->update();
context->selection_menu->update();
context->settings_menu->update();
@@ -154,6 +157,7 @@ int main(int ac, char **av) {
ClearBackground(BLACK);
context->render->display(context->world);
context->selection->display();
context->patern_preview->display();
// Start ImGui frame
rlImGuiBegin();
context->control_menu->display();

69
src/patern_preview.cpp Normal file
View File

@@ -0,0 +1,69 @@
/*
* File name: patern_preview.cpp
* Author: lejulien
* Date created: 01-01-1970 00:59:59
// Date modified: 12-01-2026 21:30:10
* ------
*/
#include <imgui.h>
#include <raylib.h>
#include <rlImGui.h>
#include <patern_preview.hpp>
#include <paterns_menu.hpp>
#include <settings_menu.hpp>
#include <snapping.hpp>
#include <world.hpp>
namespace gol {
PaternPreview::PaternPreview(std::shared_ptr<ctx> context)
: context_(context) {}
void PaternPreview::start() { is_started = true; }
void PaternPreview::update() {
if (!is_started) return;
mouse_pos_ = GetMousePosition();
if (ImGui::IsMouseClicked(1)) {
is_started = false;
return;
}
if (ImGui::IsMouseClicked(0) && !is_unplacable_) {
auto selection_pos =
screenToGrid(mouse_pos_, context_->settings_menu->getCellSize());
Vector2i size = {context_->paterns_menu->patern_width_,
context_->paterns_menu->patern_height_};
context_->world->setSelection(selection_pos, size,
context_->paterns_menu->loaded_patern_);
is_started = false;
}
// mouse should pass through any present windows
}
void PaternPreview::display() {
if (!is_started) return;
auto cell_size = context_->settings_menu->getCellSize();
auto mouse_in_grid =
screenToGrid(mouse_pos_, context_->settings_menu->getCellSize());
is_unplacable_ =
((mouse_in_grid.x + context_->paterns_menu->patern_width_ >
context_->world->getWidth()) ||
(mouse_in_grid.y + context_->paterns_menu->patern_height_ >
context_->world->getHeight()));
for (int j = 0; j < context_->paterns_menu->patern_height_; j++) {
for (int i = 0; i < context_->paterns_menu->patern_width_; i++) {
auto cell =
context_->paterns_menu
->loaded_patern_[i + (j * context_->paterns_menu->patern_width_)];
if (cell) {
DrawRectangle((i + mouse_in_grid.x) * cell_size,
(j + mouse_in_grid.y) * cell_size, cell_size, cell_size,
(is_unplacable_) ? RED : BLUE);
}
}
}
}
}; // namespace gol

View File

@@ -14,6 +14,7 @@
#include <fstream>
#include <iostream>
#include <paterns_menu.hpp>
#include <patern_preview.hpp>
#include <sstream>
namespace gol {
@@ -63,7 +64,7 @@ bool PaternsMenu::loadPatern(std::string &path) {
}
} catch (std::exception &e) {
std::cerr << "Failure in loading patern : " << path << std::endl;
return 1;
return false;
}
return true;
}
@@ -77,9 +78,8 @@ void PaternsMenu::display() {
for (auto patern_name : paterns_name_list_) {
ImGui::PushID(patern_name.c_str());
if (ImGui::Button(patern_name.c_str()) &&
loadPatern(paterns_paths_list_[patern_name])) {
// TODO: If patern is loaded successfuly, start the preview in the
// editor
loadPatern(paterns_paths_list_[patern_name])) {
context_->patern_preview->start();
}
ImGui::PopID();
ImGui::SameLine(ImGui::GetWindowWidth() - 57.);

19
src/snapping.cpp Normal file
View File

@@ -0,0 +1,19 @@
/*
* File name: snapping.hpp
* Author: lejulien
* Date created: 01-01-1970 00:59:59
// Date modified: 12-01-2026 21:30:10
* ------
*/
#include <snapping.hpp>
Vector2 snapToGrid(Vector2 screen, int cell_size) {
return {static_cast<float>(round(screen.x / cell_size) * cell_size),
static_cast<float>(round(screen.y / cell_size) * cell_size)};
}
Vector2i screenToGrid(Vector2 screen, int cell_size) {
return {static_cast<int>(round(screen.x / cell_size)),
static_cast<int>(round(screen.y / cell_size))};
}

View File

@@ -143,7 +143,6 @@ void World::resize(int width, int height) {
}
std::vector<uint32_t> World::getSelection(Vector2i &origin, Vector2i &size) {
// We assume the selection is in the grid for now
std::vector<uint32_t> data = {static_cast<uint32_t>(size.x),
static_cast<uint32_t>(size.y)};
for (int y = origin.y; y < origin.y + size.y; y++) {
@@ -153,3 +152,12 @@ std::vector<uint32_t> World::getSelection(Vector2i &origin, Vector2i &size) {
}
return data;
}
void World::setSelection(Vector2i &origin, Vector2i &size, std::vector<uint32_t> &data) {
for (int y = 0; y < size.y; y++) {
for (int x = 0; x < size.x; x++) {
(*_data)[(x + origin.x) + (y + origin.y) * _width] = data[x + y * size.x];
}
}
}