0.0.2d: Added BGA support, graphics!

lib/builtin_games/miner.c

@@ -2,75 +2,230 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <drivers/ps2_keyboard.h>
+
+#include <new_tty.h>
 
 #include <builtin_games/miner.h>
 
-
-#define PLAYER   '@'
-#define SHOP     '$'
-#define STONE    '#'
-#define IRON     ';'
-#define COAL     ':'
-#define COPPER   '^'
-#define GOLD     '%'
-#define RUBY     '*'
-#define DIAMOND  '~'
-#define PLATINUM '&'
-#define NOTHING  ' '
-
-
 /*
   static const size_t VGA_WIDTH = 80;
   static const size_t VGA_HEIGHT = 25;
 */
 
+/* clear screen */
+void cls(void)
+{
+  terminal_clear();
+}
 
+static bool pointer_valid(void* ptr)
+{
+  if (ptr/* && (ptr < (heap_end + 4096))*/)
+  {
+    return true;
+  }
+
+  return false;
+}
+
+static inline bool valid_pointer(void* ptr)
+{
+  return pointer_valid(ptr);
+}
+
+/*const char PLAYER = '@';
+const char ENEMY  = '*';
+const char PLAYER_BULLET = '^';
+const char ENEMY_BULLET  = '`'
+const char BOMB = '*';
+const char EMPTY = ' ';*/
+
+#define MAP_ROWS 25
+#define MAP_COLUMNS 25
+
+#define PLAYER_STARTING_POS (MAP_COLUMNS / 2) /* for MAP_COLUMNS being 25, this will be 12. */
+
+#define STARTING_ENEMY_NUM 4
+
+enum {
+  PLAYER = '@',
+  PLAYER_BULLET = '^',
+  ENEMY = '%',
+  ENEMY_BULLET = '`',
+  BOMB = '*',
+  EMPTY = ' ',
+};
+
+struct bullet {
+  bool players; /* if enemies, false */
+
+  int row;
+  int column;
+};
+
+struct game_vars {
+  tty_t* tty;
+  uint32_t stored_tty_flags;
+
+  int v;
+
+  char c;
+
+  int player_score;
+  int player_credits;
+
+  bool error;
+
+  int num_enemies;
+  int num_enemy_step;
+  char** map; /* char map[MAP_ROWS][MAP_COLUMNS] */
+
+  bool enemys[MAP_COLUMNS]; /* enemy bitmap */
+
+  struct bullet* bullets;
+  int num_bullets;
+};
+
+
+void init_map(struct game_vars* gv)
+{
+  for (int i = 0; i < MAP_ROWS; i++)
+  {
+    for (int j = 0; j < MAP_COLUMNS; j++)
+    {
+      gv->map[i][j] = EMPTY;
+    }
+  }
+  
+  gv->map[0][PLAYER_STARTING_POS] = PLAYER;
+
+  int enemy_pos = 0;
+
+  for (int b = 0; b < STARTING_ENEMY_NUM; b++)
+  {
+    gv->map[24][enemy_pos] = ENEMY;
+    enemy_pos++;
+    gv->num_enemies++;
+    gv->enemys[b] = true;
+  }
+
+  if (!valid_pointer(gv->map))
+  {
+    gv->error = true;
+  }
+}
+
+void ai(struct game_vars* gv)
+{
+  for (int i = 0; i < MAP_COLUMNS; i++)
+  {
+    if ((gv->map[24][i] == ENEMY) && (gv->map[0][i] == PLAYER))
+    {
+      gv->map[23][i] = ENEMY_BULLET;
+      int num_bullets = gv->num_bullets;
+      gv->bullets[num_bullets].players = false;
+      gv->bullets[num_bullets].column = i;
+      gv->bullets[num_bullets].row = 23;
+      gv->num_bullets++;
+    }
+  }
+}
+
+void tick(struct game_vars* gv)
+{
+  for (int i = 0; i < gv->num_bullets; i++)
+  {
+    struct bullet* b = &gv->bullets[i];
+    gv->map[b->row][b->column] = EMPTY;
+    b->column++;
+    b->row++;
+    gv->map[b->row][b->column] = b->players ? PLAYER_BULLET : ENEMY_BULLET;
+  }
+}
+
+int init_game(struct game_vars* ptr)
+{
+  if (ptr)
+  {
+    ptr->error = false;
+    
+    init_map(ptr);
+    
+    ptr->num_enemy_step++;
+    
+    return 0;
+  }
+
+  return -1;
+}
 
 void miner_main(void)
 {
-  terminal_clear();
+#if 0
+  cls();
+
+  struct game_vars gv = { .tty = get_active_tty(), .stored_tty_flags = tty_get_flags(get_active_tty()),
+                          .v = 0, .c = 0,
+                          .player_score = 0, .player_credits = 0,
+                          .error = false,
+                          .num_enemies = STARTING_ENEMY_NUM, .num_enemy_step = 0,
+                          .map = malloc(MAP_COLUMNS * MAP_ROWS),
+                          .bullets = NULL, .num_bullets = 0,
+                        };
+
+  memset(gv.enemys, 0, sizeof(gv.enemys));
+
+  if (!gv.map)
+  {
+    goto quit;
+  }
+
+  printf("gv.map = %p\n", gv.map);
+
+  gv.tty->flags |= TTY_RAW;
+  gv.tty->flags &= ~TTY_CANONICAL;
+  gv.tty->flags &= ~TTY_ECHO; /* disable echo */
 
   printf("\n\tMiner\n\t\tMine ores to sell for money and upgrade your drone\n\n\n\t\t\tHIT ENTER TO CONTINUE, TAB TO EXIT\n");
-  
-  char b = get_char();
-  
-  while (b != '\n' && b != '\t')
+
+  /*while (gv.c != '\n' && gv.c != '\t')
   {
-    sleep(10);
-    b = get_char();
+    gv.c = getchar();
   }
-  
-  if (b == '\t')
+
+  if (gv.c == '\t')
   {
-    return;
+    goto quit;
   }
-  
-  uint16_t c = 0x0;
-  
-  terminal_clear();
-  
-  while (true)
+
+  cls();*/
+
+  while (1)
   {
-    sleep(10);
+    gv.c = getchar();
     
-    c = get_key();
-    
-    if (c == 0xFFFA || c == 0x0)
+    if (gv.c == '\t')
     {
-      continue;
+      goto quit;
     }
     
-    break;
+    sleep(500);
   }
-  
-  b = getchar();
-  
-  while (b == 0x5)
+
+quit:
+
+  gv.tty->flags = gv.stored_tty_flags;
+  if (gv.map && pointer_valid(gv.map))
   {
-    sleep(10);
-    b = getchar();
+    free(gv.map);
   }
-  
-  terminal_clear();
+
+  cls();
+
+  printf("Goodbye!\n");
+
+  sleep(2000);
+
+  cls();
+#endif
 }

