test avoid bulled game
Dependencies: C12832_lcd LCD_fonts mbed mbed-rtos
Diff: main.cpp
- Revision:
- 39:e8d6dd3c75c7
- Parent:
- 38:63b99151e218
- Child:
- 40:ec5c1b305b9a
--- a/main.cpp Tue Dec 13 07:34:07 2016 +0000 +++ b/main.cpp Tue Dec 13 11:55:17 2016 +0000 @@ -40,11 +40,21 @@ wall_height = stage.getStage(); for(int i = 0; i < LCD_Y; i++){ for(int j = 0; j < LCD_X ; j++){ - if(wall_height[i] > (LCD_Y - 1 - j)){ + if(wall_height[j] > (LCD_Y - 1 - i)){ white_board[i][j] = 1; } } } + //print wall int +// for(int i = 0; i < LCD_X; i++){ +// printf("line %d height: %d ",i, wall_height[i]); +// for(int j = 0; j < LCD_Y; j++){ +// printf("%d ",white_board[j][i]); +// } +// printf("\n"); +// } +// printf("\n"); + } void a(){ @@ -88,8 +98,8 @@ } int corrision_judge(point p_person, point p_bullet){ - printf("bullet x: %d, y: %d \n", p_bullet.x,p_bullet.y); - printf("person x: %d, y: %d \n", p_person.x,p_person.y); + //printf("bullet x: %d, y: %d \n", p_bullet.x,p_bullet.y); +// printf("person x: %d, y: %d \n", p_person.x,p_person.y); return (line_judge(p_person.x, p_person.x + PERSON_SIZE, p_bullet.x, p_bullet.x + BULLET_SIZE) && line_judge(p_person.y, p_person.y + PERSON_SIZE, p_bullet.y - 1, p_bullet.x - 4)); @@ -103,36 +113,25 @@ lcd.setmode(XOR); int gameOver = 0; srand((int)(aIn * 100)); -<<<<<<< local Converter converter; -======= - Converter converter(); - int len = LCD_Y*LCD_X/8; - char char_map[len]; ->>>>>>> other -// Bitmap picture; + Bitmap picture; while(true){ update_mtx.lock(); reset_white_board(); make_wall(); - p_person = h.update(1); + p_person = h.update(wall_height[3]); if(b != NULL){ p_bullet = b->update(); } //printf("bullet x: %d, y: %d \n", p_bullet.x,p_bullet.y); //printf("person x: %d, y: %d \n", p_person.x,p_person.y); corrision_judge(p_person, p_bullet); - Bitmap bitmap_converted = { - LCD_X, - LCD_Y, - LCD_X/8, - char_map, - }; + picture = converter.convert(white_board); update_mtx.unlock(); lcd.cls(); lcd.print_bm(bitmPlayer,p_person.x,p_person.y); - lcd.print_bm(bitmap_converted,0,0); + lcd.print_bm(picture,0,0); if(b != NULL){ lcd.print_bm(bitmBullet_graphics, p_bullet.x, p_bullet.y); } @@ -140,7 +139,7 @@ wait(0.02); lcd.cls(); lcd.print_bm(bitmPlayerB,p_person.x,p_person.y); - lcd.print_bm(bitmap_converted,0,0); + lcd.print_bm(picture,0,0); if(b != NULL){ lcd.print_bm(bitmBullet_graphics, p_bullet.x, p_bullet.y); }