X-Git-Url: https://hackdaworld.org/gitweb/?p=physik%2Fmorpheus.git;a=blobdiff_plain;f=main.c;h=07f34c9bf85fcc25afff90c1a67a331e8f3c3e4b;hp=49be0ef95050c2626479a8cee0c18e60221a7af3;hb=0ba7850819572931f67d28ebca0cc7d73d7c6dea;hpb=3ec676caee02b75707e472b0294e8be51aab4c42

diff --git a/main.c b/main.c
index 49be0ef..07f34c9 100644
--- a/main.c
+++ b/main.c
@@ -20,7 +20,7 @@
 #include "defines.h"
 
 /* global variables */
-u32 sum_z_segments;
+u32 sum_z_cells;
 int random_fd; /* /dev/urandom file descriptor */
 
 int usage()
@@ -29,44 +29,61 @@ int usage()
  puts("-h: help");
  puts("-a <value> \t slope of nuclear energy loss (default 1)");
  puts("-c <value> \t nuclear enery loss at depths 0 (default 0)");
- puts("-x <value> \t # x segments (default 50)");
- puts("-y <value> \t # y segments (default 50)");
- puts("-z <value> \t # z segments (default 100)");
- puts("-s <value> \t # steps to calculate (default 5000");
+ puts("-x <value> \t # x cells (default 50)");
+ puts("-y <value> \t # y cells (default 50)");
+ puts("-z <value> \t # z cells (default 100)");
+ puts("-s <value> \t # steps to calculate (default 5000)");
+ puts("-X <value> \t display area intercept point x (default 25)");
+ puts("-Y <value> \t display area intercept point y (default 25)");
+ puts("-Z <value> \t display area intercept point z (default 50)");
+ puts("-d <value> \t refresh every <value> loops (default 100)");
  return -23;
 }
 
-int make_amorph(u32 *segment)
+int make_amorph(u32 *cell)
 {
- *segment=*segment|AMORPH
+ *cell=*cell|AMORPH;
  return 23;
 }
 
-/* look at segment ... */
-int process_segment(u32 *segment)
+int make_cryst(u32 *cell)
+{
+ *cell=*cell&(~AMORPH);
+ return 23;
+}
+
+/* look at cell ... */
+int process_cell(u32 *cell)
 {
  /* tag it ... testing! */
- make_amorph(segment);
+ make_amorph(cell);
  
  return 23;
 }
 
 int main(int argc,char **argv) 
 {
- u32 x_seg,y_seg,z_seg; /* amount of segments */
- u32 x,y,z; /* segments */
+ u32 x_cell,y_cell,z_cell; /* amount of segments */
+ u32 x,y,z; /* cells */
  int i; /* for counting */
  int slope_nel,start_nel; /* nuclear energy loss: slope, constant */
  int steps; /* # steps */
- void *segments_p;
+ void *cell_p;
+ struct __display display;
+ u32 display_x,display_y,display_z; /* intercept point of diplayed areas */
+ u32 display_refresh_rate; /* refresh rate for display */
 
  /* default values */
- x_seg=DEFAULT_X_SEG;
- y_seg=DEFAULT_Y_SEG;
- z_seg=DEFAULT_Z_SEG;
+ x_cell=DEFAULT_X_SEG;
+ y_cell=DEFAULT_Y_SEG;
+ z_cell=DEFAULT_Z_SEG;
  slope_nel=DEFAULT_SLOPE_NEL;
  start_nel=DEFAULT_START_NEL;
  steps=DEFAULT_STEPS;
+ display_x=DEFAULT_DISPLAY_X-1;
+ display_y=DEFAULT_DISPLAY_Y-1;
+ display_z=DEFAULT_DISPLAY_Z-1;
+ display_refresh_rate=DEFAULT_DISPLAY_REF_RATE;
  
  /* parse command args */
  for(i=1;i<argc;i++)
@@ -86,17 +103,29 @@ int main(int argc,char **argv)
      start_nel=atoi(argv[++i]);
      break;
     case 'x':
-     x_seg=atoi(argv[++i]);
+     x_cell=atoi(argv[++i]);
      break;
     case 'y':
-     y_seg=atoi(argv[++i]);
+     y_cell=atoi(argv[++i]);
      break;
     case 'z':
-     z_seg=atoi(argv[++i]);
+     z_cell=atoi(argv[++i]);
      break;
-   case 's':
+    case 's':
      steps=atoi(argv[++i]);
      break;
+    case 'X':
+     display_x=atoi(argv[++i]);
+     break;
+    case 'Y':
+     display_y=atoi(argv[++i]);
+     break;
+    case 'Z':
+     display_z=atoi(argv[++i]);
+     break;
+    case 'd':
+     display_refresh_rate=atoi(argv[++i]);
+     break;
     default:
      usage();
      return -23;
@@ -111,35 +140,48 @@ int main(int argc,char **argv)
   return -23;
  }
 
- /* calculate sum_z_segments one time! */
- sum_z_segments=0;
- for(i=1;i<=z_seg;i++) sum_z_segments+=(start_nel+i*slope_nel);
- printfd("debug: sum z segments -> %d\n",sum_z_segments);
+ /* calculate sum_z_cells one time! */
+ sum_z_cells=0;
+ for(i=1;i<=z_cell;i++) sum_z_cells+=(start_nel+i*slope_nel);
+ printfd("debug: sum z cells -> %d\n",sum_z_cells);
 
 
  /* testing ... */
 
- /* allocate segments */
- if((segments_p=malloc(x_seg*y_seg*z_seg*sizeof(u32)))==NULL)
+ /* allocate cells */
+ if((cell_p=malloc(x_cell*y_cell*z_cell*sizeof(u32)))==NULL)
  {
-  puts("failed allocating memory for segments\n");
+  puts("failed allocating memory for cells\n");
   return -23;
  }
- memset(segments_p,0,x_seg*y_seg*z_seg*sizeof(u32));
+ memset(cell_p,0,x_cell*y_cell*z_cell*sizeof(u32));
+
+ /* init display */
+ display_init(x_cell,y_cell,z_cell,&display,cell_p,&argc,argv);
 
  /* main routine */
  for(i=0;i<steps;i++)
  {
-  x=rand_get(x_seg);
-  y=rand_get(y_seg);
+  x=rand_get(x_cell);
+  y=rand_get(y_cell);
   z=rand_get_lgp(slope_nel,start_nel);
 
   /* todo */
-  distrib_c_conc(segments_p);
-  process_segment((u32)(segments_p+x+y*(x_seg-1)+z*(x_seg-1)*(y_seg-1)));
-  display(segments_p);
-  /* */
+  // distrib_c_conc(cell_p);
+  process_cell((u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1)));
 
+  /* display stuff */
+  if((i%display_refresh_rate)==0)
+  {
+   puts("refreshing diplay ...");
+   // display_draw(&display,display_x,display_y,display_z);
+  }
+  /* */
  }
+  
+ /* display again and quit when button hit */
+ puts("hit button to quit ...");
+ getchar();
+
  return 23;
 }