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

[DEBUG] correct display bug of ordering segment before weight and reject double point position in a single line

Browse Source
This commit is contained in:
Edouard DUPIN 2015-11-27 23:05:30 +01:00
parent 9e5b150ec3
commit 3105a734ed
4 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
esvg/render/Segment.cpp
View File

@ -17,11 +17,11 @@ esvg::render::Segment::Segment(const vec2& _p0, const vec2& _p1) {
if (_p0.y() < _p1.y()) { if (_p0.y() < _p1.y()) {
p0 = _p0; p0 = _p0;
p1 = _p1; p1 = _p1;
direction = 1.0f; // direction like clock direction = 1; // direction like clock
} else { } else {
p0 = _p1; p0 = _p1;
p1 = _p0; p1 = _p0;
direction = -1.0f; // direction like anti-clock direction = -1; // direction like anti-clock
} }
} }

2
esvg/render/Segment.h
View File

@ -19,7 +19,7 @@ namespace esvg {
Segment(const vec2& _p0, const vec2& _p1); Segment(const vec2& _p0, const vec2& _p1);
vec2 p0; vec2 p0;
vec2 p1; vec2 p1;
float direction; int32_t direction;
}; };
} }
} }

8
esvg/render/SegmentList.cpp
View File

@ -41,8 +41,8 @@ void esvg::render::SegmentList::createSegmentList(const esvg::render::PointList&
addSegment(it[jjj], it[iii]); addSegment(it[jjj], it[iii]);
} }
} }
// TODO : Check if it is really usefull ... // TODO : Check if it is really usefull ... ==> really bad, create parsing bug in weighter ...
std::sort(m_data.begin(), m_data.end(), sortSegmentFunction); //std::sort(m_data.begin(), m_data.end(), sortSegmentFunction);
} }
static vec2 getIntersect(const vec2& _point1, static vec2 getIntersect(const vec2& _point1,
@ -211,8 +211,8 @@ void esvg::render::SegmentList::createSegmentListStroke(esvg::render::PointList&
} }
} }
} }
// TODO : Check if it is really usefull ... // TODO : Check if it is really usefull ... ==> really bad, create parsing bug in weighter ...
std::sort(m_data.begin(), m_data.end(), sortSegmentFunction); //std::sort(m_data.begin(), m_data.end(), sortSegmentFunction);
} }

43
esvg/render/Weight.cpp
View File

