summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Tools/QtBiomeVisualiser/GeneratorSetup.cpp2
-rw-r--r--Tools/QtBiomeVisualiser/MainWindow.cpp10
-rw-r--r--Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro152
3 files changed, 86 insertions, 78 deletions
diff --git a/Tools/QtBiomeVisualiser/GeneratorSetup.cpp b/Tools/QtBiomeVisualiser/GeneratorSetup.cpp
index a6490d9fe..8f97e1f37 100644
--- a/Tools/QtBiomeVisualiser/GeneratorSetup.cpp
+++ b/Tools/QtBiomeVisualiser/GeneratorSetup.cpp
@@ -14,6 +14,8 @@ static const QString s_GeneratorNames[] =
QString("Checkerboard"),
QString("Constant"),
QString("DistortedVoronoi"),
+ QString("Grown"),
+ QString("GrownProt"),
QString("MultiStepMap"),
QString("TwoLevel"),
QString("Voronoi"),
diff --git a/Tools/QtBiomeVisualiser/MainWindow.cpp b/Tools/QtBiomeVisualiser/MainWindow.cpp
index e6e951b60..c6ea8656e 100644
--- a/Tools/QtBiomeVisualiser/MainWindow.cpp
+++ b/Tools/QtBiomeVisualiser/MainWindow.cpp
@@ -32,7 +32,8 @@ const double MainWindow::m_ViewZooms[] =
MainWindow::MainWindow(QWidget * parent) :
QMainWindow(parent),
m_GeneratorSetup(nullptr),
- m_LineSeparator(nullptr)
+ m_LineSeparator(nullptr),
+ m_CurrentZoomLevel(2)
{
initMinecraftPath();
@@ -41,6 +42,7 @@ MainWindow::MainWindow(QWidget * parent) :
connect(m_BiomeView, SIGNAL(decreaseZoom()), this, SLOT(decreaseZoom()));
connect(m_BiomeView, SIGNAL(wheelUp()), this, SLOT(increaseZoom()));
connect(m_BiomeView, SIGNAL(wheelDown()), this, SLOT(decreaseZoom()));
+ m_BiomeView->setZoomLevel(m_ViewZooms[m_CurrentZoomLevel]);
m_StatusBar = new QStatusBar();
this->setStatusBar(m_StatusBar);
@@ -286,15 +288,11 @@ void MainWindow::createActions()
{
m_actViewZoom[i] = new QAction(tr("&Zoom %1%").arg(std::floor(m_ViewZooms[i] * 100)), this);
m_actViewZoom[i]->setCheckable(true);
- if ((int)(m_ViewZooms[i] * 16) == 16)
- {
- m_actViewZoom[i]->setChecked(true);
- m_CurrentZoomLevel = i;
- }
m_actViewZoom[i]->setData(QVariant(i));
zoomGroup->addAction(m_actViewZoom[i]);
connect(m_actViewZoom[i], SIGNAL(triggered()), this, SLOT(setViewZoom()));
}
+ m_actViewZoom[m_CurrentZoomLevel]->setChecked(true);
}
diff --git a/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro b/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
index 4cff9c90f..9522491a8 100644
--- a/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
+++ b/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
@@ -12,78 +12,86 @@ TARGET = QtBiomeVisualiser
TEMPLATE = app
-SOURCES +=\
- MainWindow.cpp \
- BiomeView.cpp \
- ../../src/Generating/BioGen.cpp \
- ../../src/VoronoiMap.cpp \
- ../../src/Noise.cpp \
- ../../src/StringUtils.cpp \
- ../../src/LoggerListeners.cpp \
- ../../src/Logger.cpp \
- ../../src/IniFile.cpp \
- ../../src/OSSupport/File.cpp \
- ../../src/OSSupport/CriticalSection.cpp \
- ../../src/OSSupport/IsThread.cpp \
- ../../src/BiomeDef.cpp \
- ../../src/StringCompression.cpp \
- ../../src/WorldStorage/FastNBT.cpp \
- ../../lib/zlib/adler32.c \
- ../../lib/zlib/compress.c \
- ../../lib/zlib/crc32.c \
- ../../lib/zlib/deflate.c \
- ../../lib/zlib/gzclose.c \
- ../../lib/zlib/gzlib.c \
- ../../lib/zlib/gzread.c \
- ../../lib/zlib/gzwrite.c \
- ../../lib/zlib/infback.c \
- ../../lib/zlib/inffast.c \
- ../../lib/zlib/inflate.c \
- ../../lib/zlib/inftrees.c \
- ../../lib/zlib/trees.c \
- ../../lib/zlib/uncompr.c \
- ../../lib/zlib/zutil.c \
- GeneratorSetup.cpp \
- QtBiomeVisualiser.cpp \
- QtChunk.cpp \
- RegionCache.cpp \
- Region.cpp \
- ChunkSource.cpp \
- RegionLoader.cpp
-
-HEADERS += MainWindow.h \
- Globals.h \
- BiomeView.h \
- ../../src/Generating/BioGen.h \
- ../../src/VoronoiMap.h \
- ../../src/Noise.h \
- ../../src/StringUtils.h \
- ../../src/LoggerListeners.h \
- ../../src/Logger.h \
- ../../src/IniFile.h \
- ../../src/OSSupport/File.h \
- ../../src/OSSupport/CriticalSection.h \
- ../../src/OSSupport/IsThread.h \
- ../../src/BiomeDef.h \
- ../../src/StringCompression.h \
- ../../src/WorldStorage/FastNBT.h \
- ../../lib/zlib/crc32.h \
- ../../lib/zlib/deflate.h \
- ../../lib/zlib/gzguts.h \
- ../../lib/zlib/inffast.h \
- ../../lib/zlib/inffixed.h \
- ../../lib/zlib/inflate.h \
- ../../lib/zlib/inftrees.h \
- ../../lib/zlib/trees.h \
- ../../lib/zlib/zconf.h \
- ../../lib/zlib/zlib.h \
- ../../lib/zlib/zutil.h \
- GeneratorSetup.h \
- QtChunk.h \
- RegionCache.h \
- Region.h \
- ChunkSource.h \
- RegionLoader.h
+SOURCES += \
+ MainWindow.cpp \
+ BiomeView.cpp \
+ ../../src/Generating/BioGen.cpp \
+ ../../src/VoronoiMap.cpp \
+ ../../src/Noise.cpp \
+ ../../src/StringUtils.cpp \
+ ../../src/LoggerListeners.cpp \
+ ../../src/Logger.cpp \
+ ../../src/IniFile.cpp \
+ ../../src/OSSupport/File.cpp \
+ ../../src/OSSupport/CriticalSection.cpp \
+ ../../src/OSSupport/IsThread.cpp \
+ ../../src/BiomeDef.cpp \
+ ../../src/StringCompression.cpp \
+ ../../src/WorldStorage/FastNBT.cpp \
+ ../../lib/zlib/adler32.c \
+ ../../lib/zlib/compress.c \
+ ../../lib/zlib/crc32.c \
+ ../../lib/zlib/deflate.c \
+ ../../lib/zlib/gzclose.c \
+ ../../lib/zlib/gzlib.c \
+ ../../lib/zlib/gzread.c \
+ ../../lib/zlib/gzwrite.c \
+ ../../lib/zlib/infback.c \
+ ../../lib/zlib/inffast.c \
+ ../../lib/zlib/inflate.c \
+ ../../lib/zlib/inftrees.c \
+ ../../lib/zlib/trees.c \
+ ../../lib/zlib/uncompr.c \
+ ../../lib/zlib/zutil.c \
+ GeneratorSetup.cpp \
+ QtBiomeVisualiser.cpp \
+ QtChunk.cpp \
+ RegionCache.cpp \
+ Region.cpp \
+ ChunkSource.cpp \
+ RegionLoader.cpp
+
+
+
+HEADERS += \
+ MainWindow.h \
+ QtChunk.h \
+ Globals.h \
+ BiomeView.h \
+ ../../src/Generating/BioGen.h \
+ ../../src/Generating/IntGen.h \
+ ../../src/Generating/ProtIntGen.h \
+ ../../src/VoronoiMap.h \
+ ../../src/Noise.h \
+ ../../src/StringUtils.h \
+ ../../src/LoggerListeners.h \
+ ../../src/Logger.h \
+ ../../src/IniFile.h \
+ ../../src/OSSupport/File.h \
+ ../../src/OSSupport/CriticalSection.h \
+ ../../src/OSSupport/IsThread.h \
+ ../../src/BiomeDef.h \
+ ../../src/StringCompression.h \
+ ../../src/WorldStorage/FastNBT.h \
+ ../../lib/zlib/crc32.h \
+ ../../lib/zlib/deflate.h \
+ ../../lib/zlib/gzguts.h \
+ ../../lib/zlib/inffast.h \
+ ../../lib/zlib/inffixed.h \
+ ../../lib/zlib/inflate.h \
+ ../../lib/zlib/inftrees.h \
+ ../../lib/zlib/trees.h \
+ ../../lib/zlib/zconf.h \
+ ../../lib/zlib/zlib.h \
+ ../../lib/zlib/zutil.h \
+ GeneratorSetup.h \
+ QtChunk.h \
+ RegionCache.h \
+ Region.h \
+ ChunkSource.h \
+ RegionLoader.h
+
+
INCLUDEPATH += $$_PRO_FILE_PWD_ \
$$_PRO_FILE_PWD_/../../lib \