From ac164afa0954e28b521dc6b19d2ccf0320cc8ed1 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Tue, 8 Apr 2014 05:17:27 +0200 Subject: utils/colors: move colors into subdir, add hsv All color classes are now in an own subdirectory with a short name. The new class HsvColor represents the Hue/Saturation/Value color model and comes with conversion functions to and from rgb colors (currently integer arithmetic without optimization for higher presicion). --- test/utils/color/hsv.cpp | 87 +++++++++++++++++++++++++++++++++++++++++++++++ test/utils/color/rgb.cpp | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+) create mode 100644 test/utils/color/hsv.cpp create mode 100644 test/utils/color/rgb.cpp (limited to 'test/utils') diff --git a/test/utils/color/hsv.cpp b/test/utils/color/hsv.cpp new file mode 100644 index 00000000..0dda6719 --- /dev/null +++ b/test/utils/color/hsv.cpp @@ -0,0 +1,87 @@ +/* + * UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + */ + +#include "hsv.hpp" +#include "rgb.hpp" + +#include +#include +#include + +namespace usdx +{ + class HsvColorTest : public CppUnit::TestFixture { + CPPUNIT_TEST_SUITE(HsvColorTest); + CPPUNIT_TEST(testConversionBlack); + CPPUNIT_TEST(testConversionGray); + CPPUNIT_TEST(testConversionFromRgb); + CPPUNIT_TEST_SUITE_END(); + private: + static log4cpp::Category& log; + public: + void setUp() + { + } + + void tearDown() + { + } + + void testConversionBlack() + { + RgbColor rgb(0, 0, 0); + HsvColor hsv(rgb); + + CPPUNIT_ASSERT_EQUAL(0, (int)hsv.get_hue()); + CPPUNIT_ASSERT_EQUAL(0, (int)hsv.get_saturation()); + CPPUNIT_ASSERT_EQUAL(0, (int)hsv.get_value()); + } + + void testConversionGray() + { + RgbColor rgb(123, 123, 123); + HsvColor hsv(rgb); + + CPPUNIT_ASSERT_EQUAL(0, (int)hsv.get_hue()); + CPPUNIT_ASSERT_EQUAL(0, (int)hsv.get_saturation()); + CPPUNIT_ASSERT_EQUAL(123, (int)hsv.get_value()); + } + + void testConversionFromRgb() + { + RgbColor rgb(112, 172, 182); + HsvColor hsv(rgb); + + CPPUNIT_ASSERT_EQUAL(135, (int)hsv.get_hue()); + CPPUNIT_ASSERT_EQUAL(98, (int)hsv.get_saturation()); + CPPUNIT_ASSERT_EQUAL(182, (int)hsv.get_value()); + } + }; + + log4cpp::Category& HsvColorTest::log = + log4cpp::Category::getInstance("test.usdx.utils.color.hsv"); + + CPPUNIT_TEST_SUITE_REGISTRATION(HsvColorTest); + +}; diff --git a/test/utils/color/rgb.cpp b/test/utils/color/rgb.cpp new file mode 100644 index 00000000..68037973 --- /dev/null +++ b/test/utils/color/rgb.cpp @@ -0,0 +1,88 @@ +/* + * UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + */ + +#include "hsv.hpp" +#include "rgb.hpp" + +#include +#include +#include + +namespace usdx +{ + class RgbColorTest : public CppUnit::TestFixture { + CPPUNIT_TEST_SUITE(RgbColorTest); + CPPUNIT_TEST(testConversionFromHsv); + CPPUNIT_TEST(testConversionFromHsvBlack); + CPPUNIT_TEST(testConversionFromHsvGray); + CPPUNIT_TEST_SUITE_END(); + private: + static log4cpp::Category& log; + public: + void setUp() + { + } + + void tearDown() + { + } + + void testConversionFromHsv() + { + HsvColor hsv(135, 98, 182); + RgbColor rgb(hsv); + + // original values r: 112 g: 172 b: 182 + CPPUNIT_ASSERT_EQUAL(128, (int)rgb.get_red()); + CPPUNIT_ASSERT_EQUAL(111, (int)rgb.get_green()); + CPPUNIT_ASSERT_EQUAL(182, (int)rgb.get_blue()); + } + + void testConversionFromHsvBlack() + { + HsvColor hsv(0, 0, 0); + RgbColor rgb(hsv); + + CPPUNIT_ASSERT_EQUAL(0, (int)rgb.get_red()); + CPPUNIT_ASSERT_EQUAL(0, (int)rgb.get_green()); + CPPUNIT_ASSERT_EQUAL(0, (int)rgb.get_blue()); + } + + void testConversionFromHsvGray() + { + HsvColor hsv(0, 0, 123); + RgbColor rgb(hsv); + + CPPUNIT_ASSERT_EQUAL(123, (int)rgb.get_red()); + CPPUNIT_ASSERT_EQUAL(123, (int)rgb.get_green()); + CPPUNIT_ASSERT_EQUAL(123, (int)rgb.get_blue()); + } + }; + + log4cpp::Category& RgbColorTest::log = + log4cpp::Category::getInstance("test.usdx.utils.color.rgb"); + + CPPUNIT_TEST_SUITE_REGISTRATION(RgbColorTest); + +}; -- cgit v1.2.3