remove dead code after previous optimizations

stb_connected_components.h

@@ -240,7 +240,7 @@ typedef struct
    unsigned char num_adjacent;                // 1
    unsigned char max_adjacent;                // 1
    unsigned char adjacent_clump_list_index;   // 1
-   unsigned char on_edge;                     // 1
+   unsigned char reserved;
 } stbcc__clump; // 8
 
 #define STBCC__CLUSTER_ADJACENCY_COUNT   (STBCC__MAX_EXITS_PER_CLUSTER*2)
@@ -332,7 +332,6 @@ typedef struct
    unsigned int clump_index;
 } stbcc__unpacked_clumpid;
 
-// @OPTIMIZE: pass in these parameters unpacked, not packed
 static void stbcc__clump_union(stbcc_grid *g, stbcc__unpacked_clumpid m, int x, int y, int idx)
 {
    stbcc__clump *mc = &g->cluster[m.cluster_y][m.cluster_x].clump[m.clump_index];
@@ -490,15 +489,10 @@ static void stbcc__build_all_connections_for_cluster(stbcc_grid *g, int cx, int
       extra = 0;
 
    total = 0;
-   for (i=0; i < (int) cluster->num_clumps; ++i) {
-      int alloc=0;
-      if (cluster->clump[i].on_edge) {
-         alloc = num_adj[i]+extra;
-         if (alloc > STBCC__MAX_EXITS_PER_CLUSTER)
-            alloc = STBCC__MAX_EXITS_PER_CLUSTER;
-      }
-      else
-         assert(num_adj[i] == 0);
+   for (i=0; i < (int) cluster->num_edge_clumps; ++i) {
+      int alloc = num_adj[i]+extra;
+      if (alloc > STBCC__MAX_EXITS_PER_CLUSTER)
+         alloc = STBCC__MAX_EXITS_PER_CLUSTER;
       assert(total < 256); // must fit in byte
       cluster->clump[i].adjacent_clump_list_index = (unsigned char) total;
       cluster->clump[i].max_adjacent = alloc;
@@ -507,15 +501,10 @@ static void stbcc__build_all_connections_for_cluster(stbcc_grid *g, int cx, int
    }
    assert(total <= STBCC__CLUSTER_ADJACENCY_COUNT);
 
-   assert(g->w);
    stbcc__add_connections_to_adjacent_cluster(g, cx, cy, -1, 0);
-   assert(g->w);
    stbcc__add_connections_to_adjacent_cluster(g, cx, cy,  1, 0);
-   assert(g->w);
    stbcc__add_connections_to_adjacent_cluster(g, cx, cy,  0,-1);
-   assert(g->w);
    stbcc__add_connections_to_adjacent_cluster(g, cx, cy,  0, 1);
-   assert(g->w);
    // make sure all of the above succeeded.
    assert(g->cluster[cy][cx].rebuild_adjacency == 0);
 }
@@ -865,7 +854,7 @@ static void stbcc__build_clumps_for_cluster(stbcc_grid *g, int cx, int cy)
    stbcc__cluster *c;
    stbcc__cluster_build_info cbi;
    int label=0;
-   int i,j, num_on_edge;
+   int i,j;
    int x = cx * STBCC__CLUSTER_SIZE_X;
    int y = cy * STBCC__CLUSTER_SIZE_Y;
 
@@ -950,6 +939,9 @@ static void stbcc__build_clumps_for_cluster(stbcc_grid *g, int cx, int cy)
       }
    }
 
+   c = &g->cluster[cy][cx];
+   c->num_edge_clumps = label;
+
    // label any internal clusters
    for (j=1; j < STBCC__CLUSTER_SIZE_Y-1; ++j) {
       for (i=1; i < STBCC__CLUSTER_SIZE_X-1; ++i) {
@@ -975,11 +967,11 @@ static void stbcc__build_clumps_for_cluster(stbcc_grid *g, int cx, int cy)
       }
    }
 
-   c = &g->cluster[cy][cx];
    c->num_clumps = label;
+
    for (i=0; i < label; ++i) {
       c->clump[i].num_adjacent = 0;
-      c->clump[i].on_edge = 0;
+      c->clump[i].max_adjacent = 0;
    }
 
    for (j=0; j < STBCC__CLUSTER_SIZE_Y; ++j)
@@ -988,38 +980,6 @@ static void stbcc__build_clumps_for_cluster(stbcc_grid *g, int cx, int cy)
          assert(g->clump_for_node[y+j][x+i] <= STBCC__NULL_CLUMPID);
       }
 
