Skip to content

Commit

Permalink
Trial chambers etc
Browse files Browse the repository at this point in the history 
* added trial chambers (no icon yet)
* added sampling filter for climate noise (#287)
* fixed a crash from testing code for stack allocation (#290)
  • Loading branch information
@Cubitect
Cubitect committed Jun 2, 2024
1 parent 0683518 commit 8d54874
Show file tree
Hide file tree
Showing 24 changed files with 606 additions and 328 deletions.
2 changes: 1 addition & 1 deletion cubiomes
Submodule cubiomes updated 8 files
+169 −6 biomenoise.c
+3 −0 biomenoise.h
+2 −1 biomes.h
+3 −0 biometree.c
+54 −15 finders.c
+3 −1 finders.h
+9 −2 generator.c
+4 −1 util.c
2 changes: 1 addition & 1 deletion cubiomes-viewer.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ QT += core widgets
CHARSET = -finput-charset=UTF-8 -fexec-charset=UTF-8
QMAKE_CFLAGS = $$CHARSET -fwrapv -DSTRUCT_CONFIG_OVERRIDE=1
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_RELEASE *= -O3
QMAKE_CXXFLAGS_RELEASE *= -O3 -g3

greaterThan(QT_MAJOR_VERSION, 5) {
QMAKE_CXXFLAGS += -std=gnu++17
Expand Down
5 changes: 5 additions & 0 deletions etc/com.github.cubitect.cubiomes-viewer.metainfo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@
</screenshot>
</screenshots>

<recommends>
<display_length side="shortest">900</display_length>
<display_length side="longest">1600</display_length>
</recommends>

<url type="homepage">https://github.com/cubitect/cubiomes-viewer</url>
<url type="bugtracker">https://github.com/cubitect/cubiomes-viewer/issues</url>

Expand Down
2 changes: 2 additions & 0 deletions rc/icons.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,7 @@
<file>icons/zoom_in.png</file>
<file>icons/zoom_out.png</file>
<file>icons/zoom.png</file>
<file>icons/chambers.png</file>
<file>icons/chambers_d.png</file>
</qresource>
</RCC>
Binary file added rc/icons/chambers.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added rc/icons/chambers_d.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 58 additions & 33 deletions src/conditiondialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,17 @@ ConditionDialog::ConditionDialog(FormConditions *parent, MapView *mapview, Confi
ui->lineBiomeSize->setValidator(new QIntValidator(1, INT_MAX, this));
ui->lineTolerance->setValidator(new QIntValidator(0, 255, this));

ui->comboY->lineEdit()->setValidator(new QIntValidator(-64, 320, this));
initComboY(ui->comboY1, initcond ? initcond->y : 256);
initComboY(ui->comboY2, initcond ? initcond->y : 256);

ui->lineMin->setValidator(new QDoubleValidator(-1e6, 1e6, 4, this));
ui->lineMax->setValidator(new QDoubleValidator(-1e6, 1e6, 4, this));
QDoubleValidator *paraval = new QDoubleValidator(-1e6, 1e6, 4, this);
ui->lineMin->setValidator(paraval);
ui->lineMax->setValidator(paraval);

ui->lineCoverage->setValidator(new QDoubleValidator(0.0001, 100.0000, 4, this));
ui->lineConfidence->setValidator(new QDoubleValidator(0.0001, 99.9999, 4, this));
ui->lineCoverage2->setValidator(new QDoubleValidator(0.0001, 100.0000, 4, this));
ui->lineCoverage1->setValidator(new QDoubleValidator(0.0001, 100.0000, 4, this));
ui->lineConfidence1->setValidator(new QDoubleValidator(0.0001, 99.9999, 4, this));
ui->lineConfidence2->setValidator(new QDoubleValidator(0.0001, 99.9999, 4, this));

//qobject_cast<QListView*>(ui->comboCat->view())->setSpacing(1);
//qobject_cast<QListView*>(ui->comboType->view())->setSpacing(1);
Expand Down Expand Up @@ -301,8 +305,10 @@ ConditionDialog::ConditionDialog(FormConditions *parent, MapView *mapview, Confi
ui->checkSkipRef->setChecked(false);
ui->radioSquare->setChecked(true);
ui->checkRadius->setChecked(false);
ui->lineCoverage->setText("50");
ui->lineConfidence->setText("95");
ui->lineCoverage1->setText("50");
ui->lineCoverage2->setText("50");
ui->lineConfidence1->setText("95");
ui->lineConfidence2->setText("95");
ui->comboScale->setCurrentIndex(1);
onCheckStartChanged(false);
on_comboClimatePara_currentIndexChanged(0);
Expand Down Expand Up @@ -341,8 +347,11 @@ ConditionDialog::ConditionDialog(FormConditions *parent, MapView *mapview, Confi
on_comboClimatePara_currentIndexChanged(cond.para);
ui->comboOctaves->setCurrentIndex(cond.octave);
ui->comboMinMax->setCurrentIndex((cond.minmax & Condition::E_LOCATE_MAX) ? 1 : 0);
ui->lineMin->setText((cond.minmax & Condition::E_TEST_LOWER) ? QString::number(cond.vmin) : "");
ui->lineMax->setText((cond.minmax & Condition::E_TEST_UPPER) ? QString::number(cond.vmax) : "");
QString vmin, vmax;
if (cond.minmax & Condition::E_TEST_LOWER) vmin = QString::number(cond.vmin);
if (cond.minmax & Condition::E_TEST_UPPER) vmax = QString::number(cond.vmax);
ui->lineMin->setText(vmin);
ui->lineMax->setText(vmax);
ui->checkInvertRange->setChecked(cond.flags & Condition::FLG_INVERT);

updateMode();
Expand All @@ -357,19 +366,10 @@ ConditionDialog::ConditionDialog(FormConditions *parent, MapView *mapview, Confi
ui->checkApprox->setChecked(cond.flags & Condition::FLG_APPROX);
ui->checkMatchAny->setChecked(cond.flags & Condition::FLG_MATCH_ANY);
ui->checkSamplePos->setChecked(cond.count == 1);
ui->lineCoverage->setText(QString::number(cond.converage ? cond.converage * 100 : 50));
ui->lineConfidence->setText(QString::number(cond.confidence ? cond.confidence * 100 : 95));

int i, n = ui->comboY->count();
for (i = 0; i < n; i++)
if (ui->comboY->itemText(i).section(' ', 0, 0).toInt() == cond.y)
break;
if (i >= n)
{
ui->comboY->addItem(QString::number(cond.y));
ui->comboY2->addItem(QString::number(cond.y));
}
ui->comboY->setCurrentIndex(i);
ui->lineCoverage1->setText(QString::number(cond.converage ? cond.converage * 100 : 50));
ui->lineCoverage2->setText(QString::number(cond.converage ? cond.converage * 100 : 50));
ui->lineConfidence1->setText(QString::number(cond.confidence ? cond.confidence * 100 : 95));
ui->lineConfidence2->setText(QString::number(cond.confidence ? cond.confidence * 100 : 95));

if (cond.x1 == cond.z1 && cond.x1 == -cond.x2 && cond.x1 == -cond.z2)
{
Expand Down Expand Up @@ -486,6 +486,19 @@ void ConditionDialog::addTempCat(int temp, QString name)
}
}

void ConditionDialog::initComboY(QComboBox *cb, int y)
{
if (!cb->lineEdit()->validator())
cb->lineEdit()->setValidator(new QIntValidator(-64, 320, this));
int i, n = cb->count();
for (i = 0; i < n; i++)
if (cb->itemText(i).section(' ', 0, 0).toInt() == y)
break;
if (i >= n)
cb->addItem(QString::number(y));
cb->setCurrentIndex(i);
}

void ConditionDialog::updateMode()
{
int filterindex = ui->comboType->currentData().toInt();
Expand Down Expand Up @@ -566,7 +579,8 @@ void ConditionDialog::updateMode()
ui->checkSkipRef->setEnabled(cnt);

ui->labelY->setEnabled(ft.hasy);
ui->comboY->setEnabled(ft.hasy);
ui->comboY1->setEnabled(ft.hasy);
ui->comboY2->setEnabled(ft.hasy);

if (filterindex == F_TEMPS)
{
Expand All @@ -578,7 +592,15 @@ void ConditionDialog::updateMode()
}
else if (filterindex == F_CLIMATE_MINMAX)
{
ui->stackedWidget->setCurrentWidget(ui->pageMinMax);
ui->stackedWidget->setCurrentWidget(ui->pageNoise);
ui->stackedNoise->setCurrentWidget(ui->pageNoiseMinMax);
ui->groupBoxNoise->setTitle("Locate climate minimum/maximum");
}
else if (filterindex == F_NOISE_SAMPLE)
{
ui->stackedWidget->setCurrentWidget(ui->pageNoise);
ui->stackedNoise->setCurrentWidget(ui->pageNoiseSample);
ui->groupBoxNoise->setTitle("Climate noise samples");
}
else if (filterindex == F_BIOME_CENTER || filterindex == F_BIOME_CENTER_256)
{
Expand Down Expand Up @@ -1035,7 +1057,7 @@ void ConditionDialog::onAccept()
else
c.rmax = 0;

c.y = ui->comboY->currentText().section(' ', 0, 0).toInt();
c.y = ui->comboY1->currentText().section(' ', 0, 0).toInt();

c.flags = 0;
if (ui->checkApprox->isChecked())
Expand Down Expand Up @@ -1071,8 +1093,8 @@ void ConditionDialog::onAccept()
}
}
c.count = ui->checkSamplePos->isChecked() ? 1 : 0;
c.converage = ui->lineCoverage->text().toFloat() / 100.0;
c.confidence = ui->lineConfidence->text().toFloat() / 100.0;
c.converage = ui->lineCoverage1->text().toFloat() / 100.0;
c.confidence = ui->lineConfidence1->text().toFloat() / 100.0;
c.step = 0;
if (c.type == F_BIOME || c.type == F_BIOME_NETHER || c.type == F_BIOME_END)
c.step = ui->comboScale->currentData().toInt();
Expand All @@ -1082,22 +1104,25 @@ void ConditionDialog::onAccept()
if (ui->stackedWidget->currentWidget() == ui->pageBiomeCenter)
{
c.biomeId = ui->comboMatchBiome->currentData().toInt();
c.y = ui->comboY2->currentText().section(' ', 0, 0).toInt();
c.biomeSize = ui->lineBiomeSize->text().toInt();
c.tol = ui->lineTolerance->text().toInt();
}
if (ui->stackedWidget->currentWidget() == ui->pageMinMax)
if (ui->stackedWidget->currentWidget() == ui->pageNoise)
{
c.para = ui->comboClimatePara->currentData().toInt();
c.octave = ui->comboOctaves->currentIndex();
c.minmax = ui->comboMinMax->currentIndex() == 0 ?
Condition::E_LOCATE_MIN : Condition::E_LOCATE_MAX;
c.minmax = ui->comboMinMax->currentIndex() == 0 ? Condition::E_LOCATE_MIN : Condition::E_LOCATE_MAX;
bool ok1, ok2;
c.vmin = ui->lineMin->text().toFloat(&ok1);
if (ok1) c.minmax |= Condition::E_TEST_LOWER;
c.vmax = ui->lineMax->text().toFloat(&ok2);
if (ok2) c.minmax |= Condition::E_TEST_UPPER;
if (ok1 && ok2 && c.vmin > c.vmax)
std::swap(c.vmin, c.vmax);
c.count = ui->checkSamplePos2->isChecked() ? 1 : 0;
c.converage = ui->lineCoverage2->text().toFloat() / 100.0;
c.confidence = ui->lineConfidence2->text().toFloat() / 100.0;
}
if (ui->stackedWidget->currentWidget() == ui->pageTemps)
{
Expand Down Expand Up @@ -1653,13 +1678,13 @@ void ConditionDialog::on_comboOctaves_currentIndexChanged(int)
ui->comboOctaves->setToolTip(ui->comboOctaves->currentData(Qt::ToolTipRole).toString());
}

void ConditionDialog::on_comboY_currentTextChanged(const QString &text)
void ConditionDialog::on_comboY1_currentTextChanged(const QString &text)
{
if (ui->comboY2->currentText() != text)
ui->comboY2->setCurrentText(text);
}
void ConditionDialog::on_comboY2_currentTextChanged(const QString &text)
{
if (ui->comboY->currentText() != text)
ui->comboY->setCurrentText(text);
if (ui->comboY1->currentText() != text)
ui->comboY1->setCurrentText(text);
}
3 changes: 2 additions & 1 deletion src/conditiondialog.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class ConditionDialog : public QDialog
virtual ~ConditionDialog();

void addTempCat(int temp, QString name);
void initComboY(QComboBox *cb, int y);
void updateMode();
void updateBiomeSelection();
bool warnIfBad(Condition cond);
Expand Down Expand Up @@ -112,7 +113,7 @@ private slots:
void on_comboClimatePara_currentIndexChanged(int index);
void on_comboOctaves_currentIndexChanged(int index);

void on_comboY_currentTextChanged(const QString &text);
void on_comboY1_currentTextChanged(const QString &text);
void on_comboY2_currentTextChanged(const QString &text);

private:
Expand Down
Loading

0 comments on commit 8d54874

Please sign in to comment.