projects
/
physik
/
morpheus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9cf539e
)
-
author
hackbard
<hackbard>
Tue, 1 Apr 2003 19:22:33 +0000
(19:22 +0000)
committer
hackbard
<hackbard>
Tue, 1 Apr 2003 19:22:33 +0000
(19:22 +0000)
defines.h
patch
|
blob
|
history
display.c
patch
|
blob
|
history
main.c
patch
|
blob
|
history
diff --git
a/defines.h
b/defines.h
index
7e9b07d
..
60befa5
100644
(file)
--- a/
defines.h
+++ b/
defines.h
@@
-65,5
+65,7
@@
typedef struct __display {
/* masks for u32 cell */
#define AMORPH 0x00000001
#define CRYSTAL 0x00000000
/* masks for u32 cell */
#define AMORPH 0x00000001
#define CRYSTAL 0x00000000
+#define NAMORPH 0xfffffffe
+#define NCRYSTAL 0xffffffff
#define C_CONC_MASK 0xfffffffe
#define C_CONC_MASK 0xfffffffe
diff --git
a/display.c
b/display.c
index
6b97057
..
16f379a
100644
(file)
--- a/
display.c
+++ b/
display.c
@@
-173,6
+173,7
@@
int display_event_init(display *display)
int display_scan_event(display *display,u32 *x,u32 *y,u32 *z,int *quit)
{
DFBInputEvent keyboard_event;
int display_scan_event(display *display,u32 *x,u32 *y,u32 *z,int *quit)
{
DFBInputEvent keyboard_event;
+ display->keyboard_buffer->WaitForEvent(display->keyboard_buffer);
display->keyboard_buffer->GetEvent(display->keyboard_buffer,DFB_EVENT(&keyboard_event));
if(keyboard_event.type==DIET_KEYPRESS)
{
display->keyboard_buffer->GetEvent(display->keyboard_buffer,DFB_EVENT(&keyboard_event));
if(keyboard_event.type==DIET_KEYPRESS)
{
diff --git
a/main.c
b/main.c
index
7159a7b
..
1dbe2ba
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-218,6
+218,11
@@
int main(int argc,char **argv)
// process_cell((u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1)));
process_cell(cell_p,x,y,z,x_cell,y_cell,z_cell,a_p_range,a_p_faktor,a_p_p0);
// process_cell((u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1)));
process_cell(cell_p,x,y,z,x_cell,y_cell,z_cell,a_p_range,a_p_faktor,a_p_p0);
+
+ if(*(u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1)) && *(u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1))!=1)
+ {
+ printfd("debug: x: %u y: %u z: %u -> %x\n",x,y,z,*(u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1)));
+ }
/* display stuff */
if((i%display_refresh_rate)==0)
/* display stuff */
if((i%display_refresh_rate)==0)
@@
-228,17
+233,11
@@
int main(int argc,char **argv)
display_draw(&display,display_x,display_y,display_z);
display_event_init(&display);
display_draw(&display,display_x,display_y,display_z);
display_event_init(&display);
- /* debug ... */
- for(i=0;i<x_cell*y_cell*z_cell;++i)
- {
- if(*(u32 *)(cell_p+i))
- printf("%d -> 0x%x\n",i,*(u32 *)(cell_p+i));
- }
-
while(!quit)
{
display_scan_event(&display,&display_x,&display_y,&display_z,&quit);
display_draw(&display,display_x,display_y,display_z);
while(!quit)
{
display_scan_event(&display,&display_x,&display_y,&display_z,&quit);
display_draw(&display,display_x,display_y,display_z);
+ printfd("idle?\n");
}
display_release(&display);
}
display_release(&display);