General bug fixes

* Fixed double clear while initial jump
* Fixed landing into invalid state between crashed and playing state
* Fixed wrong user name in docker compose file
* `clearcanvas()` now called at every frame
* Deleted old unused assets

Author: AKJ7

README.md

@@ -4,7 +4,7 @@ Chrome's Dinorunner game as a standalone C library.
 
 
 ## Description  
-This project contains a port of the famous Chrome's Dinosaur Game written in C.  
+This project contains a port of the famous Chrome's Dinosaur Game written in C, C++.
 
 It is designed to be used as a configurable backend library accessable to a wide range of programming languages (using i.e. CFFIs) and hardware architectures.
 

assets/demo.gif

@@ -42,7 +42,6 @@ unsigned char dinorunner_init(struct dinorunner_s* dinorunner, const struct dime
                                  -DINORUNNER_CONFIG_HORIZON_GAP_COEFFICIENT, dinorunner->user_data);
   res &= dinorunner_trex_init(&dinorunner->trex, dimension->width, dimension->height, dinorunner->user_data);
   res &= dinorunner_gameoverpanel_init(&dinorunner->gameoverpanel, dimension);
-  res &= dinorunner_clearcanvas(dinorunner->user_data);
   res &= dinorunner_distancemeter_init(&dinorunner->distance_meter, &text_dimension, dimension->width,
                                        dinorunner->user_data);
   return res;
