mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 09:19:01 +00:00
Changed: #878 Fix typos in comments/code
This commit is contained in:
parent
bc50a7ccd6
commit
d6f29299a1
1 changed files with 16 additions and 18 deletions
|
@ -407,6 +407,7 @@ void CRGBA::modulateColors(CRGBA *dest, const CRGBA *src1, const CRGBA *src2, ui
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
void CRGBA::subtractColors(CRGBA *dest, const CRGBA *src1, const CRGBA *src2, uint numColors, uint srcStride, uint destStride, uint dup)
|
void CRGBA::subtractColors(CRGBA *dest, const CRGBA *src1, const CRGBA *src2, uint numColors, uint srcStride, uint destStride, uint dup)
|
||||||
{
|
{
|
||||||
|
@ -583,6 +584,7 @@ void CBGRA::serial(class NLMISC::IStream &f)
|
||||||
f.serial (R);
|
f.serial (R);
|
||||||
f.serial (A);
|
f.serial (A);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
void CBGRA::set(uint8 r, uint8 g, uint8 b, uint8 a)
|
void CBGRA::set(uint8 r, uint8 g, uint8 b, uint8 a)
|
||||||
{
|
{
|
||||||
|
@ -591,18 +593,18 @@ void CBGRA::set(uint8 r, uint8 g, uint8 b, uint8 a)
|
||||||
B = b;
|
B = b;
|
||||||
A = a;
|
A = a;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
void CBGRA::blendFromui(CBGRA &c0, CBGRA &c1, uint coef) // coef must be in [0,256]
|
void CBGRA::blendFromui(CBGRA &c0, CBGRA &c1, uint coef) // coef must be in [0,256]
|
||||||
{
|
{
|
||||||
int a1 = coef;
|
sint a1 = coef;
|
||||||
int a2 = 256-a1;
|
sint a2 = 256-a1;
|
||||||
R = (c0.R*a2 + c1.R*a1) >>8;
|
R = (c0.R*a2 + c1.R*a1) >>8;
|
||||||
G = (c0.G*a2 + c1.G*a1) >>8;
|
G = (c0.G*a2 + c1.G*a1) >>8;
|
||||||
B = (c0.B*a2 + c1.B*a1) >>8;
|
B = (c0.B*a2 + c1.B*a1) >>8;
|
||||||
A = (c0.A*a2 + c1.A*a1) >>8;
|
A = (c0.A*a2 + c1.A*a1) >>8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
bool CRGBA::convertToHLS(float &h, float &l, float &s) const
|
bool CRGBA::convertToHLS(float &h, float &l, float &s) const
|
||||||
{
|
{
|
||||||
|
@ -623,14 +625,15 @@ bool CRGBA::convertToHLS(float &h, float &l, float &s) const
|
||||||
s = 0;
|
s = 0;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
float diff = maxV - minV;
|
float diff = maxV - minV;
|
||||||
|
|
||||||
/// compute saturation
|
/// compute saturation
|
||||||
s = l > 0.5f ? /*are we in the top of the double-hexcone ? */
|
s = l > 0.5f ? /*are we in the top of the double-hexcone ? */
|
||||||
diff / (2.f - maxV - minV) :
|
diff / (2.f - maxV - minV) :
|
||||||
diff / (maxV + minV);
|
diff / (maxV + minV);
|
||||||
|
|
||||||
// Get hue
|
// Get hue
|
||||||
|
|
||||||
if (maxV == r)
|
if (maxV == r)
|
||||||
{
|
{
|
||||||
h = (g - b) / diff;
|
h = (g - b) / diff;
|
||||||
|
@ -651,7 +654,6 @@ bool CRGBA::convertToHLS(float &h, float &l, float &s) const
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
/// Used by buildFromHLS
|
/// Used by buildFromHLS
|
||||||
static float HLSValue(float h, float v1, float v2)
|
static float HLSValue(float h, float v1, float v2)
|
||||||
|
@ -737,8 +739,4 @@ void CRGBAF::set(float r, float g, float b, float a)
|
||||||
A = a;
|
A = a;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
} // NLMISC
|
} // NLMISC
|
||||||
|
|
Loading…
Reference in a new issue