Removed distance.enable key

dirkwhoffmann · Jul 14, 2023 · 233e6db · 233e6db
1 parent 20b2058
commit 233e6db
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/src/ddrill/Driller.cpp b/src/ddrill/Driller.cpp
@@ -69,8 +69,8 @@ Driller::drill()
         log::cout << Options::perturbation.enable << log::endl;
         log::cout << log::ralign("Series approximation: ");
         log::cout << Options::approximation.enable << log::endl;
-        log::cout << log::ralign("Border detection: ");
-        log::cout << Options::distance.enable << log::endl;
+        // log::cout << log::ralign("Border detection: ");
+        // log::cout << (Options::distance.threshold() > 0.0) << log::endl;
         log::cout << log::ralign("Area checking: ");
         log::cout << Options::areacheck.enable << log::endl;
         log::cout << log::ralign("Period checking: ");
@@ -432,13 +432,13 @@ Driller::drill(const Coord &point, std::vector<Coord> &glitchPoints)
     while (++iteration < limit) {
 
         auto two_xn_plus_dn = ref.xn[iteration - 1].extended2 + dn;
-        auto two_xn_plus_two_two_dn = two_xn_plus_dn + dn;
+        auto two_xn_plus_two_dn = two_xn_plus_dn + dn;
 
-        dercn *= two_xn_plus_two_two_dn;
+        dercn *= two_xn_plus_two_dn;
         dercn += derc0;
         dercn.reduce();
 
-        derzn *= two_xn_plus_two_two_dn;
+        derzn *= two_xn_plus_two_dn;
         derzn.reduce();
 
         dn *= two_xn_plus_dn;

diff --git a/src/ddrill/MapAnalyzer.cpp b/src/ddrill/MapAnalyzer.cpp
@@ -34,7 +34,8 @@ MapAnalyzer::analyze(const DrillMap &map)
                 auto i = y * width + x;
 
                 auto inBorder = [&]() {
-                    return Options::distance.enable && map.distMap[i] < Options::distance.threshold();
+                    // return Options::distance.enable && map.distMap[i] < Options::distance.threshold();
+                    return map.distMap[i] < Options::distance.threshold();
                 };
 
                 bool optspot = !!map.firstIterationMap[i];

diff --git a/src/shared/ImageMaker.cpp b/src/shared/ImageMaker.cpp
@@ -63,7 +63,7 @@ ImageMaker::draw(DrillMap &map)
         colorizer.setUniform("smooth", Options::palette.mode == ColoringMode::Smooth);
         colorizer.setUniform("bgcolor", sf::Glsl::Vec4(rgba.r, rgba.g, rgba.b, rgba.a));
         colorizer.setUniform("dist", map.distMapTex);
-        colorizer.setUniform("distThreshold", Options::distance.enable ? Options::distance.threshold() : 0.0);
+        colorizer.setUniform("distThreshold", Options::distance.threshold());
         colorizer.setUniform("texture", textureMapTex);
         colorizer.setUniform("textureOpacity", Options::texture.opacity());
         colorizer.setUniform("textureScale", Options::texture.scale());
@@ -127,7 +127,7 @@ ImageMaker::draw(DrillMap &map1, DrillMap &map2, isize frame, float zoom)
     colorizer.setUniform("smooth", Options::palette.mode == ColoringMode::Smooth);
     colorizer.setUniform("bgcolor", sf::Glsl::Vec4(rgba.r, rgba.g, rgba.b, rgba.a));
     colorizer.setUniform("dist", map1.distMapTex);
-    colorizer.setUniform("distThreshold", Options::distance.enable ? Options::distance.threshold(frame) : 0.0);
+    colorizer.setUniform("distThreshold", Options::distance.threshold(frame));
     colorizer.setUniform("texture", textureMapTex);
     colorizer.setUniform("textureOpacity", Options::texture.image == "" ? 0.0 : Options::texture.opacity(frame));
     colorizer.setUniform("textureScale", Options::texture.scale(frame));
@@ -145,7 +145,7 @@ ImageMaker::draw(DrillMap &map1, DrillMap &map2, isize frame, float zoom)
     colorizer2.setUniform("smooth", Options::palette.mode == ColoringMode::Smooth);
     colorizer2.setUniform("bgcolor", sf::Glsl::Vec4(rgba.r, rgba.g, rgba.b, rgba.a));
     colorizer2.setUniform("dist", map2.distMapTex);
-    colorizer2.setUniform("distThreshold", Options::distance.enable ? Options::distance.threshold(frame) : 0.0);
+    colorizer2.setUniform("distThreshold", Options::distance.threshold(frame));
     colorizer2.setUniform("texture", textureMapTex);
     colorizer2.setUniform("textureOpacity", Options::texture.image == "" ? 0.0 : Options::texture.opacity(frame));
     colorizer2.setUniform("textureScale", Options::texture.scale(frame));

diff --git a/src/shared/Options.cpp b/src/shared/Options.cpp
@@ -84,8 +84,8 @@ std::map<string,string> Options::defaults = [](){
     defaults["palette.offset"] = "-0.15";
 
     // Distance estimation keys
-    defaults["distance.enable"] = "no";
-    defaults["distance.threshold"] = "0.1";
+    // defaults["distance.enable"] = "no";
+    defaults["distance.threshold"] = "0.2";
 
     // Texture keys
     defaults["texture.image"] = "";
@@ -297,9 +297,11 @@ Options::parse(string key, string value)
 
             Parser::parse(value, palette.offset);
 
+        /*
         } else if (key == "distance.enable") {
 
             Parser::parse(value, distance.enable);
+        */
 
         } else if (key == "distance.threshold") {
 

diff --git a/src/shared/Options.h b/src/shared/Options.h
@@ -155,7 +155,7 @@ struct Options {
     static struct Distance {
 
         // Indicates if distance estimation should be applied
-        bool enable;
+        // bool enable;
 
         // Thickness
         DynamicFloat threshold;