sylar/OmniaFramework
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added ostd::SignalHandler::newCustomSignal(...)

Browse source
This commit is contained in:
OmniaX-dev 2023-10-29 01:23:24 +02:00
parent 4f7dfb6c80
commit cfcb262541
6 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ogfx/DebugTools.hpp
View file

@ -3,6 +3,7 @@
#include <ostd/Utils.hpp>
#include <unordered_map>
#include <ostd/BaseObject.hpp>
#include <ostd/Signals.hpp>
#include <ogfx/RTData.hpp>
#include <ogfx/Widgets.hpp>
@ -87,7 +88,7 @@ namespace ogfx
inline static constexpr uint32_t OnWindowDisplay = 8;
inline static constexpr uint32_t TotalFrameTime = 128;
inline static const uint32_t OnProfileDataRecieved = ogfx::RTData::newCustomSignal(2200);
inline static const uint32_t OnProfileDataRecieved = ostd::SignalHandler::newCustomSignal(2200);
inline static void enableDebugWindow(bool enable = true) { m_debugWindowEnabled = enable; }
};

8
src/ogfx/RTData.cpp
View file

@ -5,8 +5,8 @@ namespace ogfx
{
using namespace ostd;
uint32_t RTData::newCustomSignal(uint32_t sub_id)
{
return tBuiltinSignals::CustomSignalBase + sub_id;
}
// uint32_t RTData::newCustomSignal(uint32_t sub_id)
// {
// return tBuiltinSignals::CustomSignalBase + sub_id;
// }
}

2
src/ogfx/RTData.hpp
View file

@ -11,7 +11,7 @@ namespace ogfx
public:
inline static float DeltaTime { 0.0f };
inline static ostd::IPoint windowSize { 0, 0 };
static uint32_t newCustomSignal(uint32_t sub_id);
// static uint32_t newCustomSignal(uint32_t sub_id);
};
}

3
src/ogfx/Widgets.hpp
View file

@ -4,6 +4,7 @@
#include <ostd/Geometry.hpp>
#include <ostd/Color.hpp>
#include <ogfx/RTData.hpp>
#include <ostd/Signals.hpp>
#include <unordered_map>
@ -136,7 +137,7 @@ namespace ogfx
inline static ostd::WidgetID s_nextWidgetID = tWidgetState::ValidWidgetBase;
protected:
inline static const uint32_t OnWidgetFocusGainedSignal = RTData::newCustomSignal(1200);
inline static const uint32_t OnWidgetFocusGainedSignal = ostd::SignalHandler::newCustomSignal(1200);
WidgetTheme m_theme;
bool m_overrideGlobalTheme { false };
Widget* m_parent { nullptr };

2
src/ostd/Signals.hpp
View file

@ -68,6 +68,8 @@ namespace ostd
static void emitSignal(uint32_t signal_id, uint8_t prio = tSignalPriority::Normal, BaseObject& userData = BaseObject::InvalidRef());
static void connect(BaseObject& object, uint32_t signal_id);
inline static uint32_t newCustomSignal(uint32_t sub_id) { return tBuiltinSignals::CustomSignalBase + sub_id; }
private:
inline static std::vector<tSignalObjPair> m_customRecievers;
inline static std::vector<tDelegateSignal> m_delegatedSignals;

2
tools/build.nr
View file

@ -1 +1 @@
1711
1712