* fix: restore MSL extab flags and force-active stripped symbols * fix: limit ChannelTitle novtable header changes to IPL_CHANNEL_TITLE_NOVTABLE PR #182 made gui::EventHandler novtable and rewrote HermiteIntp for every unit, which dropped __vt__Q23gui12EventHandler from linked scene units and moved EventHandler::onEvent. Restore the pre-#182 definitions unless the macro is defined. * fix: restore u16 addrType in cdb::Manager::createNewRecord The original symbol takes u16 (mangled UsUs); the enum parameter made createNewRecord 4 bytes longer. Match the caller in iplNwc24Manager with a u16 local assigned through if/else. * fix: emit TVRC loop handlers after TVRCSendStartAsync The original object places both alarm handlers at the end of .text. * fix: construct scene::Date::mscMaxDate with utility::Date The MaxDate wrapper emitted a weak MaxDate ctor that the original does not have, shifting .text by 0x10 after iplDate. Go back to a plain utility::Date followed by the 0x10-byte padding array. * fix: define textinput PaneComponent dtor after PaneManager dtor Matches the original object's function order, which also pulls the weak GUIComponent dtor into place. * fix: define EGG audio Arg and SoundHeapMgr ctors out of line Emits IAudioMgr::Arg::Arg first and SoundHeapMgr's weak dtor ahead of its ctor, matching the original eggAudioMgr function order. * fix: define WaveFile dtors in AudioWavePlayer after the ctor The original emits WavePacket's weak dtor first, then the WaveFileAiff and WaveFileWav dtors. Declaring the dtors after getBit keeps the vtables in AudioWaveUtility. * fix: restore fork-point iplCSMtx string pooling Moving "MTX34" into a static const array put it in .sdata2 and left the pooled .sdata copy to be dead-stripped, shifting both sections. * fix: share tiGUIManager's named 0.0f constant drawLine_ and PaneComponent::contain now load lbl_81694EE8, as in the original, instead of emitting their own 0.0f ahead of it in .sdata2. * fix: force-active unreferenced iplDate and WDScan data MWLD dead-strips scene::padding (the 0x10 bytes after Date::mscMaxDate) and the unreferenced WDScan .sdata2 bytes lbl_81695063/lbl_81695067, which shifted .bss and .sdata2. * fix: unlink eggAudioExpMgr MWCC emits the @52 calc thunk ahead of the @52 dtor thunk, but the original has them the other way round, which swaps two vtable entries. Link the original object until the order is matched. * fix: shrink Calendar .data padding now that EventHandler has a vtable With gui::EventHandler no longer novtable, its 0x18-byte vtable fills most of the gap after __vt__Q33ipl5scene8Calendar; keep one 4-byte pad.
263 lines
8.9 KiB
C++
263 lines
8.9 KiB
C++
#ifndef GUI_MANAGER_H
|
|
#define GUI_MANAGER_H
|
|
|
|
#include <revolution/types.h>
|
|
|
|
#include <revolution/kpad.h>
|
|
#include <revolution/mem.h>
|
|
#include <revolution/mtx.h>
|
|
|
|
#include <nw4r/lyt.h>
|
|
#include <nw4r/ut.h>
|
|
|
|
namespace gui {
|
|
/* GUI MANAGER */
|
|
|
|
#define GUI_POINTS_MAX 8
|
|
|
|
class Interface;
|
|
class Component;
|
|
class Manager;
|
|
class EventHandler;
|
|
|
|
class Interface {
|
|
public:
|
|
virtual void create() {} // 0x08 (0x02)
|
|
|
|
virtual void init() {} // 0x0C (0x03)
|
|
virtual void calc() {} // 0x10 (0x04)
|
|
|
|
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
|
|
virtual void draw() {} // 0x18 (0x06)
|
|
|
|
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
|
virtual ~Interface(); // 0x1C (0x07)
|
|
#else
|
|
virtual ~Interface() {} // 0x1C (0x07)
|
|
#endif
|
|
};
|
|
|
|
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
|
class __declspec(novtable) EventHandler {
|
|
#else
|
|
class EventHandler {
|
|
#endif
|
|
public:
|
|
enum {
|
|
ON_TRIG = 0,
|
|
ON_POINT,
|
|
ON_LEFT,
|
|
ON_MOVE,
|
|
ON_DRAG,
|
|
ON_RELEASE,
|
|
};
|
|
|
|
EventHandler() : mLatestCtrlNum(0) {}
|
|
|
|
virtual void onEvent(u32 compId, u32 event, void* data) {} // 0x08 (0x02)
|
|
|
|
virtual void setManager(Manager* manager) { mpManager = manager; } // 0x0C (0x03)
|
|
|
|
virtual void setLatestEventCtrlNo(int ctrlNo) { mLatestCtrlNum = ctrlNo; } // 0x10 (0x04)
|
|
virtual int getLatestEventCtrlNo() { return mLatestCtrlNum; } // 0x14 (0x05)
|
|
|
|
protected:
|
|
Manager* mpManager; // 0x04
|
|
int mLatestCtrlNum; // 0x08
|
|
};
|
|
|
|
class Component : public Interface {
|
|
public:
|
|
virtual void init() { // 0x0C (0x03)
|
|
for (int i = 0; i < GUI_POINTS_MAX; i++) {
|
|
mbPointed[i] = false;
|
|
mDraggingPos[i].z = mDraggingPos[i].y = mDraggingPos[i].x = 0;
|
|
mbDragging[i] = false;
|
|
mFlightDuration[i] = 0;
|
|
}
|
|
}
|
|
|
|
Component(u32 id) : Interface(), mDraggingButton(0xFFFF), mID(id), mbTriggerTarget(false), mpManager(NULL) { init(); }
|
|
virtual ~Component() {} // 0x1C (0x07)
|
|
|
|
virtual u32 getID() { return mID; } // 0x20 (0x08)
|
|
|
|
virtual bool isPointed(int point) { return mbPointed[point]; } // 0x24 (0x09)
|
|
virtual bool isDragging(int point) { return mbDragging[point]; } // 0x28 (0x0A)
|
|
|
|
virtual void setPointed(int point, bool bEnable) { mbPointed[point] = bEnable; } // 0x2C (0x0B)
|
|
|
|
virtual void onPoint(int point) { mFlightDuration[point] = 0; } // 0x30 (0x0C)
|
|
virtual void offPoint(int point) { mFlightDuration[point] = 0; } // 0x34 (0x0D)
|
|
|
|
virtual void onDrag(f32 x, f32 y) {} // 0x38 (0x0E)
|
|
virtual void onMove(int point, f32 x, f32 y) { mFlightDuration[point]++; } // 0x3C (0x0F)
|
|
virtual void onTrig(int point, u32 trig, Vec& dragPos) { // 0x40 (0x10)
|
|
if (trig & mDraggingButton) {
|
|
mDraggingPos[point] = dragPos;
|
|
mbDragging[point] = true;
|
|
mFlightDuration[point] = 0;
|
|
}
|
|
}
|
|
|
|
virtual void setDraggingButton(u32 dragBtn) { mDraggingButton = dragBtn; } // 0x44 (0x11)
|
|
|
|
virtual bool update(int point, const KPADStatus* kpad, f32, f32, void* data) { return false; } // 0x48 (0x12)
|
|
virtual bool update(int point, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data); // 0x4C (0x13)
|
|
|
|
virtual bool isTriggerTarger() { return mbTriggerTarget; } // 0x50 (0x14) "targer"
|
|
virtual void setTriggerTarget(bool bEnable) { mbTriggerTarget = bEnable; } // 0x54 (0x15)
|
|
|
|
virtual void setManager(Manager* manager) { mpManager = manager; } // 0x58 (0x16)
|
|
|
|
virtual bool isVisible() { return true; } // 0x5C (0x17)
|
|
|
|
virtual u16 getFlightDuration(int point) { return mFlightDuration[point]; } // 0x60 (0x18)
|
|
virtual void setFlightDuration(int point, u16 flightDir) { mFlightDuration[point] = flightDir; } // 0x64 (0x19)
|
|
|
|
virtual bool contain(f32 x, f32 y) = 0; // 0x68 (0x1A)
|
|
|
|
protected:
|
|
bool mbPointed[GUI_POINTS_MAX]; // 0x04
|
|
|
|
bool mbDragging[GUI_POINTS_MAX]; // 0x0C
|
|
Vec mDraggingPos[GUI_POINTS_MAX]; // 0x14
|
|
int mDraggingButton; // 0x74
|
|
|
|
int mID; // 0x78
|
|
|
|
bool mbTriggerTarget; // 0x7C
|
|
|
|
Manager* mpManager; // 0x80
|
|
|
|
u16 mFlightDuration[GUI_POINTS_MAX]; // 0x84
|
|
};
|
|
|
|
class Manager : public Interface {
|
|
public:
|
|
virtual void init(); // 0x0C (0x03)
|
|
virtual void calc(); // 0x10 (0x04)
|
|
|
|
virtual void draw(); // 0x18 (0x06)
|
|
|
|
Manager(EventHandler* event, MEMAllocator* allocator) : Interface(), mpEventHandler(event), mpAllocator(allocator) {
|
|
if (mpEventHandler != NULL) {
|
|
mpEventHandler->setManager(this);
|
|
}
|
|
nw4r::ut::List_Init(&mComponents, offsetof(IDToComponent, mLink));
|
|
}
|
|
|
|
virtual ~Manager(); // 0x1C (0x07)
|
|
|
|
virtual void addComponent(Component* component); // 0x20 (0x08)
|
|
virtual Component* getComponent(u32 id); // 0x24 (0x09)
|
|
|
|
virtual bool update(int point, const KPADStatus* kpad, f32, f32, void* data) { return false; } // 0x28 (0x0A)
|
|
virtual bool update(int point, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data); // 0x2C (0x0B)
|
|
|
|
virtual void onEvent(u32 compId, u32 event, int point, void* data) { // 0x30 (0x0C)
|
|
if (mpEventHandler) {
|
|
mpEventHandler->setLatestEventCtrlNo(point);
|
|
mpEventHandler->onEvent(compId, event, data);
|
|
}
|
|
}
|
|
|
|
virtual void setAllComponentTriggerTarget(bool bEnable); // 0x34 (0x0D)
|
|
|
|
virtual void setEventHandler(EventHandler* eventHandler) { // 0x38 (0x0E)
|
|
mpEventHandler = eventHandler;
|
|
if (eventHandler) {
|
|
eventHandler->setManager(this);
|
|
}
|
|
}
|
|
virtual EventHandler* changeEventHandler(EventHandler* eventHandler) { // 0x3C (0x0F)
|
|
EventHandler* prevHandler = mpEventHandler;
|
|
mpEventHandler = eventHandler;
|
|
if (eventHandler) {
|
|
eventHandler->setManager(this);
|
|
}
|
|
return prevHandler;
|
|
}
|
|
|
|
virtual void setDraggingButton(u32 dragBtn); // 0x40 (0x10)
|
|
|
|
protected:
|
|
class IDToComponent {
|
|
public:
|
|
IDToComponent(u32 id, Component* component) : mID(id), mpComponent(component) {}
|
|
|
|
u32 mID; // 0x00
|
|
Component* mpComponent; // 0x04
|
|
|
|
nw4r::ut::Link mLink; // 0x08
|
|
};
|
|
|
|
EventHandler* mpEventHandler; // 0x04
|
|
nw4r::ut::List mComponents; // 0x08
|
|
MEMAllocator* mpAllocator; // 0x14
|
|
};
|
|
|
|
/* PANE GUI MANAGER */
|
|
|
|
class PaneComponent;
|
|
class PaneManager;
|
|
|
|
class PaneManager : public Manager {
|
|
public:
|
|
PaneManager(EventHandler* event, MEMAllocator* allocator, const nw4r::lyt::DrawInfo* drawInfo)
|
|
: Manager(event, allocator), mpDrawInfo(drawInfo) {
|
|
nw4r::ut::List_Init(&mPaneComponents, offsetof(PaneToComponent, mLink));
|
|
}
|
|
|
|
virtual ~PaneManager(); // 0x1C (0x07)
|
|
|
|
virtual void createLayoutScene(const nw4r::lyt::Layout& layout); // 0x44 (0x11)
|
|
|
|
virtual PaneComponent* getPaneComponentByPane(nw4r::lyt::Pane* pane); // 0x48 (0x12)
|
|
|
|
virtual const nw4r::lyt::DrawInfo* getDrawInfo() { return mpDrawInfo; } // 0x4C (0x13)
|
|
virtual void setDrawInfo(const nw4r::lyt::DrawInfo* drawInfo) { mpDrawInfo = drawInfo; } // 0x50 (0x14)
|
|
|
|
virtual void setAllBoundingBoxComponentTriggerTarget(bool bEnable); // 0x54 (0x15)
|
|
virtual void walkInChildren(nw4r::lyt::PaneList& paneList); // 0x58 (0x16)
|
|
|
|
protected:
|
|
class PaneToComponent {
|
|
public:
|
|
PaneToComponent(nw4r::lyt::Pane* pane, PaneComponent* component) : mpPane(pane), mpComponent(component) {}
|
|
|
|
nw4r::lyt::Pane* mpPane; // 0x00
|
|
PaneComponent* mpComponent; // 0x04
|
|
|
|
nw4r::ut::Link mLink; // 0x08
|
|
};
|
|
|
|
nw4r::ut::List mPaneComponents; // 0x18
|
|
|
|
const nw4r::lyt::DrawInfo* mpDrawInfo; // 0x24
|
|
|
|
static u32 suIDCounter;
|
|
};
|
|
|
|
class PaneComponent : public Component {
|
|
public:
|
|
PaneComponent(u32 id) : Component(id) { mpPane = NULL; }
|
|
|
|
virtual void draw(); // 0x18 (0x06)
|
|
|
|
virtual ~PaneComponent() {} // 0x1C (0x07)
|
|
|
|
virtual bool isVisible(); // 0x58 (0x17)
|
|
|
|
virtual bool contain(f32 x, f32 y); // 0x68 (0x1A)
|
|
|
|
virtual void setPane(nw4r::lyt::Pane* pane) { mpPane = pane; } // 0x6C (0x1B)
|
|
virtual nw4r::lyt::Pane* getPane() { return mpPane; } // 0x70 (0x1C)
|
|
|
|
private:
|
|
nw4r::lyt::Pane* mpPane; // 0x88
|
|
};
|
|
} // namespace gui
|
|
|
|
#endif // GUI_MANAGER_H
|