games/raycaster
1
0
Fork 0
Code Issues 30 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Map now displays and works, just need to refine the colors and the compass directions.

Browse source
This commit is contained in:
Zed A. Shaw 2025-07-15 13:28:23 -04:00
parent dca38397e7
commit 75646619b3
8 changed files with 77 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gui/fsm.cpp
View file

@ -347,7 +347,7 @@ namespace gui {
if(!sound::playing("ambient_1")) sound::play("ambient_1", true);
$debug_ui.debug();
shaders::reload();
$map_ui.save_map("map.txt", $main_ui.$compass_dir);
$map_ui.save_map($main_ui.$compass_dir);
break;
case KEY::O:
autowalking = true;

45
gui/map_view.cpp
View file

@ -18,6 +18,9 @@ namespace gui {
MapViewUI::MapViewUI(GameLevel &level) :
$level(level),
$map_render(std::make_shared<sf::RenderTexture>()),
$map_sprite($map_render->getTexture()),
$map_tiles(matrix::make(12,11)),
$paper(textures::get("full_screen_paper"))
{
}
@ -27,49 +30,45 @@ namespace gui {
}
void MapViewUI::init() {
//auto top_right = overlay.entity("top_right");
//auto cell = overlay.cell_for(top_right);
$gui.position(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
$gui.layout(
"[log_view| *%(200)map_grid | _ ]"
);
auto grid = $gui.entity("map_grid");
$gui.set<Textual>(grid,
{L"Loading...", 65, {27, 26, 23, 150}, 10});
$log_to = $gui.entity("log_view");
$gui.set<Textual>($log_to, {L"Welcome to the Game!", 25, {37, 36, 33}, 25});
$paper.sprite->setPosition({0, 0});
auto map_cell = $gui.cell_for("map_grid");
$map_sprite.setPosition({(float)map_cell.x, (float)map_cell.y + 30});
$gui.init();
}
void MapViewUI::render(sf::RenderWindow &window, int compass_dir) {
void MapViewUI::save_map(int compass_dir) {
(void)compass_dir;
// confirm we get two different maps
auto out_img = $map_render->getTexture().copyToImage();
bool worked = out_img.saveToFile("tmp/map_render.png");
dbc::check(worked, "failed to render map");
}
void MapViewUI::render(sf::RenderWindow &window, int compass_dir) {
window.draw(*$paper.sprite);
auto grid = $gui.entity("map_grid");
// System::draw_map
auto& map_text = $gui.get<Textual>(grid);
map_text.update(L"MAP BROKEN");
System::draw_map($level, $map_tiles, $entity_map, compass_dir);
System::render_map($map_tiles, $entity_map, *$map_render);
$map_sprite.setTexture($map_render->getTexture(), true);
window.draw($map_sprite);
$gui.render(window);
// $gui.debug_layout(window);
}
void MapViewUI::save_map(const std::string& outfile, int compass_dir) {
(void)compass_dir;
std::wstring map_out = L"I'M BROKEN";
std::wofstream out(outfile, std::ios::binary);
std::locale loc(std::locale::classic(), new std::codecvt_utf8<wchar_t>);
out.imbue(loc);
out << map_out;
dbc::check(out.good(), "failed to write map file");
}
void MapViewUI::update() {
if(auto text = $gui.get_if<Textual>($log_to)) {
//BUG: I'm calling this what it is, fix it

11
gui/map_view.hpp
View file

@ -1,6 +1,7 @@
#pragma once
#include "levelmanager.hpp"
#include "textures.hpp"
#include "matrix.hpp"
#include <guecs/ui.hpp>
#include <string>
@ -8,10 +9,14 @@ namespace gui {
class MapViewUI {
public:
guecs::UI $gui;
GameLevel $level;
DinkyECS::Entity $log_to;
textures::SpriteTexture $paper;
EntityGrid $entity_map;
std::deque<std::wstring> $messages;
GameLevel $level;
std::shared_ptr<sf::RenderTexture> $map_render;
sf::Sprite $map_sprite;
matrix::Matrix $map_tiles;
textures::SpriteTexture $paper;
MapViewUI(GameLevel &level);
void init();
@ -19,6 +24,6 @@ namespace gui {
void update_level(GameLevel &level);
void log(std::wstring msg);
void update();
void save_map(const std::string& outfile, int compass_dir);
void save_map(int compass_dir);
};
}