fix damaged cells

averrin · Sep 10, 2017 · b901876 · b901876
1 parent aabe3f3
commit b901876
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/MapGenerator.cpp b/src/MapGenerator.cpp
@@ -635,6 +635,12 @@ int MapGenerator::getRelax() {
   return _relax;
 }
 
+bool damagedCell(Cell* c)
+{
+  // return c->discarded;
+  return c->pointIntersection(c->site.p.x, c->site.p.y) == -1;
+}
+
 void MapGenerator::regenDiagram() {
   currentOperation = "Making nothing...";
   _bbox = sf::Rect<double>(0,0,_w, _h);
@@ -645,9 +651,15 @@ void MapGenerator::regenDiagram() {
     currentOperation = "Relaxing...";
     makeRelax();
   }
+
+  while (std::count_if(_diagram->cells.begin(), _diagram->cells.end(), damagedCell) != 0) {
+    _relax++;
+    makeRelax();
+  }
   delete _sites;
+
   std::sort(_diagram->cells.begin(), _diagram->cells.end(), cellsOrdered);
-  std::cout << "Diagram generation finished: " << _pointsCount << "\n" << std::flush;
+  std::cout << "Diagram generation finished: " << _diagram->cells.size() << "\n" << std::flush;
 }
 
 void MapGenerator::genRandomSites(std::vector<sf::Vector2<double>>& sites, sf::Rect<double>& bbox, unsigned int dx, unsigned int dy, unsigned int numSites) {

diff --git a/src/application.cpp b/src/application.cpp
@@ -291,6 +291,9 @@ class Application {
   void drawInfo() {
     sf::Vector2<float> pos = window->mapPixelToCoords(sf::Mouse::getPosition(*window));
     Region* currentRegion =  mapgen->getRegion(pos);
+    if (currentRegion == nullptr) {
+      return;
+    }
     // char p[100];
     // sprintf(p,"%p\n",currentRegion);
     // std::cout<<p<<std::flush;