AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-20 18:19:12 +00:00
Code Issues Projects Releases Wiki Activity

Lots of Windows fixes; add D3D12; more boo decoupling

Browse Source
This commit is contained in:
Luke Street
2022-02-22 00:53:57 -05:00
parent 54330e43b6
commit c33674b9ab
55 changed files with 380 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/GuiSys/CGuiFrame.hpp
View File

@@ -10,8 +10,6 @@
#include "Runtime/GuiSys/CGuiWidgetIdDB.hpp"
#include "Runtime/GuiSys/CGuiWidget.hpp"
#include <boo/IWindow.hpp>
namespace metaforce {
class CBooModel;
class CGuiCamera;
@@ -54,7 +52,7 @@ private:
std::function<void(CGuiWidget*, CGuiWidget*)> m_mouseOverChangeCb;
std::function<void(CGuiWidget*, bool)> m_mouseDownCb;
std::function<void(CGuiWidget*, bool)> m_mouseUpCb;
std::function<void(CGuiWidget*, const boo::SScrollDelta&, int, int)> m_mouseScrollCb;
std::function<void(CGuiWidget*, const SScrollDelta&, int, int)> m_mouseScrollCb;
public:
CGuiFrame(CAssetId id, CGuiSys& sys, int a, int b, int c, CSimplePool* sp);
@@ -87,7 +85,7 @@ public:
}
void SetMouseDownCallback(std::function<void(CGuiWidget*, bool)>&& cb) { m_mouseDownCb = std::move(cb); }
void SetMouseUpCallback(std::function<void(CGuiWidget*, bool)>&& cb) { m_mouseUpCb = std::move(cb); }
void SetMouseScrollCallback(std::function<void(CGuiWidget*, const boo::SScrollDelta&, int, int)>&& cb) {
void SetMouseScrollCallback(std::function<void(CGuiWidget*, const SScrollDelta&, int, int)>&& cb) {
m_mouseScrollCb = std::move(cb);
}