Hopefully limited the brick edge cases

Author: ahnlak

Ball.cpp

@@ -85,10 +85,22 @@ blit::Point Ball::get_render_location( void )
 
 blit::Rect Ball::get_bounds( void )
 {
-  return blit::Rect( 
-    location - blit::Vec2( ball_size[ball_type] / 2 - 1, ball_size[ball_type] / 2 - 1 ),
-    location + blit::Vec2( ball_size[ball_type] / 2 - 1, ball_size[ball_type] / 2 - 1 )
-  );
+  /* Work out the corners. */
+  blit::Point l_tl = location - blit::Vec2( ball_size[ball_type] / 2 - 1, ball_size[ball_type] / 2 - 1 );
+  blit::Point l_br = location + blit::Vec2( ball_size[ball_type] / 2 - 1, ball_size[ball_type] / 2 - 1 );
+
+  /* Clamp the left/right edges of the screen - unsigned, so may have wrapped. */
+  if ( ( l_tl.x < 0 ) || ( l_tl.x > blit::screen.bounds.w ) )
+  {
+    l_tl.x = 0;
+  }
+  if ( l_br.x > blit::screen.bounds.w )
+  {
+    l_br.x = blit::screen.bounds.w;
+  }
+
+  /* And return the resulting rectangle. */
+  return blit::Rect( l_tl, l_br );
 }
 
 

GameState.cpp

@@ -160,7 +160,11 @@ blit::Rect GameState::brick_to_screen( uint8_t p_row, uint8_t p_column )
 
 blit::Point GameState::screen_to_brick( blit::Point p_location )
 {
-  return blit::Point( p_location.x / 32, ( p_location.y - 10 ) / 16 );
+  /* Clamp the location to the screen, in case a bounding box has slipped */
+  /* off somewhere, which can get ... messy.                              */
+  blit::Point l_location = blit::screen.clip.clamp( p_location );
+
+  return blit::Point( l_location.x / 32, ( l_location.y - 10 ) / 16 );
 }
 
 

metadata.yml

@@ -9,6 +9,6 @@ splash:
   file: assets/32blox-image.png
 icon:
   file: assets/32blox-icon.png
-version: v0.9.1
+version: v0.9.2
 
 # End of metadata.yml