Add colors.

2025-01-08 05:25:33 +00:00 · 2013-10-08 15:07:43 -04:00 · 2013-10-08 15:07:43 -04:00 · 2159a6688a
parent 85c3f9fc90
commit 2159a6688a
5 changed files with 288 additions and 1 deletions
--- a/Base/CMakeLists.txt
+++ b/Base/CMakeLists.txt
@ -53,11 +53,13 @@ SET( SOURCES
  "src/Image.cpp"
  "src/CompressionJob.cpp"
  "src/Pixel.cpp"
+  "src/Color.cpp"
 )

 SET( HEADERS
  "include/TexCompTypes.h"
  "include/Image.h"
+  "include/Color.h"
  "include/CompressionJob.h"
  "include/Pixel.h"
  "include/VectorBase.h"
--- a/Base/include/Color.h
+++ b/Base/include/Color.h
@ -0,0 +1,100 @@
+/* FasTC
+ * Copyright (c) 2013 University of North Carolina at Chapel Hill.
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for educational, research, and non-profit purposes, without
+ * fee, and without a written agreement is hereby granted, provided that the
+ * above copyright notice, this paragraph, and the following four paragraphs
+ * appear in all copies.
+ *
+ * Permission to incorporate this software into commercial products may be
+ * obtained by contacting the authors or the Office of Technology Development
+ * at the University of North Carolina at Chapel Hill <otd@unc.edu>.
+ *
+ * This software program and documentation are copyrighted by the University of
+ * North Carolina at Chapel Hill. The software program and documentation are
+ * supplied "as is," without any accompanying services from the University of
+ * North Carolina at Chapel Hill or the authors. The University of North
+ * Carolina at Chapel Hill and the authors do not warrant that the operation of
+ * the program will be uninterrupted or error-free. The end-user understands
+ * that the program was developed for research purposes and is advised not to
+ * rely exclusively on the program for any reason.
+ *
+ * IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
+ * AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL,
+ * OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF
+ * THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA
+ * AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY
+ * DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY 
+ * STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON
+ * AN "AS IS" BASIS, AND THE UNIVERSITY  OF NORTH CAROLINA AT CHAPEL HILL AND
+ * THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, 
+ * ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Please send all BUG REPORTS to <pavel@cs.unc.edu>.
+ *
+ * The authors may be contacted via:
+ *
+ * Pavel Krajcevski
+ * Dept of Computer Science
+ * 201 S Columbia St
+ * Frederick P. Brooks, Jr. Computer Science Bldg
+ * Chapel Hill, NC 27599-3175
+ * USA
+ * 
+ * <http://gamma.cs.unc.edu/FasTC/>
+ */
+
+#ifndef BASE_INCLUDE_COLOR_H_
+#define BASE_INCLUDE_COLOR_H_
+
+#include "TexCompTypes.h"
+#include "Vector4.h"
+
+namespace FasTC {
+
+class Color : public Vec4f {
+ public:
+  Color(float r, float g, float b, float a) : Vec4f(a, r, g, b) { }
+  Color() : Vec4f(0, 0, 0, 0) { }
+
+  // Let's allow us to use the operators...
+  template<typename T>
+  Color &operator=(const Vector4<T> &other) {
+    Vec4f::operator=(other);
+    return *this;
+  }
+
+  template<typename T>
+  Color(const Vector4<T> &other) : Vec4f(other) { }
+  
+  const float &A() const { return vec[0]; }
+  float &A() { return vec[0]; }
+  const float &R() const { return vec[1]; }
+  float &R() { return vec[1]; }
+  const float &G() const { return vec[2]; }
+  float &G() { return vec[2]; }
+  const float &B() const { return vec[3]; }
+  float &B() { return vec[3]; }
+  const float &Component(uint32 idx) const { return vec[idx]; }
+  float &Component(uint32 idx) { return vec[idx]; }
+
+  // Take all of the components, transform them to their 8-bit variants,
+  // and then pack each channel into an R8G8B8A8 32-bit integer. We assume
+  // that the architecture is little-endian, so the alpha channel will end
+  // up in the most-significant byte.
+  uint32 Pack() const;
+  void Unpack(uint32 rgba);
+
+  // Tests for equality by comparing the values and the bit depths.
+  bool operator==(const Color &) const;
+};
+
+}  // namespace FasTC
+
+#endif  // BASE_INCLUDE_COLOR_H_
--- a/Base/src/Color.cpp
+++ b/Base/src/Color.cpp
@ -0,0 +1,87 @@
+/* FasTC
+ * Copyright (c) 2013 University of North Carolina at Chapel Hill.
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for educational, research, and non-profit purposes, without
+ * fee, and without a written agreement is hereby granted, provided that the
+ * above copyright notice, this paragraph, and the following four paragraphs
+ * appear in all copies.
+ *
+ * Permission to incorporate this software into commercial products may be
+ * obtained by contacting the authors or the Office of Technology Development
+ * at the University of North Carolina at Chapel Hill <otd@unc.edu>.
+ *
+ * This software program and documentation are copyrighted by the University of
+ * North Carolina at Chapel Hill. The software program and documentation are
+ * supplied "as is," without any accompanying services from the University of
+ * North Carolina at Chapel Hill or the authors. The University of North
+ * Carolina at Chapel Hill and the authors do not warrant that the operation of
+ * the program will be uninterrupted or error-free. The end-user understands
+ * that the program was developed for research purposes and is advised not to
+ * rely exclusively on the program for any reason.
+ *
+ * IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
+ * AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL,
+ * OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF
+ * THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA
+ * AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY
+ * DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY 
+ * STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON
+ * AN "AS IS" BASIS, AND THE UNIVERSITY  OF NORTH CAROLINA AT CHAPEL HILL AND
+ * THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, 
+ * ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Please send all BUG REPORTS to <pavel@cs.unc.edu>.
+ *
+ * The authors may be contacted via:
+ *
+ * Pavel Krajcevski
+ * Dept of Computer Science
+ * 201 S Columbia St
+ * Frederick P. Brooks, Jr. Computer Science Bldg
+ * Chapel Hill, NC 27599-3175
+ * USA
+ * 
+ * <http://gamma.cs.unc.edu/FasTC/>
+ */
+
+#include "Color.h"
+
+namespace FasTC {
+
+  uint32 Color::Pack() const {
+    uint32 result = 0;
+    result = static_cast<uint32>((A() + 0.5f) * 255.0f);
+    result <<= 8;
+    result = static_cast<uint32>((B() + 0.5f) * 255.0f);
+    result <<= 8;
+    result = static_cast<uint32>((G() + 0.5f) * 255.0f);
+    result <<= 8;
+    result = static_cast<uint32>((R() + 0.5f) * 255.0f);
+    return result;
+  }
+
+  void Color::Unpack(uint32 rgba) {
+    R() = static_cast<float>(rgba & 0xFF) / 255.0f;
+    G() = static_cast<float>((rgba >> 8) & 0xFF) / 255.0f;
+    B() = static_cast<float>((rgba >> 16) & 0xFF) / 255.0f;
+    A() = static_cast<float>((rgba >> 24) & 0xFF) / 255.0f;
+  }
+
+  // Tests for equality by comparing the values and the bit depths.
+  bool Color::operator==(const Color &other) const {
+    static const float kEpsilon = 0.001;
+    for(uint32 c = 0; c < 4; c++) {
+      if(fabs(Component(c) - other.Component(c)) > kEpsilon) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+}  // namespace FasTC
--- a/Base/test/CMakeLists.txt
+++ b/Base/test/CMakeLists.txt
@ -53,7 +53,7 @@ INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/Base/include)
 INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/GTest/include)

 SET(TESTS
-  Pixel Image
+  Pixel Image Color
 )

 FOREACH(TEST ${TESTS})
--- a/Base/test/TestColor.cpp
+++ b/Base/test/TestColor.cpp
@ -0,0 +1,98 @@
+/* FasTC
+ * Copyright (c) 2013 University of North Carolina at Chapel Hill.
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for educational, research, and non-profit purposes, without
+ * fee, and without a written agreement is hereby granted, provided that the
+ * above copyright notice, this paragraph, and the following four paragraphs
+ * appear in all copies.
+ *
+ * Permission to incorporate this software into commercial products may be
+ * obtained by contacting the authors or the Office of Technology Development
+ * at the University of North Carolina at Chapel Hill <otd@unc.edu>.
+ *
+ * This software program and documentation are copyrighted by the University of
+ * North Carolina at Chapel Hill. The software program and documentation are
+ * supplied "as is," without any accompanying services from the University of
+ * North Carolina at Chapel Hill or the authors. The University of North
+ * Carolina at Chapel Hill and the authors do not warrant that the operation of
+ * the program will be uninterrupted or error-free. The end-user understands
+ * that the program was developed for research purposes and is advised not to
+ * rely exclusively on the program for any reason.
+ *
+ * IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
+ * AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL,
+ * OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF
+ * THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA
+ * AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY
+ * DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY 
+ * STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON
+ * AN "AS IS" BASIS, AND THE UNIVERSITY  OF NORTH CAROLINA AT CHAPEL HILL AND
+ * THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, 
+ * ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Please send all BUG REPORTS to <pavel@cs.unc.edu>.
+ *
+ * The authors may be contacted via:
+ *
+ * Pavel Krajcevski
+ * Dept of Computer Science
+ * 201 S Columbia St
+ * Frederick P. Brooks, Jr. Computer Science Bldg
+ * Chapel Hill, NC 27599-3175
+ * USA
+ * 
+ * <http://gamma.cs.unc.edu/FasTC/>
+ */
+
+#include "gtest/gtest.h"
+#include "Color.h"
+
+static const float kEpsilon = 1e-6;
+
+TEST(Color, DefaultConstructor) {
+  FasTC::Color c;
+  EXPECT_EQ(c.R(), 0.0f);
+  EXPECT_EQ(c.G(), 0.0f);
+  EXPECT_EQ(c.B(), 0.0f);
+  EXPECT_EQ(c.A(), 0.0f);
+}
+
+TEST(Color, AssignmentConstructor) {
+  FasTC::Color c(1.0f, 0.0f, 3.0f, -1.0f);
+  EXPECT_EQ(c.R(), 1.0f);
+  EXPECT_EQ(c.G(), 0.0f);
+  EXPECT_EQ(c.B(), 3.0f);
+  EXPECT_EQ(c.A(), -1.0f);
+}
+
+TEST(Color, VectorOperators) {
+  FasTC::Color a(0.1, 0.2, 0.3, 0.4);
+  FasTC::Color b(0.2, 0.3, 0.4, 0.5);
+  FasTC::Color c = a + b;
+
+  EXPECT_NEAR(c.R(), 0.3, kEpsilon);
+  EXPECT_NEAR(c.G(), 0.5, kEpsilon);
+  EXPECT_NEAR(c.B(), 0.7, kEpsilon);
+  EXPECT_NEAR(c.A(), 0.9, kEpsilon);
+
+  FasTC::Color d = a - b;
+
+  EXPECT_NEAR(d.R(), -0.1, kEpsilon);
+  EXPECT_NEAR(d.G(), -0.1, kEpsilon);
+  EXPECT_NEAR(d.B(), -0.1, kEpsilon);
+  EXPECT_NEAR(d.A(), -0.1, kEpsilon);
+}
+
+TEST(Color, EqualityComparison) {
+  FasTC::Color a(0.1, 0.2, 0.3, 0.4);
+  FasTC::Color b(0.2, 0.3, 0.4, 0.5);
+
+  EXPECT_TRUE(a == a && b == b);
+  EXPECT_FALSE(a == b && b == a);
+}