lib/math.c

@@ -35,3 +35,9 @@ uint64_t int_pow(uint64_t base, uint32_t exp)
 
   return result;
 }
+
+
+int abs(int x)
+{
+    return (x < 0) ? -x : x;
+}

lib/stdio.c

@@ -1,7 +1,8 @@
-#include <drivers/ps2_keyboard.h>
+#include <types.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <drivers/ps2_keyboard.h>
 #include <kernel/syscall.h>
 #include <tty.h>
 
@@ -13,7 +14,7 @@ int write(uint32_t fd, void* data, size_t len)
 {
   if (fd == STDOUT)
   {
-    print_uint((uint32_t) len);
+    /*print_uint((uint32_t) len);*/
     terminal_write((char*) data, len);
   }
   else
@@ -30,8 +31,14 @@ int read(uint32_t fd, void* data, size_t max_len)
   
   if (fd == STDIN)
   {
-    char* sptr = (char*) data; /* this really shouldn't be needed... */
-    sptr = gets_new(&rv);
+    char* rd = gets_new(&rv);
+    size_t sz = strlen(rd);
+    memcpy(data, rd, (sz < max_len) ? sz : max_len);
+
+    if (!rd)
+    {
+      printf("rd is NULL!\n");
+    }
   }
   else
   {
@@ -45,12 +52,7 @@ extern bool ps2keyboard_initialized;
 
 char getchar(void)
 {
-  if (ps2keyboard_initialized)
-  {
-    return get_char();
-  }
-  
-  return '\0';
+  return tty_get_char();
 }
 
 char* getstring(void)
@@ -92,6 +94,8 @@ int getstr(char* dest)
   }
 
   strcpy(dest, p);
+
+  return 0;
 }
 
 void putc(char c)

lib/string.c

@@ -492,3 +492,78 @@ void strlnstripip(char* s)
     s[len-1] = '\0';
   }
 }
+
+char** split(const char* str, char delim)
+{
+  if (!str)
+  {
+    return NULL;
+  }
+
+  size_t count = 1;
+  for (const char* p = str; *p; p++)
+  {
+    if (*p == delim)
+    {
+      count++;
+    }
+  }
+
+  char** result = malloc((count + 1) * sizeof(char*));
+  if (!result)
+  {
+    return NULL;
+  }
+
+  size_t idx = 0;
+  const char* start = str;
+
+  for (const char* p = str; ; p++)
+  {
+    if (*p == delim || *p == '\0')
+    {
+      size_t len = p - start;
+
+      char* token = malloc(len + 1);
+      if (!token)
+      {
+        return NULL;
+      }
+
+      for (size_t i = 0; i < len; i++)
+      {
+        token[i] = start[i];
+      }
+      
+      token[len] = '\0';
+
+      result[idx++] = token;
+
+      start = p + 1;
+
+      if (*p == '\0')
+      {
+        break;
+      }
+    }
+  }
+
+  result[idx] = NULL; /* null-terminate the array */
+  return result;
+}
+
+
+void free_split(char** parts)
+{
+  if (!parts)
+  {
+    return;
+  }
+
+  for (int i = 0; parts[i] != NULL; i++)
+  {
+    free(parts[i]);
+  }
+  
+  free(parts);
+}