Compare commits
1 Commits
lju/window
...
3c37d9aca4
| Author | SHA1 | Date | |
|---|---|---|---|
| 3c37d9aca4 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -5,4 +5,3 @@ _deps
|
|||||||
CMakeSettings.json
|
CMakeSettings.json
|
||||||
.vs
|
.vs
|
||||||
.cache
|
.cache
|
||||||
build-win-x86_64
|
|
||||||
|
|||||||
@@ -69,7 +69,6 @@ include_directories(${imgui_SOURCE_DIR} ${rlImGui_SOURCE_DIR})
|
|||||||
set(SRC_CXX_FILES "./src/main.cpp"
|
set(SRC_CXX_FILES "./src/main.cpp"
|
||||||
"./src/rules.cpp"
|
"./src/rules.cpp"
|
||||||
"./src/world.cpp"
|
"./src/world.cpp"
|
||||||
"./src/grid.cpp"
|
|
||||||
"./src/render.cpp"
|
"./src/render.cpp"
|
||||||
"./src/control_menu.cpp"
|
"./src/control_menu.cpp"
|
||||||
"./src/settings_menu.cpp"
|
"./src/settings_menu.cpp"
|
||||||
@@ -91,25 +90,3 @@ add_executable(${NAME} ${SRC_CXX_FILES})
|
|||||||
|
|
||||||
# Link raylib and raylib-cpp
|
# Link raylib and raylib-cpp
|
||||||
target_link_libraries(${NAME} PUBLIC raylib nlohmann_json::nlohmann_json)
|
target_link_libraries(${NAME} PUBLIC raylib nlohmann_json::nlohmann_json)
|
||||||
|
|
||||||
# Windows cross-compilation rule
|
|
||||||
|
|
||||||
if (NOT DEFINED CMAKE_CROSSCOMPILE_WINDOWS_HELPER_ADDED)
|
|
||||||
set(CMAKE_CROSSCOMPILE_WINDOWS_HELPER_ADDED TRUE)
|
|
||||||
|
|
||||||
set(WIN_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/toolchain-mingw-w64-x86_64.cmake" CACHE PATH "Toolchain for Win x86_64")
|
|
||||||
|
|
||||||
add_custom_target(cmake-win
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E echo "Configuring Windows x86_64 build in: ${CMAKE_SOURCE_DIR}/build-win-x86_64"
|
|
||||||
COMMAND ${CMAKE_COMMAND}
|
|
||||||
-S ${CMAKE_SOURCE_DIR}
|
|
||||||
-B ${CMAKE_SOURCE_DIR}/build-win-x86_64
|
|
||||||
-G "Ninja"
|
|
||||||
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
|
|
||||||
-DCMAKE_TOOLCHAIN_FILE=${WIN_TOOLCHAIN_FILE}
|
|
||||||
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_SOURCE_DIR}/build-win-x86_64 -- -v
|
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
|
||||||
COMMENT "Configure & build for Windows x86_64 (MinGW-w64)"
|
|
||||||
VERBATIM
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
/*
|
|
||||||
* File name: grid.hpp
|
|
||||||
* Author: lejulien
|
|
||||||
* Date created: 01-01-1970 00:59:59
|
|
||||||
// Date modified: 12-01-2026 21:30:10
|
|
||||||
* ------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <context.hpp>
|
|
||||||
#include <memory>
|
|
||||||
#include <settings_menu.hpp>
|
|
||||||
#include <world.hpp>
|
|
||||||
|
|
||||||
namespace gol {
|
|
||||||
|
|
||||||
class Grid {
|
|
||||||
public:
|
|
||||||
Grid(std::shared_ptr<ctx>);
|
|
||||||
~Grid() = default;
|
|
||||||
void display();
|
|
||||||
|
|
||||||
private:
|
|
||||||
std::shared_ptr<ctx> context_;
|
|
||||||
};
|
|
||||||
|
|
||||||
}; // namespace gol
|
|
||||||
@@ -27,7 +27,6 @@ private:
|
|||||||
bool is_started = false;
|
bool is_started = false;
|
||||||
std::shared_ptr<ctx> context_;
|
std::shared_ptr<ctx> context_;
|
||||||
Vector2 mouse_pos_ = {0, 0};
|
Vector2 mouse_pos_ = {0, 0};
|
||||||
bool is_unplacable_ = false;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace gol
|
} // namespace gol
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ public:
|
|||||||
void setCell(int x, int y);
|
void setCell(int x, int y);
|
||||||
void resize(int width, int height); // destructive
|
void resize(int width, int height); // destructive
|
||||||
std::vector<uint32_t> getSelection(Vector2i &origin, Vector2i &size);
|
std::vector<uint32_t> getSelection(Vector2i &origin, Vector2i &size);
|
||||||
void setSelection(Vector2i &origin, Vector2i &size, std::vector<uint32_t> &data);
|
|
||||||
|
|
||||||
// Private members
|
// Private members
|
||||||
private:
|
private:
|
||||||
|
|||||||
27
src/grid.cpp
27
src/grid.cpp
@@ -1,27 +0,0 @@
|
|||||||
/*
|
|
||||||
* File name: grid.cpp
|
|
||||||
* Author: lejulien
|
|
||||||
* Date created: 01-01-1970 00:59:59
|
|
||||||
// Date modified: 12-01-2026 21:30:10
|
|
||||||
* ------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <raylib.h>
|
|
||||||
|
|
||||||
#include <grid.hpp>
|
|
||||||
|
|
||||||
namespace gol {
|
|
||||||
|
|
||||||
Grid::Grid(std::shared_ptr<ctx> context) : context_(context) {}
|
|
||||||
|
|
||||||
void Grid::display() {
|
|
||||||
auto cell_size = context_->settings_menu->getCellSize();
|
|
||||||
for (int j = 0; j < context_->world->getHeight(); j++) {
|
|
||||||
for (int i = 0; i < context_->world->getWidth(); i++) {
|
|
||||||
DrawRectangleLines(i * cell_size, j * cell_size, cell_size, cell_size,
|
|
||||||
GRAY);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace gol
|
|
||||||
@@ -26,7 +26,6 @@
|
|||||||
#include <selection.hpp>
|
#include <selection.hpp>
|
||||||
#include <paterns_menu.hpp>
|
#include <paterns_menu.hpp>
|
||||||
#include <patern_preview.hpp>
|
#include <patern_preview.hpp>
|
||||||
#include <grid.hpp>
|
|
||||||
|
|
||||||
int main(int ac, char **av) {
|
int main(int ac, char **av) {
|
||||||
std::shared_ptr<gol::ctx> context = std::make_shared<gol::ctx>();
|
std::shared_ptr<gol::ctx> context = std::make_shared<gol::ctx>();
|
||||||
@@ -110,7 +109,6 @@ int main(int ac, char **av) {
|
|||||||
context->selection = std::make_shared<gol::Selection>(context);
|
context->selection = std::make_shared<gol::Selection>(context);
|
||||||
context->paterns_menu = std::make_shared<gol::PaternsMenu>(context);
|
context->paterns_menu = std::make_shared<gol::PaternsMenu>(context);
|
||||||
context->patern_preview = std::make_shared<gol::PaternPreview>(context);
|
context->patern_preview = std::make_shared<gol::PaternPreview>(context);
|
||||||
gol::Grid grid(context);
|
|
||||||
|
|
||||||
// Speed handling values
|
// Speed handling values
|
||||||
float sim_speed = 1.0f;
|
float sim_speed = 1.0f;
|
||||||
@@ -157,7 +155,6 @@ int main(int ac, char **av) {
|
|||||||
}
|
}
|
||||||
BeginDrawing();
|
BeginDrawing();
|
||||||
ClearBackground(BLACK);
|
ClearBackground(BLACK);
|
||||||
grid.display();
|
|
||||||
context->render->display(context->world);
|
context->render->display(context->world);
|
||||||
context->selection->display();
|
context->selection->display();
|
||||||
context->patern_preview->display();
|
context->patern_preview->display();
|
||||||
|
|||||||
@@ -30,28 +30,24 @@ void PaternPreview::update() {
|
|||||||
is_started = false;
|
is_started = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (ImGui::IsMouseClicked(0) && !is_unplacable_) {
|
// if right click stop the preview
|
||||||
auto selection_pos =
|
// if left click, apply patern to current world
|
||||||
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
|
// mouse should pass through any present windows
|
||||||
}
|
}
|
||||||
|
|
||||||
void PaternPreview::display() {
|
void PaternPreview::display() {
|
||||||
if (!is_started) return;
|
if (!is_started) return;
|
||||||
|
std::cout << "preview display started " << std::endl;
|
||||||
auto cell_size = context_->settings_menu->getCellSize();
|
auto cell_size = context_->settings_menu->getCellSize();
|
||||||
auto mouse_in_grid =
|
auto mouse_in_grid =
|
||||||
screenToGrid(mouse_pos_, context_->settings_menu->getCellSize());
|
screenToGrid(mouse_pos_, context_->settings_menu->getCellSize());
|
||||||
is_unplacable_ =
|
bool is_unplacable =
|
||||||
((mouse_in_grid.x + context_->paterns_menu->patern_width_ >
|
((mouse_in_grid.x + context_->paterns_menu->patern_width_ >
|
||||||
context_->world->getWidth()) ||
|
context_->world->getWidth()) ||
|
||||||
(mouse_in_grid.y + context_->paterns_menu->patern_height_ >
|
(mouse_in_grid.y + context_->paterns_menu->patern_height_ >
|
||||||
context_->world->getHeight()));
|
context_->world->getHeight()));
|
||||||
|
std::cout << "mx:" << mouse_in_grid.x << ", my:" << mouse_in_grid.y
|
||||||
|
<< ", cs:" << context_->settings_menu->getCellSize() << std::endl;
|
||||||
for (int j = 0; j < context_->paterns_menu->patern_height_; j++) {
|
for (int j = 0; j < context_->paterns_menu->patern_height_; j++) {
|
||||||
for (int i = 0; i < context_->paterns_menu->patern_width_; i++) {
|
for (int i = 0; i < context_->paterns_menu->patern_width_; i++) {
|
||||||
auto cell =
|
auto cell =
|
||||||
@@ -60,7 +56,7 @@ void PaternPreview::display() {
|
|||||||
if (cell) {
|
if (cell) {
|
||||||
DrawRectangle((i + mouse_in_grid.x) * cell_size,
|
DrawRectangle((i + mouse_in_grid.x) * cell_size,
|
||||||
(j + mouse_in_grid.y) * cell_size, cell_size, cell_size,
|
(j + mouse_in_grid.y) * cell_size, cell_size, cell_size,
|
||||||
(is_unplacable_) ? RED : BLUE);
|
(is_unplacable) ? RED : BLUE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -143,6 +143,7 @@ void World::resize(int width, int height) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::vector<uint32_t> World::getSelection(Vector2i &origin, Vector2i &size) {
|
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),
|
std::vector<uint32_t> data = {static_cast<uint32_t>(size.x),
|
||||||
static_cast<uint32_t>(size.y)};
|
static_cast<uint32_t>(size.y)};
|
||||||
for (int y = origin.y; y < origin.y + size.y; y++) {
|
for (int y = origin.y; y < origin.y + size.y; y++) {
|
||||||
@@ -152,12 +153,3 @@ std::vector<uint32_t> World::getSelection(Vector2i &origin, Vector2i &size) {
|
|||||||
}
|
}
|
||||||
return data;
|
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];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
set(CMAKE_SYSTEM_NAME Windows)
|
|
||||||
set(CMAKE_SYSTEM_VERSION 1)
|
|
||||||
set(CMAKE_CROSSCOMPILING TRUE)
|
|
||||||
|
|
||||||
set(MINGW_TRIPLET "x86_64-w64-mingw32")
|
|
||||||
|
|
||||||
set(CMAKE_C_COMPILER ${MINGW_TRIPLET}-gcc)
|
|
||||||
set(CMAKE_CXX_COMPILER ${MINGW_TRIPLET}-g++)
|
|
||||||
set(CMAKE_RC_COMPILER ${MINGW_TRIPLET}-windres)
|
|
||||||
set(CMAKE_AR ${MINGW_TRIPLET}-ar)
|
|
||||||
set(CMAKE_RANLIB ${MINGW_TRIPLET}-ranlib)
|
|
||||||
set(CMAKE_OBJCOPY ${MINGW_TRIPLET}-objcopy)
|
|
||||||
|
|
||||||
set(CMAKE_FIND_ROOT_PATH /usr/${MINGW_TRIPLET})
|
|
||||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
|
||||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
|
||||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
|
||||||
|
|
||||||
set(CMAKE_C_FLAGS_INIT "-static -static-libgcc -static-libstdc++")
|
|
||||||
set(CMAKE_CXX_FLAGS_INIT "-static -static-libgcc -static-libstdc++")
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user