From: hackbard <hackbard>
Date: Tue, 8 Apr 2003 17:19:10 +0000 (+0000)
Subject: -
X-Git-Url: https://hackdaworld.org/gitweb/?a=commitdiff_plain;ds=inline;h=2fc464b1e03445cd60e9305dc9b75471ebdb04af;p=physik%2Fmorpheus.git

-
---

diff --git a/defines.h b/defines.h
index b11396e..17e680f 100644
--- a/defines.h
+++ b/defines.h
@@ -35,6 +35,8 @@
 #define URAND_MAX 0xffffffff
 #define URAND_2BYTE_MAX 0xffff
 
+#define MAX_CHARS_RANDOM_FILE 64
+
 typedef unsigned int u32;
 typedef long long unsigned int u64;
 
@@ -53,6 +55,7 @@ typedef struct __cell {
 
 /* display stuff */
 typedef struct __display {
+ int step; /* display step */
  u32 max_x,max_y,max_z; /* dimensions */
  cell *cell_p; /* pointer to cell data */
 #ifdef USE_DFB_API
diff --git a/display.c b/display.c
index 9509276..733ae23 100644
--- a/display.c
+++ b/display.c
@@ -140,6 +140,7 @@ int display_draw(display *display,u32 x,u32 y,u32 z)
  display->primary_surface->FillRectangle(display->primary_surface,menu_x,menu_y,menu_w,menu_h);
  display->primary_surface->SetColor(display->primary_surface,r,g,b,a);
  display->primary_surface->DrawRectangle(display->primary_surface,menu_x,menu_y,menu_w,menu_h);
+ display->primary_surface->DrawLine(display->primary_surface,menu_x+display_faktor_x*display->max_x/2,menu_y+display_faktor_y,menu_x+display_faktor_x*display->max_x/2,menu_y+display_faktor_y*display->max_y-display_faktor_y);
  font_dsc.flags=DFDESC_HEIGHT;
  font_dsc.height=menu_h/10;
  display->dfb->CreateFont(display->dfb,DISPLAY_FONT,&font_dsc,&(display->font));
@@ -155,6 +156,8 @@ int display_draw(display *display,u32 x,u32 y,u32 z)
  display->primary_surface->DrawString(display->primary_surface,text,-1,menu_x+display_faktor_x,menu_y+display_faktor_y*5+menu_h/10*5,DSTF_LEFT);
  sprintf(text,"c conc.: %u",(display->cell_p+x+y*display->max_x+z*display->max_x*display->max_y)->conc);
  display->primary_surface->DrawString(display->primary_surface,text,-1,menu_x+display_faktor_x,menu_y+display_faktor_y*6+menu_h/10*6,DSTF_LEFT);
+ sprintf(text,"step: %d",display->step);
+ display->primary_surface->DrawString(display->primary_surface,text,-1,menu_x+display_faktor_x*display->max_x/2+display_faktor_x,menu_y+display_faktor_y+menu_h/10,DSTF_LEFT);
  /* flip all to surface */
  display->primary_surface->Flip(display->primary_surface,NULL,0);
 #endif
diff --git a/main.c b/main.c
index c019f0a..2ac8d6a 100644
--- a/main.c
+++ b/main.c
@@ -27,6 +27,7 @@
 
 /* global variables */
 u32 *rand_buf,*rand_current;
+char random_file[MAX_CHARS_RANDOM_FILE];
 u32 gr;
 int random_fd; /* /dev/urandom file descriptor */
 
@@ -49,6 +50,7 @@ int usage()
  printf("-p <value> \t p0 for probability of cell getting amorph (default %f)\n",DEFAULT_A_P_P0);
  printf("-C <value> \t C start concentration (default %d)\n",DEFAULT_C_DIST_START_CONC);
  printf("-S <value> \t slope of linear C distribution (default %d)\n",DEFAULT_C_DIST_SLOPE);
+ puts("-R <file> \t read random datat from file (default not used)");
  return -23;
 }
 
@@ -199,6 +201,7 @@ int main(int argc,char **argv)
  display_y=y_cell/2;
  display_z=z_cell/2;
  display_refresh_rate=DEFAULT_DISPLAY_REF_RATE;
+ strcpy(random_file,"");
  
  /* parse command args */
  for(i=1;i<argc;i++)
@@ -259,6 +262,9 @@ int main(int argc,char **argv)
     case 'S':
      c_dist_slope=atoi(argv[++i]);
      break;
+    case 'R':
+     strcpy(random_file,argv[++i]);
+     break;
     default:
      usage();
      return -23;
@@ -267,17 +273,21 @@ int main(int argc,char **argv)
  }
 
  /* open random fd */
