atria-soft/esvg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] correct the color integration

Browse Source
This commit is contained in:
Edouard DUPIN 2015-12-01 23:26:43 +01:00
parent 3ebd82c71d
commit 1b8fb2f3e4
2 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
esvg/Renderer.cpp
View File

@ -36,37 +36,26 @@ esvg::Renderer::~Renderer() {
m_buffer.clear(); m_buffer.clear();
m_size = ivec2(0,0); m_size = ivec2(0,0);
} }
#if 0
etk::Color<float,4> esvg::Renderer::mergeColor(etk::Color<float,4> _base, const etk::Color<float,4>& _integration) { etk::Color<float,4> esvg::Renderer::mergeColor(etk::Color<float,4> _base, etk::Color<float,4> _integration) {
if (_integration.a() == 0.0f) {
return _base;
}
if (_base.a() == 0.0f) {
return _integration;
}
etk::Color<float,4> tmpColor(_integration.r()*_integration.a(),
_integration.g()*_integration.a(),
_integration.b()*_integration.a(),
_integration.a());
// Blend over
float tmpA = std::min(1.0f, (_base.a() + _integration.a()));
_base *= (1.0f - _integration.a());
_base += tmpColor;
_base.setA(tmpA);
return _base;
}
#else
etk::Color<float,4> esvg::Renderer::mergeColor(etk::Color<float,4> _base, const etk::Color<float,4>& _integration) {
etk::Color<float,4> result; etk::Color<float,4> result;
float a1 = _base.a(); if (_base.a() < _integration.a()) {
float a2 = _integration.a(); result = _base;
result.setR(a1 * _base.r() + a2 * (1.0f - a1) * _integration.r()); _base = _integration;
result.setG(a1 * _base.g() + a2 * (1.0f - a1) * _integration.g()); _integration = result;
result.setB(a1 * _base.b() + a2 * (1.0f - a1) * _integration.b()); }
result.setA(a1 + a2 * (1.0f - a1)); result.setR(_base.a() * _base.r() + _integration.a() * (1.0f - _base.a()) * _integration.r());
result.setG(_base.a() * _base.g() + _integration.a() * (1.0f - _base.a()) * _integration.g());
result.setB(_base.a() * _base.b() + _integration.a() * (1.0f - _base.a()) * _integration.b());
result.setA(_base.a() + _integration.a() * (1.0f - _base.a()));
if (result.a() != 0.0f) {
result.setR(result.r()/result.a());
result.setG(result.g()/result.a());
result.setB(result.b()/result.a());
}
return result; return result;
} }
#endif
void esvg::Renderer::print(const esvg::render::Weight& _weightFill, void esvg::Renderer::print(const esvg::render::Weight& _weightFill,
const etk::Color<float,4>& _colorFill, const etk::Color<float,4>& _colorFill,
const esvg::render::Weight& _weightStroke, const esvg::render::Weight& _weightStroke,

2
esvg/Renderer.h
View File

@ -53,7 +53,7 @@ namespace esvg {
void writePPM(const std::string& _fileName); void writePPM(const std::string& _fileName);
void writeBMP(const std::string& _fileName); void writeBMP(const std::string& _fileName);
protected: protected:
etk::Color<float,4> mergeColor(etk::Color<float,4> _base, const etk::Color<float,4>& _integration); etk::Color<float,4> mergeColor(etk::Color<float,4> _base, etk::Color<float,4> _integration);
public: public:
void print(const esvg::render::Weight& _weightFill, void print(const esvg::render::Weight& _weightFill,
const etk::Color<float,4>& _colorFill, const etk::Color<float,4>& _colorFill,