Add pingpong board and two bat

Author: scopeInfinity

src/kernel/syscall/graphics.c

@@ -12,7 +12,7 @@ static int _graphics_init() {
         return -1;
     }
     _graphics_prev_mode = graphics_get_mode();
-    int err = graphics_set_mode(GRAPHIC_MODE_320x200x16);
+    int err = graphics_set_mode(GRAPHIC_MODE_320x200x256);
     return err;
 }
 

src/usr/include/graphics.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#define GRAPHICS_MAX_HEIGHT  320
-#define GRAPHICS_MAX_WIDTH   200
+#define GRAPHICS_MAX_WIDTH   320
+#define GRAPHICS_MAX_HEIGHT  200
 
 #define DETECT                  0
 #define GRAPHIC_DRIVER_VGA      1
 
-#define GRAPHIC_MODE_320x200x16 0x13
+#define GRAPHIC_MODE_320x200x256 0x13
 
 #define  BLACK               0x0
 #define  BLUE                0x1
@@ -34,8 +34,12 @@ int graphresult();
 void closegraph();
 void cleardevice();
 
+int graphflush();
 
 void setcolor(int color);
 int getcolor();
 void setbkcolor(int color);
 int getbkcolor();
+
+void putpixel_noflush(int x, int y, int color);
+void putpixel(int x, int y, int color);

src/usr/include/stdlib.h

@@ -7,5 +7,7 @@ int atoi (const char *s);
 // And only base 10 is considered as signed int.
 void itoa(int num, char *s, int base);
 int min(int, int);
+int max(int, int);
+int abs(int a);
 
 void exit(int status);

src/usr/lib/graphics.c

@@ -18,7 +18,7 @@ void initgraph(int *graphdetect, int *graphmode, char *not_used) {
         // only one graphics driver is supported for now.
         return -4;
     }
-    *graphmode = GRAPHIC_MODE_320x200x16;
+    *graphmode = GRAPHIC_MODE_320x200x256;
     gstate.last_err = SYSCALL_A1(SYSCALL_GRAPHICS, SYSCALL_GRAPHICS_INITGRAPH);
 }
 
@@ -32,7 +32,7 @@ void closegraph() {
     gstate.last_err = SYSCALL_A1(SYSCALL_GRAPHICS, SYSCALL_GRAPHICS_CLOSEGRAPH);
 }
 
