From 2f8f3b0a58ff9df88ec1c3d59631df79e57d9e26 Mon Sep 17 00:00:00 2001 From: Hleb Valoshka <375gnu@gmail.com> Date: Sat, 13 May 2023 12:32:20 +0300 Subject: [PATCH] Remove DeepSkyObject::hsv2rgb() --- src/celengine/deepskyobj.cpp | 58 +----------------------------------- src/celengine/deepskyobj.h | 2 -- 2 files changed, 1 insertion(+), 59 deletions(-) diff --git a/src/celengine/deepskyobj.cpp b/src/celengine/deepskyobj.cpp index 9a9c81ef1e..6decc9e09a 100644 --- a/src/celengine/deepskyobj.cpp +++ b/src/celengine/deepskyobj.cpp @@ -79,66 +79,10 @@ bool DeepSkyObject::pick(const Eigen::ParametrizedLine& ray, cosAngleToBoundCenter); else return false; -} - - -void DeepSkyObject::hsv2rgb( float *r, float *g, float *b, float h, float s, float v ) -{ - // r,g,b values are from 0 to 1 - // h = [0,360], s = [0,1], v = [0,1] - - int i; - float f, p, q, t; - - if( s == 0 ) - { - // achromatic (grey) - *r = *g = *b = v; - return; - } - - h /= 60; // sector 0 to 5 - i = static_cast(std::floor( h )); - f = h - static_cast(i); // factorial part of h - p = v * ( 1 - s ); - q = v * ( 1 - s * f ); - t = v * ( 1 - s * ( 1 - f ) ); - switch( i ) - { - case 0: - *r = v; - *g = t; - *b = p; - break; - case 1: - *r = q; - *g = v; - *b = p; - break; - case 2: - *r = p; - *g = v; - *b = t; - break; - case 3: - *r = p; - *g = q; - *b = v; - break; - case 4: - *r = t; - *g = p; - *b = v; - break; - default: - *r = v; - *g = p; - *b = q; - break; - } } + bool DeepSkyObject::load(const AssociativeArray* params, const fs::path& resPath) { // Get position diff --git a/src/celengine/deepskyobj.h b/src/celengine/deepskyobj.h index a93beba321..21b6abfe57 100644 --- a/src/celengine/deepskyobj.h +++ b/src/celengine/deepskyobj.h @@ -40,8 +40,6 @@ class DeepSkyObject Eigen::Vector3d getPosition() const; void setPosition(const Eigen::Vector3d&); - static void hsv2rgb( float*, float*, float*, float, float, float); - virtual const char* getType() const = 0; virtual void setType(const std::string&) = 0; virtual std::string getDescription() const;