Description: demosrc samples refreshment
 Render buildable the demonstration C source samples;
 plus minor comestic changes.
Origin: vendor, Debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-11-06

--- a/demosrc/animskull.c
+++ b/demosrc/animskull.c
@@ -9,9 +9,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "tachyon.h"
+#include <tachyon.h>
 
-int rt_mynode(void); /* proto */
+/* int rt_mynode(void); */ /* proto */
 
 typedef struct {      /* Scalar Volume Visualization Data */
   int loaded;            /* Volume data memory residence flag */
@@ -27,11 +27,11 @@
 #define RAD 6.28
 
 #ifdef cube
-#define RFILE "/cfs/johns/anim/frame"
+#define RFILE "animskull-cube"
 #endif
 
-#ifndef cube 
-#define RFILE "outfile"
+#ifndef cube
+#define RFILE "animskull"
 #endif
 
 int main(int argc, char **argv) {
@@ -75,12 +75,12 @@
   vol.loaded=0;
    
   for (i=0; i<MAXFRAMES; i++) {  
-    sprintf(fname,".%4.4d.tga",i);
+    sprintf(fname,"-%4.4d.tga",i);
     strcpy(fname2,RFILE);
     strcat(fname2, fname);
      
     rt_initialize(&argc, &argv); 
-    if (rt_mynode()==0) printf("Rendering: %s \n",fname2);
+    /* if (rt_mynode()==0) */ printf("Rendering: %s \n",fname2);
 
     xc=cos(6.28 * i / (1.0 * MAXFRAMES));
     yc=sin(6.28 * i / (1.0 * MAXFRAMES));
@@ -99,7 +99,7 @@
     rt_light(scene, rt_texture(scene, &tex1), ctr1, 1.0); 
 
     rt_scalarvol(scene, rt_texture(scene, &tex2), min3, max3, 256, 256, 100, 
-	"/disk7/cube/vol/head.256x256x109", &vol);   
+	"vol/head.256x256x109", &vol);
 
     rt_renderscene(scene);
   }
--- a/demosrc/animspheres.c
+++ b/demosrc/animspheres.c
@@ -8,14 +8,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "tachyon.h"
+#include <tachyon.h>
 #include "glwin.h"
 
 #if defined(USEOPENGL)
 #include <GL/gl.h>
 #endif
 
-int rt_mynode(void); /* proto */
+/* int rt_mynode(void); */ /* proto */
 
 /* Number of frames to render */
 #define MAXFRAMES 400
@@ -195,7 +195,7 @@
         i++;
         sscanf(argv[i], "%d", &xres);
         i++;
-        sscanf(argv[i], "%d", &xres);
+        sscanf(argv[i], "%d", &yres);
       }
       continue;
     }
@@ -247,8 +247,8 @@
 
 
     if (!nosave) {
-      sprintf(fname,"outfile.%4.4d.tga",i);
-      if (rt_mynode()==0) printf("Rendering: %s\n", fname);
+      sprintf(fname,"animspheres-%4.4d.tga",i);
+      /* if (rt_mynode()==0) */ printf("Rendering: %s\n", fname);
       rt_outputfile(scene, fname);
     } else {
       printf("\rRendering %d...           ", i);
--- a/demosrc/animspheres2.c
+++ b/demosrc/animspheres2.c
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "tachyon.h"
+#include <tachyon.h>
 
 #define XRES 352 
 #define YRES 240
@@ -18,7 +18,7 @@
 #define MYPI 3.1415926
 #define MYTPI 6.282
 
-int rt_mynode(void);
+/* int rt_mynode(void); */
 
 #define MAXFRAMES 400
 #define MAXX 1.0 
@@ -34,11 +34,11 @@
 #define RAD 6.28
 
 #ifdef cube
-#define RFILE "/cfs/johns/anim/frame"
+#define RFILE "animspheres2-cube"
 #endif
 
 #ifndef cube 
-#define RFILE "outfile"
+#define RFILE "animsphere2"
 #endif
 
 
@@ -186,12 +186,12 @@
   initspheres();
    
   for (i=0; i<MAXFRAMES; i++) {  
-    sprintf(fname,".%4.4d.tga",i);
+    sprintf(fname,"-%4.4d.tga",i);
     strcpy(fname2,RFILE);
     strcat(fname2, fname);
 
     rt_initialize(&argc, &argv); 
-    if (rt_mynode()==0) printf("Rendering: %s \n",fname2);
+    /* if (rt_mynode()==0) */ printf("Rendering: %s \n",fname2);
 
     rt_outputfile(scene, fname2);
     rt_resolution(scene, xres, yres);
--- a/demosrc/fire.c
+++ b/demosrc/fire.c
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "tachyon.h"
+#include <tachyon.h>
 
 #if defined(USEOMF)
 #include "omfwrite.h"
@@ -48,14 +48,18 @@
 } flm;
 
 #ifdef cube
-#define RFILE "/cfs/johns/anim/frame"
+#define RFILE "fire-cube"
 #endif
 
-#ifndef cube 
-#define RFILE "frame"
+#ifndef cube
+#define RFILE "fire"
 #endif
 
-int rt_mynode(void); /* proto */
+/* int rt_mynode(void); */ /* proto */
+
+#define ADHOC_RMOD(A) ((A)%(XS*YS*ZS))
+#define ADHOC_NMOD(A) (A)
+#define ADHOC_LMOD(A) ((XS*YS*ZS+A)%(XS*YS*ZS))
 
 unsigned char fire[2][XS*YS*ZS + 10000];
 flm flames[NUMFLAMES + 10];
@@ -78,91 +82,91 @@
       flames[i].y = (YS - 3); 
 
     addr = (XS*flames[i].y) + flames[i].x; 
-    fire[0][addr - 1     ] = MXV;
-    fire[0][addr         ] = MXV;
-    fire[0][addr + 1     ] = MXV;
-    fire[0][addr - 1 - XS] = MXV;
-    fire[0][addr     - XS] = MXV;
-    fire[0][addr + 1 - XS] = MXV;
-    fire[0][addr - 1 + XS] = MXV;
-    fire[0][addr     + XS] = MXV;
-    fire[0][addr + 1 + XS] = MXV;
+    fire[0][ADHOC_LMOD(addr - 1     )] = MXV;
+    fire[0][ADHOC_NMOD(addr         )] = MXV;
+    fire[0][ADHOC_RMOD(addr + 1     )] = MXV;
+    fire[0][ADHOC_LMOD(addr - 1 - XS)] = MXV;
+    fire[0][ADHOC_LMOD(addr     - XS)] = MXV;
+    fire[0][ADHOC_LMOD(addr + 1 - XS)] = MXV;
+    fire[0][ADHOC_LMOD(addr - 1 + XS)] = MXV;
+    fire[0][ADHOC_RMOD(addr     + XS)] = MXV;
+    fire[0][ADHOC_RMOD(addr + 1 + XS)] = MXV;
 
     addr = addr + XS*YS;
-    fire[0][addr - 1     ] = MXV;
-    fire[0][addr         ] = MXV;
-    fire[0][addr + 1     ] = MXV;
-    fire[0][addr - 1 - XS] = MXV;
-    fire[0][addr     - XS] = MXV;
-    fire[0][addr + 1 - XS] = MXV;
-    fire[0][addr - 1 + XS] = MXV;
-    fire[0][addr     + XS] = MXV;
-    fire[0][addr + 1 + XS] = MXV;
+    fire[0][ADHOC_LMOD(addr - 1     )] = MXV;
+    fire[0][ADHOC_NMOD(addr         )] = MXV;
+    fire[0][ADHOC_RMOD(addr + 1     )] = MXV;
+    fire[0][ADHOC_LMOD(addr - 1 - XS)] = MXV;
+    fire[0][ADHOC_LMOD(addr     - XS)] = MXV;
+    fire[0][ADHOC_LMOD(addr + 1 - XS)] = MXV;
+    fire[0][ADHOC_LMOD(addr - 1 + XS)] = MXV;
+    fire[0][ADHOC_RMOD(addr     + XS)] = MXV;
+    fire[0][ADHOC_RMOD(addr + 1 + XS)] = MXV;
 
     addr = addr + XS*YS;
-    fire[0][addr - 1 ] = MXV;
-    fire[0][addr     ] = MXV;
-    fire[0][addr + 1 ] = MXV;
-    fire[0][addr + XS] = MXV;
-    fire[0][addr - XS] = MXV;
+    fire[0][ADHOC_LMOD(addr - 1 )] = MXV;
+    fire[0][ADHOC_RMOD(addr     )] = MXV;
+    fire[0][ADHOC_RMOD(addr + 1 )] = MXV;
+    fire[0][ADHOC_RMOD(addr + XS)] = MXV;
+    fire[0][ADHOC_LMOD(addr - XS)] = MXV;
   }
 
   for (z=0; z<(ZS - 1); z++) {
     addr3 = z*XS*YS;
     for (y=1; y<(YS - 1); y++) {
       addr2 = y*XS + addr3;
-      for (x=1; x<(XS - 1); x++) { 
+      for (x=1; x<(XS - 1); x++) {
         addr = x + addr2;
 
 /* NOTE:  This address code takes the 26 points in the box surrounding
           the original point, and averages them with together, to generate
-          the new point.  If you desire speed, comment out everything 
-          after the "first 6 points" 
+          the new point.  If you desire speed, comment out everything
+          after the "first 6 points"
           Remember to change the divisor on the line "xx = xx / 26"
 */
 
-      xx = fire[0][addr + 1              ] + /* first 6 adjacent neighbors */
-           fire[0][addr - 1              ] +
-           fire[0][addr     + XS         ] +
-           fire[0][addr     - XS         ] +
-           fire[0][addr           + XS*YS] +
-           fire[0][addr           - XS*YS] +  
-
-           fire[0][addr - 1 + XS] +  /* middle 4 points */    
-           fire[0][addr + 1 + XS] +      
-           fire[0][addr - 1 - XS] +      
-           fire[0][addr + 1 - XS];      
+      xx = fire[0][ADHOC_RMOD(addr + 1              )] + /* first 6 adjacent neighbors */
+           fire[0][ADHOC_LMOD(addr - 1              )] +
+           fire[0][ADHOC_RMOD(addr     + XS         )] +
+           fire[0][ADHOC_LMOD(addr     - XS         )] +
+           fire[0][ADHOC_RMOD(addr           + XS*YS)] +
+           fire[0][ADHOC_LMOD(addr           - XS*YS)] +
+
+           fire[0][ADHOC_LMOD(addr - 1 + XS)] +  /* middle 4 points */
+           fire[0][ADHOC_RMOD(addr + 1 + XS)] +
+           fire[0][ADHOC_LMOD(addr - 1 - XS)] +
+           fire[0][ADHOC_LMOD(addr + 1 - XS)];
 
            addr4=addr - XS*YS;     /* bottom 8 points */
-     xx += fire[0][addr4 - 1] +
-           fire[0][addr4 + 1];
-           addr4=addr + XS - XS*YS; 
-     xx += fire[0][addr4 - 1] +  
-           fire[0][addr4    ] +
-           fire[0][addr4 + 1]; 
+     xx += fire[0][ADHOC_LMOD(addr4 - 1)] +
+           fire[0][ADHOC_LMOD(addr4 + 1)];
+           addr4=addr + XS - XS*YS;
+     xx += fire[0][ADHOC_LMOD(addr4 - 1)] +
+           fire[0][ADHOC_LMOD(addr4    )] +
+           fire[0][ADHOC_LMOD(addr4 + 1)];
            addr4=addr - XS - XS*YS;
-     xx += fire[0][addr4 - 1] +   
-           fire[0][addr4    ] +
-           fire[0][addr4 + 1];   
+     xx += fire[0][ADHOC_LMOD(addr4 - 1)] +
+           fire[0][ADHOC_LMOD(addr4    )] +
+           fire[0][ADHOC_LMOD(addr4 + 1)];
 
            addr4=addr + XS*YS;      /* top 8 points */
-     xx += fire[0][addr4 - 1] +
-           fire[0][addr4 + 1];
-           addr4=addr + XS + XS*YS; 
-     xx += fire[0][addr4 - 1] +  
-           fire[0][addr4    ] +
-           fire[0][addr4 + 1];  
+     xx += fire[0][ADHOC_LMOD(addr4 - 1)] +
+           fire[0][ADHOC_RMOD(addr4 + 1)];
+           addr4=addr + XS + XS*YS;
+     xx += fire[0][ADHOC_LMOD(addr4 - 1)] +
+           fire[0][ADHOC_NMOD(addr4    )] +
+           fire[0][ADHOC_RMOD(addr4 + 1)];
            addr4=addr - XS + XS*YS;
-     xx += fire[0][addr4 - 1] +
-           fire[0][addr4    ] +
-           fire[0][addr4 + 1];
+     xx += fire[0][ADHOC_LMOD(addr4 - 1)] +
+           fire[0][ADHOC_NMOD(addr4    )] +
+           fire[0][ADHOC_RMOD(addr4 + 1)];
 
         xx = xx / 26;
 
-        if (xx > 1) 
+        if (xx > 1)
           fire[1][addr + XS*YS] = (unsigned char) xx - 1;
         else
-          fire[1][addr + XS*YS] = 0;   
+          fire[1][addr + XS*YS] = 0;
 
       }
     }
@@ -240,7 +244,7 @@
   p1.uaxs = rt_vector(1.0, 0.0, 0.0);
   p1.vaxs = rt_vector(0.0, 1.0, 0.0);
 
-  strcpy((char *) &p1.imap, "/disk7/cube/imaps/leafy261.ppm");
+  strcpy((char *) &p1.imap, "imaps/leafy.ppm");
 
   t1=rt_texture(scene, &p1);
 
@@ -264,7 +268,7 @@
   rt_sphere(scene, t2, rt_vector(0.0, 0.0, 1.8), 0.8); 
  
   for (i=0; i<MAXFRAMES; i++) {  
-    sprintf(fname,".%4.4d.tga",i);
+    sprintf(fname,"-%4.4d.tga",i);
     strcpy(fname2,RFILE);
     strcat(fname2, fname);
 
@@ -275,7 +279,7 @@
   rt_outputfile(scene, fname2);
 #endif
      
-    if (rt_mynode()==0) printf("Rendering: %s \n",fname2);
+    /* if (rt_mynode()==0) */ printf("Rendering: %s \n",fname2);
 
     xc=cos(6.28 * i / (1.0 * MAXFRAMES));
     yc=sin(6.28 * i / (1.0 * MAXFRAMES));
--- a/demosrc/hypertex.c
+++ b/demosrc/hypertex.c
@@ -9,9 +9,9 @@
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include "tachyon.h"
+#include <tachyon.h>
 
-int rt_mynode(void); /* proto */
+/* int rt_mynode(void); */ /* proto */
 
 #define XRES 352
 #define YRES 240
@@ -53,10 +53,10 @@
 } flm;
 
 #ifdef cube
-#define RFILE "/cfs/johns/anim/frame"
+#define RFILE "hypertex-cube"
 #endif
 #ifndef cube 
-#define RFILE "frame"
+#define RFILE "hypertex"
 #endif
 
 /* global frame number */
@@ -150,10 +150,10 @@
    p1.uaxs.x=1.0;  p1.uaxs.y=0.0;  p1.uaxs.z=0.0;
    p1.vaxs.x=0.0;  p1.vaxs.y=1.0;  p1.vaxs.z=0.0;
 #ifdef cube
-  strcpy((char *) &p1.imap, "/cfs/johns/imaps/leafy261.ppm");
+  strcpy((char *) &p1.imap, "imaps/leafy-cube.ppm");
 #endif
 #ifndef cube
-  strcpy((char *) &p1.imap, "/disk7/cube/imaps/leafy261.ppm");
+  strcpy((char *) &p1.imap, "imaps/leafy.ppm");
 #endif  
 
   t1=rt_texture(scene, &p1);
@@ -161,13 +161,13 @@
   for (i=0; i<MAXFRAMES; i++) {  
     rt_initialize(&argc, &argv); 
 
-    sprintf(fname,".%4.4d.tga",i);
+    sprintf(fname,"-%4.4d.tga",i);
     strcpy(fname2,RFILE);
     strcat(fname2, fname);
     
     framenumber++;
  
-    if (rt_mynode()==0) printf("Rendering: %s \n",fname2);
+    /* if (rt_mynode()==0) */ printf("Rendering: %s \n",fname2);
 
     xc=cos(6.28 * (i + 200) / (1.0 * MAXFRAMES));
     yc=sin(6.28 * (i + 200) / (1.0 * MAXFRAMES));
--- a/demosrc/mainanim.c
+++ b/demosrc/mainanim.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "tachyon.h"
+#include <tachyon.h>
 
 int rt_mynode(void); /* proto */
 
@@ -18,9 +18,9 @@
 #define RAD 6.28
 
 #ifdef cube
-#define RFILE "/cfs/johns/anim/frame"
+#define RFILE "mainanim-cube"
 #else
-#define RFILE "outfile"
+#define RFILE "mainanim"
 #endif
 
 int main(int argc, char **argv) {
@@ -32,7 +32,7 @@
   char fname[200];
   char fname2[200];
 
-  rt_initialize(&argc, &argv); 
+  rt_initialize(&argc, &argv);
 
   tex1.col.r=1.0;
   tex1.col.g=1.0;
@@ -140,7 +140,7 @@
     rt_plane(scene, txarray[6], ctr, vect2); 
 
 
-    sprintf(fname,".%4.4d.tga",i);
+    sprintf(fname,"-%4.4d.tga",i);
     strcpy(fname2, RFILE);
     strcat(fname2, fname);