use vector for color operation internal storage.
authorCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2012 11:17:06 +0000 (11:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2012 11:17:06 +0000 (11:17 +0000)
source/blender/compositor/operations/COM_SetColorOperation.cpp
source/blender/compositor/operations/COM_SetColorOperation.h

index 7aa2a8a27cdb1f13eab01e50cc4d98e9f8de52d0..44c29b3befda6b3e748a27c414f48cf6f2079ba8 100644 (file)
@@ -29,10 +29,7 @@ SetColorOperation::SetColorOperation() : NodeOperation()
 
 void SetColorOperation::executePixel(float output[4], float x, float y, PixelSampler sampler)
 {
-       output[0] = this->m_channel1;
-       output[1] = this->m_channel2;
-       output[2] = this->m_channel3;
-       output[3] = this->m_channel4;
+       copy_v4_v4(output, this->m_color);
 }
 
 void SetColorOperation::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])
index a6ff390c3c991ae013c88b46ac96df378e135fa0..7895c34620b0ad4ea017173ca4276b801f833542 100644 (file)
  */
 class SetColorOperation : public NodeOperation {
 private:
-       float m_channel1;
-       float m_channel2;
-       float m_channel3;
-       float m_channel4;
+       float m_color[4];
 
 public:
        /**
@@ -42,20 +39,17 @@ public:
         */
        SetColorOperation();
 
-       const float getChannel1() { return this->m_channel1; }
-       void setChannel1(float value) { this->m_channel1 = value; }
-       const float getChannel2() { return this->m_channel2; }
-       void setChannel2(float value) { this->m_channel2 = value; }
-       const float getChannel3() { return this->m_channel3; }
-       void setChannel3(float value) { this->m_channel3 = value; }
-       const float getChannel4() { return this->m_channel4; }
-       void setChannel4(const float value) { this->m_channel4 = value; }
+       const float getChannel1() { return this->m_color[0]; }
+       void setChannel1(float value) { this->m_color[0] = value; }
+       const float getChannel2() { return this->m_color[1]; }
+       void setChannel2(float value) { this->m_color[1] = value; }
+       const float getChannel3() { return this->m_color[2]; }
+       void setChannel3(float value) { this->m_color[2] = value; }
+       const float getChannel4() { return this->m_color[3]; }
+       void setChannel4(const float value) { this->m_color[3] = value; }
        void setChannels(const float value[4])
        {
-               this->m_channel1 = value[0];
-               this->m_channel2 = value[1];
-               this->m_channel3 = value[2];
-               this->m_channel4 = value[3];
+               copy_v4_v4(this->m_color, value);
        }
 
        /**