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/maindialog.ui b/CONFIG/res/maindialog.ui
index e395159b..aca3685b 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,207 @@ 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
+
+
+
+ 30
+ 30
+
+
+
+
+ 13
+ NoAntialias
+
+
+
+ Add path.
+
+
+ ＋
+
+
+
+ -
+
+
+ false
+
+
+ Paths used by the SI Loader extension.
+
+Double-click a path to edit it.
+
+
+ QAbstractScrollArea::SizeAdjustPolicy::AdjustToContentsOnFirstShow
+
+
+
+ -
+
+
+ false
+
+
+
+ 30
+ 30
+
+
+
+
+ 12
+
+
+
+ Remove path.
+
+
+ ✕
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Orientation::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
- -
-
-
- Qt::Orientation::Vertical
-
-
-
- 20
- 40
-
-
-
-
@@ -1176,9 +1325,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