From 907fe5bc0325f038cc7811d922d1eb135e9fc5d3 Mon Sep 17 00:00:00 2001 From: Joakim Hunskaar <joakim.borge.hunskar@gmail.com> Date: Fri, 3 May 2024 10:31:46 +0200 Subject: [PATCH] removed comment and edited colormap --- dependencies/testproject_featuredemo.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dependencies/testproject_featuredemo.cpp b/dependencies/testproject_featuredemo.cpp index de9722b..7017cd5 100644 --- a/dependencies/testproject_featuredemo.cpp +++ b/dependencies/testproject_featuredemo.cpp @@ -20,7 +20,7 @@ struct Ball { TDT4102::Color colour = TDT4102::Color::white; }; -std::map<std::string, const TDT4102::Color&> stringToColor { +std::map<std::string, TDT4102::Color> stringToColor { {"red", TDT4102::Color::red}, {"gold", TDT4102::Color::gold}, {"green", TDT4102::Color::green}, @@ -83,7 +83,6 @@ int main(int argc, char* argv[]) { circles.at(i).ySpeed = float(randint(-400, 400)) / 100.0f; // circles.at(i).colour = TDT4102::Color(randint(INT_MIN, INT_MAX) & 0xFFFFFF00); circles.at(i).colour = stringToColor.at(colors.at(randint(0, (colors.size()-1)))); - // circles.at(i).colour = TDT4102::Color::rebecca_purple; } while (!window.should_close()) { if (window.is_key_down(KeyboardKey::A)) { -- GitLab