diff --git a/CONFIG/MainDlg.cpp b/CONFIG/MainDlg.cpp index 5ae140c3..59f321b7 100644 --- a/CONFIG/MainDlg.cpp +++ b/CONFIG/MainDlg.cpp @@ -65,6 +65,7 @@ CMainDialog::CMainDialog(QWidget* pParent) : QDialog(pParent) connect(m_ui->sound3DCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckbox3DSound); connect(m_ui->rumbleCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxRumble); connect(m_ui->textureCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxTexture); + connect(m_ui->customAssetsCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxCustomAssets); connect(m_ui->touchComboBox, &QComboBox::currentIndexChanged, this, &CMainDialog::TouchControlsChanged); connect(m_ui->transitionTypeComboBox, &QComboBox::currentIndexChanged, this, &CMainDialog::TransitionTypeChanged); connect(m_ui->exFullResComboBox, &QComboBox::currentIndexChanged, this, &CMainDialog::ExclusiveResolutionChanged); @@ -81,6 +82,11 @@ CMainDialog::CMainDialog(QWidget* pParent) : QDialog(pParent) connect(m_ui->texturePathOpen, &QPushButton::clicked, this, &CMainDialog::SelectTexturePathDialog); connect(m_ui->texturePath, &QLineEdit::editingFinished, this, &CMainDialog::TexturePathEdited); + connect(m_ui->addCustomAssetPath, &QPushButton::clicked, this, &CMainDialog::AddCustomAssetPath); + connect(m_ui->removeCustomAssetPath, &QPushButton::clicked, this, &CMainDialog::RemoveCustomAssetPath); + connect(m_ui->customAssetPaths, &QListWidget::currentRowChanged, this, &CMainDialog::SelectedPathChanged); + connect(m_ui->customAssetPaths, &QListWidget::itemActivated, this, &CMainDialog::EditCustomAssetPath); + connect(m_ui->maxLoDSlider, &QSlider::valueChanged, this, &CMainDialog::MaxLoDChanged); connect(m_ui->maxLoDSlider, &QSlider::sliderMoved, this, &CMainDialog::MaxLoDChanged); connect(m_ui->maxActorsSlider, &QSlider::valueChanged, this, &CMainDialog::MaxActorsChanged); @@ -96,8 +102,6 @@ CMainDialog::CMainDialog(QWidget* pParent) : QDialog(pParent) connect(m_ui->yResSpinBox, &QSpinBox::valueChanged, this, &CMainDialog::YResChanged); connect(m_ui->framerateSpinBox, &QSpinBox::valueChanged, this, &CMainDialog::FramerateChanged); - layout()->setSizeConstraint(QLayout::SetFixedSize); - if (currentConfigApp->m_ram_quality_limit != 0) { m_modified = true; const QString ramError = QString("Insufficient RAM!"); @@ -312,6 +316,16 @@ void CMainDialog::UpdateInterface() m_ui->texturePath->setEnabled(currentConfigApp->m_texture_load); m_ui->texturePathOpen->setEnabled(currentConfigApp->m_texture_load); + m_ui->customAssetsCheckBox->setChecked(currentConfigApp->m_custom_assets_enabled); + m_ui->customAssetPathContainer->setEnabled(currentConfigApp->m_custom_assets_enabled); + m_ui->customAssetPaths->setEnabled(currentConfigApp->m_custom_assets_enabled); + m_ui->addCustomAssetPath->setEnabled(currentConfigApp->m_custom_assets_enabled); + m_ui->removeCustomAssetPath->setEnabled(false); + + m_ui->customAssetPaths->clear(); + assetPaths = QString::fromStdString(currentConfigApp->m_custom_asset_path).split(u','); + m_ui->customAssetPaths->addItems(assetPaths); + m_ui->aspectRatioComboBox->setCurrentIndex(currentConfigApp->m_aspect_ratio); m_ui->xResSpinBox->setValue(currentConfigApp->m_x_res); m_ui->yResSpinBox->setValue(currentConfigApp->m_y_res); @@ -442,6 +456,13 @@ void CMainDialog::OnCheckboxTexture(bool checked) UpdateInterface(); } +void CMainDialog::OnCheckboxCustomAssets(bool checked) +{ + currentConfigApp->m_custom_assets_enabled = checked; + m_modified = true; + UpdateInterface(); +} + void CMainDialog::TouchControlsChanged(int index) { currentConfigApp->m_touch_scheme = index; @@ -571,10 +592,10 @@ void CMainDialog::SelectTexturePathDialog() QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks ); - QDir texture_dir = QDir(texture_path); + QDir data_path = QDir(QString::fromStdString(currentConfigApp->m_cd_path)); - if (texture_dir.exists()) { - currentConfigApp->m_texture_path = texture_dir.absolutePath().toStdString(); + if (data_path.exists(texture_path)) { + currentConfigApp->m_texture_path = data_path.relativeFilePath(texture_path).toStdString(); m_modified = true; } UpdateInterface(); @@ -582,15 +603,67 @@ void CMainDialog::SelectTexturePathDialog() void CMainDialog::TexturePathEdited() { - QDir texture_dir = QDir(m_ui->texturePath->text()); + QString texture_path = m_ui->texturePath->text(); + QDir data_path = QDir(QString::fromStdString(currentConfigApp->m_cd_path)); - if (texture_dir.exists()) { - currentConfigApp->m_texture_path = texture_dir.absolutePath().toStdString(); + if (data_path.exists(texture_path)) { + currentConfigApp->m_texture_path = data_path.relativeFilePath(texture_path).toStdString(); m_modified = true; } UpdateInterface(); } +void CMainDialog::AddCustomAssetPath() +{ + QDir data_path = QDir(QString::fromStdString(currentConfigApp->m_cd_path)); + QStringList new_files = QFileDialog::getOpenFileNames( + this, + "Select one or more files to open", + data_path.absolutePath(), + "Interleaf files (*.si)" + ); + for (QString& item : new_files) { + item = data_path.relativeFilePath(item); + } + assetPaths += new_files; + UpdateAssetPaths(); +} + +void CMainDialog::RemoveCustomAssetPath() +{ + assetPaths.removeAt(m_ui->customAssetPaths->currentRow()); + UpdateAssetPaths(); +} + +void CMainDialog::SelectedPathChanged(int currentRow) +{ + m_ui->removeCustomAssetPath->setEnabled(currentRow != -1 ? true : false); +} + +void CMainDialog::EditCustomAssetPath() +{ + QDir data_path = QDir(QString::fromStdString(currentConfigApp->m_cd_path)); + QString prev_asset_path = assetPaths[m_ui->customAssetPaths->currentRow()]; + QString new_file = QFileDialog::getOpenFileName( + this, + "Open File", + data_path.absoluteFilePath(prev_asset_path), + "Interleaf files (*.si)" + ); + if (!new_file.isEmpty()) { + new_file = data_path.relativeFilePath(new_file); + assetPaths[m_ui->customAssetPaths->currentRow()] = new_file; + } + UpdateAssetPaths(); +} + +void CMainDialog::UpdateAssetPaths() +{ + assetPaths.removeDuplicates(); + currentConfigApp->m_custom_asset_path = assetPaths.join(u',').toStdString(); + UpdateInterface(); +} + void CMainDialog::AspectRatioChanged(int index) { currentConfigApp->m_aspect_ratio = index; diff --git a/CONFIG/MainDlg.h b/CONFIG/MainDlg.h index 0aaeeb12..22cf7895 100644 --- a/CONFIG/MainDlg.h +++ b/CONFIG/MainDlg.h @@ -29,6 +29,7 @@ class CMainDialog : public QDialog { private: bool m_modified = false; bool m_advanced = false; + QStringList assetPaths = QStringList(); Ui::MainDialog* m_ui = nullptr; SDL_DisplayMode** displayModes; @@ -48,6 +49,7 @@ private slots: void OnCheckboxMusic(bool checked); void OnCheckboxRumble(bool checked); void OnCheckboxTexture(bool checked); + void OnCheckboxCustomAssets(bool checked); void TouchControlsChanged(int index); void TransitionTypeChanged(int index); void ExclusiveResolutionChanged(int index); @@ -64,6 +66,11 @@ private slots: void AFChanged(int value); void SelectTexturePathDialog(); void TexturePathEdited(); + void AddCustomAssetPath(); + void RemoveCustomAssetPath(); + void SelectedPathChanged(int currentRow); + void EditCustomAssetPath(); + void UpdateAssetPaths(); void XResChanged(int i); void YResChanged(int i); void AspectRatioChanged(int index); diff --git a/CONFIG/config.cpp b/CONFIG/config.cpp index 766cecd4..f75838f6 100644 --- a/CONFIG/config.cpp +++ b/CONFIG/config.cpp @@ -89,7 +89,9 @@ bool CConfigApp::InitInstance() m_haptic = TRUE; m_touch_scheme = 2; m_texture_load = TRUE; - m_texture_path = "/textures/"; + m_texture_path = "textures/"; + m_custom_assets_enabled = TRUE; + m_custom_asset_path = "assets/widescreen.si"; int totalRamMiB = SDL_GetSystemRAM(); if (totalRamMiB < 12) { m_ram_quality_limit = 2; @@ -188,6 +190,8 @@ bool CConfigApp::ReadRegisterSettings() m_anisotropy = iniparser_getint(dict, "isle:Anisotropic", m_anisotropy); m_texture_load = iniparser_getboolean(dict, "extensions:texture loader", m_texture_load); m_texture_path = iniparser_getstring(dict, "texture loader:texture path", m_texture_path.c_str()); + m_custom_assets_enabled = iniparser_getboolean(dict, "extensions:si loader", m_custom_assets_enabled); + m_custom_asset_path = iniparser_getstring(dict, "si loader:files", m_custom_asset_path.c_str()); m_aspect_ratio = iniparser_getint(dict, "isle:Aspect Ratio", m_aspect_ratio); m_x_res = iniparser_getint(dict, "isle:Horizontal Resolution", m_x_res); m_y_res = iniparser_getint(dict, "isle:Vertical Resolution", m_y_res); @@ -364,7 +368,8 @@ void CConfigApp::WriteRegisterSettings() const dictionary* dict = dictionary_new(0); iniparser_set(dict, "isle", NULL); iniparser_set(dict, "extensions", NULL); - iniparser_set(dict, "texture loader", NULL); + iniparser_set(dict, "si loader", NULL); + if (m_device_enumerator->FormatDeviceName(buffer, m_driver, m_device) >= 0) { iniparser_set(dict, "isle:3D Device ID", buffer); } @@ -394,6 +399,9 @@ void CConfigApp::WriteRegisterSettings() const SetIniBool(dict, "extensions:texture loader", m_texture_load); iniparser_set(dict, "texture loader:texture path", m_texture_path.c_str()); + SetIniBool(dict, "extensions:si loader", m_custom_assets_enabled); + iniparser_set(dict, "si loader:files", m_custom_asset_path.c_str()); + SetIniBool(dict, "isle:Back Buffers in Video RAM", m_3d_video_ram); SetIniInt(dict, "isle:Island Quality", m_model_quality); @@ -451,8 +459,8 @@ CConfigApp g_theApp; int main(int argc, char* argv[]) { QApplication app(argc, argv); - QCoreApplication::setApplicationName("config"); - QCoreApplication::setApplicationVersion("1.0"); + QCoreApplication::setApplicationName("Isle-Config"); + QCoreApplication::setApplicationVersion("2.0"); QCommandLineParser parser; parser.setApplicationDescription("Configure LEGO Island"); @@ -470,7 +478,7 @@ int main(int argc, char* argv[]) if (parser.isSet(iniOption)) { g_theApp.SetIniPath(parser.value(iniOption).toStdString()); } - qInfo() << "Ini path =" << QString::fromStdString(g_theApp.GetIniPath()); + qInfo() << "INI path =" << QString::fromStdString(g_theApp.GetIniPath()); int result = 1; if (g_theApp.InitInstance()) { diff --git a/CONFIG/config.h b/CONFIG/config.h index c0dcb851..71e876f6 100644 --- a/CONFIG/config.h +++ b/CONFIG/config.h @@ -87,7 +87,9 @@ class CConfigApp { int m_texture_quality; bool m_music; bool m_texture_load; + bool m_custom_assets_enabled; std::string m_texture_path; + std::string m_custom_asset_path; std::string m_iniPath; std::string m_base_path; std::string m_cd_path; diff --git a/CONFIG/res/add.svg b/CONFIG/res/add.svg new file mode 100644 index 00000000..174d9847 --- /dev/null +++ b/CONFIG/res/add.svg @@ -0,0 +1,46 @@ + + + + + + + + diff --git a/CONFIG/res/config.qrc b/CONFIG/res/config.qrc index a2fa0bcb..fc01d9e4 100644 --- a/CONFIG/res/config.qrc +++ b/CONFIG/res/config.qrc @@ -1,7 +1,9 @@ - - shark.png - lego1.png - lego2.png - - \ No newline at end of file + + add.svg + remove.svg + shark.png + lego1.png + lego2.png + + diff --git a/CONFIG/res/maindialog.ui b/CONFIG/res/maindialog.ui index e395159b..99931197 100644 --- a/CONFIG/res/maindialog.ui +++ b/CONFIG/res/maindialog.ui @@ -6,7 +6,7 @@ 0 0 - 600 + 640 480 @@ -24,6 +24,9 @@ :/lego1.png:/lego1.png + + QLayout::SizeConstraint::SetFixedSize + @@ -72,6 +75,12 @@ + + + 425 + 0 + + 0 @@ -80,30 +89,6 @@ Game - - - - - - Enable 3D positional audio effects. - - - 3D Sound - - - - - - - Enable in-game background music. - - - Music - - - - - @@ -283,6 +268,32 @@ Set this to the CD image root. + + + + + + + Enable 3D positional audio effects. + + + 3D Sound + + + + + + + Enable in-game background music. + + + Music + + + + + + @@ -766,7 +777,10 @@ The game will gradually increase the number of actors until this maximum is reac - x + ✕ + + + Qt::TextFormat::PlainText Qt::AlignmentFlag::AlignCenter @@ -1012,72 +1026,210 @@ The game will gradually increase the number of actors until this maximum is reac - - - Settings for Texture Loader extension. + + + true - - Texture Loader - - - - - - Enabled - - - - - - - false - - - Path to texture replacements. - - - textures/ - - - - - - - false - - - - 0 - 0 - - - - - 50 - 16777215 - - - - Open - - - - + + + + 0 + 0 + 449 + 369 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Settings for Texture Loader extension. + + + Texture Loader + + + + + + Enabled + + + + + + + false + + + Path to texture replacements. Relative to the Data Path. + + + textures/ + + + + + + + false + + + + 0 + 0 + + + + + 50 + 16777215 + + + + Open + + + + + + + + + + Settings for Custom Assets. + + + Custom Assets + + + + + + Enabled + + + + + + + false + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + false + + + + 28 + 28 + + + + + 28 + 28 + + + + Add path. + + + + :/add.svg:/add.svg + + + + + + + false + + + Paths used by the SI Loader extension. + +Double-click a path to edit it. + + + QAbstractScrollArea::SizeAdjustPolicy::AdjustToContentsOnFirstShow + + + + + + + false + + + + 28 + 28 + + + + + 28 + 28 + + + + Remove path. + + + + :/remove.svg:/remove.svg + + + + + + + + + + + + + Qt::Orientation::Vertical + + + + 20 + 40 + + + + + + - - - - Qt::Orientation::Vertical - - - - 20 - 40 - - - - @@ -1176,9 +1328,14 @@ The game will gradually increase the number of actors until this maximum is reac AFSlider touchComboBox rumbleCheckBox + scrollArea textureCheckBox texturePath texturePathOpen + customAssetsCheckBox + customAssetPaths + addCustomAssetPath + removeCustomAssetPath okButton launchButton cancelButton diff --git a/CONFIG/res/remove.svg b/CONFIG/res/remove.svg new file mode 100644 index 00000000..0e601431 --- /dev/null +++ b/CONFIG/res/remove.svg @@ -0,0 +1,10 @@ + + + + diff --git a/ISLE/emscripten/filesystem.cpp b/ISLE/emscripten/filesystem.cpp index c2bfbc37..e5644608 100644 --- a/ISLE/emscripten/filesystem.cpp +++ b/ISLE/emscripten/filesystem.cpp @@ -1,6 +1,7 @@ #include "filesystem.h" #include "events.h" +#include "extensions/siloader.h" #include "extensions/textureloader.h" #include "legogamestate.h" #include "misc.h" @@ -107,6 +108,14 @@ void Emscripten_SetupFilesystem() Emscripten_SendExtensionProgress("HD Textures", (++i * 100) / sizeOfArray(g_textures)); } } + + if (Extensions::SiLoader::enabled) { + wasmfs_create_directory("/LEGO/extra", 0644, fetchfs); + + for (const auto& file : Extensions::SiLoader::files) { + registerFile(file.c_str()); + } + } #endif if (GameState()->GetSavePath() && *GameState()->GetSavePath() && !Emscripten_OPFSDisabled()) { diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index ca7bbd67..84cd28f3 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -973,6 +973,8 @@ MxResult IsleApp::SetupWindow() return FAILURE; } + Lego()->LoadSiLoader(); + DetectGameVersion(); GameState()->SerializePlayersInfo(LegoStorage::c_read); GameState()->SerializeScoreHistory(LegoStorage::c_read); diff --git a/LEGO1/lego/legoomni/include/legomain.h b/LEGO1/lego/legoomni/include/legomain.h index c5cb23af..8fdf9ecb 100644 --- a/LEGO1/lego/legoomni/include/legomain.h +++ b/LEGO1/lego/legoomni/include/legomain.h @@ -208,6 +208,7 @@ class LegoOmni : public MxOmni { void SetVersion10(MxBool p_version10) { m_version10 = p_version10; } MxBool IsVersion10() { return m_version10; } + LEGO1_EXPORT void LoadSiLoader(); // SYNTHETIC: LEGO1 0x10058b30 // SYNTHETIC: BETA10 0x1008f8d0 diff --git a/LEGO1/lego/legoomni/src/main/legomain.cpp b/LEGO1/lego/legoomni/src/main/legomain.cpp index 04b1dc34..975933ff 100644 --- a/LEGO1/lego/legoomni/src/main/legomain.cpp +++ b/LEGO1/lego/legoomni/src/main/legomain.cpp @@ -354,9 +354,6 @@ MxResult LegoOmni::Create(MxOmniCreateParam& p_param) else { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to create MxTransitionManager"); } - - Extension::Call(Load); - done: return result; // LINE: BETA10 0x1008e35d @@ -728,3 +725,8 @@ void LegoOmni::Resume() MxOmni::Resume(); SetAppCursor(e_cursorArrow); } + +void LegoOmni::LoadSiLoader() +{ + Extension::Call(Load); +} diff --git a/extensions/include/extensions/siloader.h b/extensions/include/extensions/siloader.h index 92cc3bfe..3fc7ab0a 100644 --- a/extensions/include/extensions/siloader.h +++ b/extensions/include/extensions/siloader.h @@ -19,10 +19,10 @@ class SiLoader { static bool RemoveWith(StreamObject p_object, LegoWorld* world); static std::map options; + static std::vector files; static bool enabled; private: - static std::vector files; static std::vector> startWith; static std::vector> removeWith; diff --git a/extensions/src/siloader.cpp b/extensions/src/siloader.cpp index 3532fc76..bfbddd88 100644 --- a/extensions/src/siloader.cpp +++ b/extensions/src/siloader.cpp @@ -10,24 +10,29 @@ using namespace Extensions; std::map SiLoader::options; +std::vector SiLoader::files; std::vector> SiLoader::startWith; std::vector> SiLoader::removeWith; bool SiLoader::enabled = false; void SiLoader::Initialize() -{ -} - -bool SiLoader::Load() { char* files = SDL_strdup(options["si loader:files"].c_str()); char* saveptr; for (char* file = SDL_strtok_r(files, ",\n", &saveptr); file; file = SDL_strtok_r(NULL, ",\n", &saveptr)) { - LoadFile(file); + SiLoader::files.emplace_back(file); } SDL_free(files); +} + +bool SiLoader::Load() +{ + for (const auto& file : files) { + LoadFile(file.c_str()); + } + return true; }