mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 04:31:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize library code into libs/ (#3119)

Browse Source 
* Reorganize files into libs/{dolphin,JSystem,PowerPC_EABI_Support,revolution,TRK_MINNOW_DOLPHIN}

* Update configure.py and project.py for new libs structure

* Refactor `#include <dolphin/x.h>` -> `<x.h>`

* Remove `__REVOLUTION_SDK__` forwards from dolphin

* Fix dolphin/ references in revolution

* Wrap `#include <dolphin.h>` in `!__REVOLUTION_SDK__`

* Always build TRK against dolphin headers

* Resolve revolution SDK header resolution issues
This commit is contained in:
Luke Street
2026-03-01 15:35:36 -07:00
committed by GitHub
parent c9a46bd65b
commit 4df8ccc871
1740 changed files with 583 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/src/JStudio/JStudio_JAudio2/control.cpp
+44
View File
@@ -0,0 +1,44 @@
//
// control
//
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/JStudio/JStudio_JAudio2/control.h"
#include "JSystem/JGadget/pointer.h"
JStudio_JAudio2::TCreateObject::~TCreateObject() {}
bool JStudio_JAudio2::TCreateObject::create(
JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& param_2) {
JUT_ASSERT(40, ppObject!=NULL);
CreateFunc func;
switch (param_2.get_type()) {
case 'JSND':
func = createObject_JAI_SOUND_;
break;
default:
return false;
}
*ppObject = func(param_2, this);
return 1;
}
JStudio::TObject* JStudio_JAudio2::TCreateObject::createObject_JAI_SOUND_(
JStudio::stb::data::TParse_TBlock_object const& param_1,
JStudio_JAudio2::TCreateObject* param_2) {
JStudio_JAudio2::TAdaptor_sound* adaptor = new JStudio_JAudio2::TAdaptor_sound(param_2);
if (adaptor == NULL) {
return NULL;
}
JGadget::TPointer_delete<JStudio_JAudio2::TAdaptor_sound> deleteGuard(adaptor);
adaptor->set_bPermit_onExit_notEnd_(param_2->isPermit_onExit_notEnd());
JStudio::TObject_sound* soundObj =
JStudio::TCreateObject::createFromAdaptor<JStudio_JAudio2::TAdaptor_sound>(param_1,
adaptor);
if (soundObj == NULL) {
return NULL;
}
deleteGuard.set(NULL);
return soundObj;
}
libs/JSystem/src/JStudio/JStudio_JAudio2/object-sound.cpp
+327
View File
@@ -0,0 +1,327 @@
//
// object-sound
//
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/JStudio/JStudio_JAudio2/object-sound.h"
#include "JSystem/JStudio/JStudio_JAudio2/control.h"
#include "JSystem/JStudio/JStudio_JStage/control.h"
namespace JStudio_JAudio2 {
namespace {
static void setValue_VOLUME_(JAISound *param_1, float param_2) {
param_1->getAuxiliary().moveVolume(param_2, 0);
}
static void setValue_PAN_(JAISound *param_1, float param_2) {
param_1->getAuxiliary().movePan(param_2, 0);
}
static void setValue_PITCH_(JAISound *param_1, float param_2) {
param_1->getAuxiliary().movePitch(param_2, 0);
}
static void setValue_TEMPO_(JAISound *param_1, float param_2) {
JAITempoMgr* tempoMgr = param_1->getTempoMgr();
if (tempoMgr != NULL) {
tempoMgr->setTempo(param_2);
}
}
static void setValue_ECHO_(JAISound *param_1, float param_2) {
param_1->getAuxiliary().moveFxMix(param_2, 0);
}
}; // namespace
}; // namespace JStudio_JAudio2
JStudio_JAudio2::TAdaptor_sound::TAdaptor_sound(JStudio_JAudio2::TCreateObject* param_1) :
pCreateObject_(param_1) {
field_0x11c = 0;
field_0x11d = 0;
field_0x11e = 0;
field_0x11f = 0;
field_0x120 = 0;
field_0x124 = 0xffffffff;
field_0x128 = 0;
field_0x12c = NULL;
field_0x13c = NULL;
field_0x140 = 0xffffffff;
field_0x144 = 0;
JUT_ASSERT(112, pCreateObject_!=NULL);
}
JStudio_JAudio2::TAdaptor_sound::~TAdaptor_sound() {
if (opJAISoundHandle_) {
if (field_0x11f == 0) {
opJAISoundHandle_->stop();
} else if (field_0x11c != 0) {
opJAISoundHandle_.releaseSound();
} else {
opJAISoundHandle_->stop();
}
}
}
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_prepare() {
static JStudio::TAdaptor::TSetVariableValue_immediate aoData[4] = {
TSetVariableValue_immediate(0, 0.0f),
TSetVariableValue_immediate(1, 0.0f),
TSetVariableValue_immediate(2, 0.0f),
TSetVariableValue_immediate(-1, NAN),
};
adaptor_setVariableValue_immediate(aoData);
for (TVVOSetValue_* pTVar1 = saoVVOSetValue_; pTVar1->field_0x04 != -1; pTVar1++) {
adaptor_referVariableValue(pTVar1->field_0x04)->setOutput(pTVar1);
}
}
JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_ JStudio_JAudio2::TAdaptor_sound::saoVVOSetValue_[6] = {
JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_(
JStudio_JAudio2::TAdaptor_sound::UNK_7, setValue_VOLUME_
),
JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_(
JStudio_JAudio2::TAdaptor_sound::UNK_8, setValue_PAN_
),
JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_(
JStudio_JAudio2::TAdaptor_sound::UNK_9, setValue_PITCH_
),
JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_(
JStudio_JAudio2::TAdaptor_sound::UNK_10, setValue_TEMPO_
),
JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_(
JStudio_JAudio2::TAdaptor_sound::UNK_11, setValue_ECHO_
),
JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_(
JStudio_JAudio2::TAdaptor_sound::UNK_NONE, NULL
),
};
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_end() {
}
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_update(u32 param_1) {
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(194, pObject!=NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(196, pControl!=NULL);
JStudio::TControl::TTransform_position VStack_148;
JStudio::TControl::TTransform_position VStack_154;
const JStudio::TControl::TTransform_position* pVVar2;
adaptor_getVariableValue_Vec(&VStack_148,
JStudio::TAdaptor_sound::sauVariableValue_3_POSITION_XYZ);
if (field_0x144 == 0) {
pVVar2 = pControl->transformOnSet_transform_ifEnabled(VStack_148, &VStack_154);
} else {
if (!JStudio_JStage::transform_toGlobalFromLocal(&VStack_154, VStack_148, field_0x13c, field_0x140)) {
return;
}
pVVar2 = &VStack_154;
}
field_0x130 = *pVVar2;
if (field_0x11d) {
switch(field_0x120) {
case 2: {
JAISoundStarter* soundStarter = pCreateObject_->get_pJAISoundStarter_();
soundStarter->startLevelSound(field_0x124, &opJAISoundHandle_, field_0x12c);
break;
}
case 1:
field_0x120 = 2;
break;
}
}
if (field_0x11e != 0 && field_0x124 != -1 && !opJAISoundHandle_) {
prepareSound_();
beginSound_fadeIn_();
}
if (field_0x12c != NULL && opJAISoundHandle_)
{
opJAISoundHandle_->setPos(*field_0x12c);
}
}
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_SOUND(JStudio::data::TEOperationData param_1,
void const* pContent, u32 uSize) {
switch(param_1) {
case JStudio::data::UNK_0x19:
JUT_ASSERT(283, pContent!=NULL);
JUT_ASSERT(284, uSize==4);
field_0x124 = *(u32*)pContent;
prepareSound_();
break;
}
}
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN(JStudio::data::TEOperationData param_1,
void const* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x1:
JUT_ASSERT(284, uSize == 0);
beginSound_();
break;
}
}
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN_FADE_IN(
JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(323, pContent!=NULL);
JUT_ASSERT(324, uSize==4);
beginSound_fadeIn_(*(f32*)pContent);
break;
}
}
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END(JStudio::data::TEOperationData param_1,
void const* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x1:
JUT_ASSERT(345, uSize == 0);
endSound_();
break;
}
}
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END_FADE_OUT(
JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(364, pContent!=NULL);
JUT_ASSERT(365, uSize==4);
endSound_fadeOut_(*(f32*)pContent);
break;
}
}
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT(
JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(387, pContent!=NULL);
JUT_ASSERT(388, uSize!=0);
field_0x13c = NULL;
JStage::TSystem* pJSGSystem = (JStage::TSystem*)pCreateObject_->get_pJSGSystem_();
JUT_ASSERT(396, pJSGSystem != NULL);
JStage::TObject* pJSGObject;
if (!pJSGSystem->JSGFindObject(&pJSGObject, (const char*)pContent, JStage::OBJECT_UNDEFINED)) {
JUT_ASSERT(405, pJSGObject != NULL);
field_0x13c = pJSGObject;
}
break;
}
}
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData param_1,
const void* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x18:
if (field_0x13c != NULL) {
JUT_ASSERT(431, pContent!=NULL);
JUT_ASSERT(432, uSize==0);
field_0x140 = field_0x13c->JSGFindNodeID((char*)pContent);
if (field_0x140 == -1) {
return;
}
}
break;
case JStudio::data::UNK_0x19:
JUT_ASSERT(447, uSize==4);
JUT_ASSERT(448, pContent!=NULL);
field_0x140 = *(u32*)pContent;
break;
}
}
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_ENABLE(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(468, uSize == 4);
JUT_ASSERT(469, pContent != NULL);
field_0x144 = *(u32*)pContent ? 1 : 0;
}
}
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_REPEAT(JStudio::data::TEOperationData param_1,
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(490, uSize == 4);
JUT_ASSERT(491, pContent != NULL);
field_0x11e = *(u32*)pContent ? 1 : 0;
}
}
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_CONTINUOUS(JStudio::data::TEOperationData param_1,
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(512, uSize == 4);
JUT_ASSERT(513, pContent != NULL);
field_0x11d = *(u32*)pContent ? 1 : 0;
}
}
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_LOCATED(JStudio::data::TEOperationData param_1,
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(534, pContent != NULL);
JUT_ASSERT(535, uSize == 4);
u32 val = *(u32*)pContent;
field_0x12c = NULL;
if (val != 0) {
field_0x12c = &field_0x130;
}
}
}
void JStudio_JAudio2::TAdaptor_sound::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(512, uSize == 4);
JUT_ASSERT(513, pContent != NULL);
field_0x11f = *(u32*)pContent ? 1 : 0;
}
}
void JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_::operator()(f32 param_1,
JStudio::TAdaptor* param_2) const {
JUT_ASSERT(596, param_2 != NULL);
if (((JStudio_JAudio2::TAdaptor_sound*)param_2)->opJAISoundHandle_) {
JAISound* sound = ((JStudio_JAudio2::TAdaptor_sound*)param_2)->opJAISoundHandle_.sound_;
field_0x08(sound, param_1);
}
}
void JStudio_JAudio2::TAdaptor_sound::prepareSound_() {
if (opJAISoundHandle_) {
opJAISoundHandle_stop_();
}
JAISoundStarter* soundStarter = pCreateObject_->get_pJAISoundStarter_();
if (field_0x11d == 0) {
soundStarter->startSound(field_0x124, &opJAISoundHandle_, field_0x12c);
} else {
soundStarter->startLevelSound(field_0x124, &opJAISoundHandle_, field_0x12c);
}
if (opJAISoundHandle_) {
opJAISoundHandle_->lockWhenPrepared();
}
}
void JStudio_JAudio2::TAdaptor_sound::beginSound_fadeIn_() {
if (opJAISoundHandle_) {
opJAISoundHandle_->fadeIn(field_0x128);
opJAISoundHandle_->unlockIfLocked();
field_0x120 = 1;
}
}
void JStudio_JAudio2::TAdaptor_sound::endSound_fadeOut_(u32 u32FadeTime) {
if (opJAISoundHandle_) {
opJAISoundHandle_->stop(u32FadeTime);
JUT_ASSERT(654, (u32FadeTime>0)||!opJAISoundHandle_);
field_0x120 = 0;
}
}