Merge pull request mrkite#177 from IronException/master

Feature single layer mode
cre4ture · Aug 19, 2019 · 00cc632 · 00cc632
2 parents c367653 + 9577e79
commit 00cc632
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/chunkrenderer.cpp b/chunkrenderer.cpp
@@ -42,8 +42,13 @@ void ChunkRenderer::renderChunk(QSharedPointer<Chunk> chunk) {
       int top = depth;
       if (top > chunk->highest)
         top = chunk->highest;
+      if (flags & flgSingleLayer)
+        top = depth;
       int highest = 0;
       for (int y = top; y >= 0; y--) {  // top->down
+        // perform a one deep scan in SingleLayer mode
+        if ((flags & flgSingleLayer) && (y < top))
+          break;
         int sec = y >> 4;
         ChunkSection *section = chunk->sections[sec];
         if (!section) {

diff --git a/main.cpp b/main.cpp
@@ -93,6 +93,10 @@ int main(int argc, char *argv[]) {
       minutor.setViewCavemode(true);
       continue;
     }
+    if (args[i] == "-sl" || args[i] == "--singlelayer")) {
+      minutor.setSingleLayer(true);
+      continue;
+    }
   }
 
   minutor.show();

diff --git a/mapview.h b/mapview.h
@@ -21,6 +21,7 @@ class MapView : public QWidget {
     flgCaveMode     = 4,
     flgDepthShading = 8,
     flgShowEntities = 16,
+    flgSingleLayer = 32,
     flgBiomeColors  = 64
   };
 

diff --git a/minutor.cpp b/minutor.cpp
@@ -261,6 +261,11 @@ void Minutor::setDepth(int value) {
   depth->setValue(value);
 }
 
+void Minutor::setSingleLayer(bool value) {
+  singleLayerAct->setChecked(value);
+  toggleFlags();
+}
+
 void Minutor::toggleFlags() {
   int flags = 0;
 
@@ -269,6 +274,7 @@ void Minutor::toggleFlags() {
   if (caveModeAct->isChecked())     flags |= MapView::flgCaveMode;
   if (depthShadingAct->isChecked()) flags |= MapView::flgDepthShading;
   if (biomeColorsAct->isChecked())  flags |= MapView::flgBiomeColors;
+  if (singleLayerAct->isChecked())  flags |= MapView::flgSingleLayer;
   mapview->setFlags(flags);
 
   QSet<QString> overlayTypes;
@@ -382,7 +388,14 @@ void Minutor::createActions() {
   biomeColorsAct->setStatusTip(tr("Toggle draw biome colors or block colors"));
   connect(biomeColorsAct, SIGNAL(triggered()),
           this,           SLOT(toggleFlags()));
-
+
+  singleLayerAct = new QAction(tr("&singlelayer"), this);
+  singleLayerAct->setCheckable(true);
+  //singleLayerAct->setShortcut(tr("Ctrl+L"));
+  singleLayerAct->setStatusTip(tr("Toggle single layer on/off"));
+  connect(singleLayerAct, SIGNAL(triggered()),
+          this,           SLOT(toggleFlags()));
+
   caveModeAct = new QAction(tr("&Cave Mode"), this);
   caveModeAct->setCheckable(true);
   caveModeAct->setShortcut(tr("Ctrl+C"));
@@ -516,6 +529,7 @@ void Minutor::createMenus() {
   viewMenu->addAction(caveModeAct);
   viewMenu->addAction(depthShadingAct);
   viewMenu->addAction(biomeColorsAct);
+  viewMenu->addAction(singleLayerAct);
   // [View->Overlay]
   structureOverlayMenu = viewMenu->addMenu(tr("&Structure Overlay"));
   entityOverlayMenu    = viewMenu->addMenu(tr("&Entity Overlay"));

diff --git a/minutor.h b/minutor.h
@@ -48,6 +48,7 @@ class Minutor : public QMainWindow {
   void setViewCavemode(bool value);       // set View->Cave_Mode
   void setViewDepthshading(bool value);   // set View->Depth_Shading
   void setViewBiomeColors(bool value);    // set View->Biome_Colors
+  void setSingleLayer(bool value);        // set View->Single_Layer
   void setDepth(int value);               // set Depth-Slider
 
   MapView *getMapview() const;
@@ -101,7 +102,7 @@ private slots:
   QAction *openAct, *reloadAct, *saveAct, *exitAct;
   QAction *jumpSpawnAct;
   QList<QAction *>players;
-  QAction *lightingAct, *mobSpawnAct, *caveModeAct, *depthShadingAct, *biomeColorsAct;
+  QAction *lightingAct, *mobSpawnAct, *caveModeAct, *depthShadingAct, *biomeColorsAct, *singleLayerAct;
   QAction *manageDefsAct;
   QAction *refreshAct;
   QAction *aboutAct;