mirror of
https://github.com/korenkonder/ReDIVA.git
synced 2026-10-08 22:50:08 +03:00
Some style fixes
This commit is contained in:
korenkonder
+13
-13
@@ -1829,18 +1829,21 @@ struct eyes_adjust {
|
||||
float_t pos;
|
||||
};
|
||||
|
||||
struct rob_chara_pv_data_customize_items {
|
||||
int32_t head;
|
||||
int32_t face;
|
||||
int32_t chest;
|
||||
int32_t back;
|
||||
union rob_chara_pv_data_item {
|
||||
struct {
|
||||
int32_t head;
|
||||
int32_t face;
|
||||
int32_t chest;
|
||||
int32_t back;
|
||||
};
|
||||
int32_t arr[4];
|
||||
};
|
||||
|
||||
struct rob_chara_pv_data {
|
||||
rob_chara_type type;
|
||||
int8_t field_4;
|
||||
int8_t field_5;
|
||||
int8_t field_6;
|
||||
bool field_4;
|
||||
bool field_5;
|
||||
bool field_6;
|
||||
vec3 field_8;
|
||||
int16_t rot_y_int16;
|
||||
int16_t field_16;
|
||||
@@ -1849,11 +1852,8 @@ struct rob_chara_pv_data {
|
||||
int32_t field_70;
|
||||
int32_t motion_face_ids[10];
|
||||
int32_t chara_size_index;
|
||||
int8_t height_adjust;
|
||||
union {
|
||||
rob_chara_pv_data_customize_items data;
|
||||
int32_t arr[4];
|
||||
} customize_items;
|
||||
bool height_adjust;
|
||||
rob_chara_pv_data_item item;
|
||||
eyes_adjust eyes_adjust;
|
||||
};
|
||||
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
#include <vector>
|
||||
|
||||
namespace prj {
|
||||
template <class T, class U>
|
||||
class vector_pair : public std::vector<std::pair<T, U>> {
|
||||
template <class T, class U, class Alloc = std::allocator<std::pair<T, U>>>
|
||||
class vector_pair : public std::vector<std::pair<T, U>, Alloc> {
|
||||
public:
|
||||
using value_pair = std::pair<T, U>;
|
||||
|
||||
@@ -34,11 +34,11 @@ namespace prj {
|
||||
}
|
||||
|
||||
inline void push_back(const value_pair& value) {
|
||||
std::vector<std::pair<T, U>>::push_back(value);
|
||||
std::vector<std::pair<T, U>, Alloc>::push_back(value);
|
||||
}
|
||||
|
||||
inline void push_back(value_pair&& value) {
|
||||
std::vector<std::pair<T, U>>::push_back(value);
|
||||
std::vector<std::pair<T, U>, Alloc>::push_back(value);
|
||||
}
|
||||
|
||||
inline void sort() {
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
#include <vector>
|
||||
|
||||
namespace prj {
|
||||
template <class T, class U>
|
||||
template <class T, class U, class Alloc = std::allocator<std::pair<T, U>>>
|
||||
class vector_pair_combine {
|
||||
public:
|
||||
using value_pair = std::pair<T, U>;
|
||||
using iterator = typename std::vector<value_pair>::iterator;
|
||||
using const_iterator = typename std::vector<value_pair>::const_iterator;
|
||||
std::vector<value_pair> data;
|
||||
std::vector<value_pair> new_data;
|
||||
std::vector<value_pair, Alloc> data;
|
||||
std::vector<value_pair, Alloc> new_data;
|
||||
|
||||
inline auto find(const T& key) {
|
||||
auto k = data.begin();
|
||||
|
||||
@@ -873,6 +873,9 @@ bool RobOsageTest::dest() {
|
||||
}
|
||||
|
||||
void RobOsageTest::disp() {
|
||||
if (chara_id < 0 || chara_id >= ROB_CHARA_COUNT)
|
||||
return;
|
||||
|
||||
rob_chara* rob_chr = rob_chara_array_get(chara_id);
|
||||
if (rob_chr && !pv_osage_manager_array_get_disp(chara_id)
|
||||
&& rob_chr->is_visible() && !(rob_chr->data.field_3 & 0x80)) {
|
||||
|
||||
+46
-45
@@ -116,7 +116,7 @@ namespace dw_gui_detail {
|
||||
RootKeySelection();
|
||||
virtual ~RootKeySelection() override;
|
||||
|
||||
virtual void Field_8(dw::Widget::KeyCallbackData data) override;
|
||||
virtual void Field_8(const dw::Widget::KeyCallbackData& data) override;
|
||||
};
|
||||
|
||||
dw::Shell* selected_shell;
|
||||
@@ -387,15 +387,15 @@ namespace dw {
|
||||
text.assign(str);
|
||||
}
|
||||
|
||||
void Widget::SetSize(vec2 value) {
|
||||
void Widget::SetSize(const vec2& value) {
|
||||
rect.size = value;
|
||||
}
|
||||
|
||||
int32_t Widget::KeyCallback(Widget::KeyCallbackData data) {
|
||||
int32_t Widget::KeyCallback(const Widget::KeyCallbackData& data) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32_t Widget::MouseCallback(Widget::MouseCallbackData data) {
|
||||
int32_t Widget::MouseCallback(const Widget::MouseCallbackData& data) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -403,7 +403,7 @@ namespace dw {
|
||||
return rect.pos;
|
||||
}
|
||||
|
||||
bool Widget::CheckHitPos(vec2 hit_pos) {
|
||||
bool Widget::CheckHitPos(const vec2& hit_pos) {
|
||||
rectangle rect = GetRectangle();
|
||||
return rect.pos.x <= hit_pos.x && hit_pos.x < rect.pos.x + rect.size.x
|
||||
&& rect.pos.y <= hit_pos.y && hit_pos.y < rect.size.y + rect.pos.y;
|
||||
@@ -488,7 +488,7 @@ namespace dw {
|
||||
Widget::Reset();
|
||||
}
|
||||
|
||||
int32_t Control::KeyCallback(Widget::KeyCallbackData data) {
|
||||
int32_t Control::KeyCallback(const Widget::KeyCallbackData& data) {
|
||||
if (!Field_A0())
|
||||
return 0;
|
||||
|
||||
@@ -505,7 +505,7 @@ namespace dw {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32_t Control::MouseCallback(Widget::MouseCallbackData data) {
|
||||
int32_t Control::MouseCallback(const Widget::MouseCallbackData& data) {
|
||||
if (!Field_A0())
|
||||
return 0;
|
||||
|
||||
@@ -627,7 +627,7 @@ namespace dw {
|
||||
field_68 = !value;
|
||||
}
|
||||
|
||||
Widget* Control::GetHitWidget(vec2 hit_pos) {
|
||||
Widget* Control::GetHitWidget(const vec2& hit_pos) {
|
||||
if (CheckHitPos(hit_pos))
|
||||
return this;
|
||||
return 0;
|
||||
@@ -677,7 +677,7 @@ namespace dw {
|
||||
Control::Reset();
|
||||
}
|
||||
|
||||
int32_t Scrollable::MouseCallback(Widget::MouseCallbackData data) {
|
||||
int32_t Scrollable::MouseCallback(const Widget::MouseCallbackData& data) {
|
||||
if (!v_bar)
|
||||
return Control::MouseCallback(data);
|
||||
|
||||
@@ -688,16 +688,17 @@ namespace dw {
|
||||
return ret;
|
||||
}
|
||||
|
||||
void Scrollable::SetSize(vec2 value) {
|
||||
void Scrollable::SetSize(const vec2& value) {
|
||||
Widget::SetSize(value);
|
||||
|
||||
vec2 size = value;
|
||||
if (flags & FLAG_800)
|
||||
value -= 2.0f * 2.0f;
|
||||
size -= 2.0f * 2.0f;
|
||||
|
||||
if (v_bar) {
|
||||
v_bar->rect.pos.x = value.x - v_bar->rect.size.x;
|
||||
v_bar->rect.pos.x = size.x - v_bar->rect.size.x;
|
||||
v_bar->rect.pos.y = 0.0f;
|
||||
v_bar->SetWidth(value.y);
|
||||
v_bar->SetWidth(size.y);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -709,7 +710,7 @@ namespace dw {
|
||||
v_bar->SetFont(value);
|
||||
}
|
||||
|
||||
Widget* Scrollable::GetHitWidget(vec2 hit_pos) {
|
||||
Widget* Scrollable::GetHitWidget(const vec2& hit_pos) {
|
||||
if (!CheckHitPos(hit_pos))
|
||||
return 0;
|
||||
|
||||
@@ -772,14 +773,14 @@ namespace dw {
|
||||
Scrollable::Reset();
|
||||
}
|
||||
|
||||
int32_t Composite::KeyCallback(Widget::KeyCallbackData data) {
|
||||
int32_t Composite::KeyCallback(const Widget::KeyCallbackData& data) {
|
||||
if (current_control != -1 && current_control < controls.size())
|
||||
return controls[current_control]->KeyCallback(data);
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32_t Composite::MouseCallback(Widget::MouseCallbackData data) {
|
||||
int32_t Composite::MouseCallback(const Widget::MouseCallbackData& data) {
|
||||
for (Control*& i : controls)
|
||||
if (i->CheckHitPos(data.pos))
|
||||
return i->MouseCallback(data);
|
||||
@@ -787,7 +788,7 @@ namespace dw {
|
||||
return Scrollable::MouseCallback(data);
|
||||
}
|
||||
|
||||
void Composite::SetSize(vec2 size) {
|
||||
void Composite::SetSize(const vec2& size) {
|
||||
Scrollable::SetSize(size);
|
||||
layout->SetSize(this);
|
||||
}
|
||||
@@ -809,7 +810,7 @@ namespace dw {
|
||||
return current_control == -1 && Field_C0();
|
||||
}
|
||||
|
||||
Widget* Composite::GetHitWidget(vec2 hit_pos) {
|
||||
Widget* Composite::GetHitWidget(const vec2& hit_pos) {
|
||||
if (!CheckHitPos(hit_pos))
|
||||
return Scrollable::GetHitWidget(hit_pos);
|
||||
|
||||
@@ -954,7 +955,7 @@ namespace dw {
|
||||
Composite::Reset();
|
||||
}
|
||||
|
||||
int32_t Shell::KeyCallback(Widget::KeyCallbackData data) {
|
||||
int32_t Shell::KeyCallback(const Widget::KeyCallbackData& data) {
|
||||
if (!GetDisp())
|
||||
return 0;
|
||||
|
||||
@@ -966,7 +967,7 @@ namespace dw {
|
||||
return Composite::KeyCallback(data);
|
||||
}
|
||||
|
||||
int32_t Shell::MouseCallback(Widget::MouseCallbackData data) {
|
||||
int32_t Shell::MouseCallback(const Widget::MouseCallbackData& data) {
|
||||
if (!GetDisp())
|
||||
return 0;
|
||||
|
||||
@@ -1002,7 +1003,7 @@ namespace dw {
|
||||
return Composite::MouseCallback(data);
|
||||
}
|
||||
|
||||
void Shell::SetSize(vec2 size) {
|
||||
void Shell::SetSize(const vec2& size) {
|
||||
Widget::SetSize(size);
|
||||
if (flags & CHECKBOX) {
|
||||
if (close_button) {
|
||||
@@ -1037,7 +1038,7 @@ namespace dw {
|
||||
return this == dw_gui_detail_display->selected_shell && GetDisp();
|
||||
}
|
||||
|
||||
Widget* Shell::GetHitWidget(vec2 hit_pos) {
|
||||
Widget* Shell::GetHitWidget(const vec2& hit_pos) {
|
||||
rectangle rect = GetRectangle();
|
||||
if (rect.pos.x > hit_pos.x || hit_pos.x >= rect.pos.x + rect.size.x
|
||||
|| rect.pos.y > hit_pos.y || hit_pos.y >= rect.size.y + rect.pos.y)
|
||||
@@ -1142,15 +1143,15 @@ namespace dw {
|
||||
|
||||
}
|
||||
|
||||
void KeyAdapter::Field_8(Widget::KeyCallbackData data) {
|
||||
void KeyAdapter::Field_8(const Widget::KeyCallbackData& data) {
|
||||
|
||||
}
|
||||
|
||||
void KeyAdapter::Field_10(Widget::KeyCallbackData data) {
|
||||
void KeyAdapter::Field_10(const Widget::KeyCallbackData& data) {
|
||||
|
||||
}
|
||||
|
||||
void KeyAdapter::Field_18(Widget::KeyCallbackData data) {
|
||||
void KeyAdapter::Field_18(const Widget::KeyCallbackData& data) {
|
||||
|
||||
}
|
||||
|
||||
@@ -1170,19 +1171,19 @@ namespace dw {
|
||||
|
||||
}
|
||||
|
||||
void MouseAdapter::Field_8(Widget::MouseCallbackData data) {
|
||||
void MouseAdapter::Field_8(const Widget::MouseCallbackData& data) {
|
||||
|
||||
}
|
||||
|
||||
void MouseAdapter::Field_10(Widget::MouseCallbackData data) {
|
||||
void MouseAdapter::Field_10(const Widget::MouseCallbackData& data) {
|
||||
|
||||
}
|
||||
|
||||
void MouseAdapter::Field_18(Widget::MouseCallbackData data) {
|
||||
void MouseAdapter::Field_18(const Widget::MouseCallbackData& data) {
|
||||
|
||||
}
|
||||
|
||||
void MouseAdapter::Field_20(Widget::MouseCallbackData data) {
|
||||
void MouseAdapter::Field_20(const Widget::MouseCallbackData& data) {
|
||||
|
||||
}
|
||||
|
||||
@@ -1618,7 +1619,7 @@ namespace dw {
|
||||
}
|
||||
}
|
||||
|
||||
int32_t Button::KeyCallback(Widget::KeyCallbackData data) {
|
||||
int32_t Button::KeyCallback(const Widget::KeyCallbackData& data) {
|
||||
if (!Field_A0())
|
||||
return 0;
|
||||
|
||||
@@ -1641,7 +1642,7 @@ namespace dw {
|
||||
return Control::KeyCallback(data);
|
||||
}
|
||||
|
||||
int32_t Button::MouseCallback(Widget::MouseCallbackData data) {
|
||||
int32_t Button::MouseCallback(const Widget::MouseCallbackData& data) {
|
||||
if (!Field_A0())
|
||||
return 0;
|
||||
|
||||
@@ -1826,7 +1827,7 @@ namespace dw {
|
||||
Scrollable::Reset();
|
||||
}
|
||||
|
||||
int32_t List::KeyCallback(Widget::KeyCallbackData data) {
|
||||
int32_t List::KeyCallback(const Widget::KeyCallbackData& data) {
|
||||
size_t items_count = items.size();
|
||||
if (!data.input[0] || !items_count)
|
||||
return Control::KeyCallback(data);
|
||||
@@ -1898,7 +1899,7 @@ namespace dw {
|
||||
return Control::KeyCallback(data);
|
||||
}
|
||||
|
||||
int32_t List::MouseCallback(Widget::MouseCallbackData data) {
|
||||
int32_t List::MouseCallback(const Widget::MouseCallbackData& data) {
|
||||
if (!Field_A0() || !CheckHitPos(data.pos))
|
||||
return 0;
|
||||
|
||||
@@ -1972,7 +1973,7 @@ namespace dw {
|
||||
return 0;
|
||||
}
|
||||
|
||||
void List::SetSize(vec2 size) {
|
||||
void List::SetSize(const vec2& size) {
|
||||
Scrollable::SetSize(size);
|
||||
SetScrollBarParams();
|
||||
}
|
||||
@@ -2228,7 +2229,7 @@ namespace dw {
|
||||
Composite::Reset();
|
||||
}
|
||||
|
||||
int32_t ListBox::KeyCallback(Widget::KeyCallbackData data) {
|
||||
int32_t ListBox::KeyCallback(const Widget::KeyCallbackData& data) {
|
||||
if (!Field_A0())
|
||||
return 0;
|
||||
|
||||
@@ -2238,7 +2239,7 @@ namespace dw {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32_t ListBox::MouseCallback(Widget::MouseCallbackData data) {
|
||||
int32_t ListBox::MouseCallback(const Widget::MouseCallbackData& data) {
|
||||
if (!Field_A0())
|
||||
return 0;
|
||||
|
||||
@@ -2396,7 +2397,7 @@ namespace dw {
|
||||
|
||||
}
|
||||
|
||||
int32_t ScrollBar::KeyCallback(Widget::KeyCallbackData data) {
|
||||
int32_t ScrollBar::KeyCallback(const Widget::KeyCallbackData& data) {
|
||||
if (!Field_60())
|
||||
return 0;
|
||||
|
||||
@@ -2407,7 +2408,7 @@ namespace dw {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32_t ScrollBar::MouseCallback(Widget::MouseCallbackData data) {
|
||||
int32_t ScrollBar::MouseCallback(const Widget::MouseCallbackData& data) {
|
||||
if (!Field_60())
|
||||
return 0;
|
||||
|
||||
@@ -2423,7 +2424,7 @@ namespace dw {
|
||||
return 0;
|
||||
}
|
||||
|
||||
void ScrollBar::SetSize(vec2 size) {
|
||||
void ScrollBar::SetSize(const vec2& size) {
|
||||
if (flags & HORIZONTAL) {
|
||||
rect.size.x = size.x;
|
||||
rect.size.y = font.GetFontGlyphHeight();
|
||||
@@ -2576,7 +2577,7 @@ namespace dw {
|
||||
return { 0.0f, size };
|
||||
}
|
||||
|
||||
SelectionListener::CallbackData ScrollBar::sub_1402E5140(Widget::KeyCallbackData key_callback_data) {
|
||||
SelectionListener::CallbackData ScrollBar::sub_1402E5140(const Widget::KeyCallbackData& key_callback_data) {
|
||||
SelectionListener::CallbackData callback_data;
|
||||
switch (key_callback_data.input[0]) {
|
||||
case 0x1000001:
|
||||
@@ -2606,7 +2607,7 @@ namespace dw {
|
||||
return callback_data;
|
||||
}
|
||||
|
||||
SelectionListener::CallbackData ScrollBar::sub_1402E5380(Widget::MouseCallbackData mouse_callback_data) {
|
||||
SelectionListener::CallbackData ScrollBar::sub_1402E5380(const Widget::MouseCallbackData& mouse_callback_data) {
|
||||
if (field_A6) {
|
||||
SelectionListener::CallbackData callback_data;
|
||||
if ((mouse_callback_data.input & 1) != 0) {
|
||||
@@ -2867,7 +2868,7 @@ namespace dw {
|
||||
Control::Reset();
|
||||
}
|
||||
|
||||
int32_t Slider::KeyCallback(Widget::KeyCallbackData data) {
|
||||
int32_t Slider::KeyCallback(const Widget::KeyCallbackData& data) {
|
||||
if (!Field_A0())
|
||||
return 0;
|
||||
|
||||
@@ -2878,7 +2879,7 @@ namespace dw {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32_t Slider::MouseCallback(Widget::MouseCallbackData data) {
|
||||
int32_t Slider::MouseCallback(const Widget::MouseCallbackData& data) {
|
||||
if (!Field_A0())
|
||||
return 0;
|
||||
|
||||
@@ -2896,7 +2897,7 @@ namespace dw {
|
||||
return 0;
|
||||
}
|
||||
|
||||
void Slider::SetSize(vec2 value) {
|
||||
void Slider::SetSize(const vec2& value) {
|
||||
Widget::SetSize(value);
|
||||
scroll_bar->rect.pos.x = value.x - scroll_bar->rect.size.x;
|
||||
scroll_bar->rect.pos.y = 0.0f;
|
||||
@@ -3487,7 +3488,7 @@ dw_gui_detail::Display::RootKeySelection::~RootKeySelection() {
|
||||
|
||||
}
|
||||
|
||||
void dw_gui_detail::Display::RootKeySelection::Field_8(dw::Widget::KeyCallbackData data) {
|
||||
void dw_gui_detail::Display::RootKeySelection::Field_8(const dw::Widget::KeyCallbackData& data) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
+48
-48
@@ -189,12 +189,12 @@ namespace dw {
|
||||
virtual void Reset();
|
||||
virtual std::wstring GetText();
|
||||
virtual void SetText(std::wstring& str);
|
||||
virtual void SetSize(vec2 value);
|
||||
virtual int32_t KeyCallback(Widget::KeyCallbackData data);
|
||||
virtual int32_t MouseCallback(Widget::MouseCallbackData data);
|
||||
virtual void SetSize(const vec2& value);
|
||||
virtual int32_t KeyCallback(const Widget::KeyCallbackData& data);
|
||||
virtual int32_t MouseCallback(const Widget::MouseCallbackData& data);
|
||||
virtual vec2 GetPos();
|
||||
|
||||
bool CheckHitPos(vec2 hit_pos);
|
||||
bool CheckHitPos(const vec2& hit_pos);
|
||||
void Free();
|
||||
float_t GetFontGlyphHeight();
|
||||
rectangle GetRectangle();
|
||||
@@ -236,8 +236,8 @@ namespace dw {
|
||||
|
||||
virtual void Draw() override;
|
||||
virtual void Reset() override;
|
||||
virtual int32_t KeyCallback(Widget::KeyCallbackData data) override;
|
||||
virtual int32_t MouseCallback(Widget::MouseCallbackData data) override;
|
||||
virtual int32_t KeyCallback(const Widget::KeyCallbackData& data) override;
|
||||
virtual int32_t MouseCallback(const Widget::MouseCallbackData& data) override;
|
||||
virtual vec2 GetPos() override;
|
||||
|
||||
virtual void UpdateLayout();
|
||||
@@ -253,7 +253,7 @@ namespace dw {
|
||||
virtual bool Field_98();
|
||||
virtual bool Field_A0();
|
||||
virtual void Field_A8(bool value);
|
||||
virtual Widget* GetHitWidget(vec2 hit_pos);
|
||||
virtual Widget* GetHitWidget(const vec2& hit_pos);
|
||||
|
||||
void SetParentMenu(Menu* menu);
|
||||
};
|
||||
@@ -270,10 +270,10 @@ namespace dw {
|
||||
|
||||
virtual void Draw() override;
|
||||
virtual void Reset() override;
|
||||
virtual int32_t MouseCallback(Widget::MouseCallbackData data) override;
|
||||
virtual void SetSize(vec2 value) override;
|
||||
virtual int32_t MouseCallback(const Widget::MouseCallbackData& data) override;
|
||||
virtual void SetSize(const vec2& value) override;
|
||||
virtual void SetFont(p_Font& font) override;
|
||||
virtual Widget* GetHitWidget(vec2 hit_pos) override;
|
||||
virtual Widget* GetHitWidget(const vec2& hit_pos) override;
|
||||
|
||||
virtual rectangle GetBoundingBox();
|
||||
|
||||
@@ -293,15 +293,15 @@ namespace dw {
|
||||
|
||||
virtual void Draw() override;
|
||||
virtual void Reset() override;
|
||||
virtual int32_t KeyCallback(Widget::KeyCallbackData data) override;
|
||||
virtual int32_t MouseCallback(Widget::MouseCallbackData data) override;
|
||||
virtual void SetSize(vec2 size) override;
|
||||
virtual int32_t KeyCallback(const Widget::KeyCallbackData& data) override;
|
||||
virtual int32_t MouseCallback(const Widget::MouseCallbackData& data) override;
|
||||
virtual void SetSize(const vec2& size) override;
|
||||
|
||||
virtual void UpdateLayout() override;
|
||||
virtual vec2 GetSize() override;
|
||||
virtual bool Field_58() override;
|
||||
virtual bool Field_60() override;
|
||||
virtual Widget* GetHitWidget(vec2 hit_pos) override;
|
||||
virtual Widget* GetHitWidget(const vec2& hit_pos) override;
|
||||
|
||||
virtual bool Field_C0();
|
||||
virtual bool SetCurrentControl(Control* control);
|
||||
@@ -335,14 +335,14 @@ namespace dw {
|
||||
|
||||
virtual void Draw() override;
|
||||
virtual void Reset() override;
|
||||
virtual int32_t KeyCallback(Widget::KeyCallbackData data) override;
|
||||
virtual int32_t MouseCallback(Widget::MouseCallbackData data) override;
|
||||
virtual void SetSize(vec2 size) override;
|
||||
virtual int32_t KeyCallback(const Widget::KeyCallbackData& data) override;
|
||||
virtual int32_t MouseCallback(const Widget::MouseCallbackData& data) override;
|
||||
virtual void SetSize(const vec2& size) override;
|
||||
virtual vec2 GetPos() override;
|
||||
|
||||
virtual vec2 GetSize() override;
|
||||
virtual bool Field_58() override;
|
||||
virtual Widget* GetHitWidget(vec2 hit_pos) override;
|
||||
virtual Widget* GetHitWidget(const vec2& hit_pos) override;
|
||||
|
||||
virtual rectangle GetBoundingBox() override;
|
||||
|
||||
@@ -365,9 +365,9 @@ namespace dw {
|
||||
KeyListener();
|
||||
virtual ~KeyListener();
|
||||
|
||||
virtual void Field_8(Widget::KeyCallbackData data) = 0;
|
||||
virtual void Field_10(Widget::KeyCallbackData data) = 0;
|
||||
virtual void Field_18(Widget::KeyCallbackData data) = 0;
|
||||
virtual void Field_8(const Widget::KeyCallbackData& data) = 0;
|
||||
virtual void Field_10(const Widget::KeyCallbackData& data) = 0;
|
||||
virtual void Field_18(const Widget::KeyCallbackData& data) = 0;
|
||||
};
|
||||
|
||||
class KeyAdapter : public KeyListener {
|
||||
@@ -375,9 +375,9 @@ namespace dw {
|
||||
KeyAdapter();
|
||||
virtual ~KeyAdapter() override;
|
||||
|
||||
virtual void Field_8(Widget::KeyCallbackData data) override;
|
||||
virtual void Field_10(Widget::KeyCallbackData data) override;
|
||||
virtual void Field_18(Widget::KeyCallbackData data) override;
|
||||
virtual void Field_8(const Widget::KeyCallbackData& data) override;
|
||||
virtual void Field_10(const Widget::KeyCallbackData& data) override;
|
||||
virtual void Field_18(const Widget::KeyCallbackData& data) override;
|
||||
};
|
||||
|
||||
class MouseListener {
|
||||
@@ -385,10 +385,10 @@ namespace dw {
|
||||
MouseListener();
|
||||
virtual ~MouseListener();
|
||||
|
||||
virtual void Field_8(Widget::MouseCallbackData data) = 0;
|
||||
virtual void Field_10(Widget::MouseCallbackData data) = 0;
|
||||
virtual void Field_18(Widget::MouseCallbackData data) = 0;
|
||||
virtual void Field_20(Widget::MouseCallbackData data) = 0;
|
||||
virtual void Field_8(const Widget::MouseCallbackData& data) = 0;
|
||||
virtual void Field_10(const Widget::MouseCallbackData& data) = 0;
|
||||
virtual void Field_18(const Widget::MouseCallbackData& data) = 0;
|
||||
virtual void Field_20(const Widget::MouseCallbackData& data) = 0;
|
||||
};
|
||||
|
||||
class MouseAdapter : public MouseListener {
|
||||
@@ -396,10 +396,10 @@ namespace dw {
|
||||
MouseAdapter();
|
||||
virtual ~MouseAdapter() override;
|
||||
|
||||
virtual void Field_8(Widget::MouseCallbackData data) override;
|
||||
virtual void Field_10(Widget::MouseCallbackData data) override;
|
||||
virtual void Field_18(Widget::MouseCallbackData data) override;
|
||||
virtual void Field_20(Widget::MouseCallbackData data) override;
|
||||
virtual void Field_8(const Widget::MouseCallbackData& data) override;
|
||||
virtual void Field_10(const Widget::MouseCallbackData& data) override;
|
||||
virtual void Field_18(const Widget::MouseCallbackData& data) override;
|
||||
virtual void Field_20(const Widget::MouseCallbackData& data) override;
|
||||
};
|
||||
|
||||
class MouseMoveListener {
|
||||
@@ -407,7 +407,7 @@ namespace dw {
|
||||
MouseMoveListener();
|
||||
virtual ~MouseMoveListener();
|
||||
|
||||
virtual void Field_8(Widget::MouseCallbackData data) = 0;
|
||||
virtual void Field_8(const Widget::MouseCallbackData& data) = 0;
|
||||
};
|
||||
|
||||
class Layout {
|
||||
@@ -501,8 +501,8 @@ namespace dw {
|
||||
virtual ~Button() override;
|
||||
|
||||
virtual void Draw() override;
|
||||
virtual int32_t KeyCallback(Widget::KeyCallbackData data) override;
|
||||
virtual int32_t MouseCallback(Widget::MouseCallbackData data) override;
|
||||
virtual int32_t KeyCallback(const Widget::KeyCallbackData& data) override;
|
||||
virtual int32_t MouseCallback(const Widget::MouseCallbackData& data) override;
|
||||
|
||||
virtual vec2 GetSize() override;
|
||||
|
||||
@@ -525,9 +525,9 @@ namespace dw {
|
||||
|
||||
virtual void Draw() override;
|
||||
virtual void Reset() override;
|
||||
virtual int32_t KeyCallback(Widget::KeyCallbackData data) override;
|
||||
virtual int32_t MouseCallback(Widget::MouseCallbackData data) override;
|
||||
virtual void SetSize(vec2 size) override;
|
||||
virtual int32_t KeyCallback(const Widget::KeyCallbackData& data) override;
|
||||
virtual int32_t MouseCallback(const Widget::MouseCallbackData& data) override;
|
||||
virtual void SetSize(const vec2& size) override;
|
||||
|
||||
virtual vec2 GetSize() override;
|
||||
|
||||
@@ -598,8 +598,8 @@ namespace dw {
|
||||
|
||||
virtual void Draw() override;
|
||||
virtual void Reset() override;
|
||||
virtual int32_t KeyCallback(Widget::KeyCallbackData data) override;
|
||||
virtual int32_t MouseCallback(Widget::MouseCallbackData data) override;
|
||||
virtual int32_t KeyCallback(const Widget::KeyCallbackData& data) override;
|
||||
virtual int32_t MouseCallback(const Widget::MouseCallbackData& data) override;
|
||||
|
||||
virtual vec2 GetSize() override;
|
||||
virtual void SetFont(p_Font& value) override;
|
||||
@@ -728,9 +728,9 @@ namespace dw {
|
||||
virtual ~ScrollBar() override;
|
||||
|
||||
virtual void Draw() override;
|
||||
virtual int32_t KeyCallback(Widget::KeyCallbackData data) override;
|
||||
virtual int32_t MouseCallback(Widget::MouseCallbackData data) override;
|
||||
virtual void SetSize(vec2 value) override;
|
||||
virtual int32_t KeyCallback(const Widget::KeyCallbackData& data) override;
|
||||
virtual int32_t MouseCallback(const Widget::MouseCallbackData& data) override;
|
||||
virtual void SetSize(const vec2& value) override;
|
||||
virtual vec2 GetPos() override;
|
||||
|
||||
virtual Control* GetParentControl();
|
||||
@@ -751,8 +751,8 @@ namespace dw {
|
||||
void AddSelectionListener(SelectionListener* value);
|
||||
|
||||
vec2 sub_1402E4790();
|
||||
SelectionListener::CallbackData sub_1402E5140(Widget::KeyCallbackData key_callback_data);
|
||||
SelectionListener::CallbackData sub_1402E5380(Widget::MouseCallbackData mouse_callback_data);
|
||||
SelectionListener::CallbackData sub_1402E5140(const Widget::KeyCallbackData& key_callback_data);
|
||||
SelectionListener::CallbackData sub_1402E5380(const Widget::MouseCallbackData& mouse_callback_data);
|
||||
void sub_1402F9670(float_t value);
|
||||
|
||||
static void sub_1402E6CC0(SelectionListener::CallbackData callback_data);
|
||||
@@ -782,9 +782,9 @@ namespace dw {
|
||||
|
||||
virtual void Draw() override;
|
||||
virtual void Reset() override;
|
||||
virtual int32_t KeyCallback(Widget::KeyCallbackData data) override;
|
||||
virtual int32_t MouseCallback(Widget::MouseCallbackData data) override;
|
||||
virtual void SetSize(vec2 value) override;
|
||||
virtual int32_t KeyCallback(const Widget::KeyCallbackData& data) override;
|
||||
virtual int32_t MouseCallback(const Widget::MouseCallbackData& data) override;
|
||||
virtual void SetSize(const vec2& value) override;
|
||||
|
||||
virtual void UpdateLayout() override;
|
||||
virtual vec2 GetSize() override;
|
||||
|
||||
@@ -40,12 +40,12 @@ struct sprite_text_mesh {
|
||||
~sprite_text_mesh();
|
||||
|
||||
spr::SpriteVertex* add_char();
|
||||
void add_set_char(app::text_flags flags,
|
||||
void add_set_char(app::text_flags flags,
|
||||
rectangle pos, rectangle uv, color4u8 color);
|
||||
void apply_scale_offset(vec2 scale, vec2 offset);
|
||||
void apply_scale_offset(vec2 scale, vec2 offset);
|
||||
|
||||
static void set_char(spr::SpriteVertex* vtx, app::text_flags flags,
|
||||
rectangle pos, rectangle uv, color4u8 color);
|
||||
static void set_char(spr::SpriteVertex* vtx, app::text_flags flags,
|
||||
rectangle pos, rectangle uv, color4u8 color);
|
||||
};
|
||||
|
||||
struct PrintWork {
|
||||
|
||||
Reference in New Issue
Block a user