added display support (init by now) (dfb-api)

diff --git a/Makefile b/Makefile
index 4f1c9c9f659a6e9dfeafb6468007135ba6e83494..894933978ae6243437c67fa99f9818aeffed46a5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,10 @@
 
 INCLUDEDIR = /usr/include
 
-CFLAGS = -DDEBUG -O3 -Wall -I/usr/include/directfb
+CFLAGS = -DDEBUG -DUSE_DFB_API -O3 -Wall -I/usr/include/directfb
 LIBS = -L/usr/lib/directfb-0.9.15 -ldirectfb
 
-OBJS = random.o
+OBJS = random.o display.o
 OBJS2 = morpheus
 
 morpheus: $(OBJS)

diff --git a/defines.h b/defines.h
index 58e758d25b82aee1b4590cdc96121b4553991d95..0be5bc4dcc6c4f24eb1a0f7aeea3cb515b83aa55 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -5,6 +5,10 @@
  *
  */
 
+#ifdef USE_DFB_API
+#include <directfb.h>
+#endif
+
 #define DEFAULT_X_SEG 50
 #define DEFAULT_Y_SEG 50
 #define DEFAULT_Z_SEG 100
@@ -16,29 +20,37 @@
 
 /* program defines, dont touch ;) */
 
-#ifdef DEBUG
- #define DEBUG 1
-#else
- #define DEBUG 0
-#endif
-
 #define URAND_MAX 0xffffffff
 
 typedef unsigned int u32;
 typedef long long unsigned int u64;
 
-#define printfd(fmt,args...) if(DEBUG) printf(fmt,##args);
+#ifdef DEBUG
+ #define DEBUG_IT 1
+#else 
+ #define DEBUG_IT 0
+#endif
+
+#define printfd(fmt,args...) if(DEBUG_IT) printf(fmt,##args);
 
-/* segment struct
- *
- * not used by now
- */
-struct __segment
-{
- u32 status; /* C concentration */
-}
+/* display stuff */
+typedef struct __display {
+ u32 max_x,max_y,max_z; /* dimensions */
+ u32 *cell_p; /* pointer to cell data */
+#ifdef USE_DFB_API
+ IDirectFB *dfb; /* pointer to dfb main construct */
+ IDirectFBSurface *primary_surface; /* pointer to dfb primary surface */
+#endif
+ int screen_height,screen_width; /* screen dimensions */
+} display;
+
+#define DEFAULT_DISPLAY_X 25
+#define DEFAULT_DISPLAY_Y 25
+#define DEFAULT_DISPLAY_Z 50
+#define DEFAULT_DISPLAY_REF_RATE 100
 
-/* masks for u32 segments */
+ 
+/* masks for u32 cell */
 #define AMORPH 0x00000001
 #define CRYSTAL 0x00000000
 #define C_CONC_MASK 0xfffffffe

diff --git a/display.c b/display.c
new file mode 100644 (file)
index 0000000..f61e7e2
--- /dev/null
+++ b/display.c
@@ -0,0 +1,55 @@
+/*
+ * display.c - visualization api
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "defines.h"
+
+#ifdef USE_DFB_API
+static IDirectFB *dfb=NULL;
+static IDirectFBSurface *primary_surface=NULL;
+static int screen_width=0;
+static int screen_height=0;
+#endif
+
+int display_init(int x,int y,int z,display *display,u32 *cell,int *argc,char **argv)
+{
+#ifdef USE_DFB_API
+ DFBSurfaceDescription surface_dsc;
+ // DFBFontDescription font_dsc;
+#endif
+
+ /* store dimensions */
+ display->max_x=x;
+ display->max_y=y;
+ display->max_z=z;
+ /* store pointer to cells */
+ display->cell_p=cell;
+
+ /* the api(s) */
+#ifdef USE_DFB_API
+ DirectFBInit(argc,&argv);
+ DirectFBCreate(&dfb);
+ dfb->SetCooperativeLevel(dfb,DFSCL_FULLSCREEN);
+ surface_dsc.flags=DSDESC_CAPS;
+ surface_dsc.caps=DSCAPS_PRIMARY|DSCAPS_FLIPPING;
+ dfb->CreateSurface(dfb,&surface_dsc,&primary_surface);
+ primary_surface->GetSize(primary_surface,&screen_width,&screen_height);
+ display->dfb=dfb;
+ display->primary_surface=primary_surface;
+ display->screen_width=screen_width;
+ display->screen_height=screen_height;
+#endif
+ return 23;
+}
+
+int display_draw(u32 *cell,int x,int y,int z)
+{
+#ifdef USE_DFB_API
+
+#endif
+ return 23;
+}

diff --git a/main.c b/main.c
index 49be0ef95050c2626479a8cee0c18e60221a7af3..07f34c9bf85fcc25afff90c1a67a331e8f3c3e4b 100644 (file)
--- 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;
 }

diff --git a/random.c b/random.c
index 0b7304f522d3f7dfa7aba85d247d4f8d294f16a4..3f8ed7240107b32bf696a4462649055442e04032 100644 (file)
--- a/random.c
+++ b/random.c
@@ -6,10 +6,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+
 #include "defines.h"
 
-/* global & extern variables */
-extern u32 sum_z_segments;
+/* global and extern variables */
+extern u32 sum_z_cells;
 extern int random_fd;
 
 /* return random integer between 0 - max */
@@ -21,7 +22,7 @@ u32 rand_get(u32 max)
   puts("failed reading 4 bytes of random data");
   return -23;
  }
- /* segments numbered 0...max-1 */
+ /* cells numbered 0...max-1 */
  return((u32)(rand_int*(max*1.0/URAND_MAX)));
 }
 
@@ -29,11 +30,11 @@ u32 rand_get(u32 max)
 u32 rand_get_lgp(int slope_nel,int start_nel) {
  int z;
  u32 i;
- z=rand_get(sum_z_segments)+1; /* +1 as rand_get returns values 0...max-1 */
+ z=rand_get(sum_z_cells)+1; /* +1 as rand_get returns values 0...max-1 */
  for(i=1;;i++) {
   z-=(start_nel+i*slope_nel);
   if(z<=0) break;
  }
- return(i-1); /* return values 0...z_seg-1 */
+ return(i-1); /* return values 0...z_cell-1 */
 }