Merge branch 'master' of https://github.com/mad4j/book-mdpc

Author: mad4j

examples/volume6-index.png

@@ -34,48 +34,24 @@ final float Y1 = 999;
 
 
 final float[] HP = {
-  481,0, 480,1, 473,1, 472,2, 459,4, 436,12, 419,21, 392,41,
-  375,60, 361,81, 361,83, 355,93, 354,98, 352,102, 349,112, 347,119,
-  346,121, 346,127, 345,128, 345,135, 344,166, 345,167, 345,174, 346,175,
-  346,180, 347,181, 350,195, 354,208, 363,227, 372,240, 377,244, 394,268,
-  405,281, 414,296, 418,306, 418,312, 419,313, 419,325, 418,326, 417,333,
-  413,339, 405,346, 394,352, 388,353, 375,353, 373,352, 362,350, 344,341,
-  299,311, 295,310, 272,295, 262,291, 260,289, 232,275, 226,274, 223,272,
-  212,269, 204,268, 191,263, 179,261, 168,261, 167,260, 129,260, 128,261,
-  114,262, 91,269, 67,281, 57,289, 44,301, 30,321, 19,340, 8,372,
-  7,381, 3,392, 3,397, 2,398, 1,420, 0,422, 0,481, 1,482,
-  1,493, 2,495, 2,502, 3,503, 3,510, 5,511, 7,531, 9,537,
-  9,541, 10,542, 11,551, 14,555, 17,572, 22,584, 22,587, 27,604,
-  32,613, 32,615, 50,654, 54,660, 60,666, 64,667, 66,666, 69,659,
-  69,651, 68,649, 66,629, 65,628, 65,623, 64,622, 64,616, 62,615,
-  62,610, 61,608, 61,603, 60,602, 60,595, 59,594, 57,566, 56,565,
-  56,553, 54,552, 54,539, 53,538, 53,461, 54,460, 54,448, 56,447,
-  57,429, 58,428, 58,423, 59,422, 61,409, 67,394, 76,378, 90,365,
-  103,358, 111,358, 112,357, 126,358, 136,363, 145,371, 151,381, 152,391,
-  153,392, 153,403, 152,404, 152,412, 151,413, 151,417, 149,424, 149,430,
-  148,431, 148,440, 146,441, 146,450, 145,451, 145,465, 144,466, 144,517,
-  145,518, 145,531, 146,532, 146,542, 148,543, 150,569, 152,575, 152,581,
-  153,582, 154,593, 158,604, 159,614, 163,628, 163,633, 165,634, 167,646,
-  169,651, 173,666, 175,670, 176,678, 181,688, 187,710, 192,719, 198,726,
-  202,726, 208,721, 209,704, 208,703, 208,689, 207,688, 207,681, 205,680,
-  205,674, 204,673, 204,662, 203,660, 202,637, 201,636, 201,618, 200,617,
-  200,581, 199,580, 199,572, 200,571, 200,522, 201,521, 201,511, 202,510,
-  205,476, 207,475, 207,469, 208,468, 209,459, 215,444, 221,431, 229,423,
-  241,415, 247,413, 269,413, 285,419, 293,427, 297,434, 302,445, 302,449,
-  304,456, 305,477, 304,478, 303,502, 302,503, 302,601, 303,602, 304,629,
-  305,631, 305,638, 307,639, 307,646, 308,647, 308,655, 309,656, 310,668,
-  311,669, 311,674, 312,675, 321,714, 328,733, 341,760, 345,763, 350,763,
-  354,758, 353,728, 352,727, 350,690, 349,689, 349,612, 350,611, 350,593,
-  351,592, 351,579, 352,577, 353,559, 354,558, 354,550, 355,549, 355,539,
-  356,538, 356,531, 358,530, 358,525, 361,517, 361,513, 369,497, 377,487,
-  388,478, 397,475, 413,475, 414,476, 422,477, 431,481, 443,491, 448,499,
-  455,512, 459,527, 460,528, 460,531, 461,532, 463,549, 464,550, 464,556,
-  465,558, 467,582, 468,583, 468,594, 469,595, 469,608, 470,610, 470,627,
-  471,628, 471,646, 472,647, 472,664, 473,665, 473,680, 475,681, 476,715,
-  477,716, 478,761, 479,762, 479,780, 480,781, 481,815, 482,816, 485,886,
-  486,887, 486,904, 487,905, 487,916, 488,917, 488,935, 489,936, 489,955,
-  490,956, 492,991, 494,997, 496,999, 503,999, 507,993, 509,968, 510,967,
-  512,917
+  481,0, 473,1, 459,4, 419,21, 375,60, 361,83, 354,98, 346,121,
+  345,128, 344,166, 346,180, 350,195, 363,227, 377,244, 405,281, 418,306,
+  419,313, 418,326, 413,339, 394,352, 375,353, 362,350, 299,311, 272,295,
+  260,289, 226,274, 212,269, 191,263, 168,261, 129,260, 114,262, 67,281,
+  44,301, 19,340, 7,381, 3,397, 1,420, 0,481, 1,493, 3,510,
+  11,551, 17,572, 22,587, 32,613, 50,654, 60,666, 66,666, 69,651,
+  64,616, 62,610, 61,603, 57,566, 56,553, 54,539, 53,461, 54,448,
+  58,423, 61,409, 76,378, 103,358, 112,357, 136,363, 151,381, 153,392,
+  152,404, 151,413, 149,424, 148,431, 146,441, 145,451, 144,466, 145,518,
+  146,532, 148,543, 153,582, 158,604, 163,628, 165,634, 169,651, 175,670,
+  181,688, 192,719, 202,726, 209,704, 208,689, 207,681, 205,674, 202,637,
+  201,618, 200,581, 199,572, 200,522, 201,511, 205,476, 207,469, 209,459,
+  221,431, 241,415, 269,413, 293,427, 302,445, 304,456, 304,478, 302,503,
+  303,602, 305,631, 307,639, 309,656, 312,675, 328,733, 345,763, 354,758,
+  352,727, 349,689, 350,611, 352,577, 356,538, 361,517, 369,497, 388,478,
+  413,475, 422,477, 443,491, 455,512, 460,528, 461,532, 464,550, 468,583,
+  470,610, 473,665, 475,681, 477,716, 480,781, 487,905, 488,917, 490,956,
+  494,997, 503,999, 509,968, 512,917
 };
 
 
@@ -95,18 +71,47 @@ void draw() {
   scale(s);
   fill(INK);
   noStroke();
-  
+
+  drawContour();
+
+  save("spectre.png");
+}
+
+
+int contourCount() {
+  return HP.length;
+}
+
+
+PVector contourPoint(int idx) {
+  int n = HP.length / 2;
+
+  if (idx < n) {
+    return new PVector(HP[2 * idx], HP[2 * idx + 1]);
+  }
+
+  int j = 2 * n - 1 - idx;
+  return new PVector(2 * AXIS - HP[2 * j], HP[2 * j + 1]);
+}
+
+
+void drawContour() {
+  int count = contourCount();
+
   beginShape();
-    for(int i=0; i<HP.length; i+=2) {
-      vertex(HP[i], HP[i+1]);
-    }
-    
-    for(int i=HP.length-2; i>=0; i-=2) {
-      vertex(2*AXIS-HP[i], HP[i+1]);
+    PVector pLast = contourPoint(count - 1);
+    curveVertex(pLast.x, pLast.y);
+  
+    for (int i = 0; i < count; i++) {
+      PVector p = contourPoint(i);
+      curveVertex(p.x, p.y);
     }
-  endShape(CLOSE);
 
-  save("spectre.png");
+    PVector p0 = contourPoint(0);
+    PVector p1 = contourPoint(1);
+    curveVertex(p0.x, p0.y);
+    curveVertex(p1.x, p1.y);
+  endShape(CLOSE);
 }
 
 ```