-
Notifications
You must be signed in to change notification settings - Fork 68
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Town aggregation #383
base: master
Are you sure you want to change the base?
Town aggregation #383
Conversation
Move these commits out of #285 because they're related to other states that aren't implemented and they're half finished. |
024f082
to
939871e
Compare
939871e
to
c121c8f
Compare
c121c8f
to
299a5c2
Compare
299a5c2
to
f45abd3
Compare
f8b2c5c
to
f9730ba
Compare
f9730ba
to
71fb700
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
clang-tidy made some suggestions
@@ -14,7 +14,9 @@ namespace openblack::ecs::components | |||
|
|||
struct Field | |||
{ | |||
int town; | |||
static constexpr float radius2D = 5.0f; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: invalid case style for global constant 'radius2D' [readability-identifier-naming]
static constexpr float radius2D = 5.0f; | |
static constexpr float k_Radius2D = 5.0f; |
{ | ||
[[maybe_unused]] const bool any = registry.AnyOf<Fixed, Mobile>(entity); | ||
assert(any); | ||
assert(false); // TODO |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: missing username/bug in TODO [google-readability-todo]
assert(false); // TODO | |
assert(false); // TODO(unknown): |
|
||
const auto& registry = Locator::entitiesRegistry::value(); | ||
|
||
bool checkPlanned = false; // TODO: rename to searchMore |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: missing username/bug in TODO [google-readability-todo]
bool checkPlanned = false; // TODO: rename to searchMore | |
bool checkPlanned = false; // TODO(unknown): rename to searchMore |
}); | ||
|
||
std::array<entt::entity, 100> fieldsAndPlanned; | ||
uint32_t fieldsAndPlannedCount = 0; // TODO: rename to something about circular buffer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: missing username/bug in TODO [google-readability-todo]
uint32_t fieldsAndPlannedCount = 0; // TODO: rename to something about circular buffer | |
uint32_t fieldsAndPlannedCount = 0; // TODO(unknown): rename to something about circular buffer |
|
||
std::array<entt::entity, 100> fieldsAndPlanned; | ||
uint32_t fieldsAndPlannedCount = 0; // TODO: rename to something about circular buffer | ||
uint32_t abodeCount = 0; // TODO: Rename to fieldsAndPlannedTotal |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: missing username/bug in TODO [google-readability-todo]
uint32_t abodeCount = 0; // TODO: Rename to fieldsAndPlannedTotal | |
uint32_t abodeCount = 0; // TODO(unknown): Rename to fieldsAndPlannedTotal |
} | ||
} | ||
|
||
// TODO: If there aren't enough, throw planned structures into the mix |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: missing username/bug in TODO [google-readability-todo]
// TODO: If there aren't enough, throw planned structures into the mix | |
// TODO(unknown): If there aren't enough, throw planned structures into the mix |
71fb700
to
8a6fd6e
Compare
@@ -0,0 +1,62 @@ | |||
/****************************************************************************** | |||
* Copyright (c) 2018-2023 openblack developers |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[license_checker] reported by reviewdog 🐶
* Copyright (c) 2018-2023 openblack developers | |
/****************************************************************************** | |
* Copyright (c) 2018-2024 openblack developers | |
* | |
* For a complete list of all authors, please refer to contributors.md | |
* Interested in contributing? Visit https://github.com/openblack/openblack | |
* | |
* openblack is licensed under the GNU General Public License version 3. | |
*******************************************************************************/ | |
* Copyright (c) 2018-2023 openblack developers |
@@ -0,0 +1,22 @@ | |||
/****************************************************************************** | |||
* Copyright (c) 2018-2023 openblack developers |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[license_checker] reported by reviewdog 🐶
* Copyright (c) 2018-2023 openblack developers | |
/****************************************************************************** | |
* Copyright (c) 2018-2024 openblack developers | |
* | |
* For a complete list of all authors, please refer to contributors.md | |
* Interested in contributing? Visit https://github.com/openblack/openblack | |
* | |
* openblack is licensed under the GNU General Public License version 3. | |
*******************************************************************************/ | |
* Copyright (c) 2018-2023 openblack developers |
@@ -0,0 +1,272 @@ | |||
/****************************************************************************** | |||
* Copyright (c) 2018-2023 openblack developers |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[license_checker] reported by reviewdog 🐶
* Copyright (c) 2018-2023 openblack developers | |
/****************************************************************************** | |
* Copyright (c) 2018-2024 openblack developers | |
* | |
* For a complete list of all authors, please refer to contributors.md | |
* Interested in contributing? Visit https://github.com/openblack/openblack | |
* | |
* openblack is licensed under the GNU General Public License version 3. | |
*******************************************************************************/ | |
* Copyright (c) 2018-2023 openblack developers |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
clang-tidy made some suggestions
{ | ||
[[maybe_unused]] const bool any = registry.AnyOf<Fixed, Mobile>(entity); | ||
assert(any); | ||
assert(false); // TODO |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: missing username/bug in TODO [google-readability-todo]
assert(false); // TODO | |
assert(false); // TODO(bwrsandman): |
|
||
const auto& registry = Locator::entitiesRegistry::value(); | ||
|
||
bool checkPlanned = false; // TODO: rename to searchMore |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: missing username/bug in TODO [google-readability-todo]
bool checkPlanned = false; // TODO: rename to searchMore | |
bool checkPlanned = false; // TODO(bwrsandman): rename to searchMore |
}); | ||
|
||
std::array<entt::entity, 100> fieldsAndPlanned; | ||
uint32_t fieldsAndPlannedCount = 0; // TODO: rename to something about circular buffer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: missing username/bug in TODO [google-readability-todo]
uint32_t fieldsAndPlannedCount = 0; // TODO: rename to something about circular buffer | |
uint32_t fieldsAndPlannedCount = 0; // TODO(bwrsandman): rename to something about circular buffer |
|
||
std::array<entt::entity, 100> fieldsAndPlanned; | ||
uint32_t fieldsAndPlannedCount = 0; // TODO: rename to something about circular buffer | ||
uint32_t abodeCount = 0; // TODO: Rename to fieldsAndPlannedTotal |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: missing username/bug in TODO [google-readability-todo]
uint32_t abodeCount = 0; // TODO: Rename to fieldsAndPlannedTotal | |
uint32_t abodeCount = 0; // TODO(bwrsandman): Rename to fieldsAndPlannedTotal |
} | ||
} | ||
|
||
// TODO: If there aren't enough, throw planned structures into the mix |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: missing username/bug in TODO [google-readability-todo]
// TODO: If there aren't enough, throw planned structures into the mix | |
// TODO(bwrsandman): If there aren't enough, throw planned structures into the mix |
Needed for the
GO_HOME
states as the villager needs to be assigned a town and the town must assign itself to abodes.