From a6f7aacdfb66fee73d50eccecb544544a2a14da1 Mon Sep 17 00:00:00 2001 From: Andrew Pamment Date: Sun, 20 Apr 2025 10:26:48 +1000 Subject: [PATCH] Fov Changes --- .gitattributes | 63 +++++++++ .gitignore | 365 +++++++++++++++++++++++++++++++++++++++++++++++++ Engine.cpp | 28 +++- Engine.h | 3 + Map.cpp | 36 ++++- Map.h | 1 + 6 files changed, 487 insertions(+), 9 deletions(-) create mode 100644 .gitattributes create mode 100644 .gitignore diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1ff0c42 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..10efc43 --- /dev/null +++ b/.gitignore @@ -0,0 +1,365 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Oo]ut/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +build/ \ No newline at end of file diff --git a/Engine.cpp b/Engine.cpp index a3cb582..1beeac4 100644 --- a/Engine.cpp +++ b/Engine.cpp @@ -11,6 +11,8 @@ Engine::Engine(tcod::Context *context, tcod::Console *console) { this->console = console; map = nullptr; player = nullptr; + fovRadius = 10; + computeFov = true; } void Engine::init() { @@ -32,20 +34,28 @@ bool Engine::update() { case SDL_EVENT_KEY_DOWN: switch (event.key.key) { case SDLK_UP: - if (!map->isWall(player->x, player->y - 1)) + if (!map->isWall(player->x, player->y - 1)) { player->y--; + computeFov = true; + } break; case SDLK_DOWN: - if (!map->isWall(player->x, player->y + 1)) + if (!map->isWall(player->x, player->y + 1)) { player->y++; + computeFov = true; + } break; case SDLK_LEFT: - if (!map->isWall(player->x - 1, player->y)) + if (!map->isWall(player->x - 1, player->y)) { player->x--; + computeFov = true; + } break; case SDLK_RIGHT: - if (!map->isWall(player->x + 1, player->y)) + if (!map->isWall(player->x + 1, player->y)) { player->x++; + computeFov = true; + } break; default: break; @@ -56,6 +66,11 @@ bool Engine::update() { default: break; } + if (computeFov) { + map->computeFov(); + computeFov = false; + } + } return true; } @@ -68,7 +83,10 @@ void Engine::render() { // draw the actors for (Actor** iterator = actors.begin(); iterator != actors.end(); iterator++) { - (*iterator)->render(*console); + Actor* actor = *iterator; + if (map->isInFov(actor->x, actor->y)) { + actor->render(*console); + } } context->present(*console); } diff --git a/Engine.h b/Engine.h index f7fe96a..6c725fb 100644 --- a/Engine.h +++ b/Engine.h @@ -9,6 +9,7 @@ public: TCODList actors; Actor* player; Map* map; + int fovRadius; tcod::Context *context; tcod::Console* console; Engine(tcod::Context *context, tcod::Console *console); @@ -16,6 +17,8 @@ public: ~Engine(); bool update(); void render(); +private: + bool computeFov; }; extern Engine *engine; \ No newline at end of file diff --git a/Map.cpp b/Map.cpp index 7d350b3..6e9b933 100644 --- a/Map.cpp +++ b/Map.cpp @@ -39,6 +39,7 @@ public: Map::Map(int width, int height) : width(width), height(height) { tiles = new Tile[width * height]; + map = new TCODMap(width, height); TCODBsp bsp(0, 0, width, height); bsp.splitRecursive(NULL, 8, ROOM_MAX_SIZE, ROOM_MAX_SIZE, 1.5f, 1.5f); BspListener listener(*this); @@ -47,22 +48,49 @@ Map::Map(int width, int height) : width(width), height(height) { Map::~Map() { delete[] tiles; + delete map; +} + +bool Map::isInFov(int x, int y) const { + if (map->isInFov(x, y)) { + tiles[x + y * width].explored = true; + return true; + } + return false; +} + +void Map::computeFov() { + map->computeFov(engine->player->x, engine->player->y, + engine->fovRadius); } bool Map::isWall(int x, int y) const { - return !tiles[x + y * width].canWalk; + return !map->isWalkable(x, y); +} + +bool Map::isExplored(int x, int y) const { + return tiles[x + y * width].explored; } void Map::setWall(int x, int y) { - tiles[x + y * width].canWalk = false; + map->setProperties(x, y, false, false); } void Map::render(TCOD_Console& cons) const { static const TCOD_ColorRGB darkWall(0, 0, 100); static const TCOD_ColorRGB darkGround(50, 50, 150); + static const TCOD_ColorRGB lightWall(130, 110, 50); + static const TCOD_ColorRGB lightGround(200, 180, 50); for (int x = 0; x < width; x++) { for (int y = 0; y < height; y++) { - tcod::print(cons, { x, y }, " ", std::nullopt, isWall(x, y) ? darkWall : darkGround); + if (isInFov(x, y)) { + tcod::print(cons, { x, y }, " ", std::nullopt, isWall(x, y) ? lightWall : lightGround); + } + else if (isExplored(x, y)) { + tcod::print(cons, { x, y }, " ", std::nullopt, isWall(x, y) ? darkWall : darkGround); + + + } } } } @@ -80,7 +108,7 @@ void Map::dig(int x1, int y1, int x2, int y2) { } for (int tilex = x1; tilex <= x2; tilex++) { for (int tiley = y1; tiley <= y2; tiley++) { - tiles[tilex + tiley * width].canWalk = true; + map->setProperties(tilex, tiley, true, true); } } } diff --git a/Map.h b/Map.h index 510b98a..b3f7ae3 100644 --- a/Map.h +++ b/Map.h @@ -1,4 +1,5 @@ #pragma once + struct Tile { bool explored; // has the player already seen this tile ? Tile() : explored(false) {}