Skip to content

Commit

Permalink
Update 3.2.0
Browse files Browse the repository at this point in the history
* added experimental 1.20 support
* added thread limit option for map view (Cubitect#207)
* added multithreading support for biome image export
* added no-ocean biome layer for beta 1.7
* changed map scaling to be more consistent across platforms (Cubitect#203)
* changed scaled biomes for beta 1.7 to be slightly more accurate
* fixed non-overworld voronoi scaling causing the program to crash (Cubitect#209)
* fixed stronghold biomes for pre-1.13
* fixed a small 80 byte memory leak when switching seeds or version
* fixed tall_birch_hills instead of tall_birch_forest considered non-generating in 1.9 - 1.10 (MC-98995)
* fixed a crash when opening beta 1.7 with height map (still does not work though)
  • Loading branch information
Cubitect authored and SunnySlopes committed Mar 1, 2023
1 parent 39c1280 commit 703380c
Show file tree
Hide file tree
Showing 15 changed files with 338 additions and 223 deletions.
10 changes: 5 additions & 5 deletions etc/com.github.cubitect.cubiomes-viewer.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@
</description>

<releases>
<release version="3.1.1" date="2023-02-07">
<release version="3.2.0" date="2023-02-18">
</release>
</releases>

<launchable type="desktop-id">com.github.cubitect.cubiomes-viewer.desktop</launchable>
<screenshots>
<screenshot type="default">
<image type="source">https://raw.githubusercontent.com/Cubitect/cubiomes-viewer/3.1.1/etc/screenshot_maingui-fs8.png</image>
<image type="source">https://raw.githubusercontent.com/Cubitect/cubiomes-viewer/3.2.0/etc/screenshot_maingui-fs8.png</image>
</screenshot>
<screenshot type="default">
<image type="source">https://raw.githubusercontent.com/Cubitect/cubiomes-viewer/3.1.1/etc/screenshot_biomes-fs8.png</image>
<image type="source">https://raw.githubusercontent.com/Cubitect/cubiomes-viewer/3.2.0/etc/screenshot_biomes-fs8.png</image>
</screenshot>
<screenshot type="default">
<image type="source">https://raw.githubusercontent.com/Cubitect/cubiomes-viewer/3.1.1/etc/screenshot_structures-fs8.png</image>
<image type="source">https://raw.githubusercontent.com/Cubitect/cubiomes-viewer/3.2.0/etc/screenshot_structures-fs8.png</image>
</screenshot>
<screenshot type="default">
<image type="source">https://raw.githubusercontent.com/Cubitect/cubiomes-viewer/3.1.1/etc/screenshot_surface-fs8.png</image>
<image type="source">https://raw.githubusercontent.com/Cubitect/cubiomes-viewer/3.2.0/etc/screenshot_surface-fs8.png</image>
</screenshot>
</screenshots>

Expand Down
4 changes: 2 additions & 2 deletions src/aboutdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include <QString>

#define VERS_MAJOR 3
#define VERS_MINOR 1
#define VERS_PATCH 1 // negative patch number designates a development version
#define VERS_MINOR 2
#define VERS_PATCH 0 // negative patch number designates a development version

// returns +1 if newer, -1 if older and 0 if equal
inline int cmpVers(int major, int minor, int patch)
Expand Down
3 changes: 3 additions & 0 deletions src/configdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ ConfigDialog::ConfigDialog(QWidget *parent, Config *config)
ui->buttonBiomeColor->setFont(*gp_font_mono);

ui->lineMatching->setValidator(new QIntValidator(1, 99999999, ui->lineMatching));
ui->spinThreads->setRange(1, QThread::idealThreadCount());

initSettings(config);
visModified = false;
Expand All @@ -55,6 +56,7 @@ void ConfigDialog::initSettings(Config *config)
ui->lineGridSpacing->setText(config->gridSpacing ? QString::number(config->gridSpacing) : "");
ui->comboGridMult->setCurrentText(config->gridMultiplier ? QString::number(config->gridMultiplier) : tr("None"));
ui->spinCacheSize->setValue(config->mapCacheSize);
ui->spinThreads->setValue(config->mapThreads ? config->mapThreads : QThread::idealThreadCount());
ui->lineSep->setText(config->separator);
int idx = config->quote == "\'" ? 1 : config->quote== "\"" ? 2 : 0;
ui->comboQuote->setCurrentIndex(idx);
Expand All @@ -74,6 +76,7 @@ Config ConfigDialog::getSettings()
conf.gridSpacing = ui->lineGridSpacing->text().toInt();
conf.gridMultiplier = ui->comboGridMult->currentText().toInt();
conf.mapCacheSize = ui->spinCacheSize->value();
conf.mapThreads = ui->spinThreads->value();
conf.separator = ui->lineSep->text();
int idx = ui->comboQuote->currentIndex();
conf.quote = idx == 1 ? "\'" : idx == 2 ? "\"" : "";
Expand Down
10 changes: 10 additions & 0 deletions src/configdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,16 @@
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<widget class="QLabel" name="label_9">
<property name="text">
<string>渲染地图所用线程数:</string>
</property>
</widget>
</item>
<item row="7" column="2" colspan="3">
<widget class="QSpinBox" name="spinThreads"/>
</item>
</layout>
</widget>
</item>
Expand Down
Loading

0 comments on commit 703380c

Please sign in to comment.