diff --git "a/infobank/Articles/\303\230ving 6.pdf" "b/infobank/Articles/\303\230ving 6.pdf" index 5e0eb0b6fa522b75e1d8204c5570565611d0a1d0..7eee18878f495a72abe90fd8eb052c97b392271f 100644 Binary files "a/infobank/Articles/\303\230ving 6.pdf" and "b/infobank/Articles/\303\230ving 6.pdf" differ diff --git a/templates/_folder_Exercises/O06/bouncingBall.cpp b/templates/_folder_Exercises/O06/bouncingBall.cpp index 7f76bbeadbc13844689798a74d6e5c0e88dfd5d5..57048a5149bdaa2e9cc07fecb5bd2c1fe4a5f0bc 100644 --- a/templates/_folder_Exercises/O06/bouncingBall.cpp +++ b/templates/_folder_Exercises/O06/bouncingBall.cpp @@ -25,8 +25,8 @@ void bouncingBall(){ const int radius{30}; int alpha{1}; int velocity{2}; - Color colour_up{Color::blue}; - Color colour_down{Color::blue}; + Color color_up{Color::blue}; + Color color_down{Color::blue}; int x{0}; int y{360}; int increment_x{0}; @@ -45,8 +45,8 @@ void bouncingBall(){ // initialise the run velocity = slow.velocity; - colour_up = ball_colour.at(slow.colour_up); - colour_down = ball_colour.at(slow.colour_down); + color_up = ball_color.at(slow.color_up); + color_down = ball_color.at(slow.color_down); while (!window.should_close()) { // determine increments based on the velocity @@ -63,12 +63,12 @@ void bouncingBall(){ if (count_num_passes % 2 == 0) { if (velocity == slow.velocity) { velocity = fast.velocity; - colour_up = ball_colour.at(fast.colour_up); - colour_down = ball_colour.at(fast.colour_down); + color_up = ball_color.at(fast.color_up); + color_down = ball_color.at(fast.color_down); } else { velocity = slow.velocity; - colour_up = ball_colour.at(slow.colour_up); - colour_down = ball_colour.at(slow.colour_down); + color_up = ball_color.at(slow.color_up); + color_down = ball_color.at(slow.color_down); } } } else { diff --git a/templates/_folder_Exercises/O06/bouncingBall.h b/templates/_folder_Exercises/O06/bouncingBall.h index 0711ac65d6a9b423518a9a8f5067e4ca84472732..0018d5e7042d8270325b3d2b746fea23ddaad9b3 100644 --- a/templates/_folder_Exercises/O06/bouncingBall.h +++ b/templates/_folder_Exercises/O06/bouncingBall.h @@ -8,7 +8,7 @@ struct Config{ // END: 4a }; -extern map<int, Color> ball_colour; +extern map<int, Color> ball_color; istream& operator>>(istream& is, Config& cfg);