@ -97,17 +97,23 @@ void esvg::render::Weight::generate(ivec2 _size, int32_t _subSamplingCount, cons
resize(_size); resize(_size);
// for each lines: // for each lines:
for (int32_t yyy=0; yyy<_size.y(); ++yyy) { for (int32_t yyy=0; yyy<_size.y(); ++yyy) {
SVG_VERBOSE("Weighting ... " << yyy << " / " << _size.y());
// Reduce the number of lines in the subsampling parsing: // Reduce the number of lines in the subsampling parsing:
std::vector<Segment> availlableSegmentPixel; std::vector<Segment> availlableSegmentPixel;
for (auto &it : _listSegment.m_data) { for (auto &it : _listSegment.m_data) {
if ( it.p0.y() <= float(yyy+1) if ( it.p0.y() < float(yyy+1)
&& it.p1.y() >= float(yyy)) { && it.p1.y() > float(yyy)) {
availlableSegmentPixel.push_back(it); availlableSegmentPixel.push_back(it);
} }
} }
if (availlableSegmentPixel.size() == 0) {
continue;
}
SVG_VERBOSE(" Find Basic segments " << availlableSegmentPixel.size());
// This represent the pondaration on the subSampling // This represent the pondaration on the subSampling
float deltaSize = 1.0f/_subSamplingCount; float deltaSize = 1.0f/_subSamplingCount;
for (int32_t kkk=0; kkk<_subSamplingCount ; ++kkk) { for (int32_t kkk=0; kkk<_subSamplingCount ; ++kkk) {
SVG_VERBOSE(" Scanline ... " << kkk << " / " << _subSamplingCount);
Scanline scanline(_size.x()); Scanline scanline(_size.x());
//find all the segment that cross the middle of the line of the center of the pixel line: //find all the segment that cross the middle of the line of the center of the pixel line:
float subSamplingCenterPos = yyy + deltaSize*0.5f + deltaSize*kkk; float subSamplingCenterPos = yyy + deltaSize*0.5f + deltaSize*kkk;
@ -116,23 +122,38 @@ void esvg::render::Weight::generate(ivec2 _size, int32_t _subSamplingCount, cons
for (auto &it : availlableSegmentPixel) { for (auto &it : availlableSegmentPixel) {
if ( it.p0.y() <= subSamplingCenterPos if ( it.p0.y() <= subSamplingCenterPos
&& it.p1.y() >= subSamplingCenterPos) { && it.p1.y() >= subSamplingCenterPos) {
availlableSegment.push_back(it); // check if we not get 2 identical lines:
if ( availlableSegment.size() > 0
&& availlableSegment.back().p1 == it.p0
&& availlableSegment.back().direction == it.direction) {
// we not add this point in this case to prevent double count of the same point.
} else {
availlableSegment.push_back(it);
}
} }
} }
SVG_VERBOSE(" Availlable Segment " << availlableSegment.size());
if (availlableSegment.size() == 0) {
continue;
}
for (auto &it : availlableSegment) {
SVG_VERBOSE(" Availlable Segment " << it.p0 << " -> " << it.p1 << " dir=" << it.direction);
}
// x position, angle // x position, angle
std::vector<std::pair<float, float>> listPosition; std::vector<std::pair<float, int32_t>> listPosition;
for (auto &it : availlableSegment) { for (auto &it : availlableSegment) {
vec2 delta = it.p0 - it.p1; vec2 delta = it.p0 - it.p1;
// x = coefficent*y+bbb; // x = coefficent*y+bbb;
float coefficient = delta.x()/delta.y(); float coefficient = delta.x()/delta.y();
float bbb = it.p0.x() - coefficient*it.p0.y(); float bbb = it.p0.x() - coefficient*it.p0.y();
float xpos = coefficient * subSamplingCenterPos + bbb; float xpos = coefficient * subSamplingCenterPos + bbb;
listPosition.push_back(std::pair<float,float>(xpos, it.direction)); listPosition.push_back(std::pair<float,int32_t>(xpos, it.direction));
} }
SVG_VERBOSE(" List position " << listPosition.size());
// now we order position of the xPosition: // now we order position of the xPosition:
std::sort(listPosition.begin(), listPosition.end(), sortXPosFunction); std::sort(listPosition.begin(), listPosition.end(), sortXPosFunction);
// move through all element in the point: // move through all element in the point:
float lastState = 0.0f; int32_t lastState = 0;
float currentValue = 0.0f; float currentValue = 0.0f;
int32_t lastPos = -1; int32_t lastPos = -1;
int32_t currentPos = -1; int32_t currentPos = -1;
@ -144,20 +165,20 @@ void esvg::render::Weight::generate(ivec2 _size, int32_t _subSamplingCount, cons
for (auto &it : listPosition) { for (auto &it : listPosition) {
if (currentPos != int32_t(it.first)) { if (currentPos != int32_t(it.first)) {
// fill to the new pos -1: // fill to the new pos -1:
float endValue = std::min(1.0f,std::abs(lastState)) * deltaSize; float endValue = float(std::min(1,std::abs(lastState))) * deltaSize;
for (int32_t iii=currentPos+1; iii<int32_t(it.first); ++iii) { for (int32_t iii=currentPos+1; iii<int32_t(it.first); ++iii) {
scanline.set(iii, endValue); scanline.set(iii, endValue);
} }
currentPos = int32_t(it.first); currentPos = int32_t(it.first);
currentValue = endValue; currentValue = endValue;
} }
float oldState = lastState; int32_t oldState = lastState;
lastState += it.second; lastState += it.second;
if (oldState == 0.0f) { if (oldState == 0) {
// nothing to draw before ... // nothing to draw before ...
float ratio = 1.0f - (it.first - float(int32_t(it.first))); float ratio = 1.0f - (it.first - float(int32_t(it.first)));
currentValue += ratio * deltaSize; currentValue += ratio * deltaSize;
} else if (lastState == 0.0f) { } else if (lastState == 0) {
// something new to draw ... // something new to draw ...
float ratio = 1.0f - (it.first - float(int32_t(it.first))); float ratio = 1.0f - (it.first - float(int32_t(it.first)));
currentValue -= ratio * deltaSize; currentValue -= ratio * deltaSize;
@ -170,7 +191,7 @@ void esvg::render::Weight::generate(ivec2 _size, int32_t _subSamplingCount, cons
} }
} }
// if the counter is not at 0 ==> fill if to the end with full value ... 2.0 // if the counter is not at 0 ==> fill if to the end with full value ... 2.0
if (lastState != 0.0f) { if (lastState != 0) {
// just past the last state to the end of the image ... // just past the last state to the end of the image ...
SVG_ERROR("end of Path whith no end ... " << currentPos << " -> " << _size.x()); SVG_ERROR("end of Path whith no end ... " << currentPos << " -> " << _size.x());
for (int32_t xxx=currentPos; xxx<_size.x(); ++xxx) { for (int32_t xxx=currentPos; xxx<_size.x(); ++xxx) {