mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-24 00:51:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

copy JStudio_JStage progress from pikmin2

Browse Source
This commit is contained in:
LagoLunatic
2024-04-13 23:27:13 -04:00
parent a7a4984a89
commit 778ff46ab2
15 changed files with 151 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JStudio/JStudio/jstudio-object.cpp
+6 -6
View File
@@ -161,7 +161,7 @@ void JStudio::TAdaptor::adaptor_getVariableValue_GXColor(GXColor* param_1, const
void JStudio::TAdaptor::adaptor_updateVariableValue(JStudio::TObject* pObject, u32 param_2) {
TControl* pControl = pObject->getControl();
f64 dVar3 = pControl->getSecondPerFrame();
JGadget::TEnumerator<JStudio::TVariableValue*> enumerator(pValue_, pValue_ + u);
JGadget::TEnumerator<JStudio::TVariableValue*> enumerator(mVariableValues, mVariableValues + mCount);
while (enumerator) {
JStudio::TVariableValue* value = *enumerator;
value->forward(param_2);
@@ -171,30 +171,30 @@ void JStudio::TAdaptor::adaptor_updateVariableValue(JStudio::TObject* pObject, u
/* 8026F064-8026F07C .text adaptor_setVariableValue_VOID___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio7TObjectUlPCvUl */
void JStudio::TAdaptor::adaptor_setVariableValue_VOID_(JStudio::TAdaptor* param_1, JStudio::TObject* param_2, u32 param_3, const void* param_4, u32 uSize) {
param_1->pValue_[param_3].setValue_none();
param_1->mVariableValues[param_3].setValue_none();
}
/* 8026F07C-8026F0A8 .text adaptor_setVariableValue_IMMEDIATE___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio7TObjectUlPCvUl */
void JStudio::TAdaptor::adaptor_setVariableValue_IMMEDIATE_(JStudio::TAdaptor* param_1, JStudio::TObject* param_2, u32 param_3, const void* param_4, u32 param_5) {
TVariableValue* value = &param_1->pValue_[param_3];
TVariableValue* value = &param_1->mVariableValues[param_3];
value->setValue_immediate(*(f32*)param_4);
}
/* 8026F0A8-8026F0D4 .text adaptor_setVariableValue_TIME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio7TObjectUlPCvUl */
void JStudio::TAdaptor::adaptor_setVariableValue_TIME_(JStudio::TAdaptor* param_1, JStudio::TObject* param_2, u32 param_3, const void* param_4, u32 param_5) {
TVariableValue* value = &param_1->pValue_[param_3];
TVariableValue* value = &param_1->mVariableValues[param_3];
value->setValue_time(*(f32*)param_4);
}
/* 8026F0D4-8026F144 .text adaptor_setVariableValue_FVR_NAME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio7TObjectUlPCvUl */
void JStudio::TAdaptor::adaptor_setVariableValue_FVR_NAME_(JStudio::TAdaptor* param_1, JStudio::TObject* param_2, u32 param_3, const void* param_4, u32 param_5) {
TVariableValue* value = &param_1->pValue_[param_3];
TVariableValue* value = &param_1->mVariableValues[param_3];
value->setValue_functionValue(param_2->getControl()->getFunctionValue(param_4,param_5));
}
/* 8026F144-8026F1B0 .text adaptor_setVariableValue_FVR_INDEX___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio7TObjectUlPCvUl */
void JStudio::TAdaptor::adaptor_setVariableValue_FVR_INDEX_(JStudio::TAdaptor* param_1, JStudio::TObject* param_2, u32 param_3, const void* param_4, u32 param_5) {
TVariableValue* value = &param_1->pValue_[param_3];
TVariableValue* value = &param_1->mVariableValues[param_3];
value->setValue_functionValue(param_2->getControl()->getFunctionValue_index(*(u32*)param_4));
}
src/JSystem/JStudio/JStudio_JAudio/object-sound.cpp
+4 -7
View File
@@ -35,11 +35,11 @@ void TAdaptor_sound::adaptor_do_prepare(const JStudio::TObject* param_1) {
TSetVariableValue_immediate(0xFFFFFFFF, NAN),
};
adaptor_setVariableValue_immediate(aoData);
pValue_[3].setOutput(&TAdaptor_sound::soVVOOn_BEGIN_FADE_IN_);
pValue_[4].setOutput(&TAdaptor_sound::soVVOOn_END_FADE_OUT_);
mVariableValues[3].setOutput(&TAdaptor_sound::soVVOOn_BEGIN_FADE_IN_);
mVariableValues[4].setOutput(&TAdaptor_sound::soVVOOn_END_FADE_OUT_);
for (TAdaptor_sound::TVVOSetValue_* value = TAdaptor_sound::saoVVOSetValue_; value->mValueIndex != -1; value++) {
pValue_[value->mValueIndex].setOutput(value);
mVariableValues[value->mValueIndex].setOutput(value);
}
}
@@ -76,10 +76,7 @@ void TAdaptor_sound::adaptor_do_SOUND(JStudio::data::TEOperationData op, const v
mpSound->stop(0);
}
mFlags = flags;
mpBasic->startSoundVec(flags, &mpSound, mPosition, 0, 0, 4);
if (mpSound) {
mpSound->setPrepareFlag(1);
}
mpBasic->prepareSoundVec(flags, &mpSound, mPosition, 0, 0, 4);
if (!mpSound) {
return;
}
src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp
+2 -2
View File
@@ -44,8 +44,8 @@ void TAdaptor_particle::adaptor_do_prepare(const JStudio::TObject* param_1) {
TSetVariableValue_immediate(15, 255.0f), TSetVariableValue_immediate(16, 255.0f), TSetVariableValue_immediate(0xFFFFFFFF, NAN)
};
adaptor_setVariableValue_immediate(aoData);
pValue_[18].setOutput(&TAdaptor_particle::soVVOOn_BEGIN_FADE_IN_);
pValue_[19].setOutput(&TAdaptor_particle::soVVOOn_END_FADE_OUT_);
mVariableValues[18].setOutput(&TAdaptor_particle::soVVOOn_BEGIN_FADE_IN_);
mVariableValues[19].setOutput(&TAdaptor_particle::soVVOOn_END_FADE_OUT_);
mCallback.mObject = param_1;
}
src/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp
+22 -14
View File
@@ -6,37 +6,45 @@
#include "JSystem/JStudio/JStudio_JStage/object-ambientlight.h"
#include "dolphin/types.h"
namespace JStudio_JStage {
/* 802770D8-8027716C .text __ct__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ26JStage7TSystemPQ26JStage13TAmbientLight */
JStudio_JStage::TAdaptor_ambientLight::TAdaptor_ambientLight(const JStage::TSystem*, JStage::TAmbientLight*) {
/* Nonmatching */
TAdaptor_ambientLight::TAdaptor_ambientLight(const JStage::TSystem* system, JStage::TAmbientLight* object)
: mSystem(system)
, mLight(object)
{
}
/* 8027716C-802771E4 .text __dt__Q214JStudio_JStage21TAdaptor_ambientLightFv */
JStudio_JStage::TAdaptor_ambientLight::~TAdaptor_ambientLight() {
/* Nonmatching */
TAdaptor_ambientLight::~TAdaptor_ambientLight() {
adaptor_do_end(NULL);
}
/* 802771E4-802771E8 .text adaptor_do_prepare__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ27JStudio7TObject */
void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_prepare(const JStudio::TObject*) {
/* Nonmatching */
void TAdaptor_ambientLight::adaptor_do_prepare(const JStudio::TObject*) {
}
/* 802771E8-80277274 .text adaptor_do_begin__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ27JStudio7TObject */
void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_begin(const JStudio::TObject*) {
/* Nonmatching */
void TAdaptor_ambientLight::adaptor_do_begin(const JStudio::TObject*) {
mLight->JSGFEnableFlag(1);
adaptor_setVariableValue_GXColor(sauVariableValue_4_COLOR_RGBA, mLight->JSGGetColor());
}
/* 80277274-802772C8 .text adaptor_do_end__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ27JStudio7TObject */
void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_end(const JStudio::TObject*) {
/* Nonmatching */
void TAdaptor_ambientLight::adaptor_do_end(const JStudio::TObject*) {
mLight->JSGFDisableFlag(1);
}
/* 802772C8-80277320 .text adaptor_do_update__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ27JStudio7TObjectUl */
void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_update(const JStudio::TObject*, u32) {
/* Nonmatching */
void TAdaptor_ambientLight::adaptor_do_update(const JStudio::TObject*, u32) {
GXColor color;
adaptor_getVariableValue_GXColor(&color, sauVariableValue_4_COLOR_RGBA);
mLight->JSGSetColor(color);
}
/* 80277320-80277354 .text adaptor_do_data__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ27JStudio7TObjectPCvUlPCvUl */
void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_data(const JStudio::TObject*, const void*, u32, const void*, u32) {
/* Nonmatching */
void TAdaptor_ambientLight::adaptor_do_data(const JStudio::TObject* object, const void* p2, u32 p3, const void* p4, u32 p5) {
TAdaptor_object_::adaptor_data_(mLight, p2, p3, p4, p5);
}
} // namespace JStudio_JStage
src/JSystem/JStudio/JStudio_JStage/object-fog.cpp
+35 -14
View File
@@ -6,37 +6,58 @@
#include "JSystem/JStudio/JStudio_JStage/object-fog.h"
#include "dolphin/types.h"
namespace JStudio_JStage {
/* 80277C64-80277CF8 .text __ct__Q214JStudio_JStage12TAdaptor_fogFPCQ26JStage7TSystemPQ26JStage4TFog */
JStudio_JStage::TAdaptor_fog::TAdaptor_fog(const JStage::TSystem*, JStage::TFog*) {
/* Nonmatching */
TAdaptor_fog::TAdaptor_fog(const JStage::TSystem* system, JStage::TFog* fog)
: JStudio::TAdaptor_fog()
, mSystem(system)
, mObject(fog)
{
}
/* 80277CF8-80277D70 .text __dt__Q214JStudio_JStage12TAdaptor_fogFv */
JStudio_JStage::TAdaptor_fog::~TAdaptor_fog() {
/* Nonmatching */
TAdaptor_fog::~TAdaptor_fog() {
adaptor_do_end(NULL);
}
const TAdaptor_fog::TVVOutput TAdaptor_fog::saoVVOutput_[] = {
TVVOutput(4, &JStage::TFog::JSGSetStartZ, &JStage::TFog::JSGGetStartZ),
TVVOutput(5, &JStage::TFog::JSGSetEndZ, &JStage::TFog::JSGGetEndZ),
TVVOutput(-1, NULL, NULL),
};
/* 80277D70-80277DB8 .text adaptor_do_prepare__Q214JStudio_JStage12TAdaptor_fogFPCQ27JStudio7TObject */
void JStudio_JStage::TAdaptor_fog::adaptor_do_prepare(const JStudio::TObject*) {
/* Nonmatching */
void TAdaptor_fog::adaptor_do_prepare(const JStudio::TObject*) {
for (const TVVOutput* output = saoVVOutput_; output->mValueIndex != -1; output++) {
mVariableValues[output->mValueIndex].setOutput(output);
}
}
/* 80277DB8-80277E9C .text adaptor_do_begin__Q214JStudio_JStage12TAdaptor_fogFPCQ27JStudio7TObject */
void JStudio_JStage::TAdaptor_fog::adaptor_do_begin(const JStudio::TObject*) {
/* Nonmatching */
void TAdaptor_fog::adaptor_do_begin(const JStudio::TObject*) {
mObject->JSGFEnableFlag(1);
adaptor_setVariableValue_GXColor(sauVariableValue_4_COLOR_RGBA, mObject->JSGGetColor());
for (const TVVOutput* output = saoVVOutput_; output->mValueIndex != -1; output++) {
mVariableValues[output->mValueIndex].setValue_immediate((mObject->*(output->mGetter))());
}
}
/* 80277E9C-80277EF0 .text adaptor_do_end__Q214JStudio_JStage12TAdaptor_fogFPCQ27JStudio7TObject */
void JStudio_JStage::TAdaptor_fog::adaptor_do_end(const JStudio::TObject*) {
/* Nonmatching */
void TAdaptor_fog::adaptor_do_end(const JStudio::TObject*) {
mObject->JSGFDisableFlag(1);
}
/* 80277EF0-80277F48 .text adaptor_do_update__Q214JStudio_JStage12TAdaptor_fogFPCQ27JStudio7TObjectUl */
void JStudio_JStage::TAdaptor_fog::adaptor_do_update(const JStudio::TObject*, u32) {
/* Nonmatching */
void TAdaptor_fog::adaptor_do_update(const JStudio::TObject*, u32) {
GXColor color;
adaptor_getVariableValue_GXColor(&color, sauVariableValue_4_COLOR_RGBA);
mObject->JSGSetColor(color);
}
/* 80277F48-80277F7C .text adaptor_do_data__Q214JStudio_JStage12TAdaptor_fogFPCQ27JStudio7TObjectPCvUlPCvUl */
void JStudio_JStage::TAdaptor_fog::adaptor_do_data(const JStudio::TObject*, const void*, u32, const void*, u32) {
/* Nonmatching */
void TAdaptor_fog::adaptor_do_data(const JStudio::TObject* object, const void* p2, u32 p3, const void* p4, u32 p5) {
TAdaptor_object_::adaptor_data_(mObject, p2, p3, p4, p5);
}
} // namespace JStudio_JStage
src/JSystem/JStudio/JStudio_JStage/object.cpp
+12 -4
View File
@@ -7,11 +7,19 @@
#include "dolphin/types.h"
/* 80276188-802761D0 .text adaptor_data___Q214JStudio_JStage16TAdaptor_object_FPQ26JStage7TObjectPCvUlPCvUl */
void JStudio_JStage::TAdaptor_object_::adaptor_data_(JStage::TObject*, const void*, u32, const void*, u32) {
/* Nonmatching */
void JStudio_JStage::TAdaptor_object_::adaptor_data_(JStage::TObject* object, const void* p2, u32 p3, const void* p4, u32 p5) {
object->JSGSetData((p3 == 0 ? 0xFFFFFFFF : *(u32*)p2), p4, p5);
}
/* 802761D0-80276264 .text adaptor_ENABLE___Q214JStudio_JStage16TAdaptor_object_FPQ26JStage7TObjectQ37JStudio4data15TEOperationDataPCvUl */
void JStudio_JStage::TAdaptor_object_::adaptor_ENABLE_(JStage::TObject*, JStudio::data::TEOperationData, const void*, u32) {
/* Nonmatching */
void JStudio_JStage::TAdaptor_object_::adaptor_ENABLE_(JStage::TObject* object, JStudio::data::TEOperationData op, const void* data, u32) {
switch (op) {
case JStudio::data::UNK_0x2:
if ((*(u32*)data) != 0) {
object->JSGFEnableFlag(2);
} else {
object->JSGFDisableFlag(2);
}
break;
}
}