@@ -59,13 +58,12 @@ unsigned char dinorunner_startgame(struct dinorunner_s* dinorunner) {
 unsigned char dinorunner_restart(struct dinorunner_s* dinorunner) {
   dinorunner->play_count++;
   dinorunner->running_time  = 0u;
-  dinorunner->playing       = 0u;
+  dinorunner->playing       = 1u;
   dinorunner->distance_ran  = 0u;
   dinorunner->crashed       = 0u;
   dinorunner->current_speed = DINORUNNER_CONFIG_SPEED;
   // set_speed(DINORUNNER_CONFIG_SPEED);
   dinorunner->time = dinorunner_gettimestamp(dinorunner->user_data);
-  dinorunner_clearcanvas(dinorunner->user_data);
   dinorunner_distancemeter_reset(&dinorunner->distance_meter, dinorunner->distance_meter.high_score,
                                  dinorunner->user_data);
   dinorunner_horizon_reset(&dinorunner->horizon, dinorunner->user_data);
@@ -94,26 +92,19 @@ void dinorunner_stop(struct dinorunner_s* dinorunner) {
 }
 
 static void dinorunner_gameover(struct dinorunner_s* dinorunner) {
-  if (dinorunner->playing) {
-    dinorunner_playsound(DINORUNNER_SOUND_HIT, dinorunner->user_data);
-    dinorunner_vibrate(200, dinorunner->user_data);
-  }
+  dinorunner_playsound(DINORUNNER_SOUND_HIT, dinorunner->user_data);
+  dinorunner_vibrate(200, dinorunner->user_data);
   dinorunner_stop(dinorunner);
   dinorunner->crashed                    = 1u;
   dinorunner->distance_meter.achievement = 0u;
   dinorunner_trex_update(&dinorunner->trex, 100, TREX_STATUS_CRASHED, dinorunner->user_data);
-  dinorunner_gameoverpanel_draw(&dinorunner->gameoverpanel, dinorunner->user_data);
   unsigned last_score = dinorunner_distancemeter_getactualdistance(dinorunner->distance_ran);
   if (last_score > dinorunner->distance_meter.high_score) {
     dinorunner->distance_meter.high_score = last_score;
     dinorunner_distancemeter_writehighscore(&dinorunner->distance_meter, dinorunner->distance_meter.high_score,
                                             dinorunner->user_data);
   }
-  dinorunner_distancemeter_draw(&dinorunner->distance_meter, 0, last_score, 0, dinorunner->user_data);
-  dinorunner_distancemeter_draw(&dinorunner->distance_meter, 0, dinorunner->distance_meter.high_score, 1,
-                                dinorunner->user_data);
   dinorunner->time = dinorunner_gettimestamp(dinorunner->user_data);
-  dinorunner_clearcanvas(dinorunner->user_data);
 }
 
 static inline void dinorunner_createadjustedcollisionbox(const struct collision_box_s* box,
@@ -188,8 +179,8 @@ unsigned char dinorunner_update(struct dinorunner_s* dinorunner) {
   unsigned long now        = dinorunner_gettimestamp(dinorunner->user_data);
   unsigned long delta_time = now - dinorunner->time;
   dinorunner->time         = now;
+  dinorunner_clearcanvas(dinorunner->user_data);
   if (dinorunner->playing) {
-    dinorunner_clearcanvas(dinorunner->user_data);
     if (dinorunner->trex.jumping) {
       dinorunner_trex_updatejump(&dinorunner->trex, delta_time, dinorunner->user_data);
     }
@@ -244,16 +235,21 @@ unsigned char dinorunner_update(struct dinorunner_s* dinorunner) {
   }
   if (dinorunner->crashed) {
     dinorunner_gameoverpanel_draw(&dinorunner->gameoverpanel, dinorunner->user_data);
-  } else if ((dinorunner->playing)) {
+    dinorunner_horizon_update(&dinorunner->horizon, 0, 0, 1, dinorunner->inverted, dinorunner->user_data);
+    dinorunner_distancemeter_draw(&dinorunner->distance_meter, 0,
+                                  dinorunner_distancemeter_getactualdistance(dinorunner->distance_ran), 0,
+                                  dinorunner->user_data);
+    dinorunner_distancemeter_draw(&dinorunner->distance_meter, 0, dinorunner->distance_meter.high_score, 1,
+                                  dinorunner->user_data);
+    dinorunner_trex_update(&dinorunner->trex, delta_time, TREX_STATUS_CRASHED, dinorunner->user_data);
+  } else if (dinorunner->playing) {
     dinorunner_trex_update(&dinorunner->trex, delta_time, TREX_STATUS_NONE, dinorunner->user_data);
   } else if ((!dinorunner->activated) && (dinorunner->trex.blink_count < DINORUNNER_CONFIG_MAX_BLINK_COUNT)) {
     dinorunner_trex_update(&dinorunner->trex, delta_time, TREX_STATUS_NONE, dinorunner->user_data);
     dinorunner_horizonline_draw(&dinorunner->horizon.horizon_line, dinorunner->user_data);
-    dinorunner_clearcanvas(dinorunner->user_data);
   } else {
     dinorunner_trex_update(&dinorunner->trex, delta_time, TREX_STATUS_WAITING, dinorunner->user_data);
     dinorunner_horizonline_draw(&dinorunner->horizon.horizon_line, dinorunner->user_data);
-    dinorunner_clearcanvas(dinorunner->user_data);
   }
   return 1u;
 }

assets/demo_nightmode.gif

@@ -43,7 +43,7 @@ static unsigned char duplicate_obstacle_check(const struct horizon_s* horizon,
   unsigned duplicate_count                  = 0;
   const unsigned number_of_obstacle_history = get_active_obstacle_history(horizon);
   for (unsigned i = 0u; i < number_of_obstacle_history; ++i) {
-    duplicate_count = (horizon->obstacle_history[i] == next_obstacle_type);
+    duplicate_count += (horizon->obstacle_history[i] == next_obstacle_type);
   }
   return duplicate_count >= DINORUNNER_CONFIG_OBSTACLE_MAX_OBSTACLE_DUPLICATION;
 }

assets/demo_nightmode.mp4

@@ -77,17 +77,6 @@ static inline void dinorunner_trex_setjumpvelocity(struct trex_s* trex, int sett
   trex->drop_velocity         = -setting / 2.0f;
 }
 
-static void trex_reset(struct trex_s* trex, void* user_data) {
-  trex->y_pos         = trex->ground_y_pos;
-  trex->jump_velocity = 0;
-  trex->jumping       = 0u;
-  trex->ducking       = 0u;
-  dinorunner_trex_update(trex, 0, TREX_STATUS_RUNNING, user_data);
-  trex->mid_air    = 0u;
-  trex->speed_drop = 0u;
-  trex->jump_count = 0u;
-}
-
 void dinorunner_trex_setduck(struct trex_s* trex, unsigned char is_ducking, void* user_data) {
   if (is_ducking && trex->status != TREX_STATUS_DUCKING) {
     dinorunner_trex_update(trex, 0, TREX_STATUS_DUCKING, user_data);
@@ -135,10 +124,10 @@ void dinorunner_trex_reset(struct trex_s* trex, void* user_data) {
   trex->jump_velocity = 0u;
   trex->jumping       = 0u;
   trex->ducking       = 0u;
-  trex->mid_air       = 0u;
-  trex->speed_drop    = 0u;
-  trex->jump_count    = 0u;
   dinorunner_trex_update(trex, 0, TREX_STATUS_RUNNING, user_data);
+  trex->mid_air    = 0u;
+  trex->speed_drop = 0u;
+  trex->jump_count = 0u;
 }
 
 void dinorunner_trex_startjump(struct trex_s* trex, float speed, void* user_data) {
@@ -175,7 +164,7 @@ void dinorunner_trex_updatejump(struct trex_s* trex, float delta_time, void* use
     dinorunner_trex_endjump(trex);
   }
   if (trex->y_pos > trex->ground_y_pos) {
-    trex_reset(trex, user_data);
+    dinorunner_trex_reset(trex, user_data);
     trex->jump_count++;
   }
   dinorunner_trex_update(trex, delta_time, TREX_STATUS_NONE, user_data);
@@ -196,7 +185,7 @@ unsigned char dinorunner_trex_init(struct trex_s* trex, unsigned container_width
   trex->blink_count          = 0;
   trex->animation_start_time = 0;
   trex->timer                = 0;
-  trex->ms_per_frame         = 1000.0 / DINORUNNER_CONFIG_CORE_FPS;
+  trex->ms_per_frame         = 1000.0f / DINORUNNER_CONFIG_CORE_FPS;
   trex->status               = TREX_STATUS_WAITING;
   trex->jumping              = 0u;
   trex->ducking              = 0u;

dinorunner/src/dinorunner.c

@@ -17,7 +17,7 @@ services:
     volumes:
       - /dev/bus/usb:/dev/bus/usb
       - /dev/input:/dev/input
-      - $HOME/.ssh:/home/dinorunner/.ssh
+      - $HOME/.ssh:/home/dino_runner/.ssh
       - /tmp/.X11-unix:/tmp/.X11-unix
       - /dev/dri:/dev/dri 
       - $XDG_RUNTIME_DIR/pulse/native:$XDG_RUNTIME_DIR/pulse/native