new øving6 using color not colour

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 {

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);