diff --git a/configure.py b/configure.py index 9043e95f..83fd1c7c 100755 --- a/configure.py +++ b/configure.py @@ -553,7 +553,7 @@ def DolphinLib(lib_name: str, objects: List[Object]) -> Dict[str, Any]: Object(NonMatching, "plugPikiNakata/panipikianimmgr.cpp"), Object(NonMatching, "plugPikiNakata/panitekianimator.cpp"), Object(NonMatching, "plugPikiNakata/panitestsection.cpp"), - Object(NonMatching, "plugPikiNakata/paraparameters.cpp"), + Object(Matching, "plugPikiNakata/paraparameters.cpp"), Object(NonMatching, "plugPikiNakata/pcamcamera.cpp"), Object(NonMatching, "plugPikiNakata/pcamcameramanager.cpp"), Object(NonMatching, "plugPikiNakata/pcammotionevents.cpp"), diff --git a/include/NLibSystem.h b/include/NLibSystem.h deleted file mode 100644 index 1e0dce2b..00000000 --- a/include/NLibSystem.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _NLIBSYSTEM_H -#define _NLIBSYSTEM_H - -#include "types.h" - -struct System; - -namespace NSystem { -void initSystem(System*); -void randomInt(int); -void getFreeHeap(); - -extern System* system; -}; // namespace NSystem - -#endif diff --git a/include/ParaParameters.h b/include/ParaParameters.h new file mode 100644 index 00000000..a0078a37 --- /dev/null +++ b/include/ParaParameters.h @@ -0,0 +1,124 @@ +#ifndef _PARAPARAMETERS_H +#define _PARAPARAMETERS_H + +#include "types.h" +#include "sysNew.h" + +struct Stream; + +/** + * @brief TODO + */ +template +struct ParaParameterInfo { + u32 _00; // _00, unknown + T _04; // _04, maybe min or max? + T _08; // _08, maybe min or max? +}; + +/** + * @brief TODO + */ +template +struct ParaParameters { + ParaParameters(int count, ParaParameterInfo* info) + { + mParaCount = count; + mParaInfo = info; + if (mParaCount > 0) { + mParameters = new T[mParaCount]; + } else { + mParameters = nullptr; + } + + for (int i = 0; i < mParaCount; i++) { + mParameters[i] = 0; + } + } + + void get(int); + + inline void input(ParaParameters* other) + { + for (int i = 0; i < mParaCount; i++) { + mParameters[i] = other->mParameters[i]; + } + } + + // _0C = VTBL + T* mParameters; // _00 + int mParaCount; // _04 + ParaParameterInfo* mParaInfo; // _08 + + // VTBL below members + + virtual void read(Stream&) { } // _08 + virtual void write(Stream&) { } // _0C + virtual void print() { } // _10 +}; + +/* + * @brief TODO + */ +struct ParaParameterInfoI : public ParaParameterInfo { + ParaParameterInfoI(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct ParaParametersI : public ParaParameters { + ParaParametersI(int, ParaParameterInfoI*); // unused/inlined + + virtual void read(Stream&); // _08 + virtual void write(Stream&); // _0C + virtual void print(); // _10 + + // TODO: members +}; + +/* + * @brief TODO + */ +struct ParaParameterInfoF : public ParaParameterInfo { + ParaParameterInfoF(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct ParaParametersF : public ParaParameters { + ParaParametersF(int, ParaParameterInfoF*); // unused/inlined + + virtual void read(Stream&); // _08 + virtual void write(Stream&); // _0C + virtual void print(); // _10 + + // TODO: members +}; + +/** + * @brief TODO + */ +struct ParaMultiParameters { + ParaMultiParameters(int, ParaParameterInfoI*, int, ParaParameterInfoF*); + + void input(ParaMultiParameters&); + void getF(int); + + // _08 = VTBL + ParaParametersI* mIntParams; // _00 + ParaParametersF* mFloatParams; // _04 + + // VTBL below members + + virtual void read(Stream&); // _08 + virtual void write(Stream&); // _0C + virtual void print(); // _10 +}; + +#endif diff --git a/include/Pcam/Camera.h b/include/Pcam/Camera.h new file mode 100644 index 00000000..62d9d2a8 --- /dev/null +++ b/include/Pcam/Camera.h @@ -0,0 +1,90 @@ +#ifndef _PCAM_CAMERA_H +#define _PCAM_CAMERA_H + +#include "types.h" +#include "nlib/Graphics.h" +#include "nlib/Array.h" + +struct Controller; +struct Creature; +struct Font; +struct Graphics; +struct Navi; +struct NVector3f; + +/** + * @brief TODO + */ +struct PcamMotionInfo { + PcamMotionInfo(); + + // unused/inlined: + void init(f32, f32, f32, f32, f32, f32); + void println(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct PcamControlInfo { + PcamControlInfo(); + + void init(bool, bool, bool, bool, bool, bool, bool, f32, f32, f32); + + // TODO: members +}; + +/** + * @brief TODO + * + * @note Size: 0x170. + */ +struct PcamCamera : public NCamera { + PcamCamera(Camera*); + + virtual void update(); // _08 + + void startCamera(Creature*); + void startCamera(Creature*, int, int); + void makeCurrentPosition(f32); + void parameterUpdated(); + void control(Controller&); + void control(PcamControlInfo&); + void startAttention(); + void makePosture(); + void makePolarRadius(); + void makeWatchObjectViewpoint(NVector3f&, NVector3f&); + void updateTimers(); + void startMotion(int, int); + void startMotion(PcamMotionInfo&); + void finishMotion(); + void getGoalDistance(); + void getCurrentAngle(); + void getCurrentFov(); + void getCurrentHomingSpeed(); + void getCurrentBlur(); + void calcCurrentDistance(); + void getCursorDirection(); + void outputTargetPosition(NVector3f&); + void outputCursorPosition(NVector3f&); + void outputFormationWatchpoint(Navi*, NVector3f&); + void outputTargetWatchpoint(NVector3f&); + + // unused/inlined: + void playCameraSound(int); + void getChangingMotionRate(); + void getCurrentWatchAdjustment(); + void getCurrentNaviWatchWeight(); + void calcCurrentDirection(); + void calcTargetDistance(); + void getTargetDirection(); + void makePolar(); + void printInfo(Graphics&, Font*); + + // TODO: members + u8 _04[0x16C - sizeof(NCamera)]; // _00, unknown +}; + +#endif diff --git a/include/Pcam/CameraManager.h b/include/Pcam/CameraManager.h new file mode 100644 index 00000000..6a2865f7 --- /dev/null +++ b/include/Pcam/CameraManager.h @@ -0,0 +1,53 @@ +#ifndef _PCAM_CAMERAMANAGER_H +#define _PCAM_CAMERAMANAGER_H + +#include "types.h" +#include "Node.h" + +struct Camera; +struct Controller; +struct Creature; +struct PcamCamera; +struct PcamMotionInfo; +struct PeveEvent; +struct Vector3f; + +/** + * @brief TODO + */ +enum PcamVibrationEventIDs { + PCAMVIB_NULL = -1, + PCAMVIB_SideVibration = 0, + PCAMVIB_Damage = 1, + PCAMVIB_Vibration1 = 2, + PCAMVIB_Vibration2 = 3, + PCAMVIB_LongVibration = 4, + PCAMVIB_VibrationCount, // 5 +}; + +/** + * @brief TODO + */ +struct PcamCameraManager : public Node { + PcamCameraManager(Camera*, Controller*); + + virtual void update(); // _10 + + void startCamera(Creature*); + void updateVibrationEvent(); + void startVibrationEvent(int, Vector3f&); + void outputNaviPosition(Vector3f&); + + // unused/inlined: + void startMotion(PcamMotionInfo&); + void finishMotion(); + + // _00 = VTBL + // _00-_20 = Node + PcamCamera* mCamera; // _20 + Controller* mController; // _24 + int mCurrEventIndex; // _28, see PcamVibrationEventIDs enum + PeveEvent** mVibrationEvents; // _2C, array of events indexed by mCurrEventIndex +}; + +#endif diff --git a/include/Pcam/CameraParameters.h b/include/Pcam/CameraParameters.h new file mode 100644 index 00000000..4d527b4a --- /dev/null +++ b/include/Pcam/CameraParameters.h @@ -0,0 +1,21 @@ +#ifndef _PCAM_CAMERAPARAMETERS_H +#define _PCAM_CAMERAPARAMETERS_H + +#include "types.h" +#include "Node.h" +#include "ParaParameters.h" + +/** + * @brief TODO + */ +struct PcamCameraParameters : public Node { + PcamCameraParameters(); + + virtual void read(RandomAccessStream&); // _0C + + // _00 = VTBL + // _00-_20 = Node + // TODO: members +}; + +#endif diff --git a/include/Pcam/MotionEvents.h b/include/Pcam/MotionEvents.h new file mode 100644 index 00000000..2ea38d1f --- /dev/null +++ b/include/Pcam/MotionEvents.h @@ -0,0 +1,80 @@ +#ifndef _PCAM_MOTIONEVENTS_H +#define _PCAM_MOTIONEVENTS_H + +#include "types.h" +#include "Peve/MotionEvents.h" + +struct PcamCamera; + +/** + * @brief TODO + */ +struct PcamDamageEvent : public PeveVibrationEvent { + PcamDamageEvent(PcamCamera*); + + void makePcamDamageEvent(); + + // _00 = VTBL + // _00-_10 = PeveVibrationEvent? + // TODO: members +}; + +/** + * @brief TODO + */ +struct PcamLongVibrationEvent : public PeveSerialEvent { + PcamLongVibrationEvent(PcamCamera*); + + void makePcamLongVibrationEvent(f32, f32, f32, f32); + + // _00 = VTBL + // _00-_10 = PeveSerialEvent? + // TODO: members +}; + +/** + * @brief TODO + */ +struct PcamRandomMoveEvent : public PeveEvent { + PcamRandomMoveEvent(PcamCamera*); + + virtual void update(); // _24 + + // unused/inlined: + void makePcamRandomMoveEvent(); + + // _00 = VTBL + // _00-_10 = PeveEvent + // TODO: members +}; + +/** + * @brief TODO + */ +struct PcamSideVibrationEvent : public PeveEvent { + PcamSideVibrationEvent(PcamCamera*); + + virtual void update(); // _24 + virtual void finish(); // _2C + + void makePcamSideVibrationEvent(); + + // _00 = VTBL + // _00-_10 = PeveEvent + // TODO: members +}; + +/** + * @brief TODO + */ +struct PcamVibrationEvent : public PeveVibrationEvent { + PcamVibrationEvent(PcamCamera*); + + void makePcamVibrationEvent(); + + // _00 = VTBL + // _00-_10 = PeveVibrationEvent? + // TODO: members +}; + +#endif diff --git a/include/Peve/Condition.h b/include/Peve/Condition.h new file mode 100644 index 00000000..dd503f28 --- /dev/null +++ b/include/Peve/Condition.h @@ -0,0 +1,108 @@ +#ifndef _PEVE_CONDITION_H +#define _PEVE_CONDITION_H + +#include "types.h" +#include "nlib/Node.h" + +struct NVector3fIO; + +/** + * @brief TODO + */ +struct PeveCondition { + PeveCondition(); + + virtual bool isMet() = 0; // _08 + virtual void reset() { } // _0C (weak) + virtual void update() { } // _10 (weak) + + // _00 = VTBL +}; + +/** + * @brief TODO + */ +struct PeveBooleanCondition : public PeveCondition { + PeveBooleanCondition(); // unused/inlined + + virtual bool isMet(); // _08 + + // unused/inlined: + void construct(bool); + + // _00 = VTBL + // _00-_04 = PeveCondition + bool _04; // _04 +}; + +/** + * @brief TODO + */ +struct PeveComparisonYCondition : public PeveBooleanCondition { + PeveComparisonYCondition(); // unused/inlined + + virtual void reset(); // _0C + virtual void update(); // _10 + + // unused/inlined: + void construct(NVector3fIO*, NVector3fIO*); + + // _00 = VTBL + // _00-_08 = PeveBooleanCondition + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveDependenceCondition : public PeveCondition { + PeveDependenceCondition(); // unused/inlined + + virtual bool isMet(); // _08 + virtual void reset(); // _0C + virtual void update(); // _10 + + // unused/inlined: + void construct(PeveCondition*); + + // _00 = VTBL + // _00-_04 = PeveCondition +}; + +/** + * @brief TODO + */ +struct PeveDistanceCondition : public PeveBooleanCondition { + PeveDistanceCondition(); // unused/inlined + + virtual void reset(); // _0C + virtual void update(); // _10 + + // unused/inlined: + void construct(f32, NVector3fIO*, NVector3fIO*); + + // _00 = VTBL + // _00-_08 = PeveBooleanCondition + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveTimeCondition : public PeveCondition { + PeveTimeCondition(); + + virtual bool isMet(); // _08 + virtual void reset(); // _0C + virtual void update(); // _10 + + // unused/inlined: + void construct(f32); + + // _00 = VTBL + // _00-_04 = PeveCondition + f32 mCurrTime; // _04, in seconds + f32 mLimit; // _08, in seconds +}; + +#endif diff --git a/include/Peve/Event.h b/include/Peve/Event.h new file mode 100644 index 00000000..9bc371da --- /dev/null +++ b/include/Peve/Event.h @@ -0,0 +1,84 @@ +#ifndef _PEVE_EVENT_H +#define _PEVE_EVENT_H + +#include "types.h" +#include "nlib/Node.h" +#include "Peve/Condition.h" + +/** + * @brief TODO + */ +struct PeveEvent : public NNode { + PeveEvent(int); + + virtual void reset() // _20 (weak) + { + if (mCondition) { + mCondition->reset(); + } + } + virtual void update() // _24 (weak) + { + if (mCondition) { + mCondition->update(); + } + } + virtual bool isFinished() // _28 (weak) + { + if (!mCondition) { + return true; + } + + return mCondition->isMet(); + } + virtual void finish() { } // _2C (weak) + virtual void setEventOption(int opt) // _30 + { + mEventOptions |= opt; + } + virtual void clearEventOption(int opt) // _34 + { + mEventOptions &= ~opt; + } + virtual void setEventOptions(int opts) // _38 + { + mEventOptions = opts; + } + + // _00 = VTBL + // _00-_08 = NNode + PeveCondition* mCondition; // _08 + int mEventOptions; // _0C, bitflag +}; + +/** + * @brief TODO + */ +struct PeveParallelEvent : public PeveEvent { + PeveParallelEvent(int count); // unused/inlined + + virtual void reset(); // _20 + virtual void update(); // _24 + virtual bool isFinished(); // _28 + + // _00 = VTBL + // _00-_10 = PeveEvent + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveSerialEvent : public PeveEvent { + PeveSerialEvent(int count); // unused/inlined + + virtual void reset(); // _20 + virtual void update(); // _24 + virtual bool isFinished(); // _28 + + // _00 = VTBL + // _00-_10 = PeveEvent + // TODO: members +}; + +#endif diff --git a/include/Peve/IO.h b/include/Peve/IO.h new file mode 100644 index 00000000..bef1b9c5 --- /dev/null +++ b/include/Peve/IO.h @@ -0,0 +1,82 @@ +#ifndef _PEVE_IO_H +#define _PEVE_IO_H + +#include "types.h" +#include "nlib/Geometry.h" + +struct Creature; +struct PcamCamera; + +/** + * @brief TODO + */ +struct PeveCameraPostureIO : public NPosture3DIO { + PeveCameraPostureIO(); + + virtual void input(NPosture3D&); // _08 + virtual void output(NPosture3D&); // _0C + + void construct(PcamCamera*); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveCameraViewpointIO : public NVector3fIO { + PeveCameraViewpointIO(); + + virtual void input(NVector3f&); // _08 + virtual void output(NVector3f&); // _0C + + // unused/inlined: + void construct(PcamCamera*); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveCameraWatchpointIO : public NVector3fIO { + PeveCameraWatchpointIO(); + + virtual void input(NVector3f&); // _08 + virtual void output(NVector3f&); // _0C + + // unused/inlined: + void construct(PcamCamera*); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveClampVector3fIO : public NVector3fIOClass { + PeveClampVector3fIO(); + + virtual void input(NVector3f&); // _08 + + void construct(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveCreaturePositionIO : public NVector3fIO { + PeveCreaturePositionIO(); + + virtual void input(NVector3f&); // _08 + virtual void output(NVector3f&); // _0C + + // unused/inlined: + void construct(Creature*); + + // TODO: members +}; + +#endif diff --git a/include/Peve/MotionEvents.h b/include/Peve/MotionEvents.h new file mode 100644 index 00000000..373d2a6b --- /dev/null +++ b/include/Peve/MotionEvents.h @@ -0,0 +1,210 @@ +#ifndef _PEVE_MOTIONEVENTS_H +#define _PEVE_MOTIONEVENTS_H + +#include "types.h" +#include "Peve/Event.h" +#include "nlib/Spline.h" + +struct NFunction3D; +struct NPosture3DIO; +struct NVector3f; +struct NVector3fIO; +struct Vector3f; + +/** + * @brief TODO + */ +struct PeveAccelerationEvent : public PeveEvent { + PeveAccelerationEvent(); + + virtual void update(); // _24 + + void makeAccelerationEvent(PeveCondition*, NVector3fIO*, NVector3fIO*, NVector3fIO*); + + // _00 = VTBL + // _00-_10 = PeveEvent + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveCircleMoveEvent : public PeveEvent { + PeveCircleMoveEvent(); + + virtual void reset(); // _20 + virtual void update(); // _24 + + void makeCircleMoveEvent(f32, NVector3fIO*, NVector3fIO*, f32, f32, f32, f32); + void outputPosition(Vector3f&); + void calcAngle(); + + // _00 = VTBL + // _00-_10 = PeveEvent + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveCircleMoveWatchEvent : public PeveParallelEvent { + PeveCircleMoveWatchEvent(); // unused/inlined + + // unused/inlined: + void makeCircleMoveWatchEvent(f32, NVector3fIO*, NVector3fIO*, NVector3fIO*, f32, f32, f32, f32, f32); + + // _00 = VTBL + // _00-_10 = PeveEvent + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveFunctionCurveEvent : public PeveEvent { + PeveFunctionCurveEvent(); // unused/inlined + + virtual void reset(); // _20 + virtual void update(); // _24 + + // unused/inlined: + void makeFunctionCurveEvent(PeveCondition*, NVector3fIO*, NFunction3D*, f32, f32, bool); + + // _00 = VTBL + // _00-_10 = PeveEvent + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveHomingPositionEvent : public PeveEvent { + PeveHomingPositionEvent(); // unused/inlined + + virtual void update(); // _24 + + // unused/inlined: + void makeHomingPositionEvent(PeveCondition*, NVector3fIO*, NVector3fIO*, f32); + + // _00 = VTBL + // _00-_10 = PeveEvent + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveHomingPostureEvent : public PeveParallelEvent { + PeveHomingPostureEvent(); // unused/inlined; + + // unused/inlined: + void makeHomingPostureEvent(PeveCondition*, NVector3fIO*, NVector3fIO*, f32, PeveCondition*, NVector3fIO*, NVector3fIO*, f32); + + // _00 = VTBL + // _00-_10 = PeveEvent + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveHorizontalSinWaveEvent : public PeveEvent { + PeveHorizontalSinWaveEvent() + : PeveEvent(0) + { + } + + virtual void reset(); // _20 + virtual void update(); // _24 + + void makeHorizontalSinWaveEvent(PeveCondition*, NVector3fIO*, NVector3f, f32, f32, f32, f32); + + // _00 = VTBL + // _00-_10 = PeveEvent + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveInterpolationEvent : public PeveEvent { + PeveInterpolationEvent(int, NPool*); + + virtual void reset(); // _20 + virtual void update(); // _24 + virtual bool isFinished(); // _28 + virtual void setStartTime(f32); // _3C + virtual void getStartTime(); // _40 + virtual void setPeriod(f32); // _44 + virtual void getPeriod(); // _48 + virtual void setTime(f32); // _4C + virtual void getTime(); // _50 + virtual void getEndTime(); // _54 + + // unused/inlined: + void makeInterpolationEvent(PeveCondition*, NPosture3DIO*); + + // _00 = VTBL + // _00-_10 = PeveEvent + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveMoveEvent : public PeveEvent { + PeveMoveEvent(); + + virtual void reset(); // _20 + + // unused/inlined: + void makeMoveEvent(NPosture3DIO*, NPosture3D&); + + // _00 = VTBL + // _00-_10 = PeveEvent + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveParabolaEvent : public PeveAccelerationEvent { + PeveParabolaEvent(); + + void makeParabolaEvent(PeveCondition*, NVector3fIO*, NVector3f&, f32, f32); + + // _00 = VTBL + // _00-_10 = PeveAccelerationEvent? + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveVibrationEvent : public PeveEvent { + PeveVibrationEvent(); + + virtual void update(); // _24 + + void makeVibrationEvent(f32, NPosture3DIO*, NVector3f&, f32, f32, f32); + + // _00 = VTBL + // _00-_10 = PeveEvent + // TODO: members +}; + +/** + * @brief TODO + */ +struct PeveWaitEvent : public PeveEvent { + PeveWaitEvent(); + + // unused/inlined: + void makeWaitEvent(f32); + + // _00 = VTBL + // _00-_10 = PeveEvent + // TODO: members +}; + +#endif diff --git a/include/PikiMacros.h b/include/PikiMacros.h index 23b13bff..7577ebda 100644 --- a/include/PikiMacros.h +++ b/include/PikiMacros.h @@ -23,4 +23,11 @@ (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; // clang-format on +#if DEBUG +// TODO: Reasonable definition of a debug print function +#define DEBUGPRINT(...) __VA_ARGS__ +#else +#define DEBUGPRINT(...) __VA_ARGS__ +#endif + #endif diff --git a/include/UtEffect.h b/include/UtEffect.h new file mode 100644 index 00000000..bc9beeef --- /dev/null +++ b/include/UtEffect.h @@ -0,0 +1,287 @@ +#ifndef _UTEFFECT_H +#define _UTEFFECT_H + +#include "types.h" +#include "KEffect.h" + +// NB: could maybe split these into smaller headers down the line +// Most of their functions are in uteffect in Kando, so they're here for now. + +/** + * @brief TODO + */ +struct BombEffect : public KEffect { + virtual void emit(EffectParm&); // _2C + virtual void kill(); // _30 + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct BombEffectLight : public KEffect { + virtual void emit(EffectParm&); // _2C + virtual void kill(); // _30 + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct BurnEffect : public KEffect { + virtual bool invoke(zen::particleGenerator*); // _08 + virtual void emit(EffectParm&); // _2C + virtual void kill(); // _30 + virtual void stop(); // _34 + virtual void restart(); // _38 + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct FreeLightEffect : public KEffect { + virtual void emit(EffectParm&); // _2C + virtual void kill(); // _30 + virtual void stop(); // _34 + virtual void restart(); // _38 + + void setScale(f32); + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct GoalEffect : public KEffect { + virtual bool invoke(zen::particleGenerator*); // _08 + virtual void emit(EffectParm&); // _2C + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct NaviFue : public KEffect { + virtual bool invoke(zen::particleGenerator*); // _08 + virtual void emit(EffectParm&); // _2C + virtual void kill(); // _30 + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct NaviWhistle : public KEffect { + virtual bool invoke(zen::particleGenerator*, zen::particleMdl*); // _24 + virtual void emit(EffectParm&); // _2C + virtual void kill(); // _30 + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct RippleEffect : public KEffect { + virtual void emit(EffectParm&); // _2C + virtual void kill(); // _30 + virtual void stop(); // _34 + virtual void restart(); // _38 + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct SimpleEffect : public KEffect { + virtual void emit(EffectParm&); // _2C + virtual void kill(); // _30 + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct SlimeEffect : public KEffect { + SlimeEffect(); + + virtual bool invoke(zen::particleGenerator*, zen::particleMdl*); // _24 + virtual void emit(EffectParm&); // _2C + virtual void kill(); // _30 + virtual void stop(); // _34 + virtual void restart(); // _38 + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct SmokeGrassEffect : public KEffect { + virtual void emit(EffectParm&); // _2C + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct SmokeRockEffect : public KEffect { + virtual void emit(EffectParm&); // _2C + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct SmokeSoilEffect : public KEffect { + virtual void emit(EffectParm&); // _2C + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct SmokeTreeEffect : public KEffect { + virtual void emit(EffectParm&); // _2C + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct UfoSuikomiEffect : public KEffect { + virtual void emit(EffectParm&); // _2C + virtual void kill(); // _30 + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct WhistleTemplate : public KEffect { + virtual bool invoke(zen::particleGenerator*, zen::particleMdl*); // _24 + virtual void emit(EffectParm&); // _2C + virtual void kill(); // _30 + + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = KEffect? + // TODO: members +}; + +/** + * @brief TODO + */ +struct UfoSuckEffect : public WhistleTemplate { + // _00 = VTBL1 + // _04 = VTBL2 + // _08 = VTBL3 + // _00-_0C = WhistleTemplate? + // TODO: members +}; + +/** + * @brief TODO + */ +struct PermanentEffect { + PermanentEffect(); + + void init(Vector3f&, int); + void updatePos(Vector3f&); + void changeEffect(int); + void stop(); + void restart(); + void kill(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct UtEffectMgr { + UtEffectMgr(); + + void registerEffect(int, KEffect*); + void cast(int, EffectParm&); + void kill(int); + + // TODO: members +}; + +#endif diff --git a/include/Vector.h b/include/Vector.h index 7da6f082..dc3c30f1 100644 --- a/include/Vector.h +++ b/include/Vector.h @@ -81,6 +81,8 @@ struct Vector3f { f32 getY() { return y; } f32 getZ() { return z; } + void input(Vector3f&); + // unused/inlined: void rotateTranspose(Matrix4f&); void rotate(Quat&); diff --git a/include/nlib/Array.h b/include/nlib/Array.h new file mode 100644 index 00000000..74d1d2fa --- /dev/null +++ b/include/nlib/Array.h @@ -0,0 +1,42 @@ +#ifndef _NLIB_ARRAY_H +#define _NLIB_ARRAY_H + +#include "types.h" + +/** + * @brief TODO + */ +template +struct NArray { + NArray(int max) + { + mMax = max; + mCount = 0; + mArray = new T*[mMax]; + for (int i = 0; i < mMax; i++) { + mArray[i] = nullptr; + } + } + + virtual void contains(T*); // _08 + virtual void indexOf(T*); // _0C + virtual void indexOf(T*, int); // _10 + virtual void set(int, T*); // _14 + virtual void add(T*); // _18 + virtual void removeAll(); // _1C + virtual void remove(int, int); // _20 + virtual void remove(T*); // _24 + virtual void remove(int); // _28 + virtual void add(int, T*); // _2C + virtual void insert(int, T*); // _30 + virtual void get(int); // _34 + virtual void firstElement(); // _38 + virtual void lastElement(); // _3C + + // _00 = VTBL + int mMax; // _04, max size of array + int mCount; // _08, current size of array + T** mArray; // _0C +}; + +#endif diff --git a/include/nlib/Function.h b/include/nlib/Function.h new file mode 100644 index 00000000..6fbc04c3 --- /dev/null +++ b/include/nlib/Function.h @@ -0,0 +1,92 @@ +#ifndef _NLIB_FUNCTION_H +#define _NLIB_FUNCTION_H + +#include "types.h" + +struct NVector3f; + +/** + * @brief TODO + */ +struct NFunction { + virtual f32 getValue(f32) = 0; // _08 + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NPolynomialFunction : public NFunction { + NPolynomialFunction(f32*, int); // unused/inlined + NPolynomialFunction(f32*, NPolynomialFunction&); // unused/inlined + + virtual f32 getValue(f32); // _08 + virtual void println(); // _0C + + void construct(f32*, int); + + // unused/inlined: + void construct(f32*, NPolynomialFunction&); + void mul2(NPolynomialFunction&, NPolynomialFunction&); + void getCoefficient(int); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NLinearFunction : public NPolynomialFunction { + NLinearFunction(f32*); // unused/inlined + + // unused/inlined: + void construct(f32*); + void makeLinearFunction(f32, f32, f32, f32); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NClampLinearFunction : public NLinearFunction { + NClampLinearFunction(f32*); + + virtual f32 getValue(f32); // _08 + virtual void println(); // _0C + + void construct(f32*); + void makeClampLinearFunction(f32, f32, f32, f32); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NVibrationFunction : public NFunction { + NVibrationFunction(); + + virtual f32 getValue(f32); // _08 + + void makeVibrationFunction(f32, f32, f32); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NFunction3D { + NFunction3D(); // unused/inlined + + void outputPosition(f32, NVector3f&); + + // unused/inlined: + void construct(NFunction*, NFunction*, NFunction*); + + // TODO: members +}; + +#endif diff --git a/include/nlib/Geometry.h b/include/nlib/Geometry.h new file mode 100644 index 00000000..c8820950 --- /dev/null +++ b/include/nlib/Geometry.h @@ -0,0 +1,364 @@ +#ifndef _NLIB_GEOMETRY_H +#define _NLIB_GEOMETRY_H + +#include "types.h" +#include "Dolphin/mtx.h" +#include "Vector.h" + +struct Matrix4f; +struct Stream; +struct NTransform3D; + +/** + * @brief TODO + */ +struct NVector { + NVector(); + NVector(f32*, int); // unused/inlined + + void construct(f32*, int); + void makeZero(); + + // unused/inlined: + void add(NVector&); + void dot(NVector&); + void input(NVector&); + void println(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NVector3f : public Vector3f { + NVector3f(); + NVector3f(Vector3f&); + NVector3f(f32, f32, f32); + NVector3f(Vector3f&, Vector3f&); + + void construct(Vector3f&); + void construct(f32, f32, f32); + void construct(Vector3f&, Vector3f&); + void isParallel(Vector3f&); + void println(); + void normalizeCheck(); + void normalize(); + + // unused/inlined: + void printVector3f(Vector3f&); + void printlnVector3f(Vector3f&); + void interpolate(Vector3f&, Vector3f&, f32); + void isZero(); + void equals(Vector3f&); + void isVertical(Vector3f&); + void makeUnitVector(Vector3f&, Vector3f&); + void outputQuat(f32, Quat&); + void calcAngle(NVector3f&); + void calcLargerAngle(NVector3f&); + void print(); + void normalizeByLength(f32); + + inline void setNVec(NVector3f& other) + { + x = other.x; + y = other.y; + z = other.z; + } + + // _00-_0C = Vector3f +}; + +/** + * @brief TODO + */ +struct NVector3fIO { + virtual void input(NVector3f&) = 0; // _08 + virtual void output(NVector3f&) = 0; // _0C + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NVector3fIOClass : public NVector3fIO { + virtual void input(NVector3f&); // _08 + virtual void output(NVector3f&); // _0C + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NMatrix4f { + NMatrix4f(); + NMatrix4f(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32); + NMatrix4f(Matrix4f&); // unused/inlined + NMatrix4f(Mtx); // unused/inlined + + void construct(Matrix4f&); + void input(Matrix4f&); + void set(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32); + void outputCol(int, Vector3f&); + void makeIdentRow(int); + + // unused/inlined: + void construct(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32); + void construct(Mtx); + void input(Mtx); + void output(Mtx); + void setRow(int, f32, f32, f32); + void inputRow(int, Vector3f&); + void inputRow(int, Vector3f&, f32); + void outputRow(int, Vector3f&); + void inputRows(NVector3f&, NVector3f&, NVector3f&); + void setCol(int, f32, f32, f32); + void inputCol(int, Vector3f&); + void inputCol(int, Vector3f&, f32); + void inputCols(NVector3f&, NVector3f&, NVector3f&); + void mul(Matrix4f&); + void mul2(Matrix4f&, Matrix4f&); + void scale(f32); + void transpose(); + void println(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NSpecialMatrix { + NSpecialMatrix(int); // unused/inlined + + virtual void setDimension(int); // _08 + + // unused/inlined: + void construct(int); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NUpperMatrix : public NSpecialMatrix { + NUpperMatrix(f32*, f32*, int); // unused/inlined + + // unused/inlined: + void construct(f32*, f32*, int); + void solve(NVector&, NVector&); + void println(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NLowerMatrix : public NSpecialMatrix { + NLowerMatrix(f32*, int); + + // unused/inlined: + void construct(f32*, int); + void solve(NVector&, NVector&); + void println(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct LUMatrix : public NSpecialMatrix { + LUMatrix(f32*, f32*, f32*, int); // unused/inlined + + virtual void setDimension(int); // _08 + + // unused/inlined: + void construct(f32*, f32*, f32*, int); + void solve(NVector&, NVector&); + void decompose(); + void println(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NOrientation { + NOrientation(Vector3f&); + NOrientation(); // unused/inlined + NOrientation(Vector3f&, Vector3f&); // unused/inlined + + void construct(Vector3f&); + void normalize(); + void outputLeft(NVector3f&); + void makeUp(); + + // unused/inlined: + void construct(Vector3f&, Vector3f&); + void transform(NTransform3D&); + void outputRight(NVector3f&); + void outputTransform(NTransform3D&); + void inputTransform(NTransform3D&); + void outputRotation(NTransform3D&); + void inputRotation(NTransform3D&); + void println(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NPolar3f { + NPolar3f(); + NPolar3f(Vector3f&); + NPolar3f(f32, f32, f32); // unused/inlined + NPolar3f(NPolar3f&); // unused/inlined + + void construct(Vector3f&); + void set(f32, f32, f32); + void input(Vector3f&); + void output(Vector3f&); + + // unused/inlined: + void construct(f32, f32, f32); + void construct(NPolar3f&); + void input(NPolar3f&); + void negate(); + void interpolate(NPolar3f&, NPolar3f&, f32); + void roundMeridian(); + void clampMeridian(f32); + void println(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NAxisAngle4f { + NAxisAngle4f(); // unused/inlined + NAxisAngle4f(NVector3f&, f32); + + void construct(NVector3f&, f32); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NPosture2D { + NPosture2D(); // unused/inlined + NPosture2D(Vector3f&, f32); // unused/inlined + + virtual void readData(Stream&); // _08 + + // unused/inlined: + void construct(Vector3f&, f32); + void outputTransform(NTransform3D&); + void outputInverseTransform(NTransform3D&); + void outputAxisAngle(NAxisAngle4f&); + void println(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NPosture3D { + NPosture3D(); + NPosture3D(Vector3f&, Vector3f&); + NPosture3D(NPosture3D&); // unused/inlined + + virtual void readData(Stream&); // _08 + + void construct(Vector3f&, Vector3f&); + void normalize(); + void outputRelative(NVector3f&); + void translate(Vector3f&); + + // unused/inlined: + void construct(NPosture3D&); + void outputUnitVector(NVector3f&); + void transform(NTransform3D&); + void rotate(NVector3f&, NPolar3f&); + void rotatePoint(NVector3f&, NVector3f&, NPolar3f&); + void interpolate(NPosture3D&, NPosture3D&, f32); + void input(NPosture2D&); + void output(NPosture2D&); + void outputTransform(NPosture3D&, NTransform3D&); + void outputTransform(NTransform3D&); + void outputInverseTransform(NTransform3D&); + void inputTransform(NTransform3D&); + void calcDirection(); + void println(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NPosture3DIO { + virtual void input(NPosture3D&) = 0; // _08 + virtual void output(NPosture3D&) = 0; // _0C + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NTransform3D { + NTransform3D(); + NTransform3D(NMatrix4f&); // unused/inlined + + void rotate(Vector3f&); + void transform(Vector3f&); + void inputAxisAngle(NAxisAngle4f&); + void outputRotation(Matrix4f&); + + // unused/inlined: + void construct(NMatrix4f&); + void translate(Vector3f&); + void transform(Vector3f&, Vector3f&); + void transform(NVector&); + void transform(NVector&, NVector&); + void inputVector(Vector3f&); + void inputTranslation(Vector3f&); + void outputTranslation(Vector3f&); + void inputRotation(Matrix4f&); + void inputRotation(NAxisAngle4f&); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NAlpha { + NAlpha(); // unused/inlined + + virtual void readData(Stream&); // _08 + + void reset(); + f32 getValue(f32); + + // unused/inlined: + void fadeInValue(f32); + void fadeOutValue(f32); + void fadeInOutValue(f32); + void fadeOutInValue(f32); + + // TODO: members +}; + +#endif diff --git a/include/nlib/Geometry3D.h b/include/nlib/Geometry3D.h new file mode 100644 index 00000000..45ab6310 --- /dev/null +++ b/include/nlib/Geometry3D.h @@ -0,0 +1,100 @@ +#ifndef _NLIB_GEOMETRY3D_H +#define _NLIB_GEOMETRY3D_H + +#include "types.h" +#include "nlib/Geometry.h" + +struct NSegment; +struct Plane; + +/** + * @brief TODO + */ +struct NLine { + NLine(NVector3f&, NVector3f&); + NLine(); // unused/inlined + NLine(NLine&); // unused/inlined + + virtual void transform(NTransform3D&); // _08 + virtual void println(); // _0C + + void construct(NVector3f&, NVector3f&); + void calcDistance(NVector3f&, f32*); + void calcVerticalProjection(NVector3f&); + void outputPosition(f32, NVector3f&); + + // unused/inlined: + void construct(NLine&); + void calcDistance(NLine&, f32*, f32*); + void outputVerticalPosition(NVector3f&, NVector3f&); + void outputPositionY(f32, NVector3f&); + + // _00 = VTBL + NVector3f mStart; // _04 + NVector3f mDirection; // _10 +}; + +/** + * @brief TODO + */ +struct NPlane { + NPlane(NVector3f& normal, NVector3f& point); + NPlane(); // unused/inlined + NPlane(NVector3f&, f32); // unused/inlined + NPlane(NVector3f&, NVector3f&, NVector3f&); // unused/inlined + NPlane(Plane&); // unused/inlined + NPlane(NPlane&); // unused/inlined + + virtual void transform(NTransform3D&); // _08 + virtual void println(); // _0C + + void construct(NVector3f& normal, NVector3f& point); + void outputVerticalPosition(NVector3f&, NVector3f&); + + // unused/inlined: + void construct(NVector3f&, f32); + void construct(NVector3f&, NVector3f&, NVector3f&); + void construct(Plane&); + void construct(NPlane&); + void intersects(NLine&, f32*); + void outputIntersection(NLine&, NVector3f&); + void intersectsRay(NLine&, f32*); + void outputRayIntersection(NLine&, NVector3f&); + void intersectsSegment(NSegment&, f32*); + void outputSegmentIntersection(NSegment&, NVector3f&); + void outputPosition(NVector3f&); + void negate(); + void adjustTo(NVector3f&, f32); + void adjust(NVector3f&); + void outputIntersectionLineY(NPlane&, NLine&); + void calcAngle(NPlane&); + void calcY(f32, f32); + + // _00 = VTBL + NVector3f mNormal; // _04 + f32 mOffset; // _10 +}; + +/** + * @brief TODO + */ +struct NSegment { + NSegment(); // unused/inlined + NSegment(NVector3f&, NVector3f&); // unused/inlined + NSegment(NSegment&); // unused/inlined + + // unused/inlined: + void construct(NVector3f&, NVector3f&); + void construct(NSegment&); + void calcDistanceAsSegment(NVector3f&, f32*, f32*); + void calcDistanceAsSegment(NLine&, f32*, f32*); + void calcSegmentDistanceAsSegment(NSegment&, f32*, f32*); + void transform(NTransform3D&); + void translate(NVector3f&); + void makeProjectionY(); + void println(); + + // TODO: members +}; + +#endif diff --git a/include/nlib/Graphics.h b/include/nlib/Graphics.h new file mode 100644 index 00000000..09b54ef8 --- /dev/null +++ b/include/nlib/Graphics.h @@ -0,0 +1,20 @@ +#ifndef _NLIB_GRAPHICS_H +#define _NLIB_GRAPHICS_H + +#include "types.h" + +struct Camera; + +/** + * @brief TODO + */ +struct NCamera { + NCamera(Camera*); + + void makeMatrix(); + void makeCamera(); + + // TODO: members +}; + +#endif diff --git a/include/NakataMath.h b/include/nlib/Math.h similarity index 71% rename from include/NakataMath.h rename to include/nlib/Math.h index d06640da..cb249ea5 100644 --- a/include/NakataMath.h +++ b/include/nlib/Math.h @@ -1,7 +1,9 @@ -#ifndef _NAKATAMATH_H -#define _NAKATAMATH_H +#ifndef _NLIB_MATH_H +#define _NLIB_MATH_H #include "types.h" +#include "Dolphin/mtx.h" + namespace NMathF { f32 cos(f32) { @@ -33,6 +35,15 @@ f32 sin(f32) } f32 atan2(f32, f32); f32 remainder(f32, f32); + +// unused/inlined: +f32 roundAngle(f32); } // namespace NMathF +template +struct NMath { + void copyArray44(Mtx44, Mtx44); + void absolute(f32); +}; + #endif diff --git a/include/nlib/Node.h b/include/nlib/Node.h new file mode 100644 index 00000000..02f5da37 --- /dev/null +++ b/include/nlib/Node.h @@ -0,0 +1,55 @@ +#ifndef _NLIB_NODE_H +#define _NLIB_NODE_H + +#include "types.h" +#include "nlib/Array.h" + +/** + * @brief TODO + */ +struct NNode { + NNode(int); + + virtual void setChild(int, NNode*); // _08 + virtual void addChild(NNode*); // _0C + virtual void addChild(int, NNode*); // _10 + virtual void removeChild(NNode*); // _14 + virtual void removeChild(int); // _18 + virtual void removeAllChildren(); // _1C + + void getChild(int); + + // _00 = VTBL + NArray* mNodeArray; // _04 +}; + +/** + * @brief TODO + */ +struct NListNode { + NListNode(); // unused/inlined + + // unused/inlined: + void addChild(NListNode*); + void removeChild(NListNode*); + void getChildCount(); + void addChild(int, NListNode*); + void toString(); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct NList { + NList(); // unused/inlined + + // unused/inlined: + void addList(NList*); + void toString(); + + // TODO: members +}; + +#endif diff --git a/include/nlib/Spline.h b/include/nlib/Spline.h new file mode 100644 index 00000000..125cdd2f --- /dev/null +++ b/include/nlib/Spline.h @@ -0,0 +1,90 @@ +#ifndef _NLIB_SPLINE_H +#define _NLIB_SPLINE_H + +#include "types.h" + +struct NPolynomialFunction; +struct NPosture3D; +struct NTransform3D; +struct NVector3f; +struct Stream; + +/** + * @brief TODO + */ +template +struct NPool { + + void newObject(); + void deleteObject(T*); + void deleteObject(int); + void indexOf(T*); + void indexOf(T*, int); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct SplineSegment { + SplineSegment(); + + // unused/inlined: + void calcDistance(NVector3f&, f32*); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct SplineCurve { + SplineCurve(int); + + // unused/inlined: + void makeCurve(f32*, NVector3f**, int); + void makeFunctions(int, f32*, f32*, NPolynomialFunction**); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct SplineKeyFrame { + SplineKeyFrame(); // unused/inlined + + // unused/inlined: + void transform(NTransform3D&); + void inputPosture(NPosture3D&); + void outputPosture(NPosture3D&); + void interpolate(SplineKeyFrame&, f32, NPosture3D&); + void readData(Stream&, int); + + // TODO: members +}; + +/** + * @brief TODO + */ +struct SplineInterpolator { + SplineInterpolator(int, NPool*); // unused/inlined + + void reset(); + void interpolateNext(f32, NPosture3D&); + void outputPosture(f32, NPosture3D&); + void searchSegmentIndex(f32, int); + + // unused/inlined: + void makeSpline(); + void interpolate(f32, NPosture3D&, bool); + void interpolateDirect(f32, NPosture3D&); + void addFrame(SplineKeyFrame*); + void addSegment(); + void removeAllFrames(); + + // TODO: members +}; + +#endif diff --git a/include/nlib/System.h b/include/nlib/System.h new file mode 100644 index 00000000..a2dfa269 --- /dev/null +++ b/include/nlib/System.h @@ -0,0 +1,28 @@ +#ifndef _NLIB_SYSTEM_H +#define _NLIB_SYSTEM_H + +#include "types.h" + +struct System; + +/** + * @brief TODO + */ +struct NHeap { + NHeap(int); // unused/inlined + + virtual void release(); // _08 + virtual void addHeap(NHeap*); // _0C + + // TODO: members +}; + +namespace NSystem { +void initSystem(System*); +void randomInt(int); +void getFreeHeap(); + +extern System* system; +}; // namespace NSystem + +#endif diff --git a/src/plugPikiKando/uteffect.cpp b/src/plugPikiKando/uteffect.cpp index 7f0a6d4b..4c129ef0 100644 --- a/src/plugPikiKando/uteffect.cpp +++ b/src/plugPikiKando/uteffect.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "UtEffect.h" /* * --INFO-- @@ -153,7 +153,7 @@ void SlimeEffect::emit(EffectParm&) * Address: 80113294 * Size: 00009C */ -void SlimeEffect::invoke(zen::particleGenerator*, zen::particleMdl*) +bool SlimeEffect::invoke(zen::particleGenerator*, zen::particleMdl*) { /* .loc_0x0: @@ -2107,7 +2107,7 @@ void BurnEffect::kill() * Address: 80114AA4 * Size: 000008 */ -u32 BurnEffect::invoke(zen::particleGenerator*) { return 0x1; } +bool BurnEffect::invoke(zen::particleGenerator*) { return true; } /* * --INFO-- @@ -2421,7 +2421,7 @@ void WhistleTemplate::kill() * Address: 80114E28 * Size: 00034C */ -void WhistleTemplate::invoke(zen::particleGenerator*, zen::particleMdl*) +bool WhistleTemplate::invoke(zen::particleGenerator*, zen::particleMdl*) { /* .loc_0x0: @@ -2881,7 +2881,7 @@ void SimpleEffect::kill() * Address: 801153C0 * Size: 000008 */ -u32 NaviFue::invoke(zen::particleGenerator*) { return 0x1; } +bool NaviFue::invoke(zen::particleGenerator*) { return true; } /* * --INFO-- @@ -3261,7 +3261,7 @@ void NaviWhistle::kill() * Address: 8011579C * Size: 000364 */ -void NaviWhistle::invoke(zen::particleGenerator*, zen::particleMdl*) +bool NaviWhistle::invoke(zen::particleGenerator*, zen::particleMdl*) { /* .loc_0x0: @@ -3516,7 +3516,7 @@ void NaviWhistle::invoke(zen::particleGenerator*, zen::particleMdl*) * Address: 80115B00 * Size: 000038 */ -void GoalEffect::invoke(zen::particleGenerator*) +bool GoalEffect::invoke(zen::particleGenerator*) { /* .loc_0x0: @@ -3567,45 +3567,3 @@ void GoalEffect::emit(EffectParm&) blr */ } - -/* - * --INFO-- - * Address: 80115B74 - * Size: 000008 - */ -void SlimeEffect::@4 @invoke(zen::particleGenerator*, zen::particleMdl*) -{ - /* - .loc_0x0: - subi r3, r3, 0x4 - b -0x28E4 - */ -} - -/* - * --INFO-- - * Address: 80115B7C - * Size: 000008 - */ -void NaviWhistle::@4 @invoke(zen::particleGenerator*, zen::particleMdl*) -{ - /* - .loc_0x0: - subi r3, r3, 0x4 - b -0x3E4 - */ -} - -/* - * --INFO-- - * Address: 80115B84 - * Size: 000008 - */ -void WhistleTemplate::@4 @invoke(zen::particleGenerator*, zen::particleMdl*) -{ - /* - .loc_0x0: - subi r3, r3, 0x4 - b -0xD60 - */ -} diff --git a/src/plugPikiNakata/nakatacode.cpp b/src/plugPikiNakata/nakatacode.cpp index 2a6008a2..20ccb25c 100644 --- a/src/plugPikiNakata/nakatacode.cpp +++ b/src/plugPikiNakata/nakatacode.cpp @@ -1,5 +1,5 @@ #include "CodeInitializer.h" -#include "NLibSystem.h" +#include "nlib/System.h" #include "PaniAnimator.h" #include "system.h" #include "Teki.h" diff --git a/src/plugPikiNakata/nlibfunction.cpp b/src/plugPikiNakata/nlibfunction.cpp index d3060241..faef1c01 100644 --- a/src/plugPikiNakata/nlibfunction.cpp +++ b/src/plugPikiNakata/nlibfunction.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "nlib/Function.h" /* * --INFO-- @@ -87,7 +87,7 @@ void NPolynomialFunction::mul2(NPolynomialFunction&, NPolynomialFunction&) * Address: 8011B70C * Size: 000114 */ -void NPolynomialFunction::getValue(f32) +f32 NPolynomialFunction::getValue(f32) { /* .loc_0x0: @@ -228,7 +228,8 @@ void NPolynomialFunction::println() * Address: ........ * Size: 000070 */ -NLinearFunction::NLinearFunction(f32*) +NLinearFunction::NLinearFunction(f32* p1) + : NPolynomialFunction(p1, 1) { // UNUSED FUNCTION } @@ -258,7 +259,8 @@ void NLinearFunction::makeLinearFunction(f32, f32, f32, f32) * Address: 8011B878 * Size: 00007C */ -NClampLinearFunction::NClampLinearFunction(f32*) +NClampLinearFunction::NClampLinearFunction(f32* p1) + : NLinearFunction(p1) { /* .loc_0x0: @@ -389,7 +391,7 @@ void NClampLinearFunction::makeClampLinearFunction(f32, f32, f32, f32) * Address: 8011B9AC * Size: 000134 */ -void NClampLinearFunction::getValue(f32) +f32 NClampLinearFunction::getValue(f32) { /* .loc_0x0: @@ -577,7 +579,7 @@ void NVibrationFunction::makeVibrationFunction(f32, f32, f32) * Address: 8011BB94 * Size: 000044 */ -void NVibrationFunction::getValue(f32) +f32 NVibrationFunction::getValue(f32) { /* .loc_0x0: diff --git a/src/plugPikiNakata/nlibgeometry.cpp b/src/plugPikiNakata/nlibgeometry.cpp index 03cb4dd1..ce9342a8 100644 --- a/src/plugPikiNakata/nlibgeometry.cpp +++ b/src/plugPikiNakata/nlibgeometry.cpp @@ -1,4 +1,6 @@ -#include "types.h" +#include "nlib/Geometry.h" +#include "nlib/Math.h" +#include "Vector.h" /* * --INFO-- @@ -215,7 +217,7 @@ void NMatrix4f::construct(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, * Address: ........ * Size: 000030 */ -NMatrix4f::NMatrix4f(f32 (*)[4]) +NMatrix4f::NMatrix4f(Mtx) { // UNUSED FUNCTION } @@ -225,7 +227,7 @@ NMatrix4f::NMatrix4f(f32 (*)[4]) * Address: ........ * Size: 000020 */ -void NMatrix4f::construct(f32 (*)[4]) +void NMatrix4f::construct(Mtx) { // UNUSED FUNCTION } @@ -235,7 +237,7 @@ void NMatrix4f::construct(f32 (*)[4]) * Address: ........ * Size: 000090 */ -void NMatrix4f::input(f32 (*)[4]) +void NMatrix4f::input(Mtx) { // UNUSED FUNCTION } @@ -245,7 +247,7 @@ void NMatrix4f::input(f32 (*)[4]) * Address: ........ * Size: 000090 */ -void NMatrix4f::output(f32 (*)[4]) +void NMatrix4f::output(Mtx) { // UNUSED FUNCTION } @@ -1244,7 +1246,7 @@ void NPolar3f::negate() * Address: ........ * Size: 000034 */ -void NMathF::roundAngle(f32) +f32 NMathF::roundAngle(f32) { // UNUSED FUNCTION } @@ -1898,7 +1900,8 @@ void NSpecialMatrix::construct(int) * Address: ........ * Size: 00004C */ -NLowerMatrix::NLowerMatrix(f32*, int) +NLowerMatrix::NLowerMatrix(f32* p1, int p2) + : NSpecialMatrix(p2) { // UNUSED FUNCTION } @@ -1938,7 +1941,8 @@ void NLowerMatrix::println() * Address: ........ * Size: 00004C */ -NUpperMatrix::NUpperMatrix(f32*, f32*, int) +NUpperMatrix::NUpperMatrix(f32* p1, f32* p2, int p3) + : NSpecialMatrix(p3) { // UNUSED FUNCTION } @@ -1978,7 +1982,8 @@ void NUpperMatrix::println() * Address: ........ * Size: 00006C */ -LUMatrix::LUMatrix(f32*, f32*, f32*, int) +LUMatrix::LUMatrix(f32*, f32*, f32*, int p4) + : NSpecialMatrix(p4) { // UNUSED FUNCTION } @@ -2038,7 +2043,7 @@ void LUMatrix::setDimension(int) void NSpecialMatrix::setDimension(int a1) { // Generated from stw r4, 0x4(r3) - _04 = a1; + // _04 = a1; } /* @@ -3210,7 +3215,7 @@ void NAlpha::reset() * Address: 8011D1E8 * Size: 000198 */ -void NAlpha::getValue(f32) +f32 NAlpha::getValue(f32) { /* .loc_0x0: diff --git a/src/plugPikiNakata/nlibgeometry3d.cpp b/src/plugPikiNakata/nlibgeometry3d.cpp index 1c183f82..6e924a42 100644 --- a/src/plugPikiNakata/nlibgeometry3d.cpp +++ b/src/plugPikiNakata/nlibgeometry3d.cpp @@ -1,5 +1,4 @@ -#include "types.h" -#include "NLine.h" +#include "nlib/Geometry3D.h" /* * --INFO-- @@ -36,66 +35,17 @@ NLine::NLine() * Address: 8011D3FC * Size: 000070 */ -NLine::NLine(NVector3f&, NVector3f&) -{ - /* - .loc_0x0: - mflr r0 - lis r6, 0x802C - stw r0, 0x4(r1) - addi r0, r6, 0x4368 - stwu r1, -0x28(r1) - stw r31, 0x24(r1) - addi r31, r5, 0 - stw r30, 0x20(r1) - addi r30, r4, 0 - stw r29, 0x1C(r1) - addi r29, r3, 0 - stw r0, 0x0(r3) - addi r3, r29, 0x4 - bl -0x5DC - addi r3, r29, 0x10 - bl -0x5E4 - addi r3, r29, 0 - addi r4, r30, 0 - addi r5, r31, 0 - bl .loc_0x70 - mr r3, r29 - lwz r0, 0x2C(r1) - lwz r31, 0x24(r1) - lwz r30, 0x20(r1) - lwz r29, 0x1C(r1) - addi r1, r1, 0x28 - mtlr r0 - blr - - .loc_0x70: - */ -} +NLine::NLine(NVector3f& start, NVector3f& dir) { construct(start, dir); } /* * --INFO-- * Address: 8011D46C * Size: 000034 */ -void NLine::construct(NVector3f&, NVector3f&) +void NLine::construct(NVector3f& start, NVector3f& dir) { - /* - .loc_0x0: - lfs f0, 0x0(r4) - stfs f0, 0x4(r3) - lfs f0, 0x4(r4) - stfs f0, 0x8(r3) - lfs f0, 0x8(r4) - stfs f0, 0xC(r3) - lfs f0, 0x0(r5) - stfs f0, 0x10(r3) - lfs f0, 0x4(r5) - stfs f0, 0x14(r3) - lfs f0, 0x8(r5) - stfs f0, 0x18(r3) - blr - */ + mStart.setNVec(start); + mDirection.setNVec(dir); } /* @@ -244,8 +194,14 @@ void NLine::calcVerticalProjection(NVector3f&) * Address: 8011D5C4 * Size: 00009C */ -void NLine::outputPosition(f32, NVector3f&) +void NLine::outputPosition(f32 t, NVector3f& outPos) { + NVector3f pos; + pos.x = t * mDirection.x; + pos.y = t * mDirection.y; + pos.z = t * mDirection.z; + + outPos.set(mStart.x + pos.x, mStart.y + pos.y, mStart.z + pos.z); /* .loc_0x0: mflr r0 @@ -338,23 +294,8 @@ void NLine::transform(NTransform3D&) */ void NLine::println() { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - addi r31, r3, 0 - addi r3, r31, 0x4 - bl -0x6B0 - addi r3, r31, 0x10 - bl -0x6B8 - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - */ + mStart.println(); + mDirection.println(); } /* @@ -392,71 +333,17 @@ void NPlane::construct(NVector3f&, f32) * Address: 8011D6E4 * Size: 000068 */ -NPlane::NPlane(NVector3f&, NVector3f&) -{ - /* - .loc_0x0: - mflr r0 - lis r6, 0x802C - stw r0, 0x4(r1) - addi r0, r6, 0x4358 - stwu r1, -0x28(r1) - stw r31, 0x24(r1) - addi r31, r5, 0 - stw r30, 0x20(r1) - addi r30, r4, 0 - stw r29, 0x1C(r1) - addi r29, r3, 0 - stw r0, 0x0(r3) - addi r3, r29, 0x4 - bl -0x8C4 - addi r3, r29, 0 - addi r4, r30, 0 - addi r5, r31, 0 - bl .loc_0x68 - mr r3, r29 - lwz r0, 0x2C(r1) - lwz r31, 0x24(r1) - lwz r30, 0x20(r1) - lwz r29, 0x1C(r1) - addi r1, r1, 0x28 - mtlr r0 - blr - - .loc_0x68: - */ -} +NPlane::NPlane(NVector3f& normal, NVector3f& point) { construct(normal, point); } /* * --INFO-- * Address: 8011D74C * Size: 000050 */ -void NPlane::construct(NVector3f&, NVector3f&) +void NPlane::construct(NVector3f& normal, NVector3f& point) { - /* - .loc_0x0: - lfs f0, 0x0(r4) - stfs f0, 0x4(r3) - lfs f0, 0x4(r4) - stfs f0, 0x8(r3) - lfs f0, 0x8(r4) - stfs f0, 0xC(r3) - lfs f3, 0x4(r3) - lfs f2, 0x0(r5) - lfs f1, 0x8(r3) - lfs f0, 0x4(r5) - fmuls f2, f3, f2 - lfs f3, 0xC(r3) - fmuls f0, f1, f0 - lfs f1, 0x8(r5) - fmuls f1, f3, f1 - fadds f0, f2, f0 - fadds f0, f1, f0 - fneg f0, f0 - stfs f0, 0x10(r3) - blr - */ + mNormal.setNVec(normal); + mOffset = -(mNormal.x * point.x + mNormal.y * point.y + mNormal.z * point.z); } /* @@ -781,21 +668,7 @@ void NPlane::transform(NTransform3D&) * Address: 8011D938 * Size: 000024 */ -void NPlane::println() -{ - /* - .loc_0x0: - mflr r0 - addi r3, r3, 0x4 - stw r0, 0x4(r1) - stwu r1, -0x8(r1) - bl -0x934 - lwz r0, 0xC(r1) - addi r1, r1, 0x8 - mtlr r0 - blr - */ -} +void NPlane::println() { mNormal.println(); } /* * --INFO-- diff --git a/src/plugPikiNakata/nlibgraphics.cpp b/src/plugPikiNakata/nlibgraphics.cpp index 007a0b9d..1e661e7d 100644 --- a/src/plugPikiNakata/nlibgraphics.cpp +++ b/src/plugPikiNakata/nlibgraphics.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "nlib/Graphics.h" /* * --INFO-- diff --git a/src/plugPikiNakata/nlibmath.cpp b/src/plugPikiNakata/nlibmath.cpp index e6c76b22..b7792847 100644 --- a/src/plugPikiNakata/nlibmath.cpp +++ b/src/plugPikiNakata/nlibmath.cpp @@ -1,5 +1,5 @@ #include "types.h" -#include "NakataMath.h" +#include "nlib/Math.h" /* * --INFO-- diff --git a/src/plugPikiNakata/nlibspline.cpp b/src/plugPikiNakata/nlibspline.cpp index c3be5e72..2d8ab6cc 100644 --- a/src/plugPikiNakata/nlibspline.cpp +++ b/src/plugPikiNakata/nlibspline.cpp @@ -1,4 +1,5 @@ -#include "types.h" +#include "nlib/Spline.h" +#include "nlib/Array.h" /* * --INFO-- @@ -38,7 +39,7 @@ SplineInterpolator::SplineInterpolator(int, NPool*) void SplineInterpolator::reset() { // Generated from stb r0, 0x10(r3) - _10 = 0; + // _10 = 0; } /* diff --git a/src/plugPikiNakata/nlibsystem.cpp b/src/plugPikiNakata/nlibsystem.cpp index d42afbdf..332422ae 100644 --- a/src/plugPikiNakata/nlibsystem.cpp +++ b/src/plugPikiNakata/nlibsystem.cpp @@ -1,14 +1,16 @@ -#include "types.h" +#include "nlib/System.h" +#include "nlib/Node.h" +#include "sysNew.h" +#include "Dolphin/os.h" + +System* NSystem::system; /* * --INFO-- * Address: ........ * Size: 00009C */ -static void _Error(char*, ...) -{ - // UNUSED FUNCTION -} +static void _Error(char* fmt, ...) { OSPanic(__FILE__, __LINE__, fmt, "nlibsystem"); } /* * --INFO-- @@ -25,72 +27,13 @@ static void _Print(char*, ...) * Address: 8011E0F8 * Size: 0000CC */ -NNode::NNode(int) +NNode::NNode(int size) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x28(r1) - stw r31, 0x24(r1) - stw r30, 0x20(r1) - stw r29, 0x1C(r1) - mr. r29, r4 - lis r4, 0x802C - stw r28, 0x18(r1) - addi r0, r4, 0x4C14 - addi r28, r3, 0 - stw r0, 0x0(r3) - ble- .loc_0xA0 - li r3, 0x10 - bl -0xD712C - addi r30, r3, 0 - mr. r0, r30 - beq- .loc_0x98 - lis r3, 0x802C - addi r0, r3, 0x4C44 - stw r0, 0x0(r30) - li r31, 0 - stw r29, 0x4(r30) - stw r31, 0x8(r30) - lwz r0, 0x4(r30) - rlwinm r3,r0,2,0,29 - bl -0xD715C - stw r3, 0xC(r30) - addi r4, r31, 0 - addi r5, r31, 0 - b .loc_0x8C - - .loc_0x7C: - lwz r3, 0xC(r30) - addi r4, r4, 0x1 - stwx r31, r3, r5 - addi r5, r5, 0x4 - - .loc_0x8C: - lwz r0, 0x4(r30) - cmpw r4, r0 - blt+ .loc_0x7C - - .loc_0x98: - stw r30, 0x4(r28) - b .loc_0xA8 - - .loc_0xA0: - li r0, 0 - stw r0, 0x4(r28) - - .loc_0xA8: - mr r3, r28 - lwz r0, 0x2C(r1) - lwz r31, 0x24(r1) - lwz r30, 0x20(r1) - lwz r29, 0x1C(r1) - lwz r28, 0x18(r1) - addi r1, r1, 0x28 - mtlr r0 - blr - */ + if (size > 0) { + mNodeArray = new NArray(size); + } else { + mNodeArray = nullptr; + } } /* @@ -98,27 +41,11 @@ NNode::NNode(int) * Address: 8011E1C4 * Size: 000038 */ -void NNode::setChild(int, NNode*) +void NNode::setChild(int idx, NNode* child) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x8(r1) - lwz r3, 0x4(r3) - cmplwi r3, 0 - beq- .loc_0x28 - lwz r12, 0x0(r3) - lwz r12, 0x14(r12) - mtlr r12 - blrl - - .loc_0x28: - lwz r0, 0xC(r1) - addi r1, r1, 0x8 - mtlr r0 - blr - */ + if (mNodeArray) { + mNodeArray->set(idx, child); + } } /* @@ -944,8 +871,9 @@ void NArray::get(int) * Address: 8011E89C * Size: 000008 */ -void NSystem::initSystem(System*) +void NSystem::initSystem(System* sys) { + system = sys; /* .loc_0x0: stw r3, 0x3150(r13) diff --git a/src/plugPikiNakata/paraparameters.cpp b/src/plugPikiNakata/paraparameters.cpp index 922468d8..e1f89fee 100644 --- a/src/plugPikiNakata/paraparameters.cpp +++ b/src/plugPikiNakata/paraparameters.cpp @@ -1,12 +1,16 @@ -#include "types.h" +#include "ParaParameters.h" +#include "Stream.h" +#include "Dolphin/os.h" +#include "PikiMacros.h" /* * --INFO-- * Address: ........ * Size: 00009C */ -static void _Error(char*, ...) +static void _Error(char* fmt, ...) { + OSPanic(__FILE__, __LINE__, fmt, "paraparameters"); // UNUSED FUNCTION } @@ -25,9 +29,9 @@ static void _Print(char*, ...) * Address: ........ * Size: 00009C */ -ParaParametersI::ParaParametersI(int, ParaParameterInfoI*) +ParaParametersI::ParaParametersI(int count, ParaParameterInfoI* info) + : ParaParameters(count, info) { - // UNUSED FUNCTION } /* @@ -35,47 +39,11 @@ ParaParametersI::ParaParametersI(int, ParaParameterInfoI*) * Address: 801215A4 * Size: 000080 */ -void ParaParametersI::read(Stream&) +void ParaParametersI::read(Stream& input) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x20(r1) - stw r31, 0x1C(r1) - li r31, 0 - stw r30, 0x18(r1) - li r30, 0 - stw r29, 0x14(r1) - addi r29, r4, 0 - stw r28, 0x10(r1) - addi r28, r3, 0 - b .loc_0x54 - - .loc_0x30: - mr r3, r29 - lwz r12, 0x4(r29) - lwz r12, 0x8(r12) - mtlr r12 - blrl - lwz r4, 0x0(r28) - addi r30, r30, 0x1 - stwx r3, r4, r31 - addi r31, r31, 0x4 - - .loc_0x54: - lwz r0, 0x4(r28) - cmpw r30, r0 - blt+ .loc_0x30 - lwz r0, 0x24(r1) - lwz r31, 0x1C(r1) - lwz r30, 0x18(r1) - lwz r29, 0x14(r1) - lwz r28, 0x10(r1) - addi r1, r1, 0x20 - mtlr r0 - blr - */ + for (int i = 0; i < mParaCount; i++) { + mParameters[i] = input.readInt(); + } } /* @@ -83,47 +51,11 @@ void ParaParametersI::read(Stream&) * Address: 80121624 * Size: 000080 */ -void ParaParametersI::write(Stream&) +void ParaParametersI::write(Stream& output) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x20(r1) - stw r31, 0x1C(r1) - stw r30, 0x18(r1) - li r30, 0 - rlwinm r31,r30,2,0,29 - stw r29, 0x14(r1) - addi r29, r4, 0 - stw r28, 0x10(r1) - addi r28, r3, 0 - b .loc_0x54 - - .loc_0x30: - mr r3, r29 - lwz r4, 0x0(r28) - lwz r12, 0x4(r29) - lwzx r4, r4, r31 - lwz r12, 0x24(r12) - mtlr r12 - blrl - addi r31, r31, 0x4 - addi r30, r30, 0x1 - - .loc_0x54: - lwz r0, 0x4(r28) - cmpw r30, r0 - blt+ .loc_0x30 - lwz r0, 0x24(r1) - lwz r31, 0x1C(r1) - lwz r30, 0x18(r1) - lwz r29, 0x14(r1) - lwz r28, 0x10(r1) - addi r1, r1, 0x20 - mtlr r0 - blr - */ + for (int i = 0; i < mParaCount; i++) { + output.writeInt(mParameters[i]); + } } /* @@ -133,37 +65,9 @@ void ParaParametersI::write(Stream&) */ void ParaParametersI::print() { - /* - .loc_0x0: - lwz r5, 0x4(r3) - li r6, 0 - cmpwi r5, 0 - blelr- - cmpwi r5, 0x8 - subi r4, r5, 0x8 - ble- .loc_0x38 - addi r0, r4, 0x7 - rlwinm r0,r0,29,3,31 - cmpwi r4, 0 - mtctr r0 - ble- .loc_0x38 - - .loc_0x30: - addi r6, r6, 0x8 - bdnz+ .loc_0x30 - - .loc_0x38: - sub r0, r5, r6 - cmpw r6, r5 - mtctr r0 - bgelr- - - .loc_0x48: - bdnz- .loc_0x48 - blr - b .loc_0x38 - blr - */ + for (int i = 0; i < mParaCount; i++) { + DEBUGPRINT(mParameters[i]); + } } /* @@ -171,9 +75,9 @@ void ParaParametersI::print() * Address: ........ * Size: 00009C */ -ParaParametersF::ParaParametersF(int, ParaParameterInfoF*) +ParaParametersF::ParaParametersF(int count, ParaParameterInfoF* info) + : ParaParameters(count, info) { - // UNUSED FUNCTION } /* @@ -181,47 +85,11 @@ ParaParametersF::ParaParametersF(int, ParaParameterInfoF*) * Address: 801216FC * Size: 000080 */ -void ParaParametersF::read(Stream&) +void ParaParametersF::read(Stream& input) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x20(r1) - stw r31, 0x1C(r1) - li r31, 0 - stw r30, 0x18(r1) - li r30, 0 - stw r29, 0x14(r1) - addi r29, r4, 0 - stw r28, 0x10(r1) - addi r28, r3, 0 - b .loc_0x54 - - .loc_0x30: - mr r3, r29 - lwz r12, 0x4(r29) - lwz r12, 0x14(r12) - mtlr r12 - blrl - lwz r3, 0x0(r28) - addi r30, r30, 0x1 - stfsx f1, r3, r31 - addi r31, r31, 0x4 - - .loc_0x54: - lwz r0, 0x4(r28) - cmpw r30, r0 - blt+ .loc_0x30 - lwz r0, 0x24(r1) - lwz r31, 0x1C(r1) - lwz r30, 0x18(r1) - lwz r29, 0x14(r1) - lwz r28, 0x10(r1) - addi r1, r1, 0x20 - mtlr r0 - blr - */ + for (int i = 0; i < mParaCount; i++) { + mParameters[i] = input.readFloat(); + } } /* @@ -229,47 +97,11 @@ void ParaParametersF::read(Stream&) * Address: 8012177C * Size: 000080 */ -void ParaParametersF::write(Stream&) +void ParaParametersF::write(Stream& output) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x20(r1) - stw r31, 0x1C(r1) - stw r30, 0x18(r1) - li r30, 0 - rlwinm r31,r30,2,0,29 - stw r29, 0x14(r1) - addi r29, r4, 0 - stw r28, 0x10(r1) - addi r28, r3, 0 - b .loc_0x54 - - .loc_0x30: - mr r3, r29 - lwz r4, 0x0(r28) - lwz r12, 0x4(r29) - lfsx f1, r4, r31 - lwz r12, 0x30(r12) - mtlr r12 - blrl - addi r31, r31, 0x4 - addi r30, r30, 0x1 - - .loc_0x54: - lwz r0, 0x4(r28) - cmpw r30, r0 - blt+ .loc_0x30 - lwz r0, 0x24(r1) - lwz r31, 0x1C(r1) - lwz r30, 0x18(r1) - lwz r29, 0x14(r1) - lwz r28, 0x10(r1) - addi r1, r1, 0x20 - mtlr r0 - blr - */ + for (int i = 0; i < mParaCount; i++) { + output.writeFloat(mParameters[i]); + } } /* @@ -279,37 +111,9 @@ void ParaParametersF::write(Stream&) */ void ParaParametersF::print() { - /* - .loc_0x0: - lwz r5, 0x4(r3) - li r6, 0 - cmpwi r5, 0 - blelr- - cmpwi r5, 0x8 - subi r4, r5, 0x8 - ble- .loc_0x38 - addi r0, r4, 0x7 - rlwinm r0,r0,29,3,31 - cmpwi r4, 0 - mtctr r0 - ble- .loc_0x38 - - .loc_0x30: - addi r6, r6, 0x8 - bdnz+ .loc_0x30 - - .loc_0x38: - sub r0, r5, r6 - cmpw r6, r5 - mtctr r0 - bgelr- - - .loc_0x48: - bdnz- .loc_0x48 - blr - b .loc_0x38 - blr - */ + for (int i = 0; i < mParaCount; i++) { + DEBUGPRINT(mParameters[i]); + } } /* @@ -317,171 +121,10 @@ void ParaParametersF::print() * Address: 80121854 * Size: 0000A8 */ -ParaMultiParameters::ParaMultiParameters(int, ParaParameterInfoI*, int, ParaParameterInfoF*) -{ - /* - .loc_0x0: - mflr r0 - lis r8, 0x802C - stw r0, 0x4(r1) - addi r0, r8, 0x50B0 - stwu r1, -0x38(r1) - stmw r26, 0x20(r1) - addi r26, r3, 0 - addi r27, r4, 0 - addi r28, r5, 0 - addi r29, r6, 0 - addi r30, r7, 0 - stw r0, 0x8(r3) - li r3, 0x10 - bl -0xDA884 - addi r31, r3, 0 - mr. r3, r31 - beq- .loc_0x5C - addi r4, r27, 0 - addi r5, r28, 0 - bl 0xEC - lis r3, 0x802C - addi r0, r3, 0x5150 - stw r0, 0xC(r31) - - .loc_0x5C: - stw r31, 0x0(r26) - li r3, 0x10 - bl -0xDA8B4 - addi r31, r3, 0 - mr. r3, r31 - beq- .loc_0x8C - addi r4, r29, 0 - addi r5, r30, 0 - bl .loc_0xA8 - lis r3, 0x802C - addi r0, r3, 0x50F8 - stw r0, 0xC(r31) - - .loc_0x8C: - stw r31, 0x4(r26) - mr r3, r26 - lmw r26, 0x20(r1) - lwz r0, 0x3C(r1) - addi r1, r1, 0x38 - mtlr r0 - blr - - .loc_0xA8: - */ -} - -/* - * --INFO-- - * Address: 801218FC - * Size: 000090 - */ -void ParaParameters::ParaParameters(int, ParaParameterInfo*) +ParaMultiParameters::ParaMultiParameters(int iCount, ParaParameterInfoI* iInfo, int fCount, ParaParameterInfoF* fInfo) { - /* - .loc_0x0: - mflr r0 - lis r6, 0x802C - stw r0, 0x4(r1) - addi r0, r6, 0x510C - stwu r1, -0x20(r1) - stw r31, 0x1C(r1) - addi r31, r3, 0 - stw r0, 0xC(r3) - stw r4, 0x4(r3) - stw r5, 0x8(r3) - lwz r0, 0x4(r3) - cmpwi r0, 0 - ble- .loc_0x44 - rlwinm r3,r0,2,0,29 - bl -0xDA930 - stw r3, 0x0(r31) - b .loc_0x4C - - .loc_0x44: - li r0, 0 - stw r0, 0x0(r31) - - .loc_0x4C: - lfs f0, -0x5F48(r2) - li r5, 0 - li r4, 0 - b .loc_0x6C - - .loc_0x5C: - lwz r3, 0x0(r31) - addi r5, r5, 0x1 - stfsx f0, r3, r4 - addi r4, r4, 0x4 - - .loc_0x6C: - lwz r0, 0x4(r31) - cmpw r5, r0 - blt+ .loc_0x5C - mr r3, r31 - lwz r0, 0x24(r1) - lwz r31, 0x1C(r1) - addi r1, r1, 0x20 - mtlr r0 - blr - */ -} - -/* - * --INFO-- - * Address: 8012198C - * Size: 000090 - */ -void ParaParameters::ParaParameters(int, ParaParameterInfo*) -{ - /* - .loc_0x0: - mflr r0 - lis r6, 0x802C - stw r0, 0x4(r1) - addi r0, r6, 0x5164 - stwu r1, -0x20(r1) - stw r31, 0x1C(r1) - addi r31, r3, 0 - stw r0, 0xC(r3) - stw r4, 0x4(r3) - stw r5, 0x8(r3) - lwz r0, 0x4(r3) - cmpwi r0, 0 - ble- .loc_0x44 - rlwinm r3,r0,2,0,29 - bl -0xDA9C0 - stw r3, 0x0(r31) - b .loc_0x4C - - .loc_0x44: - li r0, 0 - stw r0, 0x0(r31) - - .loc_0x4C: - li r5, 0 - addi r4, r5, 0 - li r6, 0 - b .loc_0x6C - - .loc_0x5C: - lwz r3, 0x0(r31) - addi r6, r6, 0x1 - stwx r4, r3, r5 - addi r5, r5, 0x4 - - .loc_0x6C: - lwz r0, 0x4(r31) - cmpw r6, r0 - blt+ .loc_0x5C - mr r3, r31 - lwz r0, 0x24(r1) - lwz r31, 0x1C(r1) - addi r1, r1, 0x20 - mtlr r0 - blr - */ + mIntParams = new ParaParametersI(iCount, iInfo); + mFloatParams = new ParaParametersF(fCount, fInfo); } /* @@ -489,48 +132,10 @@ void ParaParameters::ParaParameters(int, ParaParameterInfo*) * Address: 80121A1C * Size: 000074 */ -void ParaMultiParameters::input(ParaMultiParameters&) +void ParaMultiParameters::input(ParaMultiParameters& other) { - /* - .loc_0x0: - li r7, 0 - lwz r9, 0x0(r4) - lwz r8, 0x0(r3) - mr r10, r7 - b .loc_0x2C - - .loc_0x14: - lwz r6, 0x0(r9) - addi r7, r7, 0x1 - lwz r5, 0x0(r8) - lwzx r0, r6, r10 - stwx r0, r5, r10 - addi r10, r10, 0x4 - - .loc_0x2C: - lwz r0, 0x4(r8) - cmpw r7, r0 - blt+ .loc_0x14 - li r5, 0 - lwz r7, 0x4(r4) - lwz r6, 0x4(r3) - mr r8, r5 - b .loc_0x64 - - .loc_0x4C: - lwz r4, 0x0(r7) - addi r5, r5, 0x1 - lwz r3, 0x0(r6) - lfsx f0, r4, r8 - stfsx f0, r3, r8 - addi r8, r8, 0x4 - - .loc_0x64: - lwz r0, 0x4(r6) - cmpw r5, r0 - blt+ .loc_0x4C - blr - */ + mIntParams->input(other.mIntParams); + mFloatParams->input(other.mFloatParams); } /* @@ -538,35 +143,10 @@ void ParaMultiParameters::input(ParaMultiParameters&) * Address: 80121A90 * Size: 000060 */ -void ParaMultiParameters::read(Stream&) +void ParaMultiParameters::read(Stream& input) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - mr r31, r4 - stw r30, 0x10(r1) - mr r30, r3 - lwz r3, 0x0(r3) - lwz r12, 0xC(r3) - lwz r12, 0x8(r12) - mtlr r12 - blrl - lwz r3, 0x4(r30) - mr r4, r31 - lwz r12, 0xC(r3) - lwz r12, 0x8(r12) - mtlr r12 - blrl - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - lwz r30, 0x10(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - */ + mIntParams->read(input); + mFloatParams->read(input); } /* @@ -574,35 +154,10 @@ void ParaMultiParameters::read(Stream&) * Address: 80121AF0 * Size: 000060 */ -void ParaMultiParameters::write(Stream&) +void ParaMultiParameters::write(Stream& output) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - mr r31, r4 - stw r30, 0x10(r1) - mr r30, r3 - lwz r3, 0x0(r3) - lwz r12, 0xC(r3) - lwz r12, 0xC(r12) - mtlr r12 - blrl - lwz r3, 0x4(r30) - mr r4, r31 - lwz r12, 0xC(r3) - lwz r12, 0xC(r12) - mtlr r12 - blrl - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - lwz r30, 0x10(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - */ + mIntParams->write(output); + mFloatParams->write(output); } /* @@ -612,69 +167,6 @@ void ParaMultiParameters::write(Stream&) */ void ParaMultiParameters::print() { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - mr r31, r3 - lwz r3, 0x0(r3) - lwz r12, 0xC(r3) - lwz r12, 0x10(r12) - mtlr r12 - blrl - lwz r3, 0x4(r31) - lwz r12, 0xC(r3) - lwz r12, 0x10(r12) - mtlr r12 - blrl - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - */ + mIntParams->print(); + mFloatParams->print(); } - -/* - * --INFO-- - * Address: 80121BA0 - * Size: 000004 - */ -void ParaParameters::read(Stream&) { } - -/* - * --INFO-- - * Address: 80121BA4 - * Size: 000004 - */ -void ParaParameters::write(Stream&) { } - -/* - * --INFO-- - * Address: 80121BA8 - * Size: 000004 - */ -void ParaParameters::print() { } - -/* - * --INFO-- - * Address: 80121BAC - * Size: 000004 - */ -void ParaParameters::read(Stream&) { } - -/* - * --INFO-- - * Address: 80121BB0 - * Size: 000004 - */ -void ParaParameters::write(Stream&) { } - -/* - * --INFO-- - * Address: 80121BB4 - * Size: 000004 - */ -void ParaParameters::print() { } diff --git a/src/plugPikiNakata/pcamcamera.cpp b/src/plugPikiNakata/pcamcamera.cpp index 6fe6c8ac..01a00480 100644 --- a/src/plugPikiNakata/pcamcamera.cpp +++ b/src/plugPikiNakata/pcamcamera.cpp @@ -1,4 +1,6 @@ -#include "types.h" +#include "Pcam/Camera.h" +#include "Creature.h" +#include "ParaParameters.h" /* * --INFO-- @@ -96,7 +98,8 @@ void PcamControlInfo::init(bool, bool, bool, bool, bool, bool, bool, f32, f32, f * Address: 80121C0C * Size: 000134 */ -PcamCamera::PcamCamera(Camera*) +PcamCamera::PcamCamera(Camera* camera) + : NCamera(camera) { /* .loc_0x0: diff --git a/src/plugPikiNakata/pcamcameramanager.cpp b/src/plugPikiNakata/pcamcameramanager.cpp index 50231be8..651949b3 100644 --- a/src/plugPikiNakata/pcamcameramanager.cpp +++ b/src/plugPikiNakata/pcamcameramanager.cpp @@ -1,4 +1,8 @@ -#include "types.h" +#include "Pcam/CameraManager.h" +#include "Pcam/Camera.h" +#include "Peve/Event.h" +#include "Peve/Condition.h" +#include "sysNew.h" /* * --INFO-- @@ -25,8 +29,12 @@ static void _Print(char*, ...) * Address: 80123C54 * Size: 0001F8 */ -PcamCameraManager::PcamCameraManager(Camera*, Controller*) +PcamCameraManager::PcamCameraManager(Camera* camera, Controller* controller) + : Node("PcamCameraManager") { + mCamera = new PcamCamera(camera); + mController = controller; + mVibrationEvents = new PeveEvent*[PCAMVIB_VibrationCount]; /* .loc_0x0: mflr r0 @@ -252,125 +260,18 @@ void PcamCameraManager::finishMotion() */ void PcamCameraManager::updateVibrationEvent() { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - stw r30, 0x10(r1) - mr r30, r3 - lwz r0, 0x28(r3) - cmpwi r0, 0 - blt- .loc_0x80 - lwz r3, 0x2C(r30) - rlwinm r0,r0,2,0,29 - lwzx r31, r3, r0 - mr r3, r31 - lwz r12, 0x0(r31) - lwz r12, 0x28(r12) - mtlr r12 - blrl - rlwinm. r0,r3,0,24,31 - beq- .loc_0x6C - mr r3, r31 - lwz r12, 0x0(r31) - lwz r12, 0x2C(r12) - mtlr r12 - blrl - li r0, -0x1 - stw r0, 0x28(r30) - b .loc_0x80 - - .loc_0x6C: - mr r3, r31 - lwz r12, 0x0(r31) - lwz r12, 0x24(r12) - mtlr r12 - blrl - - .loc_0x80: - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - lwz r30, 0x10(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - */ -} - -/* - * --INFO-- - * Address: 80123F58 - * Size: 000038 - */ -void PeveEvent::update() -{ - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x8(r1) - lwz r3, 0x8(r3) - cmplwi r3, 0 - beq- .loc_0x28 - lwz r12, 0x0(r3) - lwz r12, 0x10(r12) - mtlr r12 - blrl - - .loc_0x28: - lwz r0, 0xC(r1) - addi r1, r1, 0x8 - mtlr r0 - blr - */ -} - -/* - * --INFO-- - * Address: 80123F90 - * Size: 000004 - */ -void PeveCondition::update() { } - -/* - * --INFO-- - * Address: 80123F94 - * Size: 000004 - */ -void PeveEvent::finish() { } - -/* - * --INFO-- - * Address: 80123F98 - * Size: 000040 - */ -void PeveEvent::isFinished() -{ - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x8(r1) - lwz r3, 0x8(r3) - cmplwi r3, 0 - bne- .loc_0x20 - li r3, 0x1 - b .loc_0x30 - - .loc_0x20: - lwz r12, 0x0(r3) - lwz r12, 0x8(r12) - mtlr r12 - blrl - - .loc_0x30: - lwz r0, 0xC(r1) - addi r1, r1, 0x8 - mtlr r0 - blr - */ + if (mCurrEventIndex < 0) { + return; + } + + PeveEvent* event = mVibrationEvents[mCurrEventIndex]; + if (event->isFinished()) { + event->finish(); + mCurrEventIndex = PCAMVIB_NULL; + return; + } + + event->update(); } /* @@ -380,6 +281,8 @@ void PeveEvent::isFinished() */ void PcamCameraManager::startVibrationEvent(int, Vector3f&) { + PeveEvent* event = mVibrationEvents[mCurrEventIndex]; + event->reset(); /* .loc_0x0: mflr r0 @@ -481,41 +384,6 @@ void PcamCameraManager::startVibrationEvent(int, Vector3f&) */ } -/* - * --INFO-- - * Address: 80124120 - * Size: 000038 - */ -void PeveEvent::reset() -{ - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x8(r1) - lwz r3, 0x8(r3) - cmplwi r3, 0 - beq- .loc_0x28 - lwz r12, 0x0(r3) - lwz r12, 0xC(r12) - mtlr r12 - blrl - - .loc_0x28: - lwz r0, 0xC(r1) - addi r1, r1, 0x8 - mtlr r0 - blr - */ -} - -/* - * --INFO-- - * Address: 80124158 - * Size: 000004 - */ -void PeveCondition::reset() { } - /* * --INFO-- * Address: 8012415C diff --git a/src/plugPikiNakata/pcamcameraparameters.cpp b/src/plugPikiNakata/pcamcameraparameters.cpp index 6c23ebf2..2fa79d16 100644 --- a/src/plugPikiNakata/pcamcameraparameters.cpp +++ b/src/plugPikiNakata/pcamcameraparameters.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "Pcam/CameraParameters.h" /* * --INFO-- diff --git a/src/plugPikiNakata/pcammotionevents.cpp b/src/plugPikiNakata/pcammotionevents.cpp index db97e903..24105c09 100644 --- a/src/plugPikiNakata/pcammotionevents.cpp +++ b/src/plugPikiNakata/pcammotionevents.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "Pcam/MotionEvents.h" /* * --INFO-- @@ -26,6 +26,7 @@ static void _Print(char*, ...) * Size: 0000CC */ PcamLongVibrationEvent::PcamLongVibrationEvent(PcamCamera*) + : PeveSerialEvent(2) { /* .loc_0x0: @@ -328,6 +329,7 @@ void PcamDamageEvent::makePcamDamageEvent() * Size: 000064 */ PcamRandomMoveEvent::PcamRandomMoveEvent(PcamCamera*) + : PeveEvent(0) { // UNUSED FUNCTION } @@ -526,6 +528,7 @@ void PcamRandomMoveEvent::update() * Size: 0000C4 */ PcamSideVibrationEvent::PcamSideVibrationEvent(PcamCamera*) + : PeveEvent(0) { /* .loc_0x0: @@ -688,46 +691,3 @@ void PcamSideVibrationEvent::finish() blr */ } - -/* - * --INFO-- - * Address: 8012499C - * Size: 000010 - */ -void PeveEvent::setEventOption(int) -{ - /* - .loc_0x0: - lwz r0, 0xC(r3) - or r0, r0, r4 - stw r0, 0xC(r3) - blr - */ -} - -/* - * --INFO-- - * Address: 801249AC - * Size: 000010 - */ -void PeveEvent::clearEventOption(int) -{ - /* - .loc_0x0: - lwz r0, 0xC(r3) - andc r0, r0, r4 - stw r0, 0xC(r3) - blr - */ -} - -/* - * --INFO-- - * Address: 801249BC - * Size: 000008 - */ -void PeveEvent::setEventOptions(int a1) -{ - // Generated from stw r4, 0xC(r3) - _0C = a1; -} diff --git a/src/plugPikiNakata/peve.cpp b/src/plugPikiNakata/peve.cpp index 9cee0927..1f743e38 100644 --- a/src/plugPikiNakata/peve.cpp +++ b/src/plugPikiNakata/peve.cpp @@ -1,4 +1,6 @@ -#include "types.h" +#include "Peve/Event.h" +#include "Peve/Condition.h" +#include "Peve/IO.h" /* * --INFO-- @@ -41,29 +43,11 @@ PeveCondition::PeveCondition() * Address: 80125550 * Size: 000048 */ -PeveEvent::PeveEvent(int) +PeveEvent::PeveEvent(int count) + : NNode(count) { - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - mr r31, r3 - bl -0x746C - lis r3, 0x802C - addi r0, r3, 0x5DD8 - stw r0, 0x0(r31) - li r0, 0 - addi r3, r31, 0 - stw r0, 0x8(r31) - stw r0, 0xC(r31) - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - */ + mCondition = nullptr; + _0C = 0; } /* @@ -71,7 +55,8 @@ PeveEvent::PeveEvent(int) * Address: ........ * Size: 000054 */ -PeveParallelEvent::PeveParallelEvent(int) +PeveParallelEvent::PeveParallelEvent(int count) + : PeveEvent(count) { // UNUSED FUNCTION } @@ -183,7 +168,7 @@ void PeveParallelEvent::update() * Address: 801256A0 * Size: 00007C */ -void PeveParallelEvent::isFinished() +bool PeveParallelEvent::isFinished() { /* .loc_0x0: @@ -234,7 +219,8 @@ void PeveParallelEvent::isFinished() * Address: 8012571C * Size: 000054 */ -PeveSerialEvent::PeveSerialEvent(int) +PeveSerialEvent::PeveSerialEvent(int count) + : PeveEvent(count) { /* .loc_0x0: @@ -378,7 +364,7 @@ void PeveSerialEvent::update() * Address: 801258A4 * Size: 000074 */ -void PeveSerialEvent::isFinished() +bool PeveSerialEvent::isFinished() { /* .loc_0x0: @@ -506,7 +492,7 @@ PeveCameraPostureIO::PeveCameraPostureIO() void PeveCameraPostureIO::construct(PcamCamera* a1) { // Generated from stw r4, 0x4(r3) - _04 = a1; + // _04 = a1; } /* diff --git a/src/plugPikiNakata/peveconditions.cpp b/src/plugPikiNakata/peveconditions.cpp index 0763dab6..f4b7ac4f 100644 --- a/src/plugPikiNakata/peveconditions.cpp +++ b/src/plugPikiNakata/peveconditions.cpp @@ -1,4 +1,6 @@ -#include "types.h" +#include "Peve/Condition.h" +#include "nlib/System.h" +#include "system.h" /* * --INFO-- @@ -65,47 +67,17 @@ void PeveDependenceCondition::construct(PeveCondition*) * Address: 80125C68 * Size: 000048 */ -PeveTimeCondition::PeveTimeCondition() -{ - /* - .loc_0x0: - mflr r0 - stw r0, 0x4(r1) - stwu r1, -0x18(r1) - stw r31, 0x14(r1) - mr r31, r3 - bl -0x73C - lis r3, 0x802C - addi r0, r3, 0x5F34 - stw r0, 0x0(r31) - mr r3, r31 - lfs f1, -0x5E00(r2) - bl .loc_0x48 - mr r3, r31 - lwz r0, 0x1C(r1) - lwz r31, 0x14(r1) - addi r1, r1, 0x18 - mtlr r0 - blr - - .loc_0x48: - */ -} +PeveTimeCondition::PeveTimeCondition() { construct(0.0f); } /* * --INFO-- * Address: 80125CB0 * Size: 000010 */ -void PeveTimeCondition::construct(f32) +void PeveTimeCondition::construct(f32 limit) { - /* - .loc_0x0: - lfs f0, -0x5E00(r2) - stfs f0, 0x4(r3) - stfs f1, 0x8(r3) - blr - */ + mCurrTime = 0.0f; + mLimit = limit; } /* @@ -288,95 +260,49 @@ void PeveComparisonYCondition::update() * Address: 80125E6C * Size: 00000C */ -void PeveComparisonYCondition::reset() -{ - // Generated from stb r0, 0x4(r3) - _04 = 0; -} +void PeveComparisonYCondition::reset() { _04 = false; } /* * --INFO-- * Address: 80125E78 * Size: 000008 */ -void PeveBooleanCondition::isMet() -{ - /* - .loc_0x0: - lbz r3, 0x4(r3) - blr - */ -} +bool PeveBooleanCondition::isMet() { return _04; } /* * --INFO-- * Address: 80125E80 * Size: 00000C */ -void PeveDistanceCondition::reset() -{ - // Generated from stb r0, 0x4(r3) - _04 = 0; -} +void PeveDistanceCondition::reset() { _04 = false; } /* * --INFO-- * Address: 80125E8C * Size: 00001C */ -void PeveTimeCondition::isMet() -{ - /* - .loc_0x0: - lfs f1, 0x4(r3) - lfs f0, 0x8(r3) - fcmpo cr0, f1, f0 - cror 2, 0x1, 0x2 - mfcr r0 - rlwinm r3,r0,3,31,31 - blr - */ -} +bool PeveTimeCondition::isMet() { return mCurrTime >= mLimit; } /* * --INFO-- * Address: 80125EA8 * Size: 00000C */ -void PeveTimeCondition::reset() -{ - /* - .loc_0x0: - lfs f0, -0x5E00(r2) - stfs f0, 0x4(r3) - blr - */ -} +void PeveTimeCondition::reset() { mCurrTime = 0.0f; } /* * --INFO-- * Address: 80125EB4 * Size: 000018 */ -void PeveTimeCondition::update() -{ - /* - .loc_0x0: - lwz r4, 0x3150(r13) - lfs f1, 0x4(r3) - lfs f0, 0x28C(r4) - fadds f0, f1, f0 - stfs f0, 0x4(r3) - blr - */ -} +void PeveTimeCondition::update() { mCurrTime += NSystem::system->getFrameTime(); } /* * --INFO-- * Address: 80125ECC * Size: 000030 */ -void PeveDependenceCondition::isMet() +bool PeveDependenceCondition::isMet() { /* .loc_0x0: diff --git a/src/plugPikiNakata/pevemotionevents.cpp b/src/plugPikiNakata/pevemotionevents.cpp index 61f4e8d5..77fb148b 100644 --- a/src/plugPikiNakata/pevemotionevents.cpp +++ b/src/plugPikiNakata/pevemotionevents.cpp @@ -1,4 +1,5 @@ -#include "types.h" +#include "Peve/MotionEvents.h" +#include "nlib/Geometry.h" /* * --INFO-- @@ -26,6 +27,7 @@ static void _Print(char*, ...) * Size: 000054 */ PeveWaitEvent::PeveWaitEvent() + : PeveEvent(0) { // UNUSED FUNCTION } @@ -46,6 +48,7 @@ void PeveWaitEvent::makeWaitEvent(f32) * Size: 000040 */ PeveAccelerationEvent::PeveAccelerationEvent() + : PeveEvent(0) { /* .loc_0x0: @@ -439,6 +442,7 @@ void PeveHorizontalSinWaveEvent::update() * Size: 00005C */ PeveCircleMoveEvent::PeveCircleMoveEvent() + : PeveEvent(0) { /* .loc_0x0: @@ -723,6 +727,7 @@ void PeveCircleMoveEvent::calcAngle() * Size: 0000F0 */ PeveCircleMoveWatchEvent::PeveCircleMoveWatchEvent() + : PeveParallelEvent(0) { // UNUSED FUNCTION } @@ -743,6 +748,7 @@ void PeveCircleMoveWatchEvent::makeCircleMoveWatchEvent(f32, NVector3fIO*, NVect * Size: 000040 */ PeveFunctionCurveEvent::PeveFunctionCurveEvent() + : PeveEvent(0) { // UNUSED FUNCTION } @@ -844,6 +850,7 @@ void PeveFunctionCurveEvent::update() * Size: 000040 */ PeveHomingPositionEvent::PeveHomingPositionEvent() + : PeveEvent(0) { // UNUSED FUNCTION } @@ -951,6 +958,7 @@ void PeveHomingPositionEvent::update() * Size: 0000D0 */ PeveHomingPostureEvent::PeveHomingPostureEvent() + : PeveParallelEvent(0) { // UNUSED FUNCTION } @@ -972,6 +980,7 @@ void PeveHomingPostureEvent::makeHomingPostureEvent(PeveCondition*, NVector3fIO* * Size: 00009C */ PeveInterpolationEvent::PeveInterpolationEvent(int, NPool*) + : PeveEvent(0) { // UNUSED FUNCTION } @@ -1194,6 +1203,7 @@ void PeveInterpolationEvent::update() * Size: 00005C */ PeveMoveEvent::PeveMoveEvent() + : PeveEvent(0) { // UNUSED FUNCTION } @@ -1251,6 +1261,7 @@ void PeveMoveEvent::reset() * Size: 00009C */ PeveVibrationEvent::PeveVibrationEvent() + : PeveEvent(0) { /* .loc_0x0: @@ -1425,7 +1436,7 @@ void PeveVibrationEvent::update() * Address: 80126DA0 * Size: 000024 */ -void PeveInterpolationEvent::isFinished() +bool PeveInterpolationEvent::isFinished() { /* .loc_0x0: diff --git a/unsorted_include_todo/BombEffect.h b/unsorted_include_todo/BombEffect.h deleted file mode 100644 index 27a11fd6..00000000 --- a/unsorted_include_todo/BombEffect.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef _BOMBEFFECT_H -#define _BOMBEFFECT_H - -/** - * .obj __vt__10BombEffect, weak - * .4byte __RTTI__10BombEffect - * .4byte 0 - * .4byte invoke__7KEffectFPQ23zen17particleGenerator - * .4byte __RTTI__10BombEffect - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__10BombEffect - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__10BombEffectFR10EffectParm - * .4byte kill__10BombEffectFv - * .4byte stop__7KEffectFv - * .4byte restart__7KEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 (weak) - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 (weak) - virtual void invoke(zen::particleMdl*); // _28 (weak) - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 - virtual void stop(); // _34 (weak) - virtual void restart(); // _38 (weak) -}; - -/** - * @brief TODO - */ -struct BombEffect : public KEffect { - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 -}; - -#endif diff --git a/unsorted_include_todo/BombEffectLight.h b/unsorted_include_todo/BombEffectLight.h deleted file mode 100644 index db358d96..00000000 --- a/unsorted_include_todo/BombEffectLight.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef _BOMBEFFECTLIGHT_H -#define _BOMBEFFECTLIGHT_H - -/** - * .obj __vt__15BombEffectLight, weak - * .4byte __RTTI__15BombEffectLight - * .4byte 0 - * .4byte invoke__7KEffectFPQ23zen17particleGenerator - * .4byte __RTTI__15BombEffectLight - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__15BombEffectLight - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__15BombEffectLightFR10EffectParm - * .4byte kill__15BombEffectLightFv - * .4byte stop__7KEffectFv - * .4byte restart__7KEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 (weak) - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 (weak) - virtual void invoke(zen::particleMdl*); // _28 (weak) - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 - virtual void stop(); // _34 (weak) - virtual void restart(); // _38 (weak) -}; - -/** - * @brief TODO - */ -struct BombEffectLight : public KEffect { - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 -}; - -#endif diff --git a/unsorted_include_todo/BurnEffect.h b/unsorted_include_todo/BurnEffect.h deleted file mode 100644 index c3f3c67a..00000000 --- a/unsorted_include_todo/BurnEffect.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef _BURNEFFECT_H -#define _BURNEFFECT_H - -/** - * .obj __vt__10BurnEffect, global - * .4byte __RTTI__10BurnEffect - * .4byte 0 - * .4byte invoke__10BurnEffectFPQ23zen17particleGenerator - * .4byte __RTTI__10BurnEffect - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__10BurnEffect - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__10BurnEffectFR10EffectParm - * .4byte kill__10BurnEffectFv - * .4byte stop__10BurnEffectFv - * .4byte restart__10BurnEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 (weak) - virtual void invoke(zen::particleMdl*); // _28 (weak) -}; - -/** - * @brief TODO - */ -struct BurnEffect : public KEffect { - virtual void invoke(zen::particleGenerator*); // _08 - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 - virtual void stop(); // _34 - virtual void restart(); // _38 -}; - -#endif diff --git a/unsorted_include_todo/FreeLightEffect.h b/unsorted_include_todo/FreeLightEffect.h deleted file mode 100644 index cdbf11fc..00000000 --- a/unsorted_include_todo/FreeLightEffect.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef _FREELIGHTEFFECT_H -#define _FREELIGHTEFFECT_H - -/** - * .obj __vt__15FreeLightEffect, global - * .4byte __RTTI__15FreeLightEffect - * .4byte 0 - * .4byte invoke__7KEffectFPQ23zen17particleGenerator - * .4byte __RTTI__15FreeLightEffect - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__15FreeLightEffect - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__15FreeLightEffectFR10EffectParm - * .4byte kill__15FreeLightEffectFv - * .4byte stop__15FreeLightEffectFv - * .4byte restart__15FreeLightEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 (weak) - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 (weak) - virtual void invoke(zen::particleMdl*); // _28 (weak) -}; - -/** - * @brief TODO - */ -struct FreeLightEffect : public KEffect { - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 - virtual void stop(); // _34 - virtual void restart(); // _38 -}; - -#endif diff --git a/unsorted_include_todo/GoalEffect.h b/unsorted_include_todo/GoalEffect.h deleted file mode 100644 index 890a56d1..00000000 --- a/unsorted_include_todo/GoalEffect.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef _GOALEFFECT_H -#define _GOALEFFECT_H - -/** - * .obj __vt__10GoalEffect, weak - * .4byte __RTTI__10GoalEffect - * .4byte 0 - * .4byte invoke__10GoalEffectFPQ23zen17particleGenerator - * .4byte __RTTI__10GoalEffect - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__10GoalEffect - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__10GoalEffectFR10EffectParm - * .4byte kill__7KEffectFv - * .4byte stop__7KEffectFv - * .4byte restart__7KEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 (weak) - virtual void invoke(zen::particleMdl*); // _28 (weak) - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 (weak) - virtual void stop(); // _34 (weak) - virtual void restart(); // _38 (weak) -}; - -/** - * @brief TODO - */ -struct GoalEffect : public KEffect { - virtual void invoke(zen::particleGenerator*); // _08 - virtual void emit(EffectParm&); // _2C -}; - -#endif diff --git a/unsorted_include_todo/LUMatrix.h b/unsorted_include_todo/LUMatrix.h deleted file mode 100644 index b564b51d..00000000 --- a/unsorted_include_todo/LUMatrix.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _LUMATRIX_H -#define _LUMATRIX_H - -/** - * .obj __vt__8LUMatrix, global - * .4byte __RTTI__8LUMatrix - * .4byte 0 - * .4byte setDimension__8LUMatrixFi - */ - -/** - * @brief TODO - */ -struct LUMatrix { - virtual void setDimension(int); // _08 -}; - -#endif diff --git a/unsorted_include_todo/NAlpha.h b/unsorted_include_todo/NAlpha.h deleted file mode 100644 index ba41b2b7..00000000 --- a/unsorted_include_todo/NAlpha.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _NALPHA_H -#define _NALPHA_H - -/** - * .obj __vt__6NAlpha, global - * .4byte __RTTI__6NAlpha - * .4byte 0 - * .4byte readData__6NAlphaFR6Stream - */ - -/** - * @brief TODO - */ -struct NAlpha { - virtual void readData(Stream&); // _08 -}; - -#endif diff --git a/unsorted_include_todo/NAxisAngle4f.h b/unsorted_include_todo/NAxisAngle4f.h deleted file mode 100644 index 173721e2..00000000 --- a/unsorted_include_todo/NAxisAngle4f.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _NAXISANGLE4F_H -#define _NAXISANGLE4F_H - -/* - * @brief TODO - */ -struct NAxisAngle4f { - NAxisAngle4f(NVector3f&, float); -}; - -#endif diff --git a/unsorted_include_todo/NCamera.h b/unsorted_include_todo/NCamera.h deleted file mode 100644 index 10cfb588..00000000 --- a/unsorted_include_todo/NCamera.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _NCAMERA_H -#define _NCAMERA_H - -/* - * @brief TODO - */ -struct NCamera { - NCamera(Camera*); - void makeMatrix(); - void makeCamera(); -}; - -#endif diff --git a/unsorted_include_todo/NClampLinearFunction.h b/unsorted_include_todo/NClampLinearFunction.h deleted file mode 100644 index 9700edc8..00000000 --- a/unsorted_include_todo/NClampLinearFunction.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _NCLAMPLINEARFUNCTION_H -#define _NCLAMPLINEARFUNCTION_H - -/** - * .obj __vt__20NClampLinearFunction, global - * .4byte __RTTI__20NClampLinearFunction - * .4byte 0 - * .4byte getValue__20NClampLinearFunctionFf - * .4byte println__20NClampLinearFunctionFv - */ - -/** - * @brief TODO - */ -struct NClampLinearFunction { - virtual void getValue(float); // _08 - virtual void println(); // _0C - - NClampLinearFunction(float*); - void construct(float*); - void makeClampLinearFunction(float, float, float, float); -}; - -#endif diff --git a/unsorted_include_todo/NFunction.h b/unsorted_include_todo/NFunction.h deleted file mode 100644 index eb291009..00000000 --- a/unsorted_include_todo/NFunction.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _NFUNCTION_H -#define _NFUNCTION_H - -/** - * .obj __vt__9NFunction, global - * .4byte __RTTI__9NFunction - * .4byte 0 - * .4byte 0 - */ - -/** - * @brief TODO - */ -struct NFunction { - virtual void _08() = 0; // _08 -}; - -#endif diff --git a/unsorted_include_todo/NFunction3D.h b/unsorted_include_todo/NFunction3D.h deleted file mode 100644 index 850d2206..00000000 --- a/unsorted_include_todo/NFunction3D.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _NFUNCTION3D_H -#define _NFUNCTION3D_H - -/* - * @brief TODO - */ -struct NFunction3D { - void outputPosition(float, NVector3f&); -}; - -#endif diff --git a/unsorted_include_todo/NHeap.h b/unsorted_include_todo/NHeap.h deleted file mode 100644 index 17761d0d..00000000 --- a/unsorted_include_todo/NHeap.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _NHEAP_H -#define _NHEAP_H - -/** - * .obj __vt__5NHeap, global - * .4byte __RTTI__5NHeap - * .4byte 0 - * .4byte release__5NHeapFv - * .4byte addHeap__5NHeapFP5NHeap - */ - -/** - * @brief TODO - */ -struct NHeap { - virtual void release(); // _08 - virtual void addHeap(NHeap*); // _0C -}; - -#endif diff --git a/unsorted_include_todo/NLine.h b/unsorted_include_todo/NLine.h deleted file mode 100644 index 5261ac05..00000000 --- a/unsorted_include_todo/NLine.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef _NLINE_H -#define _NLINE_H - -/** - * .obj __vt__5NLine, global - * .4byte __RTTI__5NLine - * .4byte 0 - * .4byte transform__5NLineFR12NTransform3D - * .4byte println__5NLineFv - */ - -/** - * @brief TODO - */ -struct NLine { - virtual void transform(NTransform3D&); // _08 - virtual void println(); // _0C - - NLine(NVector3f&, NVector3f&); - void construct(NVector3f&, NVector3f&); - void calcDistance(NVector3f&, float*); - void calcVerticalProjection(NVector3f&); - void outputPosition(float, NVector3f&); -}; - -#endif diff --git a/unsorted_include_todo/NLinearFunction.h b/unsorted_include_todo/NLinearFunction.h deleted file mode 100644 index 6f09ee51..00000000 --- a/unsorted_include_todo/NLinearFunction.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef _NLINEARFUNCTION_H -#define _NLINEARFUNCTION_H - -/** - * .obj __vt__15NLinearFunction, global - * .4byte __RTTI__15NLinearFunction - * .4byte 0 - * .4byte getValue__19NPolynomialFunctionFf - * .4byte println__19NPolynomialFunctionFv - */ - -struct NPolynomialFunction { - virtual void getValue(float); // _08 - virtual void println(); // _0C -}; - -/** - * @brief TODO - */ -struct NLinearFunction : public NPolynomialFunction { -}; - -#endif diff --git a/unsorted_include_todo/NLowerMatrix.h b/unsorted_include_todo/NLowerMatrix.h deleted file mode 100644 index 169360be..00000000 --- a/unsorted_include_todo/NLowerMatrix.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _NLOWERMATRIX_H -#define _NLOWERMATRIX_H - -/** - * .obj __vt__12NLowerMatrix, weak - * .4byte __RTTI__12NLowerMatrix - * .4byte 0 - * .4byte setDimension__14NSpecialMatrixFi - */ - -struct NSpecialMatrix { - virtual void setDimension(int); // _08 -}; - -/** - * @brief TODO - */ -struct NLowerMatrix : public NSpecialMatrix { -}; - -#endif diff --git a/unsorted_include_todo/NNode.h b/unsorted_include_todo/NNode.h deleted file mode 100644 index bf954ce6..00000000 --- a/unsorted_include_todo/NNode.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef _NNODE_H -#define _NNODE_H - -/** - * .obj __vt__5NNode, global - * .4byte __RTTI__5NNode - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - */ - -/** - * @brief TODO - */ -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C - - NNode(int); -}; - -#endif diff --git a/unsorted_include_todo/NPlane.h b/unsorted_include_todo/NPlane.h deleted file mode 100644 index 3326d2aa..00000000 --- a/unsorted_include_todo/NPlane.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _NPLANE_H -#define _NPLANE_H - -/** - * .obj __vt__6NPlane, global - * .4byte __RTTI__6NPlane - * .4byte 0 - * .4byte transform__6NPlaneFR12NTransform3D - * .4byte println__6NPlaneFv - */ - -/** - * @brief TODO - */ -struct NPlane { - virtual void transform(NTransform3D&); // _08 - virtual void println(); // _0C - - NPlane(NVector3f&, NVector3f&); - void construct(NVector3f&, NVector3f&); - void outputVerticalPosition(NVector3f&, NVector3f&); -}; - -#endif diff --git a/unsorted_include_todo/NPolynomialFunction.h b/unsorted_include_todo/NPolynomialFunction.h deleted file mode 100644 index 0dbbb435..00000000 --- a/unsorted_include_todo/NPolynomialFunction.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef _NPOLYNOMIALFUNCTION_H -#define _NPOLYNOMIALFUNCTION_H - -/** - * .obj __vt__19NPolynomialFunction, global - * .4byte __RTTI__19NPolynomialFunction - * .4byte 0 - * .4byte getValue__19NPolynomialFunctionFf - * .4byte println__19NPolynomialFunctionFv - */ - -/** - * @brief TODO - */ -struct NPolynomialFunction { - virtual void getValue(float); // _08 - virtual void println(); // _0C - - void construct(float*, int); -}; - -#endif diff --git a/unsorted_include_todo/NPosture2D.h b/unsorted_include_todo/NPosture2D.h deleted file mode 100644 index e7556898..00000000 --- a/unsorted_include_todo/NPosture2D.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _NPOSTURE2D_H -#define _NPOSTURE2D_H - -/** - * .obj __vt__10NPosture2D, global - * .4byte __RTTI__10NPosture2D - * .4byte 0 - * .4byte readData__10NPosture2DFR6Stream - */ - -/** - * @brief TODO - */ -struct NPosture2D { - virtual void readData(Stream&); // _08 -}; - -#endif diff --git a/unsorted_include_todo/NPosture3D.h b/unsorted_include_todo/NPosture3D.h deleted file mode 100644 index 3af9e801..00000000 --- a/unsorted_include_todo/NPosture3D.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _NPOSTURE3D_H -#define _NPOSTURE3D_H - -/** - * .obj __vt__10NPosture3D, global - * .4byte __RTTI__10NPosture3D - * .4byte 0 - * .4byte readData__10NPosture3DFR6Stream - */ - -/** - * @brief TODO - */ -struct NPosture3D { - virtual void readData(Stream&); // _08 -}; - -#endif diff --git a/unsorted_include_todo/NPosture3DIO.h b/unsorted_include_todo/NPosture3DIO.h deleted file mode 100644 index e39bdce6..00000000 --- a/unsorted_include_todo/NPosture3DIO.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _NPOSTURE3DIO_H -#define _NPOSTURE3DIO_H - -/** - * .obj __vt__12NPosture3DIO, weak - * .4byte __RTTI__12NPosture3DIO - * .4byte 0 - * .4byte 0 - * .4byte 0 - */ - -/** - * @brief TODO - */ -struct NPosture3DIO { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C -}; - -#endif diff --git a/unsorted_include_todo/NSpecialMatrix.h b/unsorted_include_todo/NSpecialMatrix.h deleted file mode 100644 index ad21c9d8..00000000 --- a/unsorted_include_todo/NSpecialMatrix.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _NSPECIALMATRIX_H -#define _NSPECIALMATRIX_H - -/** - * .obj __vt__14NSpecialMatrix, weak - * .4byte __RTTI__14NSpecialMatrix - * .4byte 0 - * .4byte setDimension__14NSpecialMatrixFi - */ - -/** - * @brief TODO - */ -struct NSpecialMatrix { - virtual void setDimension(int); // _08 -}; - -#endif diff --git a/unsorted_include_todo/NUpperMatrix.h b/unsorted_include_todo/NUpperMatrix.h deleted file mode 100644 index 01462813..00000000 --- a/unsorted_include_todo/NUpperMatrix.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _NUPPERMATRIX_H -#define _NUPPERMATRIX_H - -/** - * .obj __vt__12NUpperMatrix, weak - * .4byte __RTTI__12NUpperMatrix - * .4byte 0 - * .4byte setDimension__14NSpecialMatrixFi - */ - -struct NSpecialMatrix { - virtual void setDimension(int); // _08 -}; - -/** - * @brief TODO - */ -struct NUpperMatrix : public NSpecialMatrix { -}; - -#endif diff --git a/unsorted_include_todo/NVector3fIO.h b/unsorted_include_todo/NVector3fIO.h deleted file mode 100644 index 22d0891e..00000000 --- a/unsorted_include_todo/NVector3fIO.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _NVECTOR3FIO_H -#define _NVECTOR3FIO_H - -/** - * .obj __vt__11NVector3fIO, weak - * .4byte __RTTI__11NVector3fIO - * .4byte 0 - * .4byte 0 - * .4byte 0 - */ - -/** - * @brief TODO - */ -struct NVector3fIO { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C -}; - -#endif diff --git a/unsorted_include_todo/NVector3fIOClass.h b/unsorted_include_todo/NVector3fIOClass.h deleted file mode 100644 index 53b0d491..00000000 --- a/unsorted_include_todo/NVector3fIOClass.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _NVECTOR3FIOCLASS_H -#define _NVECTOR3FIOCLASS_H - -/** - * .obj __vt__16NVector3fIOClass, weak - * .4byte __RTTI__16NVector3fIOClass - * .4byte 0 - * .4byte input__16NVector3fIOClassFR9NVector3f - * .4byte output__16NVector3fIOClassFR9NVector3f - */ - -/** - * @brief TODO - */ -struct NVector3fIOClass { - virtual void input(NVector3f&); // _08 - virtual void output(NVector3f&); // _0C -}; - -#endif diff --git a/unsorted_include_todo/NVibrationFunction.h b/unsorted_include_todo/NVibrationFunction.h deleted file mode 100644 index a020e60f..00000000 --- a/unsorted_include_todo/NVibrationFunction.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _NVIBRATIONFUNCTION_H -#define _NVIBRATIONFUNCTION_H - -/** - * .obj __vt__18NVibrationFunction, global - * .4byte __RTTI__18NVibrationFunction - * .4byte 0 - * .4byte getValue__18NVibrationFunctionFf - */ - -/** - * @brief TODO - */ -struct NVibrationFunction { - virtual void getValue(float); // _08 - - NVibrationFunction(); - void makeVibrationFunction(float, float, float); -}; - -#endif diff --git a/unsorted_include_todo/NaviFue.h b/unsorted_include_todo/NaviFue.h deleted file mode 100644 index f3707ff7..00000000 --- a/unsorted_include_todo/NaviFue.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef _NAVIFUE_H -#define _NAVIFUE_H - -/** - * .obj __vt__7NaviFue, weak - * .4byte __RTTI__7NaviFue - * .4byte 0 - * .4byte invoke__7NaviFueFPQ23zen17particleGenerator - * .4byte __RTTI__7NaviFue - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__7NaviFue - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__7NaviFueFR10EffectParm - * .4byte kill__7NaviFueFv - * .4byte stop__7KEffectFv - * .4byte restart__7KEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 (weak) - virtual void invoke(zen::particleMdl*); // _28 (weak) - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 - virtual void stop(); // _34 (weak) - virtual void restart(); // _38 (weak) -}; - -/** - * @brief TODO - */ -struct NaviFue : public KEffect { - virtual void invoke(zen::particleGenerator*); // _08 - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 -}; - -#endif diff --git a/unsorted_include_todo/NaviWhistle.h b/unsorted_include_todo/NaviWhistle.h deleted file mode 100644 index 67c3137c..00000000 --- a/unsorted_include_todo/NaviWhistle.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef _NAVIWHISTLE_H -#define _NAVIWHISTLE_H - -/** - * .obj __vt__11NaviWhistle, weak - * .4byte __RTTI__11NaviWhistle - * .4byte 0 - * .4byte invoke__7KEffectFPQ23zen17particleGenerator - * .4byte __RTTI__11NaviWhistle - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__11NaviWhistleFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__11NaviWhistle - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__11NaviWhistleFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__11NaviWhistleFR10EffectParm - * .4byte kill__11NaviWhistleFv - * .4byte stop__7KEffectFv - * .4byte restart__7KEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 (weak) - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 - virtual void invoke(zen::particleMdl*); // _28 (weak) - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 - virtual void stop(); // _34 (weak) - virtual void restart(); // _38 (weak) -}; - -/** - * @brief TODO - */ -struct NaviWhistle : public KEffect { - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 -}; - -#endif diff --git a/unsorted_include_todo/ParaMultiParameters.h b/unsorted_include_todo/ParaMultiParameters.h deleted file mode 100644 index f193670f..00000000 --- a/unsorted_include_todo/ParaMultiParameters.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef _PARAMULTIPARAMETERS_H -#define _PARAMULTIPARAMETERS_H - -/** - * .obj __vt__19ParaMultiParameters, global - * .4byte __RTTI__19ParaMultiParameters - * .4byte 0 - * .4byte read__19ParaMultiParametersFR6Stream - * .4byte write__19ParaMultiParametersFR6Stream - * .4byte print__19ParaMultiParametersFv - */ - -/** - * @brief TODO - */ -struct ParaMultiParameters { - virtual void read(Stream&); // _08 - virtual void write(Stream&); // _0C - virtual void print(); // _10 -}; - -#endif diff --git a/unsorted_include_todo/ParaParameterInfoF.h b/unsorted_include_todo/ParaParameterInfoF.h deleted file mode 100644 index bd911c41..00000000 --- a/unsorted_include_todo/ParaParameterInfoF.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _PARAPARAMETERINFOF_H -#define _PARAPARAMETERINFOF_H - -/* - * @brief TODO - */ -struct ParaParameterInfoF { - ParaParameterInfoF(); -}; - -#endif diff --git a/unsorted_include_todo/ParaParameterInfoI.h b/unsorted_include_todo/ParaParameterInfoI.h deleted file mode 100644 index 3a690a5a..00000000 --- a/unsorted_include_todo/ParaParameterInfoI.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _PARAPARAMETERINFOI_H -#define _PARAPARAMETERINFOI_H - -/* - * @brief TODO - */ -struct ParaParameterInfoI { - ParaParameterInfoI(); -}; - -#endif diff --git a/unsorted_include_todo/ParaParametersF.h b/unsorted_include_todo/ParaParametersF.h deleted file mode 100644 index ceea8d74..00000000 --- a/unsorted_include_todo/ParaParametersF.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef _PARAPARAMETERSF_H -#define _PARAPARAMETERSF_H - -/** - * .obj __vt__15ParaParametersF, global - * .4byte __RTTI__15ParaParametersF - * .4byte 0 - * .4byte read__15ParaParametersFFR6Stream - * .4byte write__15ParaParametersFFR6Stream - * .4byte print__15ParaParametersFFv - */ - -/** - * @brief TODO - */ -struct ParaParametersF { - virtual void read(Stream&); // _08 - virtual void write(Stream&); // _0C - virtual void print(); // _10 -}; - -#endif diff --git a/unsorted_include_todo/ParaParametersI.h b/unsorted_include_todo/ParaParametersI.h deleted file mode 100644 index 6cf26723..00000000 --- a/unsorted_include_todo/ParaParametersI.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef _PARAPARAMETERSI_H -#define _PARAPARAMETERSI_H - -/** - * .obj __vt__15ParaParametersI, global - * .4byte __RTTI__15ParaParametersI - * .4byte 0 - * .4byte read__15ParaParametersIFR6Stream - * .4byte write__15ParaParametersIFR6Stream - * .4byte print__15ParaParametersIFv - */ - -/** - * @brief TODO - */ -struct ParaParametersI { - virtual void read(Stream&); // _08 - virtual void write(Stream&); // _0C - virtual void print(); // _10 -}; - -#endif diff --git a/unsorted_include_todo/PcamCamera.h b/unsorted_include_todo/PcamCamera.h deleted file mode 100644 index f476d920..00000000 --- a/unsorted_include_todo/PcamCamera.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _PCAMCAMERA_H -#define _PCAMCAMERA_H - -/** - * .obj __vt__10PcamCamera, global - * .4byte __RTTI__10PcamCamera - * .4byte 0 - * .4byte update__10PcamCameraFv - */ - -/** - * @brief TODO - */ -struct PcamCamera { - virtual void update(); // _08 -}; - -#endif diff --git a/unsorted_include_todo/PcamCameraManager.h b/unsorted_include_todo/PcamCameraManager.h deleted file mode 100644 index 6fdcb234..00000000 --- a/unsorted_include_todo/PcamCameraManager.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef _PCAMCAMERAMANAGER_H -#define _PCAMCAMERAMANAGER_H - -/** - * .obj __vt__17PcamCameraManager, global - * .4byte __RTTI__17PcamCameraManager - * .4byte 0 - * .4byte getAgeNodeType__5ANodeFv - * .4byte read__8CoreNodeFR18RandomAccessStream - * .4byte update__17PcamCameraManagerFv - * .4byte draw__4NodeFR8Graphics - * .4byte render__4NodeFR8Graphics - * .4byte concat__4NodeFv - * .4byte concat__4NodeFR3VQS - * .4byte concat__4NodeFR3SRT - * .4byte concat__4NodeFR8Matrix4f - * .4byte getModelMatrix__4NodeFv - */ - -struct ANode { - virtual void getAgeNodeType(); // _08 (weak) -}; - -struct CoreNode { - virtual void _08() = 0; // _08 - virtual void read(RandomAccessStream&); // _0C (weak) -}; - -struct Node { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void update(); // _10 - virtual void draw(Graphics&); // _14 - virtual void render(Graphics&); // _18 - virtual void concat(); // _1C (weak) - virtual void concat(VQS&); // _20 (weak) - virtual void concat(SRT&); // _24 (weak) - virtual void concat(Matrix4f&); // _28 (weak) - virtual void getModelMatrix(); // _2C (weak) -}; - -/** - * @brief TODO - */ -struct PcamCameraManager : public ANode, public CoreNode, public Node { - virtual void update(); // _10 - - PcamCameraManager(Camera*, Controller*); - void startCamera(Creature*); - void updateVibrationEvent(); - void startVibrationEvent(int, Vector3f&); - void outputNaviPosition(Vector3f&); -}; - -#endif diff --git a/unsorted_include_todo/PcamCameraParameters.h b/unsorted_include_todo/PcamCameraParameters.h deleted file mode 100644 index cca998cb..00000000 --- a/unsorted_include_todo/PcamCameraParameters.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef _PCAMCAMERAPARAMETERS_H -#define _PCAMCAMERAPARAMETERS_H - -/** - * .obj __vt__20PcamCameraParameters, global - * .4byte __RTTI__20PcamCameraParameters - * .4byte 0 - * .4byte getAgeNodeType__5ANodeFv - * .4byte read__20PcamCameraParametersFR18RandomAccessStream - * .4byte update__4NodeFv - * .4byte draw__4NodeFR8Graphics - * .4byte render__4NodeFR8Graphics - * .4byte concat__4NodeFv - * .4byte concat__4NodeFR3VQS - * .4byte concat__4NodeFR3SRT - * .4byte concat__4NodeFR8Matrix4f - * .4byte getModelMatrix__4NodeFv - */ - -struct ANode { - virtual void getAgeNodeType(); // _08 (weak) -}; - -struct Node { - virtual void _08() = 0; // _08 - virtual void read(RandomAccessStream&); // _0C - virtual void update(); // _10 - virtual void draw(Graphics&); // _14 - virtual void render(Graphics&); // _18 - virtual void concat(); // _1C (weak) - virtual void concat(VQS&); // _20 (weak) - virtual void concat(SRT&); // _24 (weak) - virtual void concat(Matrix4f&); // _28 (weak) - virtual void getModelMatrix(); // _2C (weak) -}; - -/** - * @brief TODO - */ -struct PcamCameraParameters : public ANode, public Node { - virtual void read(RandomAccessStream&); // _0C - - PcamCameraParameters(); -}; - -#endif diff --git a/unsorted_include_todo/PcamDamageEvent.h b/unsorted_include_todo/PcamDamageEvent.h deleted file mode 100644 index fbaaa369..00000000 --- a/unsorted_include_todo/PcamDamageEvent.h +++ /dev/null @@ -1,65 +0,0 @@ -#ifndef _PCAMDAMAGEEVENT_H -#define _PCAMDAMAGEEVENT_H - -/** - * .obj __vt__15PcamDamageEvent, weak - * .4byte __RTTI__15PcamDamageEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__9PeveEventFv - * .4byte update__18PeveVibrationEventFv - * .4byte isFinished__9PeveEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 (weak) - virtual void _24() = 0; // _24 - virtual void isFinished(); // _28 (weak) - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -struct PeveVibrationEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void update(); // _24 -}; - -/** - * @brief TODO - */ -struct PcamDamageEvent : public NNode, public PeveEvent, public PeveVibrationEvent { -}; - -#endif diff --git a/unsorted_include_todo/PcamLongVibrationEvent.h b/unsorted_include_todo/PcamLongVibrationEvent.h deleted file mode 100644 index f93cb633..00000000 --- a/unsorted_include_todo/PcamLongVibrationEvent.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef _PCAMLONGVIBRATIONEVENT_H -#define _PCAMLONGVIBRATIONEVENT_H - -/** - * .obj __vt__22PcamLongVibrationEvent, weak - * .4byte __RTTI__22PcamLongVibrationEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__15PeveSerialEventFv - * .4byte update__15PeveSerialEventFv - * .4byte isFinished__15PeveSerialEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveSerialEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 - virtual void update(); // _24 - virtual void isFinished(); // _28 -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void _28() = 0; // _28 - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PcamLongVibrationEvent : public NNode, public PeveSerialEvent, public PeveEvent { - - PcamLongVibrationEvent(PcamCamera*); -}; - -#endif diff --git a/unsorted_include_todo/PcamMotionInfo.h b/unsorted_include_todo/PcamMotionInfo.h deleted file mode 100644 index 8cd6c8e1..00000000 --- a/unsorted_include_todo/PcamMotionInfo.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _PCAMMOTIONINFO_H -#define _PCAMMOTIONINFO_H - -/* - * @brief TODO - */ -struct PcamMotionInfo { - PcamMotionInfo(); -}; - -#endif diff --git a/unsorted_include_todo/PcamRandomMoveEvent.h b/unsorted_include_todo/PcamRandomMoveEvent.h deleted file mode 100644 index 67101339..00000000 --- a/unsorted_include_todo/PcamRandomMoveEvent.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef _PCAMRANDOMMOVEEVENT_H -#define _PCAMRANDOMMOVEEVENT_H - -/** - * .obj __vt__19PcamRandomMoveEvent, global - * .4byte __RTTI__19PcamRandomMoveEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__9PeveEventFv - * .4byte update__19PcamRandomMoveEventFv - * .4byte isFinished__9PeveEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 (weak) - virtual void update(); // _24 - virtual void isFinished(); // _28 (weak) - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PcamRandomMoveEvent : public NNode, public PeveEvent { - virtual void update(); // _24 -}; - -#endif diff --git a/unsorted_include_todo/PcamSideVibrationEvent.h b/unsorted_include_todo/PcamSideVibrationEvent.h deleted file mode 100644 index 8abff574..00000000 --- a/unsorted_include_todo/PcamSideVibrationEvent.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef _PCAMSIDEVIBRATIONEVENT_H -#define _PCAMSIDEVIBRATIONEVENT_H - -/** - * .obj __vt__22PcamSideVibrationEvent, global - * .4byte __RTTI__22PcamSideVibrationEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__9PeveEventFv - * .4byte update__22PcamSideVibrationEventFv - * .4byte isFinished__9PeveEventFv - * .4byte finish__22PcamSideVibrationEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 (weak) - virtual void update(); // _24 - virtual void isFinished(); // _28 (weak) - virtual void finish(); // _2C - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PcamSideVibrationEvent : public NNode, public PeveEvent { - virtual void update(); // _24 - virtual void finish(); // _2C -}; - -#endif diff --git a/unsorted_include_todo/PcamVibrationEvent.h b/unsorted_include_todo/PcamVibrationEvent.h deleted file mode 100644 index 48b51afb..00000000 --- a/unsorted_include_todo/PcamVibrationEvent.h +++ /dev/null @@ -1,65 +0,0 @@ -#ifndef _PCAMVIBRATIONEVENT_H -#define _PCAMVIBRATIONEVENT_H - -/** - * .obj __vt__18PcamVibrationEvent, weak - * .4byte __RTTI__18PcamVibrationEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__9PeveEventFv - * .4byte update__18PeveVibrationEventFv - * .4byte isFinished__9PeveEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 (weak) - virtual void _24() = 0; // _24 - virtual void isFinished(); // _28 (weak) - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -struct PeveVibrationEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void update(); // _24 -}; - -/** - * @brief TODO - */ -struct PcamVibrationEvent : public NNode, public PeveEvent, public PeveVibrationEvent { -}; - -#endif diff --git a/unsorted_include_todo/PelletUfoLoadState.h b/unsorted_include_todo/PelletUfoLoadState.h deleted file mode 100644 index e97960e2..00000000 --- a/unsorted_include_todo/PelletUfoLoadState.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef _PELLETUFOLOADSTATE_H -#define _PELLETUFOLOADSTATE_H - -/** - * .obj __vt__18PelletUfoLoadState, global - * .4byte __RTTI__18PelletUfoLoadState - * .4byte 0 - * .4byte "procMsg__17Receiver<6Pellet>FP6PelletP3Msg" - * .4byte "procBounceMsg__17Receiver<6Pellet>FP6PelletP9MsgBounce" - * .4byte "procStickMsg__17Receiver<6Pellet>FP6PelletP8MsgStick" - * .4byte "procHangMsg__17Receiver<6Pellet>FP6PelletP7MsgHang" - * .4byte "procTargetMsg__17Receiver<6Pellet>FP6PelletP9MsgTarget" - * .4byte "procCollideMsg__17Receiver<6Pellet>FP6PelletP10MsgCollide" - * .4byte "procAnimMsg__17Receiver<6Pellet>FP6PelletP7MsgAnim" - * .4byte "procDamageMsg__17Receiver<6Pellet>FP6PelletP9MsgDamage" - * .4byte "procWallMsg__17Receiver<6Pellet>FP6PelletP7MsgWall" - * .4byte "procOffWallMsg__17Receiver<6Pellet>FP6PelletP10MsgOffWall" - * .4byte "procUserMsg__17Receiver<6Pellet>FP6PelletP7MsgUser" - * .4byte "procGroundMsg__17Receiver<6Pellet>FP6PelletP9MsgGround" - * .4byte init__18PelletUfoLoadStateFP6Pellet - * .4byte exec__18PelletUfoLoadStateFP6Pellet - * .4byte cleanup__18PelletUfoLoadStateFP6Pellet - * .4byte "resume__15AState<6Pellet>FP6Pellet" - * .4byte "restart__15AState<6Pellet>FP6Pellet" - * .4byte "transit__15AState<6Pellet>FP6Pelleti" - */ - -struct Receiver { - virtual void procMsg(Pellet*, Msg*); // _08 (weak) - virtual void procBounceMsg(Pellet*, MsgBounce*); // _0C (weak) - virtual void procStickMsg(Pellet*, MsgStick*); // _10 (weak) - virtual void procHangMsg(Pellet*, MsgHang*); // _14 (weak) - virtual void procTargetMsg(Pellet*, MsgTarget*); // _18 (weak) - virtual void procCollideMsg(Pellet*, MsgCollide*); // _1C (weak) - virtual void procAnimMsg(Pellet*, MsgAnim*); // _20 (weak) - virtual void procDamageMsg(Pellet*, MsgDamage*); // _24 (weak) - virtual void procWallMsg(Pellet*, MsgWall*); // _28 (weak) - virtual void procOffWallMsg(Pellet*, MsgOffWall*); // _2C (weak) - virtual void procUserMsg(Pellet*, MsgUser*); // _30 (weak) - virtual void procGroundMsg(Pellet*, MsgGround*); // _34 (weak) -}; - -struct AState { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void _28() = 0; // _28 - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void _34() = 0; // _34 - virtual void init(Pellet*); // _38 - virtual void exec(Pellet*); // _3C - virtual void cleanup(Pellet*); // _40 - virtual void resume(Pellet*); // _44 (weak) - virtual void restart(Pellet*); // _48 (weak) - virtual void transit(Pellet*, int); // _4C (weak) -}; - -/** - * @brief TODO - */ -struct PelletUfoLoadState : public Receiver, public AState { - virtual void init(Pellet*); // _38 - virtual void exec(Pellet*); // _3C - virtual void cleanup(Pellet*); // _40 - - PelletUfoLoadState(); -}; - -#endif diff --git a/unsorted_include_todo/PeveAccelerationEvent.h b/unsorted_include_todo/PeveAccelerationEvent.h deleted file mode 100644 index 8b3b511e..00000000 --- a/unsorted_include_todo/PeveAccelerationEvent.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef _PEVEACCELERATIONEVENT_H -#define _PEVEACCELERATIONEVENT_H - -/** - * .obj __vt__21PeveAccelerationEvent, global - * .4byte __RTTI__21PeveAccelerationEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__9PeveEventFv - * .4byte update__21PeveAccelerationEventFv - * .4byte isFinished__9PeveEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 (weak) - virtual void update(); // _24 - virtual void isFinished(); // _28 (weak) - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PeveAccelerationEvent : public NNode, public PeveEvent { - virtual void update(); // _24 - - PeveAccelerationEvent(); -}; - -#endif diff --git a/unsorted_include_todo/PeveBooleanCondition.h b/unsorted_include_todo/PeveBooleanCondition.h deleted file mode 100644 index 479ea3b6..00000000 --- a/unsorted_include_todo/PeveBooleanCondition.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef _PEVEBOOLEANCONDITION_H -#define _PEVEBOOLEANCONDITION_H - -/** - * .obj __vt__20PeveBooleanCondition, weak - * .4byte __RTTI__20PeveBooleanCondition - * .4byte 0 - * .4byte isMet__20PeveBooleanConditionFv - * .4byte reset__13PeveConditionFv - * .4byte update__13PeveConditionFv - */ - -struct PeveCondition { - virtual void isMet(); // _08 - virtual void reset(); // _0C (weak) - virtual void update(); // _10 (weak) -}; - -/** - * @brief TODO - */ -struct PeveBooleanCondition : public PeveCondition { - virtual void isMet(); // _08 -}; - -#endif diff --git a/unsorted_include_todo/PeveCameraPostureIO.h b/unsorted_include_todo/PeveCameraPostureIO.h deleted file mode 100644 index f452b6aa..00000000 --- a/unsorted_include_todo/PeveCameraPostureIO.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _PEVECAMERAPOSTUREIO_H -#define _PEVECAMERAPOSTUREIO_H - -/** - * .obj __vt__19PeveCameraPostureIO, weak - * .4byte __RTTI__19PeveCameraPostureIO - * .4byte 0 - * .4byte input__19PeveCameraPostureIOFR10NPosture3D - * .4byte output__19PeveCameraPostureIOFR10NPosture3D - */ - -/** - * @brief TODO - */ -struct PeveCameraPostureIO { - virtual void input(NPosture3D&); // _08 - virtual void output(NPosture3D&); // _0C -}; - -#endif diff --git a/unsorted_include_todo/PeveCameraViewpointIO.h b/unsorted_include_todo/PeveCameraViewpointIO.h deleted file mode 100644 index c728412a..00000000 --- a/unsorted_include_todo/PeveCameraViewpointIO.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _PEVECAMERAVIEWPOINTIO_H -#define _PEVECAMERAVIEWPOINTIO_H - -/** - * .obj __vt__21PeveCameraViewpointIO, weak - * .4byte __RTTI__21PeveCameraViewpointIO - * .4byte 0 - * .4byte input__21PeveCameraViewpointIOFR9NVector3f - * .4byte output__21PeveCameraViewpointIOFR9NVector3f - */ - -/** - * @brief TODO - */ -struct PeveCameraViewpointIO { - virtual void input(NVector3f&); // _08 - virtual void output(NVector3f&); // _0C -}; - -#endif diff --git a/unsorted_include_todo/PeveCameraWatchpointIO.h b/unsorted_include_todo/PeveCameraWatchpointIO.h deleted file mode 100644 index 82cfdfc8..00000000 --- a/unsorted_include_todo/PeveCameraWatchpointIO.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _PEVECAMERAWATCHPOINTIO_H -#define _PEVECAMERAWATCHPOINTIO_H - -/** - * .obj __vt__22PeveCameraWatchpointIO, weak - * .4byte __RTTI__22PeveCameraWatchpointIO - * .4byte 0 - * .4byte input__22PeveCameraWatchpointIOFR9NVector3f - * .4byte output__22PeveCameraWatchpointIOFR9NVector3f - */ - -/** - * @brief TODO - */ -struct PeveCameraWatchpointIO { - virtual void input(NVector3f&); // _08 - virtual void output(NVector3f&); // _0C -}; - -#endif diff --git a/unsorted_include_todo/PeveCircleMoveEvent.h b/unsorted_include_todo/PeveCircleMoveEvent.h deleted file mode 100644 index 9f42351f..00000000 --- a/unsorted_include_todo/PeveCircleMoveEvent.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef _PEVECIRCLEMOVEEVENT_H -#define _PEVECIRCLEMOVEEVENT_H - -/** - * .obj __vt__19PeveCircleMoveEvent, global - * .4byte __RTTI__19PeveCircleMoveEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__19PeveCircleMoveEventFv - * .4byte update__19PeveCircleMoveEventFv - * .4byte isFinished__9PeveEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 - virtual void update(); // _24 - virtual void isFinished(); // _28 (weak) - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PeveCircleMoveEvent : public NNode, public PeveEvent { - virtual void reset(); // _20 - virtual void update(); // _24 -}; - -#endif diff --git a/unsorted_include_todo/PeveCircleMoveWatchEvent.h b/unsorted_include_todo/PeveCircleMoveWatchEvent.h deleted file mode 100644 index 689f0d13..00000000 --- a/unsorted_include_todo/PeveCircleMoveWatchEvent.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef _PEVECIRCLEMOVEWATCHEVENT_H -#define _PEVECIRCLEMOVEWATCHEVENT_H - -/** - * .obj __vt__24PeveCircleMoveWatchEvent, weak - * .4byte __RTTI__24PeveCircleMoveWatchEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__17PeveParallelEventFv - * .4byte update__17PeveParallelEventFv - * .4byte isFinished__17PeveParallelEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveParallelEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 - virtual void update(); // _24 - virtual void isFinished(); // _28 -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void _28() = 0; // _28 - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PeveCircleMoveWatchEvent : public NNode, public PeveParallelEvent, public PeveEvent { -}; - -#endif diff --git a/unsorted_include_todo/PeveClampVector3fIO.h b/unsorted_include_todo/PeveClampVector3fIO.h deleted file mode 100644 index b9fabb29..00000000 --- a/unsorted_include_todo/PeveClampVector3fIO.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _PEVECLAMPVECTOR3FIO_H -#define _PEVECLAMPVECTOR3FIO_H - -/** - * .obj __vt__19PeveClampVector3fIO, global - * .4byte __RTTI__19PeveClampVector3fIO - * .4byte 0 - * .4byte input__19PeveClampVector3fIOFR9NVector3f - * .4byte output__16NVector3fIOClassFR9NVector3f - */ - -struct NVector3fIOClass { - virtual void input(NVector3f&); // _08 - virtual void output(NVector3f&); // _0C -}; - -/** - * @brief TODO - */ -struct PeveClampVector3fIO : public NVector3fIOClass { - virtual void input(NVector3f&); // _08 -}; - -#endif diff --git a/unsorted_include_todo/PeveComparisonYCondition.h b/unsorted_include_todo/PeveComparisonYCondition.h deleted file mode 100644 index a53d4862..00000000 --- a/unsorted_include_todo/PeveComparisonYCondition.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef _PEVECOMPARISONYCONDITION_H -#define _PEVECOMPARISONYCONDITION_H - -/** - * .obj __vt__24PeveComparisonYCondition, global - * .4byte __RTTI__24PeveComparisonYCondition - * .4byte 0 - * .4byte isMet__20PeveBooleanConditionFv - * .4byte reset__24PeveComparisonYConditionFv - * .4byte update__24PeveComparisonYConditionFv - */ - -struct PeveBooleanCondition { - virtual void isMet(); // _08 -}; - -/** - * @brief TODO - */ -struct PeveComparisonYCondition : public PeveBooleanCondition { - virtual void reset(); // _0C - virtual void update(); // _10 -}; - -#endif diff --git a/unsorted_include_todo/PeveCondition.h b/unsorted_include_todo/PeveCondition.h deleted file mode 100644 index f1336f8d..00000000 --- a/unsorted_include_todo/PeveCondition.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _PEVECONDITION_H -#define _PEVECONDITION_H - -/** - * .obj __vt__13PeveCondition, weak - * .4byte __RTTI__13PeveCondition - * .4byte 0 - * .4byte 0 - * .4byte reset__13PeveConditionFv - * .4byte update__13PeveConditionFv - */ - -/** - * @brief TODO - */ -struct PeveCondition { - virtual void _08() = 0; // _08 - virtual void reset(); // _0C (weak) - virtual void update(); // _10 (weak) - - PeveCondition(); -}; - -#endif diff --git a/unsorted_include_todo/PeveCreaturePositionIO.h b/unsorted_include_todo/PeveCreaturePositionIO.h deleted file mode 100644 index cd6ebc74..00000000 --- a/unsorted_include_todo/PeveCreaturePositionIO.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _PEVECREATUREPOSITIONIO_H -#define _PEVECREATUREPOSITIONIO_H - -/** - * .obj __vt__22PeveCreaturePositionIO, weak - * .4byte __RTTI__22PeveCreaturePositionIO - * .4byte 0 - * .4byte input__22PeveCreaturePositionIOFR9NVector3f - * .4byte output__22PeveCreaturePositionIOFR9NVector3f - */ - -/** - * @brief TODO - */ -struct PeveCreaturePositionIO { - virtual void input(NVector3f&); // _08 - virtual void output(NVector3f&); // _0C -}; - -#endif diff --git a/unsorted_include_todo/PeveDependenceCondition.h b/unsorted_include_todo/PeveDependenceCondition.h deleted file mode 100644 index ec503900..00000000 --- a/unsorted_include_todo/PeveDependenceCondition.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef _PEVEDEPENDENCECONDITION_H -#define _PEVEDEPENDENCECONDITION_H - -/** - * .obj __vt__23PeveDependenceCondition, weak - * .4byte __RTTI__23PeveDependenceCondition - * .4byte 0 - * .4byte isMet__23PeveDependenceConditionFv - * .4byte reset__23PeveDependenceConditionFv - * .4byte update__23PeveDependenceConditionFv - */ - -/** - * @brief TODO - */ -struct PeveDependenceCondition { - virtual void isMet(); // _08 - virtual void reset(); // _0C - virtual void update(); // _10 -}; - -#endif diff --git a/unsorted_include_todo/PeveDistanceCondition.h b/unsorted_include_todo/PeveDistanceCondition.h deleted file mode 100644 index 88c0c967..00000000 --- a/unsorted_include_todo/PeveDistanceCondition.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef _PEVEDISTANCECONDITION_H -#define _PEVEDISTANCECONDITION_H - -/** - * .obj __vt__21PeveDistanceCondition, global - * .4byte __RTTI__21PeveDistanceCondition - * .4byte 0 - * .4byte isMet__20PeveBooleanConditionFv - * .4byte reset__21PeveDistanceConditionFv - * .4byte update__21PeveDistanceConditionFv - */ - -struct PeveBooleanCondition { - virtual void isMet(); // _08 -}; - -/** - * @brief TODO - */ -struct PeveDistanceCondition : public PeveBooleanCondition { - virtual void reset(); // _0C - virtual void update(); // _10 -}; - -#endif diff --git a/unsorted_include_todo/PeveEvent.h b/unsorted_include_todo/PeveEvent.h deleted file mode 100644 index 1a0067c8..00000000 --- a/unsorted_include_todo/PeveEvent.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef _PEVEEVENT_H -#define _PEVEEVENT_H - -/** - * .obj __vt__9PeveEvent, weak - * .4byte __RTTI__9PeveEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__9PeveEventFv - * .4byte update__9PeveEventFv - * .4byte isFinished__9PeveEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -/** - * @brief TODO - */ -struct PeveEvent : public NNode { - virtual void reset(); // _20 (weak) - virtual void update(); // _24 (weak) - virtual void isFinished(); // _28 (weak) - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -#endif diff --git a/unsorted_include_todo/PeveFunctionCurveEvent.h b/unsorted_include_todo/PeveFunctionCurveEvent.h deleted file mode 100644 index 46b9ed29..00000000 --- a/unsorted_include_todo/PeveFunctionCurveEvent.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef _PEVEFUNCTIONCURVEEVENT_H -#define _PEVEFUNCTIONCURVEEVENT_H - -/** - * .obj __vt__22PeveFunctionCurveEvent, global - * .4byte __RTTI__22PeveFunctionCurveEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__22PeveFunctionCurveEventFv - * .4byte update__22PeveFunctionCurveEventFv - * .4byte isFinished__9PeveEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 - virtual void update(); // _24 - virtual void isFinished(); // _28 (weak) - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PeveFunctionCurveEvent : public NNode, public PeveEvent { - virtual void reset(); // _20 - virtual void update(); // _24 -}; - -#endif diff --git a/unsorted_include_todo/PeveHomingPositionEvent.h b/unsorted_include_todo/PeveHomingPositionEvent.h deleted file mode 100644 index 76effba2..00000000 --- a/unsorted_include_todo/PeveHomingPositionEvent.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef _PEVEHOMINGPOSITIONEVENT_H -#define _PEVEHOMINGPOSITIONEVENT_H - -/** - * .obj __vt__23PeveHomingPositionEvent, global - * .4byte __RTTI__23PeveHomingPositionEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__9PeveEventFv - * .4byte update__23PeveHomingPositionEventFv - * .4byte isFinished__9PeveEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 (weak) - virtual void update(); // _24 - virtual void isFinished(); // _28 (weak) - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PeveHomingPositionEvent : public NNode, public PeveEvent { - virtual void update(); // _24 -}; - -#endif diff --git a/unsorted_include_todo/PeveHomingPostureEvent.h b/unsorted_include_todo/PeveHomingPostureEvent.h deleted file mode 100644 index b52893b7..00000000 --- a/unsorted_include_todo/PeveHomingPostureEvent.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef _PEVEHOMINGPOSTUREEVENT_H -#define _PEVEHOMINGPOSTUREEVENT_H - -/** - * .obj __vt__22PeveHomingPostureEvent, weak - * .4byte __RTTI__22PeveHomingPostureEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__17PeveParallelEventFv - * .4byte update__17PeveParallelEventFv - * .4byte isFinished__17PeveParallelEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveParallelEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 - virtual void update(); // _24 - virtual void isFinished(); // _28 -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void _28() = 0; // _28 - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PeveHomingPostureEvent : public NNode, public PeveParallelEvent, public PeveEvent { -}; - -#endif diff --git a/unsorted_include_todo/PeveHorizontalSinWaveEvent.h b/unsorted_include_todo/PeveHorizontalSinWaveEvent.h deleted file mode 100644 index 6bf200dc..00000000 --- a/unsorted_include_todo/PeveHorizontalSinWaveEvent.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef _PEVEHORIZONTALSINWAVEEVENT_H -#define _PEVEHORIZONTALSINWAVEEVENT_H - -/** - * .obj __vt__26PeveHorizontalSinWaveEvent, global - * .4byte __RTTI__26PeveHorizontalSinWaveEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__26PeveHorizontalSinWaveEventFv - * .4byte update__26PeveHorizontalSinWaveEventFv - * .4byte isFinished__9PeveEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 - virtual void update(); // _24 - virtual void isFinished(); // _28 (weak) - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PeveHorizontalSinWaveEvent : public NNode, public PeveEvent { - virtual void reset(); // _20 - virtual void update(); // _24 -}; - -#endif diff --git a/unsorted_include_todo/PeveInterpolationEvent.h b/unsorted_include_todo/PeveInterpolationEvent.h deleted file mode 100644 index e39f3f71..00000000 --- a/unsorted_include_todo/PeveInterpolationEvent.h +++ /dev/null @@ -1,71 +0,0 @@ -#ifndef _PEVEINTERPOLATIONEVENT_H -#define _PEVEINTERPOLATIONEVENT_H - -/** - * .obj __vt__22PeveInterpolationEvent, global - * .4byte __RTTI__22PeveInterpolationEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__22PeveInterpolationEventFv - * .4byte update__22PeveInterpolationEventFv - * .4byte isFinished__22PeveInterpolationEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - * .4byte setStartTime__22PeveInterpolationEventFf - * .4byte getStartTime__22PeveInterpolationEventFv - * .4byte setPeriod__22PeveInterpolationEventFf - * .4byte getPeriod__22PeveInterpolationEventFv - * .4byte setTime__22PeveInterpolationEventFf - * .4byte getTime__22PeveInterpolationEventFv - * .4byte getEndTime__22PeveInterpolationEventFv - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 - virtual void update(); // _24 - virtual void isFinished(); // _28 - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PeveInterpolationEvent : public NNode, public PeveEvent { - virtual void reset(); // _20 - virtual void update(); // _24 - virtual void isFinished(); // _28 - virtual void setStartTime(float); // _3C - virtual void getStartTime(); // _40 - virtual void setPeriod(float); // _44 - virtual void getPeriod(); // _48 - virtual void setTime(float); // _4C - virtual void getTime(); // _50 - virtual void getEndTime(); // _54 -}; - -#endif diff --git a/unsorted_include_todo/PeveMoveEvent.h b/unsorted_include_todo/PeveMoveEvent.h deleted file mode 100644 index 87eb5e55..00000000 --- a/unsorted_include_todo/PeveMoveEvent.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef _PEVEMOVEEVENT_H -#define _PEVEMOVEEVENT_H - -/** - * .obj __vt__13PeveMoveEvent, global - * .4byte __RTTI__13PeveMoveEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__13PeveMoveEventFv - * .4byte update__9PeveEventFv - * .4byte isFinished__9PeveEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 - virtual void update(); // _24 (weak) - virtual void isFinished(); // _28 (weak) - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PeveMoveEvent : public NNode, public PeveEvent { - virtual void reset(); // _20 -}; - -#endif diff --git a/unsorted_include_todo/PeveParabolaEvent.h b/unsorted_include_todo/PeveParabolaEvent.h deleted file mode 100644 index 68b6bd9b..00000000 --- a/unsorted_include_todo/PeveParabolaEvent.h +++ /dev/null @@ -1,65 +0,0 @@ -#ifndef _PEVEPARABOLAEVENT_H -#define _PEVEPARABOLAEVENT_H - -/** - * .obj __vt__17PeveParabolaEvent, weak - * .4byte __RTTI__17PeveParabolaEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__9PeveEventFv - * .4byte update__21PeveAccelerationEventFv - * .4byte isFinished__9PeveEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 (weak) - virtual void _24() = 0; // _24 - virtual void isFinished(); // _28 (weak) - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -struct PeveAccelerationEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void update(); // _24 -}; - -/** - * @brief TODO - */ -struct PeveParabolaEvent : public NNode, public PeveEvent, public PeveAccelerationEvent { -}; - -#endif diff --git a/unsorted_include_todo/PeveParallelEvent.h b/unsorted_include_todo/PeveParallelEvent.h deleted file mode 100644 index 896cc988..00000000 --- a/unsorted_include_todo/PeveParallelEvent.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef _PEVEPARALLELEVENT_H -#define _PEVEPARALLELEVENT_H - -/** - * .obj __vt__17PeveParallelEvent, global - * .4byte __RTTI__17PeveParallelEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__17PeveParallelEventFv - * .4byte update__17PeveParallelEventFv - * .4byte isFinished__17PeveParallelEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 - virtual void update(); // _24 - virtual void isFinished(); // _28 - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PeveParallelEvent : public NNode, public PeveEvent { - virtual void reset(); // _20 - virtual void update(); // _24 - virtual void isFinished(); // _28 -}; - -#endif diff --git a/unsorted_include_todo/PeveSerialEvent.h b/unsorted_include_todo/PeveSerialEvent.h deleted file mode 100644 index 0f1062a5..00000000 --- a/unsorted_include_todo/PeveSerialEvent.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef _PEVESERIALEVENT_H -#define _PEVESERIALEVENT_H - -/** - * .obj __vt__15PeveSerialEvent, global - * .4byte __RTTI__15PeveSerialEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__15PeveSerialEventFv - * .4byte update__15PeveSerialEventFv - * .4byte isFinished__15PeveSerialEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 - virtual void update(); // _24 - virtual void isFinished(); // _28 - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PeveSerialEvent : public NNode, public PeveEvent { - virtual void reset(); // _20 - virtual void update(); // _24 - virtual void isFinished(); // _28 -}; - -#endif diff --git a/unsorted_include_todo/PeveTimeCondition.h b/unsorted_include_todo/PeveTimeCondition.h deleted file mode 100644 index ddd1fc0e..00000000 --- a/unsorted_include_todo/PeveTimeCondition.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _PEVETIMECONDITION_H -#define _PEVETIMECONDITION_H - -/** - * .obj __vt__17PeveTimeCondition, weak - * .4byte __RTTI__17PeveTimeCondition - * .4byte 0 - * .4byte isMet__17PeveTimeConditionFv - * .4byte reset__17PeveTimeConditionFv - * .4byte update__17PeveTimeConditionFv - */ - -/** - * @brief TODO - */ -struct PeveTimeCondition { - virtual void isMet(); // _08 - virtual void reset(); // _0C - virtual void update(); // _10 - - PeveTimeCondition(); -}; - -#endif diff --git a/unsorted_include_todo/PeveVibrationEvent.h b/unsorted_include_todo/PeveVibrationEvent.h deleted file mode 100644 index 9b5cd8f5..00000000 --- a/unsorted_include_todo/PeveVibrationEvent.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef _PEVEVIBRATIONEVENT_H -#define _PEVEVIBRATIONEVENT_H - -/** - * .obj __vt__18PeveVibrationEvent, global - * .4byte __RTTI__18PeveVibrationEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__9PeveEventFv - * .4byte update__18PeveVibrationEventFv - * .4byte isFinished__9PeveEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 (weak) - virtual void update(); // _24 - virtual void isFinished(); // _28 (weak) - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PeveVibrationEvent : public NNode, public PeveEvent { - virtual void update(); // _24 -}; - -#endif diff --git a/unsorted_include_todo/PeveWaitEvent.h b/unsorted_include_todo/PeveWaitEvent.h deleted file mode 100644 index d15d77c6..00000000 --- a/unsorted_include_todo/PeveWaitEvent.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef _PEVEWAITEVENT_H -#define _PEVEWAITEVENT_H - -/** - * .obj __vt__13PeveWaitEvent, weak - * .4byte __RTTI__13PeveWaitEvent - * .4byte 0 - * .4byte setChild__5NNodeFiP5NNode - * .4byte addChild__5NNodeFP5NNode - * .4byte addChild__5NNodeFiP5NNode - * .4byte removeChild__5NNodeFP5NNode - * .4byte removeChild__5NNodeFi - * .4byte removeAllChildren__5NNodeFv - * .4byte reset__9PeveEventFv - * .4byte update__9PeveEventFv - * .4byte isFinished__9PeveEventFv - * .4byte finish__9PeveEventFv - * .4byte setEventOption__9PeveEventFi - * .4byte clearEventOption__9PeveEventFi - * .4byte setEventOptions__9PeveEventFi - */ - -struct NNode { - virtual void setChild(int, NNode*); // _08 - virtual void addChild(NNode*); // _0C - virtual void addChild(int, NNode*); // _10 - virtual void removeChild(NNode*); // _14 - virtual void removeChild(int); // _18 - virtual void removeAllChildren(); // _1C -}; - -struct PeveEvent { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void reset(); // _20 (weak) - virtual void update(); // _24 (weak) - virtual void isFinished(); // _28 (weak) - virtual void finish(); // _2C (weak) - virtual void setEventOption(int); // _30 - virtual void clearEventOption(int); // _34 - virtual void setEventOptions(int); // _38 -}; - -/** - * @brief TODO - */ -struct PeveWaitEvent : public NNode, public PeveEvent { -}; - -#endif diff --git a/unsorted_include_todo/RippleEffect.h b/unsorted_include_todo/RippleEffect.h deleted file mode 100644 index 0f229b9d..00000000 --- a/unsorted_include_todo/RippleEffect.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef _RIPPLEEFFECT_H -#define _RIPPLEEFFECT_H - -/** - * .obj __vt__12RippleEffect, global - * .4byte __RTTI__12RippleEffect - * .4byte 0 - * .4byte invoke__7KEffectFPQ23zen17particleGenerator - * .4byte __RTTI__12RippleEffect - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__12RippleEffect - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__12RippleEffectFR10EffectParm - * .4byte kill__12RippleEffectFv - * .4byte stop__12RippleEffectFv - * .4byte restart__12RippleEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 (weak) - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 (weak) - virtual void invoke(zen::particleMdl*); // _28 (weak) -}; - -/** - * @brief TODO - */ -struct RippleEffect : public KEffect { - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 - virtual void stop(); // _34 - virtual void restart(); // _38 -}; - -#endif diff --git a/unsorted_include_todo/SimpleEffect.h b/unsorted_include_todo/SimpleEffect.h deleted file mode 100644 index da862165..00000000 --- a/unsorted_include_todo/SimpleEffect.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef _SIMPLEEFFECT_H -#define _SIMPLEEFFECT_H - -/** - * .obj __vt__12SimpleEffect, weak - * .4byte __RTTI__12SimpleEffect - * .4byte 0 - * .4byte invoke__7KEffectFPQ23zen17particleGenerator - * .4byte __RTTI__12SimpleEffect - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__12SimpleEffect - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__12SimpleEffectFR10EffectParm - * .4byte kill__12SimpleEffectFv - * .4byte stop__7KEffectFv - * .4byte restart__7KEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 (weak) - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 (weak) - virtual void invoke(zen::particleMdl*); // _28 (weak) - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 - virtual void stop(); // _34 (weak) - virtual void restart(); // _38 (weak) -}; - -/** - * @brief TODO - */ -struct SimpleEffect : public KEffect { - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 -}; - -#endif diff --git a/unsorted_include_todo/SlimeEffect.h b/unsorted_include_todo/SlimeEffect.h deleted file mode 100644 index 99f865bd..00000000 --- a/unsorted_include_todo/SlimeEffect.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef _SLIMEEFFECT_H -#define _SLIMEEFFECT_H - -/** - * .obj __vt__11SlimeEffect, global - * .4byte __RTTI__11SlimeEffect - * .4byte 0 - * .4byte invoke__7KEffectFPQ23zen17particleGenerator - * .4byte __RTTI__11SlimeEffect - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__11SlimeEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__11SlimeEffect - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__11SlimeEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__11SlimeEffectFR10EffectParm - * .4byte kill__11SlimeEffectFv - * .4byte stop__11SlimeEffectFv - * .4byte restart__11SlimeEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 (weak) - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 - virtual void invoke(zen::particleMdl*); // _28 (weak) -}; - -/** - * @brief TODO - */ -struct SlimeEffect : public KEffect { - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 - virtual void stop(); // _34 - virtual void restart(); // _38 -}; - -#endif diff --git a/unsorted_include_todo/SmokeGrassEffect.h b/unsorted_include_todo/SmokeGrassEffect.h deleted file mode 100644 index dc4796bc..00000000 --- a/unsorted_include_todo/SmokeGrassEffect.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef _SMOKEGRASSEFFECT_H -#define _SMOKEGRASSEFFECT_H - -/** - * .obj __vt__16SmokeGrassEffect, weak - * .4byte __RTTI__16SmokeGrassEffect - * .4byte 0 - * .4byte invoke__7KEffectFPQ23zen17particleGenerator - * .4byte __RTTI__16SmokeGrassEffect - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__16SmokeGrassEffect - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__16SmokeGrassEffectFR10EffectParm - * .4byte kill__7KEffectFv - * .4byte stop__7KEffectFv - * .4byte restart__7KEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 (weak) - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 (weak) - virtual void invoke(zen::particleMdl*); // _28 (weak) - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 (weak) - virtual void stop(); // _34 (weak) - virtual void restart(); // _38 (weak) -}; - -/** - * @brief TODO - */ -struct SmokeGrassEffect : public KEffect { - virtual void emit(EffectParm&); // _2C -}; - -#endif diff --git a/unsorted_include_todo/SmokeRockEffect.h b/unsorted_include_todo/SmokeRockEffect.h deleted file mode 100644 index 3d9569aa..00000000 --- a/unsorted_include_todo/SmokeRockEffect.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef _SMOKEROCKEFFECT_H -#define _SMOKEROCKEFFECT_H - -/** - * .obj __vt__15SmokeRockEffect, weak - * .4byte __RTTI__15SmokeRockEffect - * .4byte 0 - * .4byte invoke__7KEffectFPQ23zen17particleGenerator - * .4byte __RTTI__15SmokeRockEffect - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__15SmokeRockEffect - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__15SmokeRockEffectFR10EffectParm - * .4byte kill__7KEffectFv - * .4byte stop__7KEffectFv - * .4byte restart__7KEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 (weak) - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 (weak) - virtual void invoke(zen::particleMdl*); // _28 (weak) - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 (weak) - virtual void stop(); // _34 (weak) - virtual void restart(); // _38 (weak) -}; - -/** - * @brief TODO - */ -struct SmokeRockEffect : public KEffect { - virtual void emit(EffectParm&); // _2C -}; - -#endif diff --git a/unsorted_include_todo/SmokeSoilEffect.h b/unsorted_include_todo/SmokeSoilEffect.h deleted file mode 100644 index c16cb880..00000000 --- a/unsorted_include_todo/SmokeSoilEffect.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef _SMOKESOILEFFECT_H -#define _SMOKESOILEFFECT_H - -/** - * .obj __vt__15SmokeSoilEffect, weak - * .4byte __RTTI__15SmokeSoilEffect - * .4byte 0 - * .4byte invoke__7KEffectFPQ23zen17particleGenerator - * .4byte __RTTI__15SmokeSoilEffect - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__15SmokeSoilEffect - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__15SmokeSoilEffectFR10EffectParm - * .4byte kill__7KEffectFv - * .4byte stop__7KEffectFv - * .4byte restart__7KEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 (weak) - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 (weak) - virtual void invoke(zen::particleMdl*); // _28 (weak) - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 (weak) - virtual void stop(); // _34 (weak) - virtual void restart(); // _38 (weak) -}; - -/** - * @brief TODO - */ -struct SmokeSoilEffect : public KEffect { - virtual void emit(EffectParm&); // _2C -}; - -#endif diff --git a/unsorted_include_todo/SmokeTreeEffect.h b/unsorted_include_todo/SmokeTreeEffect.h deleted file mode 100644 index 4e2e976d..00000000 --- a/unsorted_include_todo/SmokeTreeEffect.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef _SMOKETREEEFFECT_H -#define _SMOKETREEEFFECT_H - -/** - * .obj __vt__15SmokeTreeEffect, weak - * .4byte __RTTI__15SmokeTreeEffect - * .4byte 0 - * .4byte invoke__7KEffectFPQ23zen17particleGenerator - * .4byte __RTTI__15SmokeTreeEffect - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__15SmokeTreeEffect - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__15SmokeTreeEffectFR10EffectParm - * .4byte kill__7KEffectFv - * .4byte stop__7KEffectFv - * .4byte restart__7KEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 (weak) - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 (weak) - virtual void invoke(zen::particleMdl*); // _28 (weak) - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 (weak) - virtual void stop(); // _34 (weak) - virtual void restart(); // _38 (weak) -}; - -/** - * @brief TODO - */ -struct SmokeTreeEffect : public KEffect { - virtual void emit(EffectParm&); // _2C -}; - -#endif diff --git a/unsorted_include_todo/SplineInterpolator.h b/unsorted_include_todo/SplineInterpolator.h deleted file mode 100644 index 706acb73..00000000 --- a/unsorted_include_todo/SplineInterpolator.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _SPLINEINTERPOLATOR_H -#define _SPLINEINTERPOLATOR_H - -/* - * @brief TODO - */ -struct SplineInterpolator { - void reset(); - void interpolateNext(float, NPosture3D&); - void outputPosture(float, NPosture3D&); - void searchSegmentIndex(float, int); -}; - -#endif diff --git a/unsorted_include_todo/UfoSuckEffect.h b/unsorted_include_todo/UfoSuckEffect.h deleted file mode 100644 index 4e82ee19..00000000 --- a/unsorted_include_todo/UfoSuckEffect.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef _UFOSUCKEFFECT_H -#define _UFOSUCKEFFECT_H - -/** - * .obj __vt__13UfoSuckEffect, weak - * .4byte __RTTI__13UfoSuckEffect - * .4byte 0 - * .4byte invoke__7KEffectFPQ23zen17particleGenerator - * .4byte __RTTI__13UfoSuckEffect - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__15WhistleTemplateFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__13UfoSuckEffect - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__15WhistleTemplateFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__15WhistleTemplateFR10EffectParm - * .4byte kill__15WhistleTemplateFv - * .4byte stop__7KEffectFv - * .4byte restart__7KEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 (weak) - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void _24() = 0; // _24 - virtual void invoke(zen::particleMdl*); // _28 (weak) - virtual void _2C() = 0; // _2C - virtual void _30() = 0; // _30 - virtual void stop(); // _34 (weak) - virtual void restart(); // _38 (weak) -}; - -struct WhistleTemplate { - virtual void _08() = 0; // _08 - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 - virtual void _28() = 0; // _28 - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 -}; - -/** - * @brief TODO - */ -struct UfoSuckEffect : public KEffect, public WhistleTemplate { -}; - -#endif diff --git a/unsorted_include_todo/UfoSuikomiEffect.h b/unsorted_include_todo/UfoSuikomiEffect.h deleted file mode 100644 index d11e3479..00000000 --- a/unsorted_include_todo/UfoSuikomiEffect.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef _UFOSUIKOMIEFFECT_H -#define _UFOSUIKOMIEFFECT_H - -/** - * .obj __vt__16UfoSuikomiEffect, weak - * .4byte __RTTI__16UfoSuikomiEffect - * .4byte 0 - * .4byte invoke__7KEffectFPQ23zen17particleGenerator - * .4byte __RTTI__16UfoSuikomiEffect - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__16UfoSuikomiEffect - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__7KEffectFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__16UfoSuikomiEffectFR10EffectParm - * .4byte kill__16UfoSuikomiEffectFv - * .4byte stop__7KEffectFv - * .4byte restart__7KEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 (weak) - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 (weak) - virtual void invoke(zen::particleMdl*); // _28 (weak) - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 - virtual void stop(); // _34 (weak) - virtual void restart(); // _38 (weak) -}; - -/** - * @brief TODO - */ -struct UfoSuikomiEffect : public KEffect { - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 -}; - -#endif diff --git a/unsorted_include_todo/WhistleTemplate.h b/unsorted_include_todo/WhistleTemplate.h deleted file mode 100644 index 9e459403..00000000 --- a/unsorted_include_todo/WhistleTemplate.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef _WHISTLETEMPLATE_H -#define _WHISTLETEMPLATE_H - -/** - * .obj __vt__15WhistleTemplate, weak - * .4byte __RTTI__15WhistleTemplate - * .4byte 0 - * .4byte invoke__7KEffectFPQ23zen17particleGenerator - * .4byte __RTTI__15WhistleTemplate - * .4byte 0xFFFFFFFC - * .4byte "@4@invoke__15WhistleTemplateFPQ23zen17particleGeneratorPQ23zen11particleMdl" - * .4byte __RTTI__15WhistleTemplate - * .4byte 0xFFFFFFF8 - * .4byte "@8@invoke__7KEffectFPQ23zen11particleMdl" - * .4byte invoke__15WhistleTemplateFPQ23zen17particleGeneratorPQ23zen11particleMdl - * .4byte invoke__7KEffectFPQ23zen11particleMdl - * .4byte emit__15WhistleTemplateFR10EffectParm - * .4byte kill__15WhistleTemplateFv - * .4byte stop__7KEffectFv - * .4byte restart__7KEffectFv - */ - -struct KEffect { - virtual void invoke(zen::particleGenerator*); // _08 (weak) - virtual void _0C() = 0; // _0C - virtual void _10() = 0; // _10 - virtual void _14() = 0; // _14 - virtual void _18() = 0; // _18 - virtual void _1C() = 0; // _1C - virtual void _20() = 0; // _20 - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 - virtual void invoke(zen::particleMdl*); // _28 (weak) - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 - virtual void stop(); // _34 (weak) - virtual void restart(); // _38 (weak) -}; - -/** - * @brief TODO - */ -struct WhistleTemplate : public KEffect { - virtual void invoke(zen::particleGenerator*, zen::particleMdl*); // _24 - virtual void emit(EffectParm&); // _2C - virtual void kill(); // _30 -}; - -#endif