-   for (i=0; i < STBCC__CLUSTER_SIZE_X; ++i) {
-      int d = cbi.label[0][i];
-      if (d != STBCC__NULL_CLUMPID) {
-         c->clump[d].on_edge = 1;
-      }
-      d = cbi.label[STBCC__CLUSTER_SIZE_Y-1][i];
-      if (d != STBCC__NULL_CLUMPID) {
-         c->clump[d].on_edge = 1;
-      }
-   }
-
-   for (j=1; j < STBCC__CLUSTER_SIZE_Y-1; ++j) {
-      int d = cbi.label[j][0];
-      if (d != STBCC__NULL_CLUMPID) {
-         c->clump[d].on_edge = 1;
-      }
-      d = cbi.label[j][STBCC__CLUSTER_SIZE_X-1];
-      if (d != STBCC__NULL_CLUMPID) {
-         c->clump[d].on_edge = 1;
-      }
-   }
-
-   num_on_edge = 0;
-   for (i=0; i < (int) c->num_clumps; ++i)
-      num_on_edge += c->clump[i].on_edge;
-   c->num_edge_clumps = num_on_edge;
-
-   for (i=0; i < (int) c->num_edge_clumps; ++i)
-      assert(c->clump[i].on_edge);
-   for (; i < (int) c->num_clumps; ++i)
-      assert(!c->clump[i].on_edge);
-
    // set the global label for all interior clumps since they can't have connections, so we don't have to do this on the global pass
    for (i=(int) c->num_edge_clumps; i < (int) c->num_clumps; ++i) {
       stbcc__global_clumpid gc;

tests/grid_reachability.c

@@ -99,7 +99,7 @@ void write_map(stbcc_grid *g, int w, int h, char *filename)
          if (c == STBCC_NULL_UNIQUE_ID)
             c = 0xff000000;
          else
-            c = ~c;
+            c = (~c)^0x555555;
          color[j][i] = c;
       }
    }
@@ -149,7 +149,14 @@ int main(int argc, char **argv)
 
    for (i=0; i < w; ++i)
       for (j=0; j < h; ++j)
-         map[j*w+i] = (i ^ j) & 1 ? 255 : 0;
+         map[j*w+i] = (((i+1) ^ (j+1)) >> 1) & 1 ? 255 : 0;
+         //map[j*w+i] = (((i ^ j) >> 5) ^ (i ^ j)) & 1 ? 255 : 0;
+         //map[j*w+i] = stb_rand() & 1 ? 255 : 0;
+
+   #if 0
+   for (i=0; i < 100000; ++i)
+      map[(stb_rand()%h)*w + stb_rand()%w] ^= 255;
+   #endif
             
    stbi_write_png("tests/output/stbcc/reference.png", w, h, 1, map, 0);
 
@@ -192,8 +199,8 @@ int main(int argc, char **argv)
          loc[i][0] = stb_rand() % w;
          loc[i][1] = stb_rand() % h;
       }
-      start_timer("updating 500");
-      for (i=0; i < 500; ++i) {
+      start_timer("updating 2500");
+      for (i=0; i < 2500; ++i) {
          if (stbcc_query_grid_open(g, loc[i][0], loc[i][1]))
             stbcc_update_grid(g, loc[i][0], loc[i][1], 1);
          else