Skip to content

fix api #13

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.

Sign up for GitHub

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

Open
frto027 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix api #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions shared/sources.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
#include "config-utils/shared/config-utils.hpp"
#include "types.hpp"

#define QOUNTERS_EXPORT __attribute__ ((visibility ("default")))

namespace Qounters::Sources {
extern std::vector<std::pair<std::string, std::pair<Types::SourceFn<std::string>, Types::SourceUIFn>>> texts;
extern std::vector<std::pair<std::string, std::pair<Types::SourceFn<float>, Types::SourceUIFn>>> shapes;
extern std::vector<std::pair<std::string, std::pair<Types::SourceFn<UnityEngine::Color>, Types::SourceUIFn>>> colors;
extern std::vector<std::pair<std::string, std::pair<Types::SourceFn<bool>, Types::SourceUIFn>>> enables;
extern QOUNTERS_EXPORT std::vector<std::pair<std::string, std::pair<Types::SourceFn<std::string>, Types::SourceUIFn>>> texts;
extern QOUNTERS_EXPORT std::vector<std::pair<std::string, std::pair<Types::SourceFn<float>, Types::SourceUIFn>>> shapes;
extern QOUNTERS_EXPORT std::vector<std::pair<std::string, std::pair<Types::SourceFn<UnityEngine::Color>, Types::SourceUIFn>>> colors;
extern QOUNTERS_EXPORT std::vector<std::pair<std::string, std::pair<Types::SourceFn<bool>, Types::SourceUIFn>>> enables;

struct PremadeInfo {
std::string name;
Expand All @@ -28,7 +30,7 @@ namespace Qounters::Sources {
PremadeInfo* GetPremadeInfo(std::string const& mod, std::string const& name);

template <class T>
T GetSource(std::vector<std::pair<std::string, T>> sourceVec, std::string source) {
T GetSource(std::vector<std::pair<std::string, T>>& sourceVec, std::string source) {
for (auto& [str, ret] : sourceVec) {
if (str == source)
return ret;
Expand All @@ -38,7 +40,7 @@ namespace Qounters::Sources {

template <class T>
inline void Register(
std::vector<std::pair<std::string, std::pair<T, Types::SourceUIFn>>> sourceVec, std::string source, T sourceFn, Types::SourceUIFn sourceUIFn
std::vector<std::pair<std::string, std::pair<T, Types::SourceUIFn>>>& sourceVec, std::string source, T sourceFn, Types::SourceUIFn sourceUIFn
) {
sourceVec.emplace_back(source, std::make_pair(sourceFn, sourceUIFn));
}
Expand Down