-static int graphflush() {
+int graphflush() {
     gstate.last_err = SYSCALL_A2(SYSCALL_GRAPHICS, SYSCALL_GRAPHICS_COPYBUFFER, BUFFER);
     return gstate.last_err;
 }
@@ -48,35 +48,70 @@ void setviewport(int left, int top, int right, int bottom, int clip) {
 }
 
 int getmaxx() {
-    // TODO
+    return GRAPHICS_MAX_WIDTH-1;
 }
 
 int getmaxy() {
-    // TODO
+    return GRAPHICS_MAX_HEIGHT-1;
 }
 
 void setcolor(int color) {
-    // TODO
+    gstate.color = color;
 }
 
-int getcolor() {
-    // TODO
+inline int getcolor() {
+    return gstate.color;
 }
 
-void setbkcolor(int color) {
+inline void setbkcolor(int color) {
     gstate.bkcolor = color;
 }
 
 int getbkcolor() {
-    // TODO
+    return gstate.bkcolor;
 }
 
 void putpixel(int x, int y, int color) {
-    // TODO
+    BUFFER[y][x]=color;
+    graphflush();
+}
+
+void putpixel_noflush(int x, int y, int color) {
+    BUFFER[y][x]=color;
 }
 
 void line(int x1, int y1, int x2, int y2) {
-    // TODO
+    const int color = getcolor();
+    if(abs(x1-x2)>=abs(y1-y2)) {
+        // horizontal length is longer
+        if(x1>x2) {
+            int t;
+            t = x1; x1 = x2; x2 = t;
+            t = y1; y1 = y2; y2 = t;
+        }
+        // x1<=x2
+        const int xdiff = x2-x1;
+        const int ydiff = y2-y1;
+        for (int x = x1; x <= x2; x++) {
+            int y = ydiff*(x-x1)/xdiff;
+            BUFFER[y][x]=color;
+        }
+    } else  {
+        // vertical length is longer
+        if(y1>y2) {
+            int t;
+            t = x1; x1 = x2; x2 = t;
+            t = y1; y1 = y2; y2 = t;
+        }
+        // y1<=y2
+        const int xdiff = x2-x1;
+        const int ydiff = y2-y1;
+        for (int y = y1; y <= y2; y++) {
+            int x = y*xdiff/ydiff+x1;
+            BUFFER[y][x]=color;
+        }
+    }
+    graphflush();
 }
 
 void drawpoly(int num, int polypoints[]) {
@@ -88,15 +123,28 @@ void filpoly(int num, int polypoints[]) {
 }
 
 void rectangle(int left, int top, int right, int bottom) {
-    line(left, top, right, top);
-    line(left, bottom, right, bottom);
-    line(left, top, left, bottom);
-    line(right, top, right, bottom);
+    const int color = getcolor();
+
+    for(int x=left;x<=right;x++) {
+        BUFFER[top][x]=color;
+        BUFFER[bottom][x]=color;
+    }
+    for(int y=top+1;y<bottom;y++) {
+        BUFFER[y][left]=color;
+        BUFFER[y][right]=color;
+    }
+    graphflush();
 }
 
 void bar(int left, int top, int right, int bottom) {
-    // filled rectangle
-    // TODO
+    const int color = getcolor();
+
+    for(int y=top;y<=bottom;y++) {
+        for(int x=left;x<=right;x++) {
+            BUFFER[y][x]=color;
+        }
+    }
+    graphflush();
 }
 
 void ellipse(int x, int y, int x_radius, int y_radius) {

src/usr/lib/stdlib.c

@@ -6,6 +6,14 @@ int min(int a, int b) {
     return (a<b)?a:b;
 }
 
+int max(int a, int b) {
+    return (a>b)?a:b;
+}
+
+int abs(int a) {
+    return (a>=0)?a:-a;
+}
+
 int atoi(const char *s) {
     int neg = 0;
     if ((*s) == '-' || (*s) == '+') {

src/usr/local/src/pingpong.c

@@ -3,11 +3,89 @@
 #include <conio.h>
 #include <graphics.h>
 
-void game() {
+#define DIR_UP   -1
+#define DIR_DOWN  1
+#define PLAYER_1  1
+#define PLAYER_2  2
+
+const int WINDOW_HEIGHT = GRAPHICS_MAX_HEIGHT;
+const int WINDOW_WIDTH  = GRAPHICS_MAX_WIDTH;
+
+const int BAT_HALF_HEIGHT = 15;
+const int BAT_HALF_WIDTH  = 2;
+const int BAT_SPEED = 5;
+
+const int bat_miny = BAT_HALF_HEIGHT;
+const int bat_maxy = (WINDOW_HEIGHT-1)-BAT_HALF_HEIGHT;
+
+const int p1_x = 10;
+const int p2_x = (WINDOW_WIDTH-1)-p1_x;
+
+struct playerState {
+    int y;
+};
+
+struct {
+    struct playerState p1, p2;
+} gstate;
+
+void game_init() {
+    gstate.p1.y = (bat_miny+bat_maxy)/2;
+    gstate.p2 = gstate.p1;
+}
+
+void draw_board() {
     // clear screen
-    setbkcolor(WHITE);
+    setbkcolor(LIGHT_GREEN);
     cleardevice();
-    getch();
+
+    setcolor(BLUE);
+    bar(p1_x-BAT_HALF_WIDTH, gstate.p1.y-BAT_HALF_HEIGHT,
+        p1_x+BAT_HALF_WIDTH, gstate.p1.y+BAT_HALF_HEIGHT);
+
+    setcolor(RED);
+    bar(p2_x-BAT_HALF_WIDTH, gstate.p2.y-BAT_HALF_HEIGHT,
+        p2_x+BAT_HALF_WIDTH, gstate.p2.y+BAT_HALF_HEIGHT);
+}
+
+void move_bat(int player_id, int dir) {
+    struct playerState* p = NULL;
+    if(player_id==PLAYER_1) {
+        p = &gstate.p1;
+    } else if(player_id==PLAYER_2) {
+        p = &gstate.p2;
+    } else {
+        return;
+    }
+
+    if(dir==DIR_UP) {
+        p->y -= BAT_SPEED;
+    } else if(dir==DIR_DOWN) {
+        p->y += BAT_SPEED;
+    }
+
+    // keep bat in bounds
+    p->y = max(bat_miny, min(bat_maxy, p->y));
+}
+
+void game() {
+    game_init();
+    while (1)  {
+        draw_board();
+
+        char c = getch();
+        if(c=='e') {
+            return;
+        } else if(c=='w') {
+            move_bat(PLAYER_1, DIR_UP);
+        } else if(c=='s') {
+            move_bat(PLAYER_1, DIR_DOWN);
+        } else if(c=='p') {
+            move_bat(PLAYER_2, DIR_UP);
+        } else if(c=='l') {
+            move_bat(PLAYER_2, DIR_DOWN);
+        }
+    }
 }
 
 int main(int argc,char *argv[]) {