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

Implements ConstString in several core places in the library, improving performance.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-02-27 18:23:23 +01:00
parent 1d3a8da99e
commit 412e0a4d63
17 changed files with 161 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Library/CreatureData/CreatureSpecies.cpp
View File

@@ -2,21 +2,19 @@
using namespace CreatureLib::Library;
CreatureSpecies::CreatureSpecies(uint16_t id, std::string name, const SpeciesVariant* defaultVariant, float genderRatio,
std::string growthRate, uint8_t captureRate)
: _id(id), _genderRate(genderRatio), _growthRate(std::move(growthRate)), _captureRate(captureRate),
_variants({{"default", defaultVariant}}), _name(std::move(name)) {}
CreatureSpecies::CreatureSpecies(uint16_t id, const Arbutils::CaseInsensitiveConstString& name,
const SpeciesVariant* defaultVariant, float genderRatio,
const Arbutils::CaseInsensitiveConstString& growthRate, uint8_t captureRate)
: _id(id), _genderRate(genderRatio), _growthRate(growthRate), _captureRate(captureRate),
_variants({{"default"_cnc, defaultVariant}}), _name(name) {}
bool CreatureSpecies::HasVariant(const std::string& name) const {
auto key = name;
std::transform(key.begin(), key.end(), key.begin(), ::tolower);
return _variants.find(key) != _variants.end();
bool CreatureSpecies::HasVariant(const Arbutils::CaseInsensitiveConstString& name) const {
return _variants.find(name) != _variants.end();
}
bool CreatureSpecies::TryGetVariant(const std::string& name, const SpeciesVariant*& out) const {
auto key = name;
std::transform(key.begin(), key.end(), key.begin(), ::tolower);
auto find = _variants.find(key);
bool CreatureSpecies::TryGetVariant(const Arbutils::CaseInsensitiveConstString& name,
const SpeciesVariant*& out) const {
auto find = _variants.find(name);
if (find != _variants.end()) {
out = find->second;
return true;
@@ -24,20 +22,17 @@ bool CreatureSpecies::TryGetVariant(const std::string& name, const SpeciesVarian
return false;
}
const SpeciesVariant* CreatureSpecies::GetVariant(const std::string& name) const {
const SpeciesVariant* CreatureSpecies::GetVariant(const Arbutils::CaseInsensitiveConstString& name) const {
auto key = name;
std::transform(key.begin(), key.end(), key.begin(), ::tolower);
return _variants.at(key);
}
void CreatureSpecies::SetVariant(const std::string& name, const SpeciesVariant* variant) {
auto key = name;
std::transform(key.begin(), key.end(), key.begin(), ::tolower);
auto find = _variants.find(key);
void CreatureSpecies::SetVariant(const Arbutils::CaseInsensitiveConstString& name, const SpeciesVariant* variant) {
auto find = _variants.find(name);
if (find != _variants.end()) {
delete find->second;
}
_variants[key] = variant;
_variants[name] = variant;
}
Gender CreatureSpecies::GetRandomGender(Arbutils::Random& rand) const {
@@ -46,6 +41,4 @@ Gender CreatureSpecies::GetRandomGender(Arbutils::Random& rand) const {
if (val >= this->_genderRate)
return Gender ::Female;
return Gender ::Male;
}
const std::string& CreatureSpecies::GetName() const { return _name; }
}

30
src/Library/CreatureData/CreatureSpecies.hpp
View File

@@ -1,6 +1,7 @@
#ifndef CREATURELIB_CREATURESPECIES_HPP
#define CREATURELIB_CREATURESPECIES_HPP
#include <Arbutils/ConstString.hpp>
#include <string>
#include <unordered_map>
#include "../Gender.hpp"
@@ -14,16 +15,17 @@ namespace CreatureLib::Library {
class CreatureSpecies {
uint16_t _id;
float _genderRate;
std::string _growthRate;
const Arbutils::CaseInsensitiveConstString _growthRate;
uint8_t _captureRate;
private:
std::unordered_map<std::string, const SpeciesVariant*> _variants;
std::string _name;
std::unordered_map<Arbutils::CaseInsensitiveConstString, const SpeciesVariant*> _variants;
Arbutils::CaseInsensitiveConstString _name;
public:
CreatureSpecies(uint16_t id, std::string name, const SpeciesVariant* defaultVariant, float genderRatio,
std::string growthRate, uint8_t captureRate);
CreatureSpecies(uint16_t id, const Arbutils::CaseInsensitiveConstString& name,
const SpeciesVariant* defaultVariant, float genderRatio,
const Arbutils::CaseInsensitiveConstString& growthRate, uint8_t captureRate);
virtual ~CreatureSpecies() {
for (auto v : _variants)
@@ -33,18 +35,22 @@ namespace CreatureLib::Library {
inline uint16_t GetId() const { return _id; }
inline float GetGenderRate() const { return _genderRate; }
inline const std::string& GetGrowthRate() const { return _growthRate; }
inline const Arbutils::CaseInsensitiveConstString& GetGrowthRate() const { return _growthRate; }
inline uint8_t GetCaptureRate() const { return _captureRate; }
[[nodiscard]] bool HasVariant(const std::string& key) const;
[[nodiscard]] bool TryGetVariant(const std::string& name, const SpeciesVariant*& out) const;
[[nodiscard]] const SpeciesVariant* GetVariant(const std::string& key) const;
[[nodiscard]] bool HasVariant(const Arbutils::CaseInsensitiveConstString& key) const;
[[nodiscard]] bool TryGetVariant(const Arbutils::CaseInsensitiveConstString& name,
const SpeciesVariant*& out) const;
[[nodiscard]] const SpeciesVariant* GetVariant(const Arbutils::CaseInsensitiveConstString& key) const;
[[nodiscard]] Gender GetRandomGender(Arbutils::Random& rand) const;
[[nodiscard]] const std::string& GetName() const;
[[nodiscard]] const Arbutils::CaseInsensitiveConstString& GetName() const { return _name; }
void SetVariant(const std::string& name, const SpeciesVariant* variant);
void SetVariant(const Arbutils::CaseInsensitiveConstString& name, const SpeciesVariant* variant);
const std::unordered_map<std::string, const SpeciesVariant*>& GetVariantsIterator() const { return _variants; }
const std::unordered_map<Arbutils::CaseInsensitiveConstString, const SpeciesVariant*>&
GetVariantsIterator() const {
return _variants;
}
};
}