raylib-cpp progress
This commit is contained in:
@@ -33,7 +33,7 @@ class SignalRaw : private NonCopyable {
|
||||
|
||||
void operator()(Args... args) const {
|
||||
for (const CallBack& callback : m_Callbacks) {
|
||||
callback->operator()(args...);
|
||||
callback->operator()(std::forward<Args>(args)...);
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -64,9 +64,9 @@ class Signal {
|
||||
m_Signal->Connect(std::make_shared<CallBackRaw>(a_Callback));
|
||||
}
|
||||
|
||||
[[nodiscard]] std::unique_ptr<ConnectionGuard> ConnectSafe(const CallBack& a_Callback) {
|
||||
[[nodiscard]] std::shared_ptr<ConnectionGuard> ConnectSafe(const CallBack& a_Callback) {
|
||||
m_Signal->Connect(a_Callback);
|
||||
return std::make_unique<ConnectionGuard>(*this, a_Callback);
|
||||
return std::make_shared<ConnectionGuard>(*this, a_Callback);
|
||||
}
|
||||
|
||||
void Disconnect(const CallBack& a_Callback) {
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace utils {
|
||||
*/
|
||||
class SlotGuard {
|
||||
private:
|
||||
std::vector<std::unique_ptr<Connection>> m_Connections;
|
||||
std::vector<std::shared_ptr<Connection>> m_Connections;
|
||||
|
||||
public:
|
||||
/**
|
||||
@@ -21,7 +21,7 @@ class SlotGuard {
|
||||
template <typename... Args>
|
||||
void Connect(Signal<Args...> a_Signal, const typename Signal<Args...>::CallBack::element_type& a_Callback) {
|
||||
auto ptr = std::make_shared<typename Signal<Args...>::CallBack::element_type>(a_Callback);
|
||||
m_Connections.push_back(a_Signal.ConnectSafe(ptr));
|
||||
m_Connections.emplace_back(a_Signal.ConnectSafe(ptr));
|
||||
}
|
||||
|
||||
void Disconnect() {
|
||||
|
||||
Reference in New Issue
Block a user