[Gzz-commits] gzz/Documentation/Manuscripts/Paper pipe.mp

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/12/01 14:20:10

Modified files:
        Documentation/Manuscripts/Paper: pipe.mp 

Log message:
        diagram

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Paper/pipe.mp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gzz/Documentation/Manuscripts/Paper/pipe.mp
diff -u gzz/Documentation/Manuscripts/Paper/pipe.mp:1.3 
gzz/Documentation/Manuscripts/Paper/pipe.mp:1.4
--- gzz/Documentation/Manuscripts/Paper/pipe.mp:1.3     Sun Dec  1 13:41:55 2002
+++ gzz/Documentation/Manuscripts/Paper/pipe.mp Sun Dec  1 14:20:10 2002
@@ -7,15 +7,15 @@
 
 % defaultfont := "ptmr7t";
 
-y0 = 700;
+y0 = 650;
 y1 = 600; % globals
 y2 = 500;
 y3 = 450; % perpaper
 y4 = 350;
 y5 = 300; % perpass
 y6 = 200;
-y7 = 100; % pertexunit
-y8 = 0;
+y7 = 150; % pertexunit
+y8 = 100;
 
 x0 = 40;
 x1 = 100; % repunit
@@ -33,6 +33,10 @@
     endfor;
 enddef;
 
+pair hyperparams[], lab[], basistex[], combprogs[],
+    repunit[], colors[], basistexprobs[], 
+    combparams[], combprog[],
+    texgen[], texture[];
 
 draw (x0,y2)--(xl,y2);
 draw (x0,y4)--(xl,y4);
@@ -42,37 +46,73 @@
 label.rt("Per-pass", (x0, .5[y4,y6]));
 label.rt("Per-texunit", (x0, .5[y6,y8]));
 
-
-label.urt("Repeat unit", (x1, y3));
-drawgrid((x1 + 20,y3), (40,-40), 1, (-30,-60), 1);
+% label.urt("Hyperparams", (x1, y1));
+%     drawgrid((x1,y1), (40,0), 4, (0,-40), 5);
+%     hyperparams[1] = (x1,y1) + (15,-15);
+
+    label.urt("Repeat unit", (x1, y3));
+       drawgrid((x1 + 20,y3), (40,-40), 1, (-30,-50), 1);
+       repunit[1] = (x1, y3-30);
+
+    label.urt("TexGen", (x1, y7));
+       drawoptions(withpen pencircle scaled .5pt dashed evenly);
+       drawgrid((x1 + 20,y7), (40,-40), 1, (-30,-50), 1);
+       drawoptions();
+       drawgrid((x1 + 20,y7), (20,-20), 1, (-10,-70), 1);
+       texgen[1] = (x1,y7-30);
 
 
 
 label.urt("Lab*", (x2, y1));
-pair p[];
-p1 = (x2, y1-20);
-p2 = (p1 + (50, 0));
-draw p1 ... (.5[p1,p2] + (0,5)) ... p2 ... (.5[p1,p2]-(0,5)) ... cycle;
-draw p1 -- (.5[p1,p2] - (0,50)) .. p2;
+    pair p[];
+    p1 = (x2, y1-20);
+    p2 = (p1 + (50, 0));
+    draw p1 ... (.5[p1,p2] + (0,5)) ... p2 ... (.5[p1,p2]-(0,5)) ... cycle;
+    draw p1 -- (.5[p1,p2] - (0,50)) .. p2;
+    lab[1] = (x2+20, y1 - 30);
 
     label.urt("Colors", (x2, y3));
-    drawgrid((x2,y3), (0,-20), 1, (80,0), 4);
+       drawgrid((x2,y3), (0,-20), 1, (80,0), 4);
+       colors[1] = (x2 + 20, y3-10);
 
 
 
 label.urt("Basis textures", (x3, y1));
-drawgrid((x3, y1), (0,-60), 4, (60,0), 4);
+    drawgrid((x3, y1), (0,-60), 4, (60,0), 4);
+    basistex[1] = (x3,y1-60);
+
 
-    label.urt(btex \noindent Basis texture\\ probabilities etex, (x3, y3));
-    drawgrid((x3, y3), (0,-60), 4, (60,0), 4);
-    label.lrt(".81", (x3, y3));
-    label.lrt(".11", (x3+30, y3-15));
+    label.urt(btex \hbox{\vbox{\noindent Basis texture\\ probabilities}} etex, 
(x3, y3));
+       drawgrid((x3, y3), (0,-60), 4, (60,0), 4);
+       label.lrt(".81", (x3, y3));
+       label.lrt(".11", (x3+30, y3-15));
+       basistexprobs[1] = (x3,y3);
+       basistexprobs[2] = (x3,y3-60);
+
+    label.urt("Texture", (x3, y7));
+       drawgrid((x3, y7), (0,-15), 1, (15,0), 1);
+       texture[1] = (x3,y7);
 
 label.urt("Combiner programs",(x4,y1));
-drawgrid((x4, y1), (0,-60), 5, (60,0), 1);
+    drawgrid((x4, y1), (0,-60), 5, (60,0), 1);
+    combprogs[1] = (x4, y1-60);
+
+    label.urt("Combiner params",(x3+50,y5));
+       drawgrid((x3+50, y5), (0,-40), 3, (40,0), 2);
+
+    label.urt("Combiner program", (x4+50, y5));
+       drawgrid((x4+50, y5), (0,-10), 1, (60,0), 1);
+       combprog[1] = (x4+50, y5);
 
 
+drawoptions(withpen pencircle scaled 1pt);
 
+% drawarrow hyperparams[1]{-1,-1} ... repunit[1];
+drawarrow repunit[1]{-1,-1} ... texgen[1];
+drawarrow lab[1]{-1,-1} ... colors[1];
+drawarrow basistex[1]{-1,-1} ... basistexprobs[1];
+drawarrow basistexprobs[2]{-1,-1} ... texture[1];
+drawarrow combprogs[1]{-.2,-1} ... combprog[1];
 
 endfig;