Archive/Shipwright
0
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-04-28 13:17:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

clang-format .hpp files (#5307)

Browse source 
* Add hpp files to clang-format script

* clang-format hpp files
This commit is contained in:
Archez 2025-04-03 23:33:35 -04:00 • committed by GitHub
parent 2deea6e105
commit f37c3aa228
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 1048 additions and 1058 deletions
Download patch file Download diff file Expand all files Collapse all files

2
run-clang-format.ps1
View file

@ -37,7 +37,7 @@ if (-not (Test-Path $clangFormatFilePath) -or ($currentVersion -ne $requiredVers
$basePath = (Resolve-Path .).Path
$files = Get-ChildItem -Path $basePath\soh -Recurse -File `
| Where-Object { ($_.Extension -eq '.c' -or $_.Extension -eq '.cpp' -or `
($_.Extension -eq '.h' -and `
(($_.Extension -eq '.h' -or $_.Extension -eq '.hpp') -and `
(-not ($_.FullName -like "*\soh\src\*" -or $_.FullName -like "*\soh\include\*")))) -and `
(-not ($_.FullName -like "*\soh\assets\*")) }

6
run-clang-format.sh
View file

@ -10,8 +10,8 @@
# -name "*.c" -o -name "*.cpp"
# find all .c and .cpp files
#
# -name "*.h" ! -path "soh/src/**.h" ! -path "soh/include/**.h"
# find all .h files that aren't in soh/src or soh/include
# ( -name "*.h" -o -name "*.hpp" ) ! -path "soh/src/**.h" ! -path "soh/include/**.h"
# find all .h and .hpp files that aren't in soh/src or soh/include
# this is because zret decomp only runs clang-format on c files
# https://github.com/zeldaret/mm/blob/b7e5468ca16315a7e322055eff3d97fe980bbc25/format.py#L182
#
@ -26,4 +26,4 @@
# and pass it as an argument to clang-format
# verbose to print files being formatted and X out of Y status
find soh -type f \( -name "*.c" -o -name "*.cpp" -o \( -name "*.h" ! -path "soh/src/**.h" ! -path "soh/include/**.h" \) \) ! -path "soh/assets/*" -print0 | xargs -0 clang-format-14 -i --verbose
find soh -type f \( -name "*.c" -o -name "*.cpp" -o \( \( -name "*.h" -o -name "*.hpp" \) ! -path "soh/src/*" ! -path "soh/include/*" \) \) ! -path "soh/assets/*" -print0 | xargs -0 clang-format-14 -i --verbose

50
soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp
View file

@ -6,28 +6,28 @@
#include "text.hpp"
namespace CustomMessages {
std::string MESSAGE_END();
std::string WAIT_FOR_INPUT();
std::string HORIZONTAL_SPACE(uint8_t x);
std::string GO_TO(uint16_t x);
std::string INSTANT_TEXT_ON();
std::string INSTANT_TEXT_OFF();
std::string SHOP_MESSAGE_BOX();
std::string EVENT_TRIGGER();
std::string DELAY_FRAMES(uint8_t x);
std::string CLOSE_AFTER(uint8_t x);
std::string PLAYER_NAME();
std::string PLAY_OCARINA();
std::string ITEM_OBTAINED(uint8_t x);
std::string SET_SPEED(uint8_t x);
std::string SKULLTULAS_DESTROYED();
std::string CURRENT_TIME();
std::string UNSKIPPABLE();
std::string TWO_WAY_CHOICE();
std::string NEWLINE();
std::string COLOR(std::string x);
std::string CENTER_TEXT();
std::string IF_NOT_MQ();
std::string MQ_ELSE();
std::string MQ_END();
}
std::string MESSAGE_END();
std::string WAIT_FOR_INPUT();
std::string HORIZONTAL_SPACE(uint8_t x);
std::string GO_TO(uint16_t x);
std::string INSTANT_TEXT_ON();
std::string INSTANT_TEXT_OFF();
std::string SHOP_MESSAGE_BOX();
std::string EVENT_TRIGGER();
std::string DELAY_FRAMES(uint8_t x);
std::string CLOSE_AFTER(uint8_t x);
std::string PLAYER_NAME();
std::string PLAY_OCARINA();
std::string ITEM_OBTAINED(uint8_t x);
std::string SET_SPEED(uint8_t x);
std::string SKULLTULAS_DESTROYED();
std::string CURRENT_TIME();
std::string UNSKIPPABLE();
std::string TWO_WAY_CHOICE();
std::string NEWLINE();
std::string COLOR(std::string x);
std::string CENTER_TEXT();
std::string IF_NOT_MQ();
std::string MQ_ELSE();
std::string MQ_END();
} // namespace CustomMessages

84
soh/soh/Enhancements/randomizer/3drando/fill.hpp
View file

@ -7,52 +7,52 @@
#include <vector>
#include <string>
//RANDOTODO merge into Logic once Logic is a class passed to logic funtions
// RANDOTODO merge into Logic once Logic is a class passed to logic funtions
struct GetAccessibleLocationsStruct {
std::vector<RandomizerCheck> accessibleLocations;
std::vector<RandomizerRegion> regionPool;
//Variables for playthrough
int gsCount;
int maxGsCount;
std::vector<LogicVal> buyIgnores;
std::vector<RandomizerCheck> accessibleLocations;
std::vector<RandomizerRegion> regionPool;
// Variables for playthrough
int gsCount;
int maxGsCount;
std::vector<LogicVal> buyIgnores;
//Variables for search
std::vector<Rando::ItemLocation*> newItemLocations;
bool logicUpdated;
bool resetSphere;
// Variables for search
std::vector<Rando::ItemLocation*> newItemLocations;
bool logicUpdated;
bool resetSphere;
//Variables For Validating Entrences
bool haveTimeAccess;
bool foundTempleOfTime;
bool validatedStartingRegion;
bool sphereZeroComplete;
bool timePassChildDay;
bool timePassChildNight;
bool timePassAdultDay;
bool timePassAdultNight;
// Variables For Validating Entrences
bool haveTimeAccess;
bool foundTempleOfTime;
bool validatedStartingRegion;
bool sphereZeroComplete;
bool timePassChildDay;
bool timePassChildNight;
bool timePassAdultDay;
bool timePassAdultNight;
std::vector<RandomizerCheck> itemSphere;
std::list<Rando::Entrance*> entranceSphere;
std::vector<RandomizerCheck> itemSphere;
std::list<Rando::Entrance*> entranceSphere;
bool calculatingAvailableChecks = false;
bool calculatingAvailableChecks = false;
GetAccessibleLocationsStruct(int _maxGsCount){
regionPool = {RR_ROOT};
gsCount = 0;
maxGsCount = _maxGsCount;
logicUpdated = false;
resetSphere = false;
}
void InitLoop(){
logicUpdated = false;
for (Rando::ItemLocation* location : newItemLocations) {
location->ApplyPlacedItemEffect();
GetAccessibleLocationsStruct(int _maxGsCount) {
regionPool = { RR_ROOT };
gsCount = 0;
maxGsCount = _maxGsCount;
logicUpdated = false;
resetSphere = false;
}
void InitLoop() {
logicUpdated = false;
for (Rando::ItemLocation* location : newItemLocations) {
location->ApplyPlacedItemEffect();
}
newItemLocations.clear();
itemSphere.clear();
entranceSphere.clear();
}
newItemLocations.clear();
itemSphere.clear();
entranceSphere.clear();
}
};
void ClearProgress();
@ -64,10 +64,12 @@ std::vector<RandomizerCheck> GetEmptyLocations(std::vector<RandomizerCheck> allo
void ProcessRegion(Region* region, GetAccessibleLocationsStruct& gals, RandomizerGet ignore = RG_NONE,
bool stopOnBeatable = false, bool addToPlaythrough = false);
std::vector<RandomizerCheck> ReachabilitySearch(const std::vector<RandomizerCheck>& allowedLocations, RandomizerGet ignore=RG_NONE, bool calculatingAvailableChecks=false);
std::vector<RandomizerCheck> ReachabilitySearch(const std::vector<RandomizerCheck>& allowedLocations,
RandomizerGet ignore = RG_NONE,
bool calculatingAvailableChecks = false);
void GeneratePlaythrough();
bool CheckBeatable(RandomizerGet ignore=RG_NONE);
bool CheckBeatable(RandomizerGet ignore = RG_NONE);
void ValidateEntrances(bool checkPoeCollectorAccess, bool checkOtherEntranceAccess);

62
soh/soh/Enhancements/randomizer/3drando/hints.hpp
View file

@ -11,29 +11,30 @@
#include "../../custom-message/CustomMessageManager.h"
struct HintDistributionSetting {
std::string name;
HintType type;
uint32_t weight;
uint8_t fixed;
uint8_t copies;
std::function<bool(RandomizerCheck)> filter;
uint8_t dungeonLimit;
std::string name;
HintType type;
uint32_t weight;
uint8_t fixed;
uint8_t copies;
std::function<bool(RandomizerCheck)> filter;
uint8_t dungeonLimit;
HintDistributionSetting(std::string _name, HintType _type, uint32_t _weight, uint8_t _fixed, uint8_t _copies,
std::function<bool(RandomizerCheck)> _filter, uint8_t _dungeonLimit = 40);
HintDistributionSetting(std::string _name, HintType _type, uint32_t _weight, uint8_t _fixed, uint8_t _copies,
std::function<bool(RandomizerCheck)> _filter, uint8_t _dungeonLimit = 40);
};
struct HintSetting {
uint8_t alwaysCopies;
uint8_t trialCopies;
uint8_t junkWeight;
std::vector<HintDistributionSetting> distTable;
uint8_t alwaysCopies;
uint8_t trialCopies;
uint8_t junkWeight;
std::vector<HintDistributionSetting> distTable;
};
class HintText {
public:
public:
HintText() = default;
HintText(CustomMessage clearText_, std::vector<CustomMessage> ambiguousText_ = {}, std::vector<CustomMessage> obscureText_ = {});
HintText(CustomMessage clearText_, std::vector<CustomMessage> ambiguousText_ = {},
std::vector<CustomMessage> obscureText_ = {});
const CustomMessage& GetClear() const;
const CustomMessage& GetObscure() const;
const CustomMessage& GetObscure(uint8_t selection) const;
@ -46,27 +47,28 @@ public:
bool operator==(const HintText& right) const;
bool operator!=(const HintText& right) const;
private:
private:
CustomMessage clearText;
std::vector<CustomMessage> ambiguousText = {};
std::vector<CustomMessage> obscureText = {};
};
struct StaticHintInfo{
HintType type;
std::vector<RandomizerHintTextKey> hintKeys;
RandomizerSettingKey setting;
std::variant<bool, uint8_t> condition;
std::vector<RandomizerCheck> targetChecks;
std::vector<RandomizerGet> targetItems;
std::vector<RandomizerCheck> hintChecks;
bool yourPocket;
int num;
struct StaticHintInfo {
HintType type;
std::vector<RandomizerHintTextKey> hintKeys;
RandomizerSettingKey setting;
std::variant<bool, uint8_t> condition;
std::vector<RandomizerCheck> targetChecks;
std::vector<RandomizerGet> targetItems;
std::vector<RandomizerCheck> hintChecks;
bool yourPocket;
int num;
StaticHintInfo() = default;
StaticHintInfo(HintType _type, std::vector<RandomizerHintTextKey> _hintKeys, RandomizerSettingKey _setting, std::variant<bool, uint8_t> _condition,
std::vector<RandomizerCheck> _targetChecks, std::vector<RandomizerGet> _targetItems = {},
std::vector<RandomizerCheck> _hintChecks = {}, bool _yourPocket = false, int _num = 0);
StaticHintInfo() = default;
StaticHintInfo(HintType _type, std::vector<RandomizerHintTextKey> _hintKeys, RandomizerSettingKey _setting,
std::variant<bool, uint8_t> _condition, std::vector<RandomizerCheck> _targetChecks,
std::vector<RandomizerGet> _targetItems = {}, std::vector<RandomizerCheck> _hintChecks = {},
bool _yourPocket = false, int _num = 0);
};
RandomizerHintTextKey GetRandomJunkHint();

3
soh/soh/Enhancements/randomizer/3drando/menu.hpp
View file

@ -13,4 +13,5 @@
#define DELETE_PRESET 6
#define RESET_TO_DEFAULTS 8
bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, std::string seedInput);
bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
std::string seedInput);

8
soh/soh/Enhancements/randomizer/3drando/playthrough.hpp
View file

@ -4,6 +4,8 @@
#include "../context.h"
namespace Playthrough {
int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks);
int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, int count = 1);
}
int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
std::set<RandomizerTrick> enabledTricks);
int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
int count = 1);
} // namespace Playthrough

31
soh/soh/Enhancements/randomizer/3drando/pool_functions.hpp
View file

@ -5,38 +5,35 @@
#include <iostream>
#include <iterator>
template <typename T, typename Predicate>
static void erase_if(std::vector<T>& vector, Predicate pred) {
vector.erase(std::remove_if(begin(vector), end(vector), pred), end(vector));
template <typename T, typename Predicate> static void erase_if(std::vector<T>& vector, Predicate pred) {
vector.erase(std::remove_if(begin(vector), end(vector), pred), end(vector));
}
template <typename T, typename Predicate>
std::vector<T> FilterFromPool(std::vector<T>& vector, Predicate pred, bool eraseAfterFilter = false) {
std::vector<T> filteredPool = {};
std::copy_if(vector.begin(), vector.end(), std::back_inserter(filteredPool), pred);
std::vector<T> filteredPool = {};
std::copy_if(vector.begin(), vector.end(), std::back_inserter(filteredPool), pred);
if (eraseAfterFilter) {
erase_if(vector, pred);
}
if (eraseAfterFilter) {
erase_if(vector, pred);
}
return filteredPool;
return filteredPool;
}
template <typename T, typename Predicate>
std::vector<T> FilterAndEraseFromPool(std::vector<T>& vector, Predicate pred) {
return FilterFromPool(vector, pred, true);
return FilterFromPool(vector, pred, true);
}
template <typename T, typename FromPool>
void AddElementsToPool(std::vector<T>& toPool, const FromPool& fromPool) {
toPool.insert(toPool.end(), std::cbegin(fromPool), std::cend(fromPool));
template <typename T, typename FromPool> void AddElementsToPool(std::vector<T>& toPool, const FromPool& fromPool) {
toPool.insert(toPool.end(), std::cbegin(fromPool), std::cend(fromPool));
}
template <typename T, typename Container>
bool ElementInContainer(T& element, const Container& container) {
return std::find(container.begin(), container.end(), element) != container.end();
template <typename T, typename Container> bool ElementInContainer(T& element, const Container& container) {
return std::find(container.begin(), container.end(), element) != container.end();
}
template <typename First, typename... T> bool IsAnyOf(First&& first, T&&... t) {
return ((first == t) || ...);
return ((first == t) || ...);
}

3
soh/soh/Enhancements/randomizer/3drando/rando_main.hpp
View file

@ -3,5 +3,6 @@
#include <set>
namespace RandoMain {
void GenerateRando(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, std::string seedInput);
void GenerateRando(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
std::string seedInput);
}

30
soh/soh/Enhancements/randomizer/3drando/random.hpp
View file

@ -11,9 +11,8 @@ void Random_Init(uint32_t seed);
uint32_t Random(int min, int max);
double RandomDouble();
//Get a random element from a vector or array
template <typename T>
T RandomElement(std::vector<T>& vector, bool erase) {
// Get a random element from a vector or array
template <typename T> T RandomElement(std::vector<T>& vector, bool erase) {
const auto idx = Random(0, vector.size());
const T selected = vector[idx];
if (erase) {
@ -21,17 +20,14 @@ T RandomElement(std::vector<T>& vector, bool erase) {
}
return selected;
}
template <typename Container>
auto& RandomElement(Container& container) {
template <typename Container> auto& RandomElement(Container& container) {
return container[Random(0, std::size(container))];
}
template <typename Container>
const auto& RandomElement(const Container& container) {
template <typename Container> const auto& RandomElement(const Container& container) {
return container[Random(0, std::size(container))];
}
template <typename T>
const T RandomElementFromSet(const std::set<T>& set) {
template <typename T> const T RandomElementFromSet(const std::set<T>& set) {
if (set.size() == 1) {
return *set.begin();
}
@ -44,19 +40,15 @@ const T RandomElementFromSet(const std::set<T>& set) {
return *it;
}
//Shuffle items within a vector or array
//RANDOTODO There's probably a more efficient way to do what this does.
template <typename T>
void Shuffle(std::vector<T>& vector) {
for (std::size_t i = 0; i + 1 < vector.size(); i++)
{
// Shuffle items within a vector or array
// RANDOTODO There's probably a more efficient way to do what this does.
template <typename T> void Shuffle(std::vector<T>& vector) {
for (std::size_t i = 0; i + 1 < vector.size(); i++) {
std::swap(vector[i], vector[Random(i, vector.size())]);
}
}
template <typename T, std::size_t size>
void Shuffle(std::array<T, size>& arr) {
for (std::size_t i = 0; i + 1 < arr.size(); i++)
{
template <typename T, std::size_t size> void Shuffle(std::array<T, size>& arr) {
for (std::size_t i = 0; i + 1 < arr.size(); i++) {
std::swap(arr[i], arr[Random(i, arr.size())]);
}
}

16
soh/soh/Enhancements/randomizer/3drando/shops.hpp
View file

@ -16,16 +16,10 @@ struct PriceSettingsStruct {
RandomizerSettingKey tycoonWallet;
RandomizerSettingKey affordable;
PriceSettingsStruct(RandomizerSettingKey _main,
RandomizerSettingKey _fixedPrice,
RandomizerSettingKey _range1,
RandomizerSettingKey _range2,
RandomizerSettingKey _noWallet,
RandomizerSettingKey _childWallet,
RandomizerSettingKey _adultWallet,
RandomizerSettingKey _giantWallet,
RandomizerSettingKey _tycoonWallet,
RandomizerSettingKey _affordable);
PriceSettingsStruct(RandomizerSettingKey _main, RandomizerSettingKey _fixedPrice, RandomizerSettingKey _range1,
RandomizerSettingKey _range2, RandomizerSettingKey _noWallet, RandomizerSettingKey _childWallet,
RandomizerSettingKey _adultWallet, RandomizerSettingKey _giantWallet,
RandomizerSettingKey _tycoonWallet, RandomizerSettingKey _affordable);
};
extern void PlaceVanillaShopItems();
@ -34,5 +28,3 @@ extern uint16_t GetRandomPrice(Rando::Location* loc, PriceSettingsStruct priceSe
extern uint16_t GetCheapBalancedPrice();
extern int GetShopsanityReplaceAmount();
extern Text GetIceTrapName(uint8_t id);

54
soh/soh/Enhancements/randomizer/3drando/text.hpp
View file

@ -7,22 +7,20 @@
#define SINGULAR 1
class Text {
public:
public:
Text() = default;
Text(std::string english_, std::string french_, std::string spanish_)
: english(std::move(english_)),
french(std::move(french_)),
spanish(std::move(spanish_)),
german(std::move("")) {
// german defaults to english text until a translation is provided.
german = english;
}
: english(std::move(english_)), french(std::move(french_)), spanish(std::move(spanish_)),
german(std::move("")) {
// german defaults to english text until a translation is provided.
german = english;
}
Text(std::string english_, std::string french_, std::string spanish_, std::string german_)
: english(std::move(english_)),
french(std::move(french_)),
spanish(std::move(spanish_)),
german(std::move(german_)) {}
Text(std::string english_) : english(std::move(english_)), french(std::move("")), spanish(std::move("")), german(std::move("")) {
: english(std::move(english_)), french(std::move(french_)), spanish(std::move(spanish_)),
german(std::move(german_)) {
}
Text(std::string english_)
: english(std::move(english_)), french(std::move("")), spanish(std::move("")), german(std::move("")) {
// default unprovided languages to english text
french = spanish = german = english;
}
@ -54,24 +52,24 @@ public:
const std::string& GetForLanguage(uint8_t language) const {
switch (language) {
case 0: //LANGUAGE_ENG: changed to resolve #include loops
case 0: // LANGUAGE_ENG: changed to resolve #include loops
return GetEnglish();
case 2: //LANGUAGE_FRA:
case 2: // LANGUAGE_FRA:
return GetFrench();
case 1: //LANGUAGE_GER:
case 1: // LANGUAGE_GER:
return GetGerman();
default:
return GetEnglish();
}
}
Text operator+ (const Text& right) const {
return Text{english + right.GetEnglish(), french + right.GetFrench(), spanish + right.GetSpanish(),
german + right.GetGerman()};
Text operator+(const Text& right) const {
return Text{ english + right.GetEnglish(), french + right.GetFrench(), spanish + right.GetSpanish(),
german + right.GetGerman() };
}
Text operator+ (const std::string& right) const {
return Text{english + right, french + right, spanish + right, german + right};
Text operator+(const std::string& right) const {
return Text{ english + right, french + right, spanish + right, german + right };
}
bool operator==(const Text& right) const {
@ -88,11 +86,11 @@ public:
void Replace(std::string oldStr, std::string newStr) {
for (std::string* str : {&english, &french, &spanish, &german}) {
for (std::string* str : { &english, &french, &spanish, &german }) {
size_t position = str->find(oldStr);
while (position != std::string::npos) {
str->replace(position, oldStr.length(), newStr);
position = str->find(oldStr);
str->replace(position, oldStr.length(), newStr);
position = str->find(oldStr);
}
}
}
@ -123,15 +121,15 @@ public:
// Convert first char to upper case
Text Capitalize(void) const {
Text cap = *this + "";
for (std::string* str : {&cap.english, &cap.french, &cap.spanish, &cap.german}) {
for (std::string* str : { &cap.english, &cap.french, &cap.spanish, &cap.german }) {
(*str)[0] = std::toupper((*str)[0]);
}
return cap;
}
//find the appropriate bars that separate singular from plural
// find the appropriate bars that separate singular from plural
void SetForm(int form) {
for (std::string* str : {&english, &french, &spanish, &german}) {
for (std::string* str : { &english, &french, &spanish, &german }) {
size_t firstBar = str->find('|');
if (firstBar != std::string::npos) {
@ -151,7 +149,7 @@ public:
}
}
}
//remove the remaining bar
// remove the remaining bar
this->Replace("|", "");
}

17
soh/soh/SohGui/SohGui.hpp
View file

@ -32,14 +32,15 @@
#include "SohModals.h"
namespace SohGui {
void SetupHooks();
void SetupGuiElements();
void Draw();
void Destroy();
void RegisterPopup(std::string title, std::string message, std::string button1 = "OK", std::string button2 = "", std::function<void()> button1callback = nullptr, std::function<void()> button2callback = nullptr);
void ShowRandomizerSettingsMenu();
UIWidgets::Colors GetMenuThemeColor();
}
void SetupHooks();
void SetupGuiElements();
void Draw();
void Destroy();
void RegisterPopup(std::string title, std::string message, std::string button1 = "OK", std::string button2 = "",
std::function<void()> button1callback = nullptr, std::function<void()> button2callback = nullptr);
void ShowRandomizerSettingsMenu();
UIWidgets::Colors GetMenuThemeColor();
} // namespace SohGui
#define THEME_COLOR SohGui::GetMenuThemeColor()

1714
soh/soh/SohGui/UIWidgets.hpp
View file

File diff suppressed because it is too large Load diff