mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-12 13:35:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into pjb-audio

Browse Source
This commit is contained in:
PJB3005
2026-03-27 17:18:11 +01:00
parent 4b30cd7ddb 04df9d5397
commit 248f3945b4
100 changed files with 2987 additions and 1076 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/include/JSystem/JAHNodeLib/JAHSoundPlayerNode.h
+33
View File
@@ -2,10 +2,43 @@
#define JAHSOUNDPLAYERNODE_H
#include "JSystem/JAHostIO/JAHFrameNode.h"
#include "JSystem/JAHostIO/JAHUAsnData.h"
#include "JSystem/JAHostIO/JAHUTableEdit.h"
class JAHPlayBox : public JAHUSeBox {
public:
JAHPlayBox();
virtual void onCurrentNodeFrame();
public:
/* 0x85 */ u8 unk85;
};
class JAHSoundPlayerNode : public JAHFrameNode {
public:
JAHSoundPlayerNode();
virtual void message(JAHControl&);
virtual void onCurrentNodeFrame();
u8 getContMode() const;
public:
/* 0x70 */ s32 unk70;
/* 0x74 */ s32 unk74;
/* 0x78 */ s32 unk78;
/* 0x7C */ u8 unk7C;
/* 0x7D */ u8 unk7D;
/* 0x7E */ u8 unk7E;
/* 0x7F */ u8 unk7F;
/* 0x80 */ s32 unk80;
/* 0x84 */ s32 unk84;
/* 0x88 */ s64 unk88;
/* 0x90 */ s64 unk90;
/* 0x98 */ JAHPlayBox unk98;
/* 0x120 */ bool unk120;
/* 0x122 */ JAHUAsn unk122;
};
#endif /* JAHSOUNDPLAYERNODE_H */
libs/JSystem/include/JSystem/JAHostIO/JAHFrameNode.h
+4 -2
View File
@@ -9,17 +9,19 @@ class JAHVirtualNode;
class JAHFrameNode : public JAHioNode {
public:
JAHFrameNode(const char*);
/* vt[07] */ virtual ~JAHFrameNode();
/* vt[02] */ virtual void listenPropertyEvent(const JORPropertyEvent*);
/* vt[05] */ virtual void genMessage(JORMContext*);
/* vt[06] */ virtual void listenNodeEvent(const JORNodeEvent*);
/* vt[0C] */ virtual s32 getNodeType();
/* vt[0C] */ virtual s32 getNodeType() { return 1; }
/* vt[11] */ virtual void onCurrentNodeFrame();
/* vt[12] */ virtual void onFrame();
void framework();
void currentFramework();
void callAllVirtualMessages(JAHControl&);
void appendVirNode(JAHVirtualNode*);
JSULink<JAHFrameNode>* getFrameNodeLink() { return &mFrameNodeLink; }
/* 0x44 */ JSUTree<JAHVirtualNode> mTree;
libs/JSystem/include/JSystem/JAHostIO/JAHPubDefine.h
+5 -1
View File
@@ -4,18 +4,22 @@
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JUtility/JUTAssert.h"
template<class T>
template <class T>
class JAHSingletonBase {
public:
JAHSingletonBase() { sInstance = (T*)this; }
virtual ~JAHSingletonBase() { sInstance = NULL; }
static T* newInstance() {
// clang-format off
JUT_ASSERT(82, sInstance==NULL);
// clang-format on
if (!sInstance) {
sInstance = JKR_NEW T();
}
// clang-format off
JUT_ASSERT(85, sInstance!=NULL);
// clang-format on
return sInstance;
}
libs/JSystem/include/JSystem/JAHostIO/JAHUAsnData.h
+40
View File
@@ -0,0 +1,40 @@
#ifndef JAHUASNNDATA_H
#define JAHUASNNDATA_H
#include "types.h"
class JORReflexible;
class JAHControl;
class JAHUAsn {
public:
JAHUAsn(u16 param_1) : unk0(param_1) {}
u8 getAttribute(u32);
u16 getSubNum(s32, s32);
u16 getDataNum(s32, s32, s32);
const char* getName(s32, s32, s32, s32);
u32 getDataId(s32, s32, s32, s32);
u8 getCategory(u32);
u8 getSub(u32);
u16 getDataPerCat(u32);
u16 getDataPerSub(u32);
u32 getNextId(u32, bool);
void createComboBoxCategory(JAHControl&);
void createComboBoxSub(JAHControl&, s32, s32);
void createComboBoxData(JAHControl&, s32, s32, s32);
void checkAndUpdateNameBox(s32*, s32*, s32*, s32*, s32, s32, s32, JORReflexible*);
void updateNameBoxAll(s32*, s32*, s32*, s32*, JORReflexible*);
private:
void __updateNameBoxCategory(s32*, JORReflexible*);
void __updateNameBoxSub(s32, s32, s32*, JORReflexible*);
void __updateNameBoxData(s32, s32, s32, s32*, JORReflexible*);
u32 __GetSubNo(s32);
u32 __GetDataNo(s32);
/* 0x0 */ u16 unk0;
};
#endif /* JAHUASNNDATA_H */
libs/JSystem/include/JSystem/JAHostIO/JAHUGlobal.h
+30
View File
@@ -0,0 +1,30 @@
#ifndef JAHUGLOBAL_H
#define JAHUGLOBAL_H
#include <cstring>
#include "JSystem/JHostIO/JORServer.h"
#include "JSystem/JUtility/JUTAssert.h"
inline void JAHUDialog_CatComment(char* param_1, const char* param_2, const char* param_3) {
if (param_3) {
std::strcpy(param_1, param_3);
std::strcat(param_1, "\n\n");
}
std::strcat(param_1, param_2);
}
inline void JAHUDialog_OK(const char* mes, const char* param_2, const char* param_3) {
char buffer[128];
if (param_3) {
JAHUDialog_CatComment(buffer, mes, param_3);
} else {
// clang-format off
JUT_ASSERT(144, std::strlen(mes)<128-1)
// clang-format on
std::strcpy(buffer, mes);
}
JORMessageBox(buffer, param_2, 0x30);
}
#endif /* JAHUGLOBAL_H */
libs/JSystem/include/JSystem/JAHostIO/JAHUTableEdit.h
+38 -1
View File
@@ -2,10 +2,47 @@
#define JAHUTABLEDIT_H
#include "JSystem/JAHostIO/JAHVirtualNode.h"
#include "JSystem/JAudio2/JAISound.h"
class JAHUAsn;
class JAHUSeBox : public JAHVirtualNode {
public:
JAHUSeBox();
JAHUSeBox(u32, u32*);
virtual void message(JAHControl&);
virtual void onCurrentNodeFrame();
virtual void propertyEvent(JAH_P_Event, uintptr_t);
virtual void nodeEvent(JAH_N_Event);
virtual void trigPlayButton();
virtual void trigStopButton();
virtual void soundPlay();
virtual void soundStop();
u8 checkNameSetChange();
void updateNameSet(JORReflexible*);
void setId(u32, bool, JORReflexible*);
u32 getId() const { return unk58; }
public:
/* 0x40 */ JAISoundHandle unk40;
/* 0x44 */ JAISoundHandle unk44;
/* 0x48 */ bool unk48;
/* 0x4C */ u32 unk4C;
/* 0x50 */ u32 unk50;
/* 0x54 */ u32 unk54;
/* 0x58 */ u32 unk58;
/* 0x5C */ u32* unk5C;
/* 0x60 */ JAHUAsn* mAsnCalc;
/* 0x64 */ s32 unk64;
/* 0x68 */ s32 unk68;
/* 0x6C */ s32 unk6C;
/* 0x70 */ s32 unk70;
/* 0x74 */ s32 unk74;
/* 0x78 */ s32 unk78;
/* 0x7C */ s32 unk7C;
/* 0x80 */ s32 unk80;
/* 0x84 */ bool unk84;
};
#endif /* JAHUTABLEDIT_H */
libs/JSystem/include/JSystem/JAHostIO/JAHUpdate.h
+57
View File
@@ -0,0 +1,57 @@
#ifndef JAHUPDATE_H
#define JAHUPDATE_H
#include "JSystem/JAHostIO/JAHioNode.h"
#include "JSystem/JHostIO/JORMContext.h"
#include "JSystem/JHostIO/JORServer.h"
#include "types.h"
namespace JAHUpdate {
extern JAHioNode* spNode;
extern JORMContext* spMc;
inline void startUpdateNode(JAHioNode* param_1) {
spMc = attachJORMContext(8);
spNode = param_1;
spMc->startUpdateNode(spNode);
}
inline void endUpdateNode() {
spMc->endUpdateNode();
releaseJORMContext(spMc);
spMc = NULL;
spNode = NULL;
}
inline void buttonOn(JAHioNode* param_1, u32 param_2) {
bool b = false;
if (spMc != NULL)
b = true;
if (!b)
startUpdateNode(param_1);
spMc->updateButton(1, param_2, 0);
if (!b)
endUpdateNode();
}
inline void buttonOff(JAHioNode* param_1, u32 param_2) {
bool b = false;
if (spMc != NULL)
b = true;
if (!b)
startUpdateNode(param_1);
spMc->updateButton(1, param_2, 0x40000000);
if (!b)
endUpdateNode();
}
} // namespace JAHUpdate
#endif /* JAHUPDATE_H */
libs/JSystem/include/JSystem/JAHostIO/JAHVirtualNode.h
+18 -3
View File
@@ -8,13 +8,28 @@ class JAHControl;
class JAHVirtualNode {
public:
JAHVirtualNode();
JAHVirtualNode(const char*);
virtual void updateNode();
virtual void message(JAHControl&);
virtual void message(JAHControl&) {}
virtual void onFrame();
virtual void onCurrentNodeFrame();
virtual void propertyEvent(JAH_P_Event, u32);
virtual void propertyEvent(JAH_P_Event, uintptr_t);
virtual void nodeEvent(JAH_N_Event);
virtual void virtualMessage(JAHControl&);
void callAllVirtualMessages(JAHControl&);
JAHioNode* getMaster();
void framework();
void currentFramework();
void listenVirtualPropertyEvent(JAH_P_Event, uintptr_t);
void listenVirtualNodeEvent(JAH_N_Event);
void setVirNodeName(const char*);
JSUTree<JAHVirtualNode>* getVirTree() { return &mTree; }
static u32 getVirNodeNum() { return smVirNodeNum; }
static u32 smVirNodeNum;
/* 0x04 */ JSUTree<JAHVirtualNode> mTree;
/* 0x20 */ char mName[32];
libs/JSystem/include/JSystem/JAHostIO/JAHioMessage.h
+185 -7
View File
@@ -1,22 +1,42 @@
#ifndef JAHIOMESSAGE_H
#define JAHIOMESSAGE_H
#include <JSystem/JHostIO/JORMContext.h>
#include <types.h>
class JAHioNode;
class JORMContext;
class JAHControl;
class JAHControl {
public:
JAHControl(JORMContext*, JAHioNode*);
void returnY(u16);
void indent(s8);
void makeComment(const char*, u32, u8, u32);
void makeComment(const char*, u32, u8, u32);
void makeButtonL(const char*, u32, u16, u32);
void makeCommentL(const char*, u32, u16, u32);
void endComboBox();
void startComboBoxL(const char*, s32*, u16, u16, u32);
void makeSlider(const char*, s32*, s32, s32, u32);
void makeSlider(const char*, s16*, s16, s16, u32);
void makeSlider(const char*, f32*, f32, f32, u32);
void makeButton(const char*, u32, u8, u32);
void endRadioButton();
void makeRadioButtonItem(const char*, u8);
void startRadioButton(const char*, u8*, u8, u32);
void makeCheckBox(const char*, u8*, u8, bool, u32);
void makeSlider(const char*, u8*, u8, u8, u32);
void makeComboBoxItem(const char*, u8);
void makeComboBoxItem(const char*, s32);
void startComboBox(const char*, u8*, u8, u32);
static u16 getComboWidth(u8 itemNo) { return smComboWidth[itemNo]; }
static u16 getLineHeight() { return smLineHeight; }
static u16 getContWidth() { return smContWidth; }
static u16 getIntervalX() { return smIntX; }
static u16 getNameWidth() { return smNameWidth; }
static u32 getContWidth() { return smContWidth; }
static u32 getIntervalX() { return smIntX; }
static u32 getNameWidth() { return smNameWidth; }
static u16 smButtonWidth[];
static u16 smCommentWidth[];
@@ -34,9 +54,7 @@ public:
u16 getY() { return mY; }
JORMContext* getContext() { return mContext; }
void tabX(u16 param_1) {
mX += param_1 + smIntX;
}
void tabX(u16 param_1) { mX += smIntX + param_1; }
void returnYDirectSize(u16 param_1) {
mY += param_1;
mX = smXLeft + field_0x4 * smIndentSize;
@@ -49,4 +67,164 @@ public:
/* 0x0C */ JAHioNode* mNode;
};
// There's a funky dependency loop between JAHControl and JAHContTemplate, which must be resolved
// THIS way, as makeSlider etc functions must be defined NOT out-of-line for their string literal
// symbols to get the correct mangling.
class JAHContTemplate {
public:
template <class T>
static void startComboBox(JAHControl* param_1, const char* param_2, T* param_3, u16 param_4,
u16 param_5, u32 param_6) {
if (param_2) {
param_1->getContext()->genLabel(param_2, 0, param_6, NULL, param_1->getX(),
param_1->getY(), param_4, param_1->getLineHeight());
param_1->tabX(param_4);
}
param_1->getContext()->startComboBox(param_2, param_3, param_6, NULL, param_1->getX(),
param_1->getY() - 7, param_5,
param_1->getLineHeight());
param_1->tabX(param_5);
}
template <class T>
static void makeSlider(JAHControl* param_1, const char* param_2, T* param_3, T param_4,
T param_5, u32 param_6) {
if (param_2) {
param_1->getContext()->genLabel(param_2, 0, param_6, NULL, param_1->getX(),
param_1->getY(), param_1->getNameWidth(),
param_1->getLineHeight());
}
param_1->getContext()->genSlider(
"---", param_3, param_4, param_5, param_6, NULL,
(u32)param_1->getX() + param_1->getNameWidth() + param_1->getIntervalX(),
param_1->getY() - 3, param_1->getContWidth(), param_1->getLineHeight());
param_1->returnY(1);
}
template <class T>
static void startRadioButton(JAHControl* param_1, const char* param_2, T* param_3, T param_4,
u32 param_5) {
if (param_2) {
param_1->getContext()->genLabel(param_2, 0, param_5, NULL, param_1->getX(),
param_1->getY(), param_1->getNameWidth() + 48,
param_1->getLineHeight());
}
param_1->getContext()->startRadioButton(
param_2, param_3, param_5, NULL,
(u32)param_1->getX() + param_1->getNameWidth() + param_1->getIntervalX() + 48,
param_1->getY(), param_1->getContWidth() + 250, param_4 * 18);
param_1->returnYDirectSize(param_4 * 18);
}
template <class T>
static void makeCheckBox(JAHControl* param_1, const char* param_2, T* param_3, T param_4,
bool param_5, u32 param_6) {
if (!param_5) {
param_1->getContext()->genCheckBox(param_2, param_3, param_4, param_6, NULL,
param_1->getX(), param_1->getY(), 1000,
param_1->getLineHeight());
} else {
param_1->getContext()->genCheckBox(param_2, param_3, param_4, param_6, NULL,
param_1->getX() + param_1->getNameWidth() +
param_1->getIntervalX() + 52,
param_1->getY(), 1000, param_1->getLineHeight());
}
param_1->returnY(1);
}
template <class T>
static void startComboBox(JAHControl* param_1, const char* param_2, T* param_3, T param_4,
u32 param_5) {
if (param_2) {
param_1->getContext()->genLabel(param_2, 0, param_5, NULL, param_1->getX(),
param_1->getY(), param_1->getNameWidth() + 48,
param_1->getLineHeight());
}
param_1->getContext()->startComboBox(
param_2, param_3, param_5, NULL,
param_1->getX() + param_1->getNameWidth() + param_1->getIntervalX() + 48,
param_1->getY() - 7, param_1->getComboWidth(param_4), param_1->getLineHeight());
}
};
inline void JAHControl::makeButtonL(const char* param_1, u32 param_2, u16 param_3, u32 param_4) {
mContext->genButton(param_1, param_2, param_4, NULL, mX, mY - 5, param_3, smLineHeight);
tabX(param_3);
}
inline void JAHControl::makeCommentL(const char* param_1, u32 param_2, u16 param_3, u32 param_4) {
mContext->genLabel(param_1, param_2, param_4, NULL, mX, mY, param_3, smLineHeight);
tabX(param_3);
}
inline void JAHControl::endComboBox() {
mContext->endComboBox();
}
inline void JAHControl::startComboBoxL(const char* param_1, s32* param_2, u16 param_3, u16 param_4,
u32 param_5) {
JAHContTemplate::startComboBox(this, param_1, param_2, param_3, param_4, param_5);
}
inline void JAHControl::makeSlider(const char* param_1, s32* param_2, s32 param_3, s32 param_4,
u32 param_5) {
JAHContTemplate::makeSlider(this, param_1, param_2, param_3, param_4, param_5);
}
inline void JAHControl::makeSlider(const char* param_1, s16* param_2, s16 param_3, s16 param_4,
u32 param_5) {
JAHContTemplate::makeSlider(this, param_1, param_2, param_3, param_4, param_5);
}
inline void JAHControl::makeSlider(const char* param_1, f32* param_2, f32 param_3, f32 param_4,
u32 param_5) {
JAHContTemplate::makeSlider(this, param_1, param_2, param_3, param_4, param_5);
}
inline void JAHControl::makeSlider(const char* param_1, u8* param_2, u8 param_3, u8 param_4,
u32 param_5) {
JAHContTemplate::makeSlider(this, param_1, param_2, param_3, param_4, param_5);
}
inline void JAHControl::makeButton(const char* param_1, u32 param_2, u8 param_3, u32 param_4) {
mContext->genButton(param_1, param_2, param_4, NULL, mX, mY - 5, smButtonWidth[param_3],
smLineHeight);
returnY(1);
}
inline void JAHControl::endRadioButton() {
mContext->endRadioButton();
}
inline void JAHControl::makeRadioButtonItem(const char* param_1, u8 param_2) {
mContext->genRadioButtonItem(param_1, param_2, 0, -1, -1, 128, 16);
}
inline void JAHControl::startRadioButton(const char* param_1, u8* param_2, u8 param_3,
u32 param_4) {
JAHContTemplate::startRadioButton(this, param_1, param_2, param_3, param_4);
}
inline void JAHControl::makeCheckBox(const char* param_1, u8* param_2, u8 param_3, bool param_4,
u32 param_5) {
JAHContTemplate::makeCheckBox(this, param_1, param_2, param_3, param_4, param_5);
}
inline void JAHControl::makeComboBoxItem(const char* label, u8 itemNo) {
makeComboBoxItem(label, (s32)itemNo);
}
inline void JAHControl::makeComboBoxItem(const char* label, s32 itemNo) {
mContext->genComboBoxItem(label, itemNo);
}
inline void JAHControl::startComboBox(const char* label, u8* param_2, u8 param_3, u32 param_4) {
JAHContTemplate::startComboBox(this, label, param_2, param_3, param_4);
}
#endif /* JAHIOMESSAGE_H */
libs/JSystem/include/JSystem/JAHostIO/JAHioNode.h
+1 -1
View File
@@ -31,7 +31,7 @@ public:
/* vt[0C] */ virtual s32 getNodeType() { return 0; }
/* vt[0D] */ virtual u32 getNodeKind() const;
/* vt[0E] */ virtual u32 getNodeIcon() const { return 0; }
/* vt[0F] */ virtual void propertyEvent(JAH_P_Event, u32) {}
/* vt[0F] */ virtual void propertyEvent(JAH_P_Event, uintptr_t) {}
/* vt[10] */ virtual void nodeEvent(JAH_N_Event) {}
void updateNode();
void setNodeName(const char*);
libs/JSystem/include/JSystem/JAudio2/JASDSPInterface.h
+1
View File
@@ -1,6 +1,7 @@
#ifndef JASDSPINTERFACE_H
#define JASDSPINTERFACE_H
#include <cstdint>
#include <types.h>
/**
libs/JSystem/include/JSystem/JAudio2/JAUSoundTable.h
+4
View File
@@ -193,7 +193,11 @@ struct JAUSoundNameTable : public JASGlobalInstance<JAUSoundNameTable> {
JAUSoundNameTable(bool param_0) : JASGlobalInstance<JAUSoundNameTable>(param_0) {
}
~JAUSoundNameTable() {}
int getNumGroups_inSection(u8) const;
int getNumItems_inGroup(u8, u8) const;
void init(void const*);
const char* getName(JAISoundID) const;
const char* getGroupName(JAISoundID) const;
JAUSoundTable_<JAUSoundNameTableRoot,JAUSoundNameTableSection,JAUSoundNameTableGroup,void> field_0x0;
};
libs/JSystem/include/JSystem/JHostIO/JOREvent.h
+36
View File
@@ -0,0 +1,36 @@
#ifndef JOREVENT_H
#define JOREVENT_H
#include "types.h"
class JORReflexible;
struct JOREvent {};
struct JORPropertyEvent : JOREvent {
enum EKind {
EKind_HasListener = (1 << 30),
EKind_ValueID = (1 << 29),
EKind_FloatValue = (1 << 9),
};
/* 0x00 */ u8 field_0x0[0x4 - 0x0];
/* 0x04 */ u32 type;
/* 0x08 */ u32 kind;
/* 0x0C */ char* id; // id?
/* 0x10 */ JORReflexible* field_0x10; // ?
/* 0x14 */ u32 field_0x14;
union {
u32 U32;
u16 U16[2];
}
/* 0x18 */ field_0x18;
};
struct JORGenEvent : JOREvent {};
struct JORNodeEvent : JOREvent {
/* 0x00 */ u32 field_0x0;
};
#endif /* JOREVENT_H */
libs/JSystem/include/JSystem/JHostIO/JORFile.h
+1 -1
View File
@@ -18,7 +18,7 @@ public:
/* 0x08 */ u32 m_fileAttribute;
/* 0x0C */ u32 m_lowDateTime;
/* 0x10 */ u32 m_highDateTime;
/* 0x14 */ char* m_filename;
/* 0x14 */ char m_filename[];
};
class JORFile {
libs/JSystem/include/JSystem/JHostIO/JORMContext.h
+17 -6
View File
@@ -8,7 +8,7 @@
#endif
#include <stdint.h>
#include <global.h>
#include "JSystem/JHostIO/JORReflexible.h"
#include "JSystem/JHostIO/JOREvent.h"
#include "JSystem/JSupport/JSUMemoryStream.h"
#define MCTX_MSG_RESET 0
@@ -195,9 +195,7 @@ public:
void startUpdateNode(JORReflexible* obj) { putNode(obj); }
void genNodeSub(const char* label, JORReflexible* i_node, u32, u32);
void putNode(JORReflexible* obj) {
mOutputStream << (uintptr_t)obj;
}
void putNode(JORReflexible* obj) { mOutputStream << (uintptr_t)obj; }
void invalidNode(JORReflexible* i_node, u32);
void genControl(u32 type, u32 kind, const char* label, u32 style, u32 id,
@@ -222,6 +220,10 @@ public:
u16 posX = -1, u16 posY = -1, u16 width = JORM_DEFAULT_WIDTH,
u16 height = JORM_DEFAULT_HEIGHT);
void updateButton(u32 param_1, u32 param_2, u32 param_3) {
updateControl(param_1, param_2, param_3);
}
void genLabel(const char* label, u32 id, u32 style = 0, JOREventListener* pListener = NULL,
u16 posX = -1, u16 posY = -1, u16 width = JORM_DEFAULT_WIDTH,
u16 height = JORM_DEFAULT_HEIGHT);
@@ -271,6 +273,7 @@ public:
DEFINE_START_COMBO_BOX_ID(s32, JORPropertyEvent::EKind_ValueID)
DEFINE_UPDATE_COMBO_BOX(u8)
DEFINE_UPDATE_COMBO_BOX(s32)
DEFINE_UPDATE_COMBO_BOX_ID(s32)
@@ -280,6 +283,16 @@ public:
genSelectorItemSub(label, itemNo, 0, 0, 0, 0, 0);
}
void editComboBoxItem(u32 param_0, u32 param_1, const char* param_2, s32 param_3, u32 param_4);
void addComboBoxItem(u32 param_1, s32* param_2, const char* param_3, s32 param_4, u32 param_5) {
editComboBoxItem(param_1, (uintptr_t)param_2, param_3, param_4, param_5);
}
void removeComboBoxItem(u32 param_1, s32* param_2, u32 param_3) {
editComboBoxItem(param_1, (uintptr_t)param_2, NULL, 0, param_3);
}
/**
* === RADIO BUTTON ===
*/
@@ -314,8 +327,6 @@ public:
updateSelectorSub(mode, (uintptr_t)pSrc, *pSrc, param_3);
}
void editComboBoxItem(u32 param_0, u32 param_1, const char* param_2, s32 param_3, u32 param_4);
void openMessageBox(void* param_0, u32 style, const char* message, const char* title);
/* 0x00000 */ u8 mBuffer[0x10000];
libs/JSystem/include/JSystem/JHostIO/JORReflexible.h
+8 -37
View File
@@ -2,36 +2,12 @@
#define JORREFLEXIBLE_H
#include <types.h>
#include "JSystem/JHostIO/JORServer.h"
class JORReflexible;
struct JOREvent {};
struct JORPropertyEvent : JOREvent {
enum EKind {
EKind_HasListener = (1 << 30),
EKind_ValueID = (1 << 29),
EKind_FloatValue = (1 << 9),
};
/* 0x00 */ u8 field_0x0[0x4 - 0x0];
/* 0x04 */ u32 type;
/* 0x08 */ u32 kind;
/* 0x0C */ char* id; // id?
/* 0x10 */ JORReflexible* field_0x10; // ?
/* 0x14 */ u32 field_0x14;
union {
u32 U32;
u16 U16[2];
}
/* 0x18 */ field_0x18;
};
struct JORGenEvent : JOREvent {};
struct JORNodeEvent : JOREvent {
/* 0x00 */ u32 field_0x0;
};
struct JOREvent;
struct JORPropertyEvent;
struct JORGenEvent;
struct JORNodeEvent;
class JORMContext;
class JORServer;
@@ -46,16 +22,11 @@ public:
class JORReflexible : public JOREventListener {
public:
static JORServer* getJORServer() { return JORServer::getInstance(); }
#if DEBUG
JORReflexible() {}
#if TARGET_PC
static JORServer* getJORServer() {
OSPanic(__FILE__, __LINE__, "getJORServer is unimplemented");
}
#else
static JORServer* getJORServer();
#endif
virtual void listenPropertyEvent(const JORPropertyEvent*);
virtual void listen(u32, const JOREvent*);
virtual void genObjectInfo(const JORGenEvent*);
libs/JSystem/include/JSystem/JKernel/JKRHeap.h
+6 -2
View File
@@ -81,7 +81,7 @@ public:
bool setErrorFlag(bool errorFlag);
bool isSubHeap(JKRHeap* heap) const;
void* getAltAramStartAdr();
static void* getAltAramStartAdr();
/* vt[03] */ virtual void callAllDisposer();
/* vt[04] */ virtual u32 getHeapType() = 0;
@@ -222,9 +222,13 @@ public:
#define JKRHEAP_NAME(heap, name) (heap)->setName(name)
#define JKRHEAP_NAMEF(heap, name, ...) (heap)->setNamef(name, __VA_ARGS__)
#define JKRHEAP_CURRENT_NAME(heap, name) JKRHEAP_NAME(mDoExt_getCurrentHeap(), name)
#define JKRHEAP_CURRENT_NAMEF(heap, name, ...) JKRHEAP_NAMEF(mDoExt_getCurrentHeap(), name, __VA_ARGS__)
#else
#define JKRHEAP_NAME(heap, name)
#define JKRHEAP_NAMEF(heap, name)
#define JKRHEAP_NAMEF(heap, name, ...)
#define JKRHEAP_CURRENT_NAME(heap, name)
#define JKRHEAP_CURRENT_NAMEF(heap, name, ...)
#endif
};
libs/JSystem/include/JSystem/JStudio/JStudio/ctb.h
+3 -3
View File
@@ -64,9 +64,9 @@ struct data {
};
struct TBlockData {
u32 size;
u16 scheme;
u16 IDSize;
BE(u32) size;
BE(u16) scheme;
BE(u16) IDSize;
u32 field_0x8[0];
};
libs/JSystem/include/JSystem/JStudio/JStudio_JParticle/control.h
+1 -102
View File
@@ -27,7 +27,7 @@ struct TCreateObject : public JStudio::TCreateObject {
createObject_JPA_PARTICLE_(JStudio::stb::data::TParse_TBlock_object const&,
JStudio_JParticle::TCreateObject*);
const JStage::TSystem* get_pJSGSystem_() { return pJSGSystem_; }
const JStage::TSystem* get_pJSGSystem_() const { return pJSGSystem_; }
bool isPermit_onExit_notEnd() { return mPermit_onExit_notEnd; }
/* 0x0C */ JPAEmitterManager* pJPAEmitterManager_;
@@ -35,107 +35,6 @@ struct TCreateObject : public JStudio::TCreateObject {
/* 0x14 */ bool mPermit_onExit_notEnd;
};
struct TAdaptor_particle : public JStudio::TAdaptor_particle {
typedef JStudio::TObject_particle ObjectType;
struct TJPACallback_emitter_ : public JPAEmitterCallBack {
TJPACallback_emitter_(TAdaptor_particle* param_1) {
pThis_ = param_1;
pOld = NULL;
JUT_ASSERT(113, pThis_!=NULL);
}
virtual void execute(JPABaseEmitter*);
virtual void executeAfter(JPABaseEmitter*);
virtual void draw(JPABaseEmitter*);
virtual void drawAfter(JPABaseEmitter*);
JPAEmitterCallBack* getOld() { return pOld; }
void setOld(JPAEmitterCallBack* cb) { pOld = cb; }
/* 0x4 */ TAdaptor_particle* pThis_;
/* 0x8 */ JPAEmitterCallBack* pOld;
};
struct TJPAEmitter_stopDrawParticle_ {
TJPAEmitter_stopDrawParticle_(JPABaseEmitter* emitter) : pJPAEmitter_(emitter) {}
~TJPAEmitter_stopDrawParticle_() {
if (pJPAEmitter_ != NULL) {
pJPAEmitter_->stopDrawParticle();
}
}
void set(JPABaseEmitter* emitter) { pJPAEmitter_ = emitter; }
/* 0x0 */ JPABaseEmitter* pJPAEmitter_;
};
TAdaptor_particle(JStudio_JParticle::TCreateObject*);
void beginParticle_fadeIn_();
void endParticle_fadeOut_(u32);
virtual ~TAdaptor_particle();
virtual void adaptor_do_prepare();
virtual void adaptor_do_end();
virtual void adaptor_do_update(u32);
virtual void adaptor_do_PARTICLE(JStudio::data::TEOperationData, void const*, u32);
virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, void const*, u32);
virtual void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, void const*,
u32);
virtual void adaptor_do_END(JStudio::data::TEOperationData, void const*, u32);
virtual void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, void const*,
u32);
virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32);
virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*,
u32);
virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*,
u32);
virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, void const*,
u32);
virtual void adaptor_do_REPEAT(JStudio::data::TEOperationData, void const*, u32);
virtual void adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData, void const*,
u32);
static bool state_isFade_(u8 param_1) {
return param_1 == 1 || param_1 == 3;
}
bool state_isFade_() {
return state_isFade_(field_0x1b8);
}
void beginParticle_fadeIn_(u32 param_1) {
field_0x1c8 = param_1;
beginParticle_fadeIn_();
}
void beginParticle_() {
beginParticle_fadeIn_(0);
}
void endParticle_() {
if (pJPAEmitter_ != NULL) {
pJPAEmitter_->becomeInvalidEmitter();
}
}
void set_bPermit_onExit_notEnd_(bool param_1) { field_0x1b4 = param_1; }
/* 0x1A0 */ TCreateObject* pCreateObject_;
/* 0x1A4 */ JPABaseEmitter* pJPAEmitter_;
/* 0x1A8 */ TJPACallback_emitter_ field_0x1a8;
/* 0x1B4 */ u8 field_0x1b4;
/* 0x1B5 */ u8 field_0x1b5;
/* 0x1B6 */ u8 field_0x1b6;
/* 0x1B7 */ u8 field_0x1b7;
/* 0x1B8 */ u8 field_0x1b8;
/* 0x1BC */ u32 field_0x1bc;
/* 0x1C0 */ u32 u32FadeTime_end;
/* 0x1C4 */ u32 field_0x1c4;
/* 0x1C8 */ u32 field_0x1c8;
/* 0x1CC */ u32 field_0x1cc;
/* 0x1D0 */ JStage::TObject* field_0x1d0;
/* 0x1D4 */ u32 field_0x1d4;
/* 0x1D8 */ u8 field_0x1d8;
};
}; // namespace JStudio_JParticle
#endif /* JSTUDIO_JPARTICLE_CONTROL_H */
libs/JSystem/include/JSystem/JStudio/JStudio_JParticle/object-particle.h
+96
View File
@@ -3,4 +3,100 @@
#include "JSystem/JStudio/JStudio_JParticle/control.h"
namespace JStudio_JParticle {
struct TAdaptor_particle : public JStudio::TAdaptor_particle {
typedef JStudio::TObject_particle ObjectType;
struct TJPACallback_emitter_ : public JPAEmitterCallBack {
TJPACallback_emitter_(TAdaptor_particle* param_1) {
pThis_ = param_1;
pOld = NULL;
JUT_ASSERT(113, pThis_!=NULL);
}
virtual void execute(JPABaseEmitter*);
virtual void executeAfter(JPABaseEmitter*);
virtual void draw(JPABaseEmitter*);
virtual void drawAfter(JPABaseEmitter*);
JPAEmitterCallBack* getOld() const { return pOld; }
void setOld(JPAEmitterCallBack* cb) { pOld = cb; }
/* 0x4 */ TAdaptor_particle* pThis_;
/* 0x8 */ JPAEmitterCallBack* pOld;
};
TAdaptor_particle(JStudio_JParticle::TCreateObject*);
void beginParticle_fadeIn_();
void endParticle_fadeOut_(u32);
virtual ~TAdaptor_particle();
virtual void adaptor_do_prepare();
virtual void adaptor_do_end();
virtual void adaptor_do_update(u32);
virtual void adaptor_do_PARTICLE(JStudio::data::TEOperationData, void const*, u32);
virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, void const*, u32);
virtual void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, void const*,
u32);
virtual void adaptor_do_END(JStudio::data::TEOperationData, void const*, u32);
virtual void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, void const*,
u32);
virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32);
virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*,
u32);
virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*,
u32);
virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, void const*,
u32);
virtual void adaptor_do_REPEAT(JStudio::data::TEOperationData, void const*, u32);
virtual void adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData, void const*,
u32);
static const char* toString_state_(int param_1);
static bool state_isFade_(u8 param_1) {
return param_1 == 1 || param_1 == 3;
}
bool state_isFade_() const {
return state_isFade_(field_0x1b8);
}
void beginParticle_fadeIn_(u32 param_1) {
field_0x1c8 = param_1;
beginParticle_fadeIn_();
}
void beginParticle_() {
beginParticle_fadeIn_(0);
}
void endParticle_() {
if (pJPAEmitter_ != NULL) {
pJPAEmitter_->becomeInvalidEmitter();
}
}
void set_bPermit_onExit_notEnd_(bool param_1) { field_0x1b4 = param_1; }
/* 0x1A0 */ TCreateObject* pCreateObject_;
/* 0x1A4 */ JPABaseEmitter* pJPAEmitter_;
/* 0x1A8 */ TJPACallback_emitter_ field_0x1a8;
/* 0x1B4 */ u8 field_0x1b4;
/* 0x1B5 */ bool field_0x1b5;
/* 0x1B6 */ bool field_0x1b6;
/* 0x1B7 */ u8 field_0x1b7;
/* 0x1B8 */ u8 field_0x1b8;
/* 0x1BC */ u32 field_0x1bc;
/* 0x1C0 */ u32 u32FadeTime_end_;
/* 0x1C4 */ u32 u32FadeTime_current_;
/* 0x1C8 */ u32 field_0x1c8;
/* 0x1CC */ u32 field_0x1cc;
/* 0x1D0 */ JStage::TObject* field_0x1d0;
/* 0x1D4 */ u32 field_0x1d4;
/* 0x1D8 */ bool field_0x1d8;
};
} // namespace JStudio_JParticle
#endif /* OBJECT_PARTICLE_H */
libs/JSystem/include/JSystem/JSupport/JSUInputStream.h
+8 -12
View File
@@ -5,9 +5,9 @@
#include "dusk/endian.h"
/**
* @ingroup jsystem-jsupport
*
*/
* @ingroup jsystem-jsupport
*
*/
class JSUInputStream : public JSUIosBase {
public:
JSUInputStream() {}
@@ -93,13 +93,9 @@ public:
return *this;
}
s32 read(bool& val) {
return read(&val, sizeof(bool));
}
s32 read(bool& val) { return read(&val, sizeof(bool)); }
s32 read(u8& val) {
return read(&val, sizeof(u8));
}
s32 read(u8& val) { return read(&val, sizeof(u8)); }
s32 read(u32& param_0) {
auto ret = read(&param_0, 4);
@@ -114,9 +110,9 @@ public:
// move?
/**
* @ingroup jsystem-jsupport
*
*/
* @ingroup jsystem-jsupport
*
*/
template <typename T>
T* JSUConvertOffsetToPtr(const void*, const void*);
libs/JSystem/include/JSystem/JSupport/JSUMemoryStream.h
+5 -7
View File
@@ -5,9 +5,9 @@
#include "JSystem/JSupport/JSURandomOutputStream.h"
/**
* @ingroup jsystem-jsupport
*
*/
* @ingroup jsystem-jsupport
*
*/
class JSUMemoryInputStream : public JSURandomInputStream {
public:
JSUMemoryInputStream(const void* res, s32 size) { setBuffer(res, size); }
@@ -19,9 +19,7 @@ public:
s32 getLength() const;
s32 getPosition() const;
void* getPointer() const {
return (u8*)mBuffer + mPosition;
}
void* getPointer() const { return (u8*)mBuffer + mPosition; }
private:
/* 0x08 */ const void* mBuffer;
@@ -39,7 +37,7 @@ public:
virtual ~JSUMemoryOutputStream() {}
virtual s32 writeData(const void*, s32);
virtual s32 getLength() const;
virtual s32 getPosition() const;
virtual s32 getPosition() const { return mPosition; }
virtual s32 seek(s32, JSUStreamSeekFrom);
virtual s32 getAvailable() const;
virtual s32 seekPos(s32, JSUStreamSeekFrom);
libs/JSystem/src/JAHNodeLib/JAHAudienceSettingNode.cpp
+5
View File
@@ -0,0 +1,5 @@
#include <JSystem/JAHostIO/JAHioMessage.h>
void dummy(JAHControl* cont) {
cont->makeSlider(NULL, (f32*)NULL, (f32)0, (f32)0, 0);
}
libs/JSystem/src/JAHNodeLib/JAHConductNode.cpp
+8
View File
@@ -0,0 +1,8 @@
#include <JSystem/JAHostIO/JAHioMessage.h>
void dummy(JAHControl* cont, u16 s) {
cont->startRadioButton(NULL, (u8*)NULL, (u8)0, 0);
cont->makeRadioButtonItem(NULL, (u8)0);
cont->endRadioButton();
cont->makeButton(NULL, 0, (u8)0, 0);
}
libs/JSystem/src/JAHNodeLib/JAHIDSwapNode.cpp
+8
View File
@@ -0,0 +1,8 @@
#include "JSystem/JAHostIO/JAHUTableEdit.h"
#include "JSystem/JAHostIO/JAHioMessage.h"
static void dummy(JAHUSeBox* box, JAHControl* ctrl) {
box->getId();
ctrl->makeCheckBox(NULL, (u8*)NULL, 0, false, 0);
box->~JAHUSeBox();
}
libs/JSystem/src/JAHNodeLib/JAHSoundPlayerNode.cpp
+149
View File
@@ -0,0 +1,149 @@
#include "JSystem/JAHNodeLib/JAHSoundPlayerNode.h"
#include "JSystem/JAHostIO/JAHUpdate.h"
#include "JSystem/JAHostIO/JAHioMessage.h"
#include "JSystem/JAudio2/JAISoundStarter.h"
void JAHPlayBox::onCurrentNodeFrame() {
JAHSoundPlayerNode* master = (JAHSoundPlayerNode*)getMaster();
if (!master)
return;
u8 b = master->getContMode() & 2;
if (!b) {
JAHUSeBox::onCurrentNodeFrame();
} else if (unk48 != unk85) {
if (unk48) {
JAHUpdate::buttonOff(getMaster(), unk4C);
JAHUpdate::buttonOn(getMaster(), unk50);
} else {
JAHUpdate::buttonOn(getMaster(), unk4C);
JAHUpdate::buttonOff(getMaster(), unk50);
}
}
unk85 = unk48;
}
u8 JAHSoundPlayerNode::getContMode() const {
return unk7C;
}
JAHSoundPlayerNode::JAHSoundPlayerNode() : JAHFrameNode("SOUND PLAYER"), unk122(16) {
unk70 = 30;
unk74 = 60;
unk78 = 10;
unk7C = 0;
unk7D = 0;
unk7E = 1;
unk80 = 0;
unk84 = 0;
unk7F = 2;
unk120 = 0;
appendVirNode(&unk98);
}
JAHPlayBox::JAHPlayBox() : JAHUSeBox(-1, NULL) {
unk85 = 0;
}
void JAHSoundPlayerNode::message(JAHControl& param_1) {
param_1.returnY(1);
param_1.makeCheckBox("ID順に連続再生する", &unk7C, 2, false, 0);
param_1.returnY(1);
param_1.makeComment("--連続再生モード設定--", 0, 5, 0);
param_1.indent(1);
param_1.makeSlider("最大再生時間(1=0.1sec)", &unk70, 0, 60000, 0);
param_1.makeSlider("空白時間(1=0.1sec)", &unk78, 0, 6000, 0);
param_1.returnY(1);
param_1.startRadioButton("ダミーデータの挙動", &unk7E, 2, 0);
param_1.makeRadioButtonItem("スキップする", 1);
param_1.makeRadioButtonItem("再生する", 0);
param_1.endRadioButton();
param_1.startRadioButton("トリガーSEまたはBGM系の挙動", &unk7D, 2, 0);
param_1.makeRadioButtonItem("フル再生", 0);
param_1.makeRadioButtonItem("最大再生時間以上はフェードアウト", 1);
param_1.endRadioButton();
param_1.returnY(1);
param_1.makeSlider("フェードアウト時間(単位：ゲームフレーム)", &unk74, 0, 3600, 0);
}
void JAHSoundPlayerNode::onCurrentNodeFrame() {
if (!(unk7C & 2))
return;
u8 attr = unk122.getAttribute(unk98.getId());
switch (unk98.unk48) {
case true:
switch (unk7F) {
case 0:
if (!unk98.unk40) {
unk90 = OSGetTime();
unk84 = 0;
unk7F = 2;
break;
}
if (unk80 > unk70) {
unk84 = 0;
unk7F = 2;
} else {
JASGlobalInstance<JAISoundStarter>::getInstance()->startSound(unk98.getId(),
&unk98.unk40, NULL);
unk80 = OSTicksToMilliseconds(OSGetTime() - unk88) / 100;
}
if (unk7D == 1) {
if (unk80 > unk70) {
unk98.unk40->stop(unk74);
unk84 = 0;
unk90 = OSGetTime();
unk7F = 1;
} else {
unk80 = OSTicksToMilliseconds(OSGetTime() - unk88) / 100;
}
}
break;
case 1:
if (!unk98.unk40) {
unk7F = 2;
unk90 = OSGetTime();
}
break;
case 2:
if (unk120) {
if (unk84 <= unk78) {
if (unk84 < 0)
JASGlobalInstance<JAISoundStarter>::getInstance()->startSound(
unk98.getId(), &unk98.unk40, NULL);
unk84 = OSTicksToMilliseconds(OSGetTime() - unk90) / 100;
break;
}
u32 id = unk122.getNextId(unk98.getId(), unk7E != 0 ? true : false);
unk98.setId(id, true, this);
}
JASGlobalInstance<JAISoundStarter>::getInstance()->startSound(unk98.getId(),
&unk98.unk40, NULL);
unk7F = 0;
unk80 = 0;
unk88 = OSGetTime();
unk84 = 0;
break;
}
break;
case false:
if (unk120) {
unk80 = 0;
unk84 = 0;
unk7F = 2;
}
break;
}
unk120 = unk98.unk48;
}
libs/JSystem/src/JAHNodeLib/JAHViewerApp.cpp
+14
View File
@@ -0,0 +1,14 @@
#include "JSystem/JAHostIO/JAHioMessage.h"
#include "JSystem/JSupport/JSUMemoryStream.h"
#include "JSystem/JSupport/JSUOutputStream.h"
static void dummy(JSUMemoryInputStream& in, JSUOutputStream& out, JAHControl& ctrl) {
out << s16(0);
s16 b;
in >> b;
ctrl.makeSlider("", (u8*)NULL, (u8)0, (u8)0, 0);
u16 a;
in >> a;
in.getPointer();
}
libs/JSystem/src/JAHNodeLib/JAHViewerSys.cpp
+12
View File
@@ -0,0 +1,12 @@
#include "JSystem/JAHostIO/JAHUGlobal.h"
static void dummy(JSUInputStream& input) {
JSUMemoryOutputStream stream(NULL, 0);
stream.getPosition();
stream << u8(0);
u8 b;
input >> b;
u32 a;
input >> a;
JAHUDialog_OK("", "", "");
}
libs/JSystem/src/JAHostIO/JAHFrameNode.cpp
+93
View File
@@ -0,0 +1,93 @@
#include <JSystem/JAHostIO/JAHFrameNode.h>
#include <JSystem/JAHostIO/JAHVirtualNode.h>
#include <JSystem/JAHostIO/JAHioMessage.h>
#include <JSystem/JAHostIO/JAHioMgr.h>
JAHFrameNode::JAHFrameNode(const char* name)
: JAHioNode(name), mTree((JAHVirtualNode*)this), mFrameNodeLink(this) {}
void JAHFrameNode::genMessage(JORMContext* context) {
JAHControl control(context, this);
callAllVirtualMessages(control);
message(control);
if (JAHSingletonBase<JAHioMgr>::getIns()->getNodeSysType() == 0)
generateTempChildren(context);
else
generateRealChildren(context);
}
void JAHFrameNode::callAllVirtualMessages(JAHControl& control) {
if (mTree.getNumChildren() == 0)
return;
for (JSUTreeIterator<JAHVirtualNode> iter = mTree.getFirstChild(); iter != mTree.getEndChild();
++iter)
{
iter->message(control);
}
}
void JAHFrameNode::appendVirNode(JAHVirtualNode* node) {
mTree.appendChild(node->getVirTree());
}
void JAHFrameNode::listenPropertyEvent(const JORPropertyEvent* event) {
for (JSUTreeIterator<JAHVirtualNode> iter = mTree.getFirstChild(); iter != mTree.getEndChild();
++iter)
{
iter->listenVirtualPropertyEvent(JAH_P_EVENT0, (uintptr_t)event->id);
}
JAHioNode::listenPropertyEvent(event);
for (JSUTreeIterator<JAHVirtualNode> iter = mTree.getFirstChild(); iter != mTree.getEndChild();
++iter)
{
iter->listenVirtualPropertyEvent(JAH_P_EVENT1, (uintptr_t)event->id);
}
}
void JAHFrameNode::listenNodeEvent(const JORNodeEvent* event) {
JAHioNode::listenNodeEvent(event);
if (event->field_0x0 == 3) {
for (JSUTreeIterator<JAHVirtualNode> iter = mTree.getFirstChild();
iter != mTree.getEndChild(); ++iter)
iter->listenVirtualNodeEvent(JAH_N_EVENT0);
} else if (event->field_0x0 == 4) {
for (JSUTreeIterator<JAHVirtualNode> iter = mTree.getFirstChild();
iter != mTree.getEndChild(); ++iter)
iter->listenVirtualNodeEvent(JAH_N_EVENT1);
} else if (event->field_0x0 == 5) {
for (JSUTreeIterator<JAHVirtualNode> iter = mTree.getFirstChild();
iter != mTree.getEndChild(); ++iter)
iter->listenVirtualNodeEvent(JAH_N_EVENT2);
}
}
void JAHFrameNode::framework() {
onFrame();
if (mTree.getNumChildren() != 0) {
int i = 0; // unused?
for (JSUTreeIterator<JAHVirtualNode> iter = mTree.getFirstChild();
iter != mTree.getEndChild(); ++iter)
{
iter->framework();
}
}
}
void JAHFrameNode::onFrame() {}
void JAHFrameNode::currentFramework() {
onCurrentNodeFrame();
if (mTree.getNumChildren() != 0) {
int i = 0; // unused?
for (JSUTreeIterator<JAHVirtualNode> iter = mTree.getFirstChild();
iter != mTree.getEndChild(); ++iter)
{
iter->currentFramework();
}
}
}
void JAHFrameNode::onCurrentNodeFrame() {}
libs/JSystem/src/JAHostIO/JAHUAsnData.cpp
+172
View File
@@ -0,0 +1,172 @@
#include <JSystem/JAHostIO/JAHUAsnData.h>
#include "JSystem/JAHostIO/JAHioMessage.h"
#include "JSystem/JAudio2/JAUSoundTable.h"
#include "JSystem/JHostIO/JORServer.h"
u8 JAHUAsn::getAttribute(u32 param_1) {
u8 a = (param_1 & 0x800) >> 11;
u8 b = (param_1 & 0xC0000000) >> 24;
return a | (b << 4);
}
u16 JAHUAsn::getSubNum(s32 param_1, s32 param_2) {
JAUSoundNameTable* table = JASGlobalInstance<JAUSoundNameTable>::getInstance();
int num = table->getNumItems_inGroup(param_1, param_2);
int uVar2 = (u16)(num / unk0);
if (num % unk0 > 0)
uVar2++;
return uVar2 <= 64 ? (u16)uVar2 : (u16)64;
}
u16 JAHUAsn::getDataNum(s32 param_1, s32 param_2, s32 param_3) {
JAUSoundNameTable* table = JASGlobalInstance<JAUSoundNameTable>::getInstance();
int uVar1 = getSubNum(param_1, param_2);
int iVar2 = table->getNumItems_inGroup(param_1, param_2);
if (iVar2 == 0)
return 0;
if (iVar2 % unk0 == 0)
return unk0;
if (param_3 == uVar1 - 1)
return iVar2 % unk0;
return unk0;
}
const char* JAHUAsn::getName(s32 param_1, s32 param_2, s32 param_3, s32 param_4) {
JAUSoundNameTable* table = JASGlobalInstance<JAUSoundNameTable>::getInstance();
return table->getName((param_1 << 24) + (param_2 << 16) + (param_4 + param_3 * unk0));
}
u32 JAHUAsn::getDataId(s32 param_1, s32 param_2, s32 param_3, s32 param_4) {
return (param_1 << 24) + (param_2 << 16) + (param_4 + param_3 * unk0);
}
void JAHUAsn::createComboBoxCategory(JAHControl& control) {
int totalItems = 0;
JAUSoundNameTable* table = JASGlobalInstance<JAUSoundNameTable>::getInstance();
for (u32 i = 0; i < 3; ++i) {
for (u32 j = 0; j < table->getNumGroups_inSection(i); ++j) {
if (table->getNumItems_inGroup(i, j) > 0) {
const char* name = table->getGroupName((i << 24) + (j << 16));
control.getContext()->genComboBoxItem(name, totalItems);
++totalItems;
}
}
}
}
void JAHUAsn::createComboBoxSub(JAHControl& control, s32 param_2, s32 param_3) {
int uVar1 = getSubNum(param_2, param_3);
for (int i = 0; i < uVar1; ++i) {
char buffer[4];
sprintf(buffer, "%2x\0", i);
control.getContext()->genComboBoxItem(buffer, i);
}
}
void JAHUAsn::createComboBoxData(JAHControl& control, s32 param_2, s32 param_3, s32 param_4) {
int uVar1 = getDataNum(param_2, param_3, param_4);
for (int i = 0; i < uVar1; ++i) {
const char* name = getName(param_2, param_3, param_4, i);
control.getContext()->genComboBoxItem(name, i);
}
}
void JAHUAsn::checkAndUpdateNameBox(s32* param_1, s32* param_2, s32* param_3, s32* param_4,
s32 param_5, s32 param_6, s32 param_7, JORReflexible* param_8) {
if (*param_1 != param_5 || *param_2 != param_6 || *param_3 != param_7) {
if (*param_2 != param_6 || *param_1 != param_5) {
*param_3 = 0;
__updateNameBoxSub(*param_1, *param_2, param_3, param_8);
}
if (*param_3 != param_7 || *param_2 != param_6 || *param_1 != param_5) {
*param_4 = 0;
__updateNameBoxData(*param_1, *param_2, *param_3, param_4, param_8);
}
}
}
void JAHUAsn::updateNameBoxAll(s32* param_1, s32* param_2, s32* param_3, s32* param_4,
JORReflexible* param_5) {
__updateNameBoxCategory(param_2, param_5);
__updateNameBoxSub(*param_1, *param_2, param_3, param_5);
__updateNameBoxData(*param_1, *param_2, *param_3, param_4, param_5);
}
void JAHUAsn::__updateNameBoxCategory(s32* param_1, JORReflexible* param_2) {
JORMContext* ctx = attachJORMContext(8);
ctx->startUpdateNode(param_2);
ctx->updateComboBox(2, param_1, 0);
ctx->endUpdateNode();
releaseJORMContext(ctx);
}
void JAHUAsn::__updateNameBoxSub(s32 param_1, s32 param_2, s32* param_3, JORReflexible* param_4) {
JORMContext* ctx = attachJORMContext(8);
ctx->startUpdateNode(param_4);
ctx->removeComboBoxItem(5, param_3, 0);
int num = getSubNum(param_1, param_2);
for (int i = 0; i < num; ++i) {
char buf[4];
sprintf(buf, "%2x\0", i);
ctx->addComboBoxItem(1, param_3, buf, i, 0);
}
ctx->updateComboBox(2, param_3, 0);
ctx->endUpdateNode();
releaseJORMContext(ctx);
}
void JAHUAsn::__updateNameBoxData(s32 param_1, s32 param_2, s32 param_3, s32* param_4,
JORReflexible* param_5) {
JORMContext* ctx = attachJORMContext(8);
ctx->startUpdateNode(param_5);
ctx->removeComboBoxItem(5, param_4, 0);
ctx->endUpdateNode();
releaseJORMContext(ctx);
ctx = attachJORMContext(8);
ctx->startUpdateNode(param_5);
int num = getDataNum(param_1, param_2, param_3);
for (int i = 0; i < num; ++i) {
ctx->addComboBoxItem(1, param_4, getName(param_1, param_2, param_3, i), i, 0);
}
ctx->updateComboBox(2, param_4, 0);
ctx->endUpdateNode();
releaseJORMContext(ctx);
}
u32 JAHUAsn::__GetSubNo(s32 param_1) {
return param_1 / unk0;
}
u32 JAHUAsn::__GetDataNo(s32 param_1) {
return param_1 % unk0;
}
u8 JAHUAsn::getCategory(u32 param_1) {
return (param_1 & 0xF0000) >> 0x10;
}
u8 JAHUAsn::getSub(u32 param_1) {
int perCat = getDataPerCat(param_1);
return __GetSubNo(perCat);
}
u16 JAHUAsn::getDataPerCat(u32 param_1) {
return param_1;
}
u16 JAHUAsn::getDataPerSub(u32 param_1) {
u16 perCat = getDataPerCat(param_1);
return __GetDataNo(perCat);
}
u32 JAHUAsn::getNextId(u32 param_1, bool param_2) {
JUT_ASSERT(490, 0L);
return param_1;
}
libs/JSystem/src/JAHostIO/JAHUFx.cpp
+8
View File
@@ -0,0 +1,8 @@
#include <JSystem/JAHostIO/JAHioMessage.h>
void dummy(JAHControl* cont, u16 s) {
cont->makeSlider(NULL, (s16*)NULL, (s16)0, (s16)0, 0);
cont->makeSlider(NULL, (s32*)NULL, (s32)0, (s32)0, 0);
cont->returnYDirectSize(s);
cont->startRadioButton(NULL, (u8*)NULL, (u8)0, 0);
}
libs/JSystem/src/JAHostIO/JAHUTableEdit.cpp
+196
View File
@@ -0,0 +1,196 @@
#include "JSystem/JAHostIO/JAHUTableEdit.h"
#include "JSystem/JAHostIO/JAHUAsnData.h"
#include "JSystem/JAHostIO/JAHUpdate.h"
#include "JSystem/JAHostIO/JAHioMessage.h"
#include "JSystem/JAHostIO/JAHioUtil.h"
#include "JSystem/JAudio2/JAISoundStarter.h"
#include "JSystem/JAudio2/JAUSoundTable.h"
JAHUSeBox::JAHUSeBox(u32 param_1, u32* param_2) : JAHVirtualNode(NULL) {
unk4C = getVirNodeNum() | 0x12000000;
unk50 = getVirNodeNum() | 0x13000000;
unk54 = getVirNodeNum() | 0x14000000;
unk5C = param_2;
mAsnCalc = NULL;
mAsnCalc = new JAHUAsn(0x10);
JUT_ASSERT(611, mAsnCalc);
unk48 = false;
if (param_1 == -1)
unk58 = mAsnCalc->getDataId(0, 0, 0, 0);
else
unk58 = param_1;
unk84 = 0;
}
void JAHUSeBox::trigPlayButton() {
unk48 = true;
JAHUpdate::buttonOff(getMaster(), unk4C);
JAHUpdate::buttonOn(getMaster(), unk50);
}
void JAHUSeBox::trigStopButton() {
unk48 = false;
JAHUpdate::buttonOn(getMaster(), unk4C);
JAHUpdate::buttonOff(getMaster(), unk50);
soundStop();
}
void JAHUSeBox::soundStop() {
if (unk40)
unk40->stop();
}
void JAHUSeBox::onCurrentNodeFrame() {
if (unk48) {
soundPlay();
unk48 = false;
}
if (unk44 && !unk40) {
JAHUpdate::buttonOn(getMaster(), unk4C);
JAHUpdate::buttonOff(getMaster(), unk50);
} else if (!unk44 && unk40) {
JAHUpdate::buttonOff(getMaster(), unk4C);
JAHUpdate::buttonOn(getMaster(), unk50);
}
}
void JAHUSeBox::soundPlay() {
JAISoundStarter* starter = JASGlobalInstance<JAISoundStarter>::getInstance();
if (starter) {
starter->startSound(unk58, &unk40, 0);
}
}
void JAHUSeBox::message(JAHControl& control) {
if (!unk84 && JASGlobalInstance<JAUSoundNameTable>::getInstance()) {
if (unk58 == -1) {
unk64 = 0;
unk68 = 0;
unk6C = 0;
unk70 = 0;
unk74 = 0;
unk78 = 0;
unk7C = 0;
unk80 = 0;
unk58 = 0;
} else {
unk64 = unk58 >> 24;
unk68 = mAsnCalc->getCategory(unk58);
unk6C = mAsnCalc->getSub(unk58);
unk70 = mAsnCalc->getDataPerSub(unk58);
unk74 = unk64;
unk78 = unk68;
unk7C = unk6C;
unk80 = unk70;
}
unk84 = true;
}
control.startComboBoxL(NULL, &unk68, 0, 200, 0);
mAsnCalc->createComboBoxCategory(control);
control.endComboBox();
control.startComboBoxL(NULL, &unk6C, 0, 0x2d, 0);
mAsnCalc->createComboBoxSub(control, unk64, unk68);
control.endComboBox();
control.startComboBoxL(NULL, &unk70, 0, 200, 0);
mAsnCalc->createComboBoxData(control, unk64, unk68, unk6C);
control.endComboBox();
control.makeCommentL(JAHioUtil::getString("%08x", unk58), unk54, 0x37, 0);
control.makeButtonL("＞", unk4C, 0x32, 0);
control.makeButtonL("■", unk50, 0x32, 0x40000000);
control.returnY(1);
}
void JAHUSeBox::nodeEvent(JAH_N_Event) {}
void JAHUSeBox::propertyEvent(JAH_P_Event param_1, u32 param_2) {
if (param_1 == 0) {
unk74 = unk64;
unk78 = unk68;
unk7C = unk6C;
unk80 = unk70;
return;
}
if (param_2 != unk4C && param_2 != unk50 &&
((unk7C == unk6C && unk80 == unk70) || unk68 != unk78))
{
JAUSoundNameTable* table = JASGlobalInstance<JAUSoundNameTable>::getInstance();
int groups = table->getNumGroups_inSection(0);
if (unk68 >= groups) {
groups += table->getNumGroups_inSection(1);
if (unk68 < groups) {
unk64 = 1;
unk68 -= table->getNumGroups_inSection(0);
} else {
unk64 = 2;
unk68 -= groups;
}
} else {
unk64 = 0;
}
}
mAsnCalc->checkAndUpdateNameBox(&unk64, &unk68, &unk6C, &unk70, unk74, unk78, unk7C,
getMaster());
if (checkNameSetChange()) {
unk58 = mAsnCalc->getDataId(unk64, unk68, unk6C, unk70);
if (unk5C != NULL)
*unk5C = unk58;
char buf[9];
sprintf(buf, "%08x", unk58);
JORMContext* ctx = attachJORMContext(8);
ctx->startUpdateNode(getMaster());
ctx->updateLabel(2, unk54, buf);
ctx->endUpdateNode();
releaseJORMContext(ctx);
}
if (param_2 == unk4C) {
trigPlayButton();
} else if (param_2 == unk50) {
trigStopButton();
}
}
u8 JAHUSeBox::checkNameSetChange() {
u8 iVar1 = 0;
if (unk74 != unk64)
iVar1++;
if (unk78 != unk68)
iVar1++;
if (unk7C != unk6C)
iVar1++;
if (unk80 != unk70)
iVar1++;
return iVar1;
}
void JAHUSeBox::updateNameSet(JORReflexible* param_1) {
mAsnCalc->updateNameBoxAll(&unk64, &unk68, &unk6C, &unk70, param_1);
JORMContext* ctx = attachJORMContext(8);
ctx->startUpdateNode(param_1);
ctx->updateLabel(2, unk54, JAHioUtil::getString("%08x", unk58));
ctx->endUpdateNode();
releaseJORMContext(ctx);
}
void JAHUSeBox::setId(u32 param_1, bool param_2, JORReflexible* param_3) {
unk58 = param_1;
unk64 = unk58 >> 24;
unk68 = (param_1 >> 16) & 0xff;
unk6C = mAsnCalc->getSub(param_1);
unk70 = mAsnCalc->getDataPerSub(param_1);
if (param_2)
updateNameSet(param_3);
}
libs/JSystem/src/JAHostIO/JAHVirtualNode.cpp
+93
View File
@@ -0,0 +1,93 @@
#include <JSystem/JAHostIO/JAHVirtualNode.h>
#include <JSystem/JUtility/JUTAssert.h>
#include <cstring>
u32 JAHVirtualNode::smVirNodeNum;
void JAHVirtualNode::virtualMessage(JAHControl& control) {
message(control);
callAllVirtualMessages(control);
}
void JAHVirtualNode::callAllVirtualMessages(JAHControl& control) {
if (mTree.getNumChildren() == 0)
return;
for (JSUTreeIterator<JAHVirtualNode> iter = mTree.getFirstChild(); iter != mTree.getEndChild();
++iter)
{
iter->message(control);
}
}
JAHioNode* JAHVirtualNode::getMaster() {
JSUTree<JAHVirtualNode>* it = mTree.getParent();
while (it->getParent())
it = it->getParent();
return (JAHioNode*)it->getObject();
}
void JAHVirtualNode::framework() {
onFrame();
for (JSUTreeIterator<JAHVirtualNode> iter = getVirTree()->getFirstChild();
iter != getVirTree()->getEndChild(); ++iter)
{
iter->framework();
}
}
void JAHVirtualNode::onFrame() {}
void JAHVirtualNode::currentFramework() {
onCurrentNodeFrame();
for (JSUTreeIterator<JAHVirtualNode> iter = getVirTree()->getFirstChild();
iter != getVirTree()->getEndChild(); ++iter)
{
iter->framework();
}
}
void JAHVirtualNode::onCurrentNodeFrame() {}
void JAHVirtualNode::listenVirtualPropertyEvent(JAH_P_Event param_1, uintptr_t param_2) {
propertyEvent(param_1, param_2);
for (JSUTreeIterator<JAHVirtualNode> iter = mTree.getFirstChild(); iter != mTree.getEndChild();
++iter)
{
iter->listenVirtualPropertyEvent(param_1, param_2);
}
}
void JAHVirtualNode::propertyEvent(JAH_P_Event, uintptr_t) {}
void JAHVirtualNode::listenVirtualNodeEvent(JAH_N_Event param_1) {
nodeEvent(param_1);
for (JSUTreeIterator<JAHVirtualNode> iter = mTree.getFirstChild(); iter != mTree.getEndChild();
++iter)
{
iter->listenVirtualNodeEvent(param_1);
}
}
void JAHVirtualNode::nodeEvent(JAH_N_Event) {}
void JAHVirtualNode::setVirNodeName(const char* name) {
JUT_ASSERT(139, name);
size_t size = strlen(name) + 1;
// clang-format off
JUT_ASSERT(141, size<32);
// clang-format on
strcpy(mName, name);
}
JAHVirtualNode::JAHVirtualNode(const char* name) : mTree(this) {
if (name)
setVirNodeName(name);
else
setVirNodeName("no name");
smVirNodeNum += 1;
}
void JAHVirtualNode::updateNode() {
getMaster()->updateNode();
}
libs/JSystem/src/JAHostIO/JAHioMessage.cpp
+2 -2
View File
@@ -1,4 +1,4 @@
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/JAHostIO/JAHioMessage.h"
#include "JSystem/JAHostIO/JAHioNode.h"
@@ -7,7 +7,7 @@
u16 JAHControl::smButtonWidth[] = {20, 50, 100, 150, 300, 600};
u16 JAHControl::smCommentWidth[] = {20, 50, 100, 200, 400, 800};
u16 JAHControl::smComboWidth[] = { 50, 100, 150, 200, 300, 600};
u16 JAHControl::smComboWidth[] = {50, 100, 150, 200, 300, 600};
u16 JAHControl::smYTop = 5;
u16 JAHControl::smXLeft = 5;
u16 JAHControl::smIndentSize = 30;
libs/JSystem/src/JAHostIO/JAHioMgr.cpp
+5 -2
View File
@@ -1,9 +1,12 @@
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/JAHostIO/JAHioMgr.h"
#include "JSystem/JAHostIO/JAHFrameNode.h"
#include "JSystem/JAHostIO/JAHioMgr.h"
#include "JSystem/JHostIO/JORServer.h"
template <>
JAHioMgr* JAHSingletonBase<JAHioMgr>::sInstance = NULL;
JAHioMgr::JAHioMgr() : field_0x4(0), field_0x8(0) {}
void JAHioMgr::init_OnGame() {
libs/JSystem/src/JAHostIO/JAHioNode.cpp
+10 -6
View File
@@ -1,10 +1,12 @@
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/JAHostIO/JAHioNode.h"
#include <cstring>
#include "JSystem/JAHostIO/JAHioMessage.h"
#include "JSystem/JAHostIO/JAHioMgr.h"
#include "JSystem/JAHostIO/JAHioNode.h"
#include "JSystem/JHostIO/JORServer.h"
#include <cstring>
JAHioNode* JAHioNode::smCurrentNode;
JAHioNode::JAHioNode(const char* name) : mTree(this) {
mLastChild = NULL;
@@ -86,7 +88,9 @@ void JAHioNode::generateTempChildren(JORMContext* mctx) {
}
}
u32 JAHioNode::getNodeKind() const { return 0; }
u32 JAHioNode::getNodeKind() const {
return 0;
}
JAHioNode* JAHioNode::getParent() {
if (mTree.getParent()) {
@@ -96,9 +100,9 @@ JAHioNode* JAHioNode::getParent() {
}
void JAHioNode::listenPropertyEvent(const JORPropertyEvent* event) {
propertyEvent(JAH_P_EVENT0, (u32)event->id);
propertyEvent(JAH_P_EVENT0, (uintptr_t)event->id);
JORReflexible::listenPropertyEvent(event);
propertyEvent(JAH_P_EVENT1, (u32)event->id);
propertyEvent(JAH_P_EVENT1, (uintptr_t)event->id);
}
void JAHioNode::listenNodeEvent(const JORNodeEvent* event) {
libs/JSystem/src/JAHostIO/JAHioUtil.cpp
+13 -3
View File
@@ -1,13 +1,23 @@
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/JAHostIO/JAHioUtil.h"
#include <cstdarg>
#include <cstdio>
#include "JSystem/JAHostIO/JAHUpdate.h"
#include "JSystem/JAHostIO/JAHioUtil.h"
#include "JSystem/JHostIO/JORFile.h"
char JAHioUtil::mStringBuffer[256];
JAHioNode* JAHUpdate::spNode;
JORMContext* JAHUpdate::spMc;
static char* dummy(JORDir* dir) {
return std::strrchr(dir->getFilename(), '\n');
}
char* JAHioUtil::getString(const char* msg, ...) {
va_list args;
va_start(msg, args);
va_start(args, msg);
vsprintf(mStringBuffer, msg, args);
va_end(args);
return mStringBuffer;
libs/JSystem/src/JKernel/JKRExpHeap.cpp
+3 -1
View File
@@ -214,7 +214,9 @@ void* JKRExpHeap::do_alloc(u32 size, int alignment) {
#endif
#if TARGET_PC
JUT_ASSERT_MSG_F(__LINE__, ptr != nullptr, "failed to alloc memory! (0x%x byte).\n", size);
JUT_ASSERT_MSG_F(__LINE__, ptr != nullptr,
"Failed to alloc memory! (%s) (0x%X bytes).\n Heap size: %u\n Used size: %u",
this->getName(), size, getSize(), getTotalUsedSize());
#else
if (ptr == NULL) {
JUTWarningConsole_f(":::cannot alloc memory (0x%x byte).\n", size);
libs/JSystem/src/JStudio/JStudio/ctb.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ JStudio::ctb::TObject* JStudio::ctb::TControl::getObject_index(u32 param_0) {
JStudio::ctb::TFactory::~TFactory() {}
JStudio::ctb::TObject* JStudio::ctb::TFactory::create(JStudio::ctb::data::TParse_TBlock const& param_0) {
switch(BSWAP16(param_0.get_scheme())) {
switch(param_0.get_scheme()) {
case 1:
return JKR_NEW TObject_TxyzRy(param_0);
default:
libs/JSystem/src/JStudio/JStudio/jstudio-control.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ int JStudio::TControl::transformOnGet_setOrigin_TxyzRy(Vec const& param_0, f32 p
int JStudio::TControl::transform_setOrigin_ctb(JStudio::ctb::TObject const& param_0) {
switch (param_0.getScheme()) {
case 1: {
const f32* pfVar4 = (const f32*)param_0.getData();
const BE(f32)* pfVar4 = (const BE(f32)*)param_0.getData();
Vec local_144 = {0.0f, 0.0f, 0.0f};
local_144.x = pfVar4[0];
local_144.y = pfVar4[1];
libs/JSystem/src/JStudio/JStudio_JParticle/control.cpp
+3 -2
View File
@@ -4,9 +4,10 @@
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/JStudio/JStudio_JParticle/control.h"
#include "JSystem/JParticle/JPAEmitterManager.h"
#include "JSystem/JGadget/pointer.h"
#include "JSystem/JParticle/JPAEmitterManager.h"
#include "JSystem/JStudio/JStudio_JParticle/control.h"
#include "JSystem/JStudio/JStudio_JParticle/object-particle.h"
JStudio_JParticle::TCreateObject::~TCreateObject() {}
libs/JSystem/src/JStudio/JStudio_JParticle/object-particle.cpp
+264 -129
View File
@@ -7,8 +7,36 @@
#include "JSystem/JStudio/JStudio_JParticle/object-particle.h"
#include "JSystem/JStudio/JStudio_JStage/control.h"
JStudio_JParticle::TAdaptor_particle::TAdaptor_particle(
JStudio_JParticle::TCreateObject* param_1) :
namespace JStudio_JParticle {
namespace {
struct TJPAEmitter_stopDrawParticle_ {
TJPAEmitter_stopDrawParticle_(JPABaseEmitter* emitter) : pJPAEmitter_(emitter) {}
~TJPAEmitter_stopDrawParticle_() {
if (pJPAEmitter_ != NULL) {
pJPAEmitter_->stopDrawParticle();
}
}
void set(JPABaseEmitter* emitter) { pJPAEmitter_ = emitter; }
/* 0x0 */ JPABaseEmitter* pJPAEmitter_;
};
class TToString_u32ID_ {
public:
TToString_u32ID_() {}
const char* operator()(u32 param_1) {
snprintf(buf, sizeof(buf), "0x%08x", param_1);
return buf;
}
private:
char buf[11];
};
} // anonymous namespace
TAdaptor_particle::TAdaptor_particle(TCreateObject* param_1) :
pCreateObject_(param_1),
pJPAEmitter_(NULL),
field_0x1a8(this) {
@@ -18,8 +46,8 @@ JStudio_JParticle::TAdaptor_particle::TAdaptor_particle(
field_0x1b7 = 0;
field_0x1b8 = 0;
field_0x1bc = -1;
u32FadeTime_end = 0;
field_0x1c4 = 0;
u32FadeTime_end_ = 0;
u32FadeTime_current_ = 0;
field_0x1c8 = 0;
field_0x1cc = 0;
field_0x1d0 = NULL;
@@ -28,7 +56,7 @@ JStudio_JParticle::TAdaptor_particle::TAdaptor_particle(
JUT_ASSERT(90, pCreateObject_!=NULL);
}
JStudio_JParticle::TAdaptor_particle::~TAdaptor_particle() {
TAdaptor_particle::~TAdaptor_particle() {
if (pJPAEmitter_ != NULL) {
if (field_0x1b6 == 0) {
pCreateObject_->emitter_destroy(pJPAEmitter_);
@@ -36,48 +64,65 @@ JStudio_JParticle::TAdaptor_particle::~TAdaptor_particle() {
pJPAEmitter_->setEmitterCallBackPtr(field_0x1a8.getOld());
pJPAEmitter_->quitImmortalEmitter();
} else {
JGADGET_WARNMSG(116, "not permitted : not-end on exit\n demo-object : " << adaptor_getID_string());
pCreateObject_->emitter_destroy(pJPAEmitter_);
}
}
}
void JStudio_JParticle::TAdaptor_particle::adaptor_do_prepare() {
static JStudio::TAdaptor::TSetVariableValue_immediate aoData[18] = {
JStudio::TAdaptor::TSetVariableValue_immediate(0, 0.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(1, 0.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(2, 0.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(3, 0.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(4, 0.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(5, 0.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(6, 1.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(7, 1.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(8, 1.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(9, 255.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(10, 255.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(11, 255.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(12, 255.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(13, 255.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(14, 255.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(15, 255.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(16, 255.0f),
JStudio::TAdaptor::TSetVariableValue_immediate(),
void TAdaptor_particle::adaptor_do_prepare() {
static TSetVariableValue_immediate aoData[18] = {
TSetVariableValue_immediate(0, 0.0f),
TSetVariableValue_immediate(1, 0.0f),
TSetVariableValue_immediate(2, 0.0f),
TSetVariableValue_immediate(3, 0.0f),
TSetVariableValue_immediate(4, 0.0f),
TSetVariableValue_immediate(5, 0.0f),
TSetVariableValue_immediate(6, 1.0f),
TSetVariableValue_immediate(7, 1.0f),
TSetVariableValue_immediate(8, 1.0f),
TSetVariableValue_immediate(9, 255.0f),
TSetVariableValue_immediate(10, 255.0f),
TSetVariableValue_immediate(11, 255.0f),
TSetVariableValue_immediate(12, 255.0f),
TSetVariableValue_immediate(13, 255.0f),
TSetVariableValue_immediate(14, 255.0f),
TSetVariableValue_immediate(15, 255.0f),
TSetVariableValue_immediate(16, 255.0f),
TSetVariableValue_immediate(),
};
adaptor_setVariableValue_immediate(aoData);
}
void JStudio_JParticle::TAdaptor_particle::adaptor_do_end() {
void TAdaptor_particle::adaptor_do_end() {
#if DEBUG
if (field_0x1b8 == 0) {
JUT_ASSERT(160, pJPAEmitter_==NULL);
return;
}
JUT_ASSERT(163, pJPAEmitter_!=NULL);
if (!state_isFade_()) {
return;
}
JUT_ASSERT(166, u32FadeTime_current_<u32FadeTime_end_);
JGADGET_WARNMSG(169, "particle not finished : " << toString_state_(field_0x1b8) << "\n demo-object : " << adaptor_getID_string());
#endif
}
void JStudio_JParticle::TAdaptor_particle::adaptor_do_update(u32 param_1) {
void TAdaptor_particle::adaptor_do_update(u32 param_1) {
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(179, pObject != NULL);
JUT_ASSERT(179, pObject!=NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(181, pControl != NULL);
if (u32FadeTime_end != 0 && field_0x1c4 < u32FadeTime_end) {
JUT_ASSERT(181, pControl!=NULL);
if (u32FadeTime_end_ != 0 && u32FadeTime_current_ < u32FadeTime_end_) {
JUT_ASSERT(187, state_isFade_());
JUT_ASSERT(188, pJPAEmitter_ != NULL);
field_0x1c4 += param_1;
if (field_0x1c4 >= u32FadeTime_end) {
JUT_ASSERT(188, pJPAEmitter_!=NULL);
u32FadeTime_current_ += param_1;
if (u32FadeTime_current_ >= u32FadeTime_end_) {
switch (field_0x1b8) {
case 1:
field_0x1b8 = 2;
@@ -87,9 +132,11 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_update(u32 param_1) {
pJPAEmitter_ = NULL;
field_0x1b8 = 0;
break;
default:
JUT_ASSERT(203, false);
}
u32FadeTime_end = 0;
field_0x1c4 = 0;
u32FadeTime_end_ = 0;
u32FadeTime_current_ = 0;
}
} else {
JUT_ASSERT(210, !state_isFade_());
@@ -99,139 +146,206 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_update(u32 param_1) {
}
}
void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARTICLE(
void TAdaptor_particle::adaptor_do_PARTICLE(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x19) {
JUT_ASSERT(232, uSize==4);
JUT_ASSERT(233, pContent!=NULL);
field_0x1bc = *(BE(u32)*)pContent;
switch (param_1) {
case JStudio::data::UNK_0x19: {
JUT_ASSERT(232, pContent!=NULL);
JUT_ASSERT(233, uSize==4);
u32 var_r29 = *(BE(u32)*)pContent;
field_0x1bc = var_r29;
break;
}
default:
JGADGET_WARNMSG(241, "unknown data-type : " << param_1 << "\n demo-object : " << adaptor_getID_string());
}
}
void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN(JStudio::data::TEOperationData param_1,
void TAdaptor_particle::adaptor_do_BEGIN(JStudio::data::TEOperationData param_1,
const void* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x1:
JUT_ASSERT(253, uSize==0);
beginParticle_();
break;
default:
JGADGET_WARNMSG(259, "unknown data-type : " << param_1 << "\n demo-object : " << adaptor_getID_string());
}
}
void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN_FADE_IN(
void TAdaptor_particle::adaptor_do_BEGIN_FADE_IN(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x2:
case JStudio::data::UNK_0x2: {
JUT_ASSERT(272, pContent!=NULL);
JUT_ASSERT(273, uSize==4);
beginParticle_fadeIn_(*(BE(f32)*)pContent);
u32 var_r29 = *(BE(f32)*)pContent;
beginParticle_fadeIn_(var_r29);
break;
}
default:
JGADGET_WARNMSG(282, "unknown data-type : " << param_1 << "\n demo-object : " << adaptor_getID_string());
}
}
void JStudio_JParticle::TAdaptor_particle::adaptor_do_END(JStudio::data::TEOperationData param_1,
void TAdaptor_particle::adaptor_do_END(JStudio::data::TEOperationData param_1,
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x1) {
switch (param_1) {
case JStudio::data::UNK_0x1:
JUT_ASSERT(294, uSize==0);
endParticle_();
}
}
void JStudio_JParticle::TAdaptor_particle::adaptor_do_END_FADE_OUT(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(336, pContent!=NULL);
JUT_ASSERT(337, uSize==4);
endParticle_fadeOut_(*(BE(f32)*)pContent);
break;
default:
JGADGET_WARNMSG(300, "unknown data-type : " << param_1 << "\n demo-object : " << adaptor_getID_string());
}
}
void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT(
void TAdaptor_particle::adaptor_do_END_FADE_OUT(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x18:
case JStudio::data::UNK_0x2: {
JUT_ASSERT(313, pContent!=NULL);
JUT_ASSERT(314, uSize==4);
u32 var_r29 = *(BE(f32)*)pContent;
endParticle_fadeOut_(var_r29);
break;
}
default:
JGADGET_WARNMSG(323, "unknown data-type : " << param_1 << "\n demo-object : " << adaptor_getID_string());
}
}
void TAdaptor_particle::adaptor_do_PARENT(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x18: {
JUT_ASSERT(336, pContent!=NULL);
JUT_ASSERT(337, uSize>0);
const char* szID = (const char*)pContent;
JGADGET_ASSERTWARN(339, szID[uSize-1]=='\0');
field_0x1d0 = NULL;
const JStage::TSystem* pJSGSystem = pCreateObject_->get_pJSGSystem_();
JUT_ASSERT(345, pJSGSystem!=NULL);
JStage::TObject* pJSGObject;
if (pJSGSystem->JSGFindObject(&pJSGObject, (const char*)pContent, JStage::OBJECT_UNDEFINED) == 0) {
JUT_ASSERT(354, pJSGObject!=NULL);
field_0x1d0 = pJSGObject;
if (pJSGSystem->JSGFindObject(&pJSGObject, szID, JStage::OBJECT_UNDEFINED) != 0) {
JGADGET_WARNMSG(351, "object not found as parent : " << szID << "\n demo-object : " << adaptor_getID_string());
break;
}
JUT_ASSERT(354, pJSGObject!=NULL);
field_0x1d0 = pJSGObject;
break;
}
default:
JGADGET_WARNMSG(361, "unknown data-type : " << param_1 << "\n demo-object : " << adaptor_getID_string());
}
}
void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_NODE(
void TAdaptor_particle::adaptor_do_PARENT_NODE(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x18:
if (field_0x1d0 != NULL) {
JUT_ASSERT(380, pContent!=NULL);
JUT_ASSERT(381, uSize==4);
field_0x1d4 = field_0x1d0->JSGFindNodeID((const char*)pContent);
if (field_0x1d4 == -1) {
return;
}
case JStudio::data::UNK_0x18: {
if (field_0x1d0 == NULL) {
JGADGET_WARNMSG(377, "object not specified as parent\n demo-object : " << adaptor_getID_string());
break;
}
break;
JUT_ASSERT(380, pContent!=NULL);
JUT_ASSERT(381, uSize>0);
const char* szID = (const char*)pContent;
JGADGET_ASSERTWARN(383, szID[uSize-1]=='\0');
field_0x1d4 = field_0x1d0->JSGFindNodeID(szID);
if (field_0x1d4 != -1) {
return;
} else {
JGADGET_WARNMSG(388, "node not found about parent : " << szID << "\n demo-object : " << adaptor_getID_string());
return;
}
}
case JStudio::data::UNK_0x19:
JUT_ASSERT(397, uSize==4);
JUT_ASSERT(396, pContent!=NULL);
JUT_ASSERT(396, uSize==4);
JUT_ASSERT(397, pContent!=NULL);
field_0x1d4 = *(BE(u32)*)pContent;
break;
default:
JGADGET_WARNMSG(404, "unknown data-type : " << param_1 << "\n demo-object : " << adaptor_getID_string());
}
}
void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData param_1,
const char* TAdaptor_particle::toString_state_(int param_1) {
static const char* const asz[] = {"none", "begin", "stable", "end"};
return JGadget::toStringFromIndex(param_1, asz, ARRAY_SIZE(asz), "(undefined)");
}
void TAdaptor_particle::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData param_1,
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
switch (param_1) {
case JStudio::data::UNK_0x2: {
JUT_ASSERT(417, uSize==4);
JUT_ASSERT(418, pContent!=NULL);
field_0x1d8 = *(BE(u32)*)pContent ? 1 : 0;
u32 var_r29 = *(BE(u32)*)pContent;
field_0x1d8 = var_r29 != 0;
break;
}
default:
JGADGET_WARNMSG(426, "unknown data-type : " << param_1 << "\n demo-object : " << adaptor_getID_string());
}
}
void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData param_1,
void TAdaptor_particle::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData param_1,
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
switch (param_1) {
case JStudio::data::UNK_0x2: {
JUT_ASSERT(439, uSize==4);
JUT_ASSERT(439, pContent!=NULL);
field_0x1cc = *(BE(u32)*)pContent;
JUT_ASSERT(440, pContent!=NULL);
u32 var_r29 = *(BE(u32)*)pContent;
field_0x1cc = var_r29;
break;
}
default:
JGADGET_WARNMSG(447, "unknown data-type : " << param_1);
}
}
void JStudio_JParticle::TAdaptor_particle::adaptor_do_REPEAT(JStudio::data::TEOperationData param_1,
void TAdaptor_particle::adaptor_do_REPEAT(JStudio::data::TEOperationData param_1,
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
switch (param_1) {
case JStudio::data::UNK_0x2: {
JUT_ASSERT(460, uSize==4);
JUT_ASSERT(461, pContent!=NULL);
field_0x1b5 = *(BE(u32)*)pContent ? 1 : 0;
u32 var_r29 = *(BE(u32)*)pContent;
field_0x1b5 = var_r29 != 0;
break;
}
default:
JGADGET_WARNMSG(469, "unknown data-type : " << param_1 << "\n demo-object : " << adaptor_getID_string());
}
}
void JStudio_JParticle::TAdaptor_particle::adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData param_1,
void TAdaptor_particle::adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData param_1,
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(460, uSize==4);
JUT_ASSERT(461, pContent!=NULL);
field_0x1b6 = *(BE(u32)*)pContent ? 1 : 0;
switch (param_1) {
case JStudio::data::UNK_0x2: {
JUT_ASSERT(482, uSize==4);
JUT_ASSERT(483, pContent!=NULL);
u32 var_r29 = *(BE(u32)*)pContent;
field_0x1b6 = var_r29 != 0;
break;
}
default:
JGADGET_WARNMSG(491, "unknown data-type : " << param_1 << "\n demo-object : " << adaptor_getID_string());
}
}
void
JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::execute(JPABaseEmitter* pJPAEmitter) {
void TAdaptor_particle::TJPACallback_emitter_::execute(JPABaseEmitter* pJPAEmitter) {
JUT_ASSERT(518, pJPAEmitter==pThis_->pJPAEmitter_);
if (pJPAEmitter->isEnableDeleteEmitter()) {
pThis_->pCreateObject_->emitter_destroy(pJPAEmitter);
pThis_->pJPAEmitter_ = NULL;
pThis_->field_0x1b8 = 0;
pThis_->u32FadeTime_end = 0;
pThis_->field_0x1c4 = 0;
pThis_->u32FadeTime_end_ = 0;
pThis_->u32FadeTime_current_ = 0;
return;
}
const JStudio::TObject* pObject = pThis_->adaptor_getObject();
@@ -258,34 +372,45 @@ JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::execute(JPABaseEmit
break;
case 1:
break;
default:
JUT_ASSERT(566, false);
}
pJPAEmitter->setGlobalTranslation(pVVar9->translation);
int rotx = 65536.0 * (pVVar9->rotation.x / 360.0);
int roty = 65536.0 * (pVVar9->rotation.y / 360.0);
int rotz = 65536.0 * (pVVar9->rotation.z / 360.0);
pJPAEmitter->setGlobalRotation(JGeometry::TVec3<s16>(rotx, roty, rotz));
pJPAEmitter->setGlobalRotation(JGeometry::TVec3<s16>(
65536.0 * (pVVar9->rotation.x / 360.0),
65536.0 * (pVVar9->rotation.y / 360.0),
65536.0 * (pVVar9->rotation.z / 360.0)
));
pJPAEmitter->setGlobalScale(pVVar9->scaling);
} else {
Mtx afStack_1f0;
if (JStudio_JStage::transform_toGlobalFromLocal(afStack_1f0, VStack_19c, pThis_->field_0x1d0,
pThis_->field_0x1d4) == 0)
{
JGADGET_WARNMSG(583, "can\'t transform about parent\n demo-object : " << pThis_->adaptor_getID_string());
return;
}
pJPAEmitter->setGlobalSRTMatrix(afStack_1f0);
}
f64 alpha = 1.0;
u32 u32FadeTime_end = pThis_->u32FadeTime_end;
f64 dVar16 = u32FadeTime_end;
f64 dVar15 = pThis_->field_0x1c4;
switch(pThis_->field_0x1b8) {
u32 u32FadeTime_end = pThis_->u32FadeTime_end_;
u32 u32FadeTime_current = pThis_->u32FadeTime_current_;
f64 var_f30 = u32FadeTime_end;
f64 var_f29 = u32FadeTime_current;
switch (pThis_->field_0x1b8) {
case 1:
JUT_ASSERT(606, u32FadeTime_end>0);
alpha = dVar15 / dVar16;
alpha = var_f29 / var_f30;
break;
case 2:
break;
case 3:
JUT_ASSERT(611, u32FadeTime_end>0);
alpha = (dVar16 - dVar15) / dVar16;
alpha = (var_f30 - var_f29) / var_f30;
break;
default:
JUT_ASSERT(619, false);
}
u8 globalAlpha = 255;
@@ -302,48 +427,53 @@ JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::execute(JPABaseEmit
}
}
void
JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::executeAfter(JPABaseEmitter* pJPAEmitter) {
void TAdaptor_particle::TJPACallback_emitter_::executeAfter(JPABaseEmitter* pJPAEmitter) {
if (pOld != NULL) {
pOld->executeAfter(pJPAEmitter);
}
}
void
JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::draw(JPABaseEmitter* pJPAEmitter) {
void TAdaptor_particle::TJPACallback_emitter_::draw(JPABaseEmitter* pJPAEmitter) {
if (pOld != NULL) {
pOld->draw(pJPAEmitter);
}
}
void
JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::drawAfter(JPABaseEmitter* pJPAEmitter) {
void TAdaptor_particle::TJPACallback_emitter_::drawAfter(JPABaseEmitter* pJPAEmitter) {
if (pOld != NULL) {
pOld->drawAfter(pJPAEmitter);
}
}
void JStudio_JParticle::TAdaptor_particle::beginParticle_fadeIn_() {
void TAdaptor_particle::beginParticle_fadeIn_() {
if (pJPAEmitter_ != NULL) {
JGADGET_WARNMSG(686,
"past emitter already exist\n demo-object : " << adaptor_getID_string() <<
"\n begin prepare particle-ID : " << TToString_u32ID_()(field_0x1bc));
pCreateObject_->emitter_destroy(pJPAEmitter_);
}
JPABaseEmitter* pEmitter = pCreateObject_->emitter_create(field_0x1bc);
pJPAEmitter_ = pEmitter;
if (pEmitter != NULL) {
field_0x1a8.setOld(pEmitter->getEmitterCallBackPtr());
pEmitter->setEmitterCallBackPtr(&field_0x1a8);
pEmitter->becomeImmortalEmitter();
field_0x1b7 = 1;
field_0x1b8 = 1;
if (field_0x1c8 == 0) {
field_0x1b8 = 2;
}
u32FadeTime_end = field_0x1c8;
field_0x1c4 = 0;
if (pEmitter == NULL) {
JGADGET_WARNMSG(696,
"can\'t create emitter : " << TToString_u32ID_()(field_0x1bc) <<
"\n demo-object : " << adaptor_getID_string());
return;
}
field_0x1a8.setOld(pEmitter->getEmitterCallBackPtr());
pEmitter->setEmitterCallBackPtr(&field_0x1a8);
pEmitter->becomeImmortalEmitter();
field_0x1b7 = 1;
field_0x1b8 = 1;
if (field_0x1c8 == 0) {
field_0x1b8 = 2;
}
u32FadeTime_end_ = field_0x1c8;
u32FadeTime_current_ = 0;
}
void JStudio_JParticle::TAdaptor_particle::endParticle_fadeOut_(u32 param_1) {
void TAdaptor_particle::endParticle_fadeOut_(u32 param_1) {
if (pJPAEmitter_ == NULL) {
return;
}
@@ -351,14 +481,15 @@ void JStudio_JParticle::TAdaptor_particle::endParticle_fadeOut_(u32 param_1) {
pCreateObject_->emitter_destroy(pJPAEmitter_);
pJPAEmitter_ = NULL;
field_0x1b8 = 0;
u32FadeTime_end = 0;
field_0x1c4 = 0;
u32FadeTime_end_ = 0;
u32FadeTime_current_ = 0;
return;
}
u8 eState_old = field_0x1b8 & 0xff;
field_0x1b8 = 3;
if (field_0x1c4 == 0) {
u32FadeTime_end = param_1;
if (u32FadeTime_current_ == 0) {
JUT_ASSERT(731, !state_isFade_(eState_old));
u32FadeTime_end_ = param_1;
return;
}
JUT_ASSERT(735, state_isFade_(eState_old));
@@ -366,13 +497,17 @@ void JStudio_JParticle::TAdaptor_particle::endParticle_fadeOut_(u32 param_1) {
switch(eState_old) {
case 1:
u32Denominator = field_0x1c4;
u32Denominator = u32FadeTime_current_;
break;
case 3:
u32Denominator = u32FadeTime_end - field_0x1c4;
u32Denominator = u32FadeTime_end_ - u32FadeTime_current_;
break;
default:
JUT_ASSERT(791, false);
}
JUT_ASSERT(793, u32Denominator!=0);
u32FadeTime_end = ((f64)param_1 * (f64)u32FadeTime_end) / u32Denominator;
field_0x1c4 = u32FadeTime_end - param_1;
u32FadeTime_end_ = ((f64)param_1 * (f64)u32FadeTime_end_) / u32Denominator;
u32FadeTime_current_ = u32FadeTime_end_ - param_1;
}
} // namespace JStudio_JParticle
libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string
+5 -1
View File
@@ -10,7 +10,6 @@ using ::memcmp;
using ::memchr;
using ::memmove;
using ::strrchr;
using ::strlen;
using ::strncmp;
using ::strcmp;
@@ -25,6 +24,11 @@ using ::wcslen;
inline char* strchr(char* str, int c) {
return ::strchr(str, c);
}
inline char* strrchr(char* str, int c) {
return ::strrchr(str, c);
}
}; // namespace std
#endif
libs/revolution/include/revolution/dvd.h
+5 -4
View File
@@ -3,7 +3,6 @@
#include <revolution/types.h>
#include <revolution/esp.h>
#include "global.h"
#ifdef __cplusplus
extern "C" {
@@ -188,15 +187,16 @@ typedef struct DVDGameTOC {
typedef struct DVDPartitionParams DVDPartitionParams;
#define ROUND_HACK(n, a) (((u32)(n) + (a)-1) & ~((a)-1))
struct DVDPartitionParams {
ESTicket ticket;
u8 padding0[ROUND(sizeof(ESTicket), 32) - sizeof(ESTicket)];
u8 padding0[ROUND_HACK(sizeof(ESTicket), 32) - sizeof(ESTicket)];
ESTicketView ticketView;
u8 padding1[ROUND(sizeof(ESTicketView), 32) - sizeof(ESTicketView)];
u8 padding1[ROUND_HACK(sizeof(ESTicketView), 32) - sizeof(ESTicketView)];
u32 numTmdBytes;
u8 padding2[28];
ESTitleMeta tmd;
u8 padding3[ROUND(sizeof(ESTitleMeta), 32) - sizeof(ESTitleMeta)];
u8 padding3[ROUND_HACK(sizeof(ESTitleMeta), 32) - sizeof(ESTitleMeta)];
u32 numCertBytes;
u8 padding4[28];
u8 certificates[4096];
@@ -204,6 +204,7 @@ struct DVDPartitionParams {
u8 padding5[28];
u8 h3Hash[98304];
};
#undef ROUND_HACK
typedef struct diRegVals {
u32 ImmRegVal;
libs/revolution/src/ipc/ipcProfile.c
+1
View File
@@ -1,4 +1,5 @@
#include <revolution.h>
#include "global.h"
#include <cstring>
#if SDK_AUG2010
libs/revolution/src/pad/Pad.c
+1
View File
@@ -1,6 +1,7 @@
#include <revolution.h>
#include <revolution/pad.h>
#include <revolution/si.h>
#include "global.h"
#include <cstring>
libs/revolution/src/wpad/__wpad.h
+1
View File
@@ -3,6 +3,7 @@
#include <revolution/os.h>
#include <revolution/wpad.h>
#include "global.h"
#ifdef __cplusplus
extern "C" {