- if((random_fd=open("/dev/urandom",O_RDONLY))<0)
+ if(!strcmp(random_file,""))
  {
-  puts("cannot open /dev/urandom\n");
-  return -23;
+  if((random_fd=open("/dev/urandom",O_RDONLY))<0)
+  {
+   puts("cannot open /dev/urandom");
+   return -23;
+  }
+ } else
+ {
+  if((random_fd=open(random_file,O_RDONLY))<0)
+  {
+   puts("cannot open random file");
+   return -23;
+  }
  }
-
- /* calculate gr one time! */
- gr=0;
- for(i=1;i<=z_cell;i++) gr+=i;
- printfd("debug: gr = %d\n",gr);
-
  /* allocate random number buffer */
  printf("malloc will free %d bytes now ...\n",RAND_BUF_SIZE);
  if((rand_buf=(u32 *)malloc(RAND_BUF_SIZE))==NULL)
@@ -286,6 +296,11 @@ int main(int argc,char **argv)
   return -23;
  }
  rand_current=rand_buf+RAND_BUF_SIZE;
+  
+ /* calculate gr one time! */
+ gr=0;
+ for(i=1;i<=z_cell;i++) gr+=i;
+ printfd("debug: gr = %d\n",gr);
 
  /* allocate cells */
  printf("malloc will free %d bytes now ...\n",x_cell*y_cell*z_cell*sizeof(cell));
@@ -302,7 +317,7 @@ int main(int argc,char **argv)
 
  /* main routine */
  printfd("debug: starting main routine ...\n");
- for(i=0;i<steps;i++)
+ for(display.step=0;display.step<steps;display.step++)
  {
   x=rand_get(x_cell);
   y=rand_get(y_cell);
@@ -311,11 +326,10 @@ int main(int argc,char **argv)
   /* todo */
   distrib_c_conc(cell_p,c_dist_c0,c_dist_slope,c_conc,x_cell,y_cell,z_cell);
 
-  // process_cell(cell_p+x+y*x_cell+z*x_cell*y_cell);
   process_cell(cell_p,x,y,z,x_cell,y_cell,z_cell,a_p_range,a_p_faktor,a_p_p0,&c_conc);
 
   /* display stuff */
-  if((i%display_refresh_rate)==0)
+  if((display.step%display_refresh_rate)==0)
    display_draw(&display,display_x,display_y,display_z);
  }
  printfd("debug: main routine finished!\n");
diff --git a/random.c b/random.c
index b2e11fd..c81dffa 100644
--- a/random.c
+++ b/random.c
@@ -6,6 +6,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "defines.h"
 
@@ -13,6 +15,7 @@
 extern u32 gr;
 extern int random_fd;
 extern u32 *rand_buf,*rand_current;
+extern char random_file[MAX_CHARS_RANDOM_FILE];
 
 /* return random integer between 0 - max-1 */
 u32 rand_get(u32 max) 
@@ -22,9 +25,17 @@ u32 rand_get(u32 max)
   printfd("debug: reading new random bytes\n");
   if(read(random_fd,rand_buf,RAND_BUF_SIZE)!=RAND_BUF_SIZE)
   {
-   puts("failed reading 1 mega bytes of random data");
-   return -23;
+   if(!strcmp(random_file,""))
+   {
+    puts("random file end, starting over ...");
+    lseek(random_fd,0,SEEK_SET);
+   } else
+   {
+    puts("failed reading 1 mega bytes of random data");
+    return -23;
+   }
   }
+  printfd("debug: finished reading random bytes\n");
   rand_current=rand_buf;
  }
  /* cells numbered 0...max-1 */