Deukhoofd
/
CreatureLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup of ScriptAggregator class.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-04-23 23:23:58 +02:00
parent 3a11bba913
commit dd668f2b1c
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
11 changed files with 89 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Battling/Models/Battle.cpp
View File

@ -85,7 +85,9 @@ bool Battle::CreatureInField(const Creature* creature) const {
void Battle::ForceRecall(uint8_t side, uint8_t index) { _sides[side]->SetCreature(nullptr, index); }
void Battle::GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) { scripts.Append(&_volatile); }
void Battle::GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) {
scripts.Append(ScriptWrapper::FromSet(&_volatile));
}
void Battle::SwitchCreature(uint8_t sideIndex, uint8_t index, Creature* c) {
auto side = this->_sides[sideIndex];

2
src/Battling/Models/BattleSide.cpp
View File

@ -70,7 +70,7 @@ bool BattleSide::CreatureOnSide(const Creature* creature) const {
Creature* BattleSide::GetCreature(uint8_t index) const { return _creatures[index]; }
void BattleSide::GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) {
scripts.Append(&_volatile);
scripts.Append(ScriptWrapper::FromSet(&_volatile));
_battle->GetActiveScripts(scripts);
}
uint8_t BattleSide::GetRandomCreatureIndex() {

6
src/Battling/Models/Creature.cpp
View File

@ -167,9 +167,9 @@ bool Battling::Creature::HasType(uint8_t type) const noexcept {
}
void Battling::Creature::GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) {
scripts.Append(&_activeTalent);
scripts.Append(&_status);
scripts.Append(&_volatile);
scripts.Append(ScriptWrapper::FromScript(&_activeTalent));
scripts.Append(ScriptWrapper::FromScript(&_status));
scripts.Append(ScriptWrapper::FromSet(&_volatile));
if (_side != nullptr) {
_side->GetActiveScripts(scripts);
}

2
src/Battling/Models/ExecutingAttack.hpp
View File

@ -87,7 +87,7 @@ namespace CreatureLib::Battling {
protected:
void GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) override {
scripts.Append(&_script);
scripts.Append(ScriptWrapper::FromScript(&_script));
_user->GetActiveScripts(scripts);
}
};

72
src/Battling/ScriptHandling/ScriptAggregator.hpp
View File

@ -11,54 +11,54 @@ using namespace Arbutils::Collections;
namespace CreatureLib::Battling {
class ScriptAggregator {
List<ScriptWrapper> _scripts;
const ScriptWrapper* _scripts;
size_t _size;
size_t _index = 0;
bool _isSetSet = false;
const List<Script*>* _setScripts = nullptr;
size_t _setIndex = 0;
public:
ScriptAggregator(){};
explicit ScriptAggregator(const List<ScriptWrapper>& scripts) : _scripts(scripts){};
explicit ScriptAggregator(const List<ScriptWrapper>& scripts)
: _scripts(scripts.RawData()), _size(scripts.Count()){};
void Reset() {
inline void Reset() {
_index = 0;
_isSetSet = false;
_setIndex = 0;
}
bool HasNext() { return _index < _scripts.Count() || (_isSetSet && _setIndex < _setScripts->Count()); }
inline bool HasNext() { return _index < _size; }
Script* GetNextNotNull() {
while (HasNext()) {
auto s = GetNext();
if (s != nullptr) {
return s;
}
}
return nullptr;
}
Script* GetNext() {
// We can probably do this in a cleaner version once C++ 20 drops with Coroutine support.
if (_isSetSet) {
if (_setIndex >= _setScripts->Count()) {
_isSetSet = false;
return GetNext();
}
auto s = _setScripts->At(_setIndex);
_setIndex++;
if (_setIndex >= _setScripts->Count()) {
_isSetSet = false;
}
return s;
}
if (_index >= _scripts.Count())
return nullptr;
auto& next = _scripts[_index];
_index++;
if (!next.IsSet()) {
auto scriptPtr = next.GetScript();
if (scriptPtr == nullptr)
return GetNext();
return *scriptPtr;
auto& current = _scripts[_index];
if (!current.IsSet()) {
_index++;
auto s = current.GetScript();
if (s == nullptr)
return nullptr;
return *s;
} else {
auto set = next.GetScriptSet();
if (set->Count() == 0)
return GetNext();
_setScripts = set->GetIterator();
_isSetSet = true;
_setIndex = 0;
return GetNext();
auto& set = *current.GetScriptSet()->GetIterator();
auto count = set.Count();
if (_setIndex >= count) {
_index++;
_setIndex = 0;
return nullptr;
}
auto v = set[_setIndex++];
if (_setIndex >= count) {
_index++;
_setIndex = 0;
}
return v;
}
}
};

2
src/Battling/ScriptHandling/ScriptSet.hpp
View File

@ -66,7 +66,7 @@ namespace CreatureLib::Battling {
bool Has(uint32_t keyHash) const { return _lookup.Has(keyHash); }
size_t Count() const { return _scripts.Count(); }
inline size_t Count() const { return _scripts.Count(); }
const Arbutils::Collections::List<Script*>* GetIterator() const { return &_scripts; }
};

10
src/Battling/ScriptHandling/ScriptSource.hpp
View File

@ -8,7 +8,8 @@
namespace CreatureLib::Battling {
class ScriptSource {
bool _areScriptsInitialized = false;
ScriptAggregator _scripts;
List<ScriptWrapper> _scripts;
ScriptAggregator _scriptsIterator;
protected:
virtual void GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) = 0;
@ -17,12 +18,11 @@ namespace CreatureLib::Battling {
public:
const ScriptAggregator& GetScriptIterator() {
if (!_areScriptsInitialized) {
List<ScriptWrapper> scripts;
GetActiveScripts(scripts);
_scripts = ScriptAggregator(scripts);
GetActiveScripts(_scripts);
_scriptsIterator = ScriptAggregator(_scripts);
_areScriptsInitialized = true;
}
return _scripts;
return _scriptsIterator;
}
};
}

20
src/Battling/ScriptHandling/ScriptWrapper.hpp
View File

@ -7,20 +7,24 @@
namespace CreatureLib::Battling {
class ScriptWrapper {
union {
Script** _script;
ScriptSet* _scriptSet;
};
bool _isSet;
union {
Script* const* _script;
const ScriptSet* _scriptSet;
};
ScriptWrapper(Script** s, bool isSet) : _isSet(isSet), _script(s){};
ScriptWrapper(ScriptSet* s, bool isSet) : _isSet(isSet), _scriptSet(s){};
public:
ScriptWrapper(Script** s) : _script(s), _isSet(false) {}
ScriptWrapper(ScriptSet* s) : _scriptSet(s), _isSet(true) {}
static inline ScriptWrapper FromScript(Script** s) { return ScriptWrapper(s, false); }
static inline ScriptWrapper FromSet(ScriptSet* s) { return ScriptWrapper(s, true); }
bool IsSet() const { return _isSet; }
Script** GetScript() const { return _script; }
ScriptSet* GetScriptSet() const { return _scriptSet; }
inline Script* const* GetScript() const { return _script; }
inline const ScriptSet* GetScriptSet() const { return _scriptSet; }
};
}

2
src/Battling/TurnChoices/AttackTurnChoice.hpp
View File

@ -56,7 +56,7 @@ namespace CreatureLib::Battling {
protected:
void GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) override {
scripts.Append(&_attackScript);
scripts.Append(ScriptWrapper::FromScript(&_attackScript));
GetUser()->GetActiveScripts(scripts);
}
};

26
tests/BattleTests/ScriptTests/ScriptAggregatorTests.cpp
View File

@ -21,7 +21,7 @@ public:
TEST_CASE("Script Aggregator properly iterates containing script.", "[Battling, Scripting]") {
Script* script = new TestScript("test");
auto ran = 0;
auto vec = Arbutils::Collections::List<ScriptWrapper>{&script};
auto vec = Arbutils::Collections::List<ScriptWrapper>{ScriptWrapper::FromScript(&script)};
auto aggr = ScriptAggregator(vec);
while (aggr.HasNext()) {
auto next = aggr.GetNext();
@ -37,7 +37,8 @@ TEST_CASE("Script Aggregator properly iterates multiple scripts.", "[Battling, S
Script* script2 = new TestScript("test2");
Script* script3 = new TestScript("test3");
auto ran = 0;
auto vec = Arbutils::Collections::List<ScriptWrapper>{&script, &script2, &script3};
auto vec = Arbutils::Collections::List<ScriptWrapper>{
ScriptWrapper::FromScript(&script), ScriptWrapper::FromScript(&script2), ScriptWrapper::FromScript(&script3)};
auto aggr = ScriptAggregator(vec);
while (aggr.HasNext()) {
auto next = aggr.GetNext();
@ -59,10 +60,10 @@ TEST_CASE("Script Aggregator properly iterates Script Set.", "[Battling, Scripti
set.Add(script);
set.Add(script2);
set.Add(script3);
auto vec = Arbutils::Collections::List<ScriptWrapper>{&set};
auto vec = Arbutils::Collections::List<ScriptWrapper>{ScriptWrapper::FromSet(&set)};
auto aggr = ScriptAggregator(vec);
while (aggr.HasNext()) {
auto next = aggr.GetNext();
auto next = aggr.GetNextNotNull();
REQUIRE(next != nullptr);
dynamic_cast<TestScript*>(next)->TestMethod(ran);
}
@ -77,10 +78,11 @@ TEST_CASE("Script Aggregator properly iterates data of Script Set and Script.",
auto set = ScriptSet();
set.Add(script2);
set.Add(script3);
auto vec = Arbutils::Collections::List<ScriptWrapper>{&set, &script};
auto vec =
Arbutils::Collections::List<ScriptWrapper>{ScriptWrapper::FromSet(&set), ScriptWrapper::FromScript(&script)};
auto aggr = ScriptAggregator(vec);
while (aggr.HasNext()) {
auto next = aggr.GetNext();
auto next = aggr.GetNextNotNull();
REQUIRE(next != nullptr);
dynamic_cast<TestScript*>(next)->TestMethod(ran);
}
@ -96,10 +98,11 @@ TEST_CASE("Script Aggregator properly iterates data of Script and Script Set.",
auto set = ScriptSet();
set.Add(script2);
set.Add(script3);
auto vec = Arbutils::Collections::List<ScriptWrapper>{&script, &set};
auto vec =
Arbutils::Collections::List<ScriptWrapper>{ScriptWrapper::FromScript(&script), ScriptWrapper::FromSet(&set)};
auto aggr = ScriptAggregator(vec);
while (aggr.HasNext()) {
auto next = aggr.GetNext();
auto next = aggr.GetNextNotNull();
REQUIRE(next != nullptr);
dynamic_cast<TestScript*>(next)->TestMethod(ran);
}
@ -116,10 +119,11 @@ TEST_CASE("Script Aggregator properly iterates data of Script, Script Set and Sc
auto set = ScriptSet();
set.Add(script2);
set.Add(script3);
auto vec = Arbutils::Collections::List<ScriptWrapper>{&script, &set, &script4};
auto vec = Arbutils::Collections::List<ScriptWrapper>{
ScriptWrapper::FromScript(&script), ScriptWrapper::FromSet(&set), ScriptWrapper::FromScript(&script4)};
auto aggr = ScriptAggregator(vec);
while (aggr.HasNext()) {
auto next = aggr.GetNext();
auto next = aggr.GetNextNotNull();
REQUIRE(next != nullptr);
dynamic_cast<TestScript*>(next)->TestMethod(ran);
}
@ -141,7 +145,7 @@ TEST_CASE("Script Aggregator properly iterates when empty.", "[Battling, Scripti
TEST_CASE("Script Aggregator properly iterates empty Script Set.", "[Battling, Scripting]") {
auto ran = 0;
auto set = ScriptSet();
auto vec = Arbutils::Collections::List<ScriptWrapper>{&set};
auto vec = Arbutils::Collections::List<ScriptWrapper>{ScriptWrapper::FromSet(&set)};
auto aggr = ScriptAggregator(vec);
while (aggr.HasNext()) {
auto next = aggr.GetNext();

18
tests/BattleTests/ScriptTests/ScriptSourceTest.cpp
View File

@ -24,7 +24,9 @@ public:
Script* ScriptPtr = nullptr;
protected:
void GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) override { scripts.Append(&ScriptPtr); }
void GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) override {
scripts.Append(ScriptWrapper::FromScript(&ScriptPtr));
}
};
class ScriptSourceWithScriptSet : public ScriptSource {
@ -32,7 +34,9 @@ public:
ScriptSet Set;
protected:
void GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) override { scripts.Append(&Set); }
void GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) override {
scripts.Append(ScriptWrapper::FromSet(&Set));
}
};
TEST_CASE("Script source with unset script ptr.", "[Battling, Scripting]") {
@ -75,7 +79,7 @@ TEST_CASE("Script source with single item script set.", "[Battling, Scripting]")
auto s = new TestScript("foobar");
source.Set.Add(s);
auto scripts = source.GetScriptIterator();
auto first = scripts.GetNext();
auto first = scripts.GetNextNotNull();
CHECK(first != nullptr);
CHECK(first->GetName() == "foobar");
}
@ -87,11 +91,11 @@ TEST_CASE("Script source with multiple item script set.", "[Battling, Scripting]
source.Set.Add(s);
source.Set.Add(s2);
auto scripts = source.GetScriptIterator();
auto first = scripts.GetNext();
CHECK(first != nullptr);
auto first = scripts.GetNextNotNull();
REQUIRE(first != nullptr);
CHECK(first->GetName() == "foobar");
auto second = scripts.GetNext();
CHECK(second != nullptr);
auto second = scripts.GetNextNotNull();
REQUIRE(second != nullptr);
CHECK(second->GetName() == "foobar2");
}