FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed line endings

Browse Source
This commit is contained in:
Robert Osfield
2016-05-25 10:09:18 +01:00
parent 559f138152
commit 92ffa85917
1 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
src/osgText/GlyphGeometry.cpp
View File

@@ -115,18 +115,18 @@ public:
_segments.push_back( Segment((*elements)[i], (*elements)[i+1], thickness) );
}
}
bool shorter(float original_thickness, float new_thickness) const { return (original_thickness<0.0f) ? (new_thickness>original_thickness) : (new_thickness<original_thickness); }
bool shorten(float& original_thickness, float new_thickness) { if (shorter(original_thickness, new_thickness)) { original_thickness = new_thickness; return true; } else return false; }
bool shortenBisector(unsigned int i, float new_thickness)
{
{
bool r1 = shorten(_segments[(i+_segments.size()-1)%(_segments.size())].suggestedThickness, new_thickness);
bool r2 = shorten(_segments[i].suggestedThickness, new_thickness);
return r1 || r2;
}
void applySuggestedThickness()
{
for(Segments::iterator itr = _segments.begin();
@@ -136,7 +136,7 @@ public:
(*itr).thickness = (*itr).suggestedThickness;
}
}
void applyThickness(float thickness)
{
for(Segments::iterator itr = _segments.begin();
@@ -147,7 +147,7 @@ public:
(*itr).suggestedThickness = thickness;
}
}
void getSuggestedThicknessRange(float& smallest, float& largest)
{
for(Segments::iterator itr = _segments.begin();
@@ -158,7 +158,7 @@ public:
if (t<smallest) smallest = t;
if (t>largest) largest = t;
}
if (largest<0.0f) std::swap(smallest, largest);
}
@@ -328,10 +328,10 @@ public:
osg::Vec3 new_vertex = intersection_abcd + bisector_abcd*new_thickness;
//OSG_NOTICE<<"computeBisectorPoint("<<i<<", targetThickness="<<targetThickness<<", bisector_abcd = "<<bisector_abcd<<", ab_sidevector="<<ab_sidevector<<", b-a="<<b-a<<", scale_factor="<<scale_factor<<std::endl;
va = intersection_abcd;
vb = new_vertex;
return new_thickness;
}
@@ -346,7 +346,7 @@ public:
float computeThicknessThatBisectorAndSegmentMeet(const osg::Vec3& va, const osg::Vec3& vb, unsigned int bi, float original_thickness)
{
osg::Vec3 bisector = (vb-va);
bisector /= original_thickness;
Segment& seg_opposite = _segments[ (bi+_segments.size()) % _segments.size() ];
@@ -364,33 +364,33 @@ public:
}
float h = ((va-vc)*cdn) / denom;
if (h<0.0)
if (h<0.0)
{
return FLT_MAX;
}
return h;
}
int clampSegmentToEdge(osg::Vec3& va, osg::Vec3& vb, const osg::Vec3& vc, const osg::Vec3& vd)
{
osg::Vec2 ncd(vc.y()-vd.y(), vd.x()-vc.x());
float na = (va.x()-vc.x())*ncd.x() + (va.y()-vc.y())*ncd.y();
float nb = (vb.x()-vc.x())*ncd.x() + (vb.y()-vc.y())*ncd.y();
if (na>=0.0f) // check if na is inside
{
// check if wholly inside
if (nb>=0.0f) return 1;
// na is inside, nb outside, need to shift nb to (vc, vd) line.
float d = na-nb;
if (d==0.0f)
if (d==0.0f)
{
return 1;
}
float r = na/d;
vb = va+(vb-va)*r;
}
@@ -398,27 +398,27 @@ public:
{
// check if wholly outside
if (nb<=0.0f) return -1;
// na is outside, nb inside, need to shift na to (vc, vd) line.
float d = nb-na;
if (d==0.0f)
if (d==0.0f)
{
return -1;
}
float r = -na/d;
va = va+(vb-va)*r;
}
return 0;
}
bool doesSegmentIntersectQuad(osg::Vec3 va, osg::Vec3 vb, const osg::Vec3& v1, const osg::Vec3& v2, const osg::Vec3& v3, const osg::Vec3& v4)
{
osg::Vec2 ncd(v1.y()-v2.y(), v2.x()-v1.x());
// catch case of bisector boundary point being behind the segment of interest
float na = (va.x()-v1.x())*ncd.x() + (va.y()-v1.y())*ncd.y();
if (na>=0.0) return false;
@@ -431,22 +431,22 @@ public:
osg::Vec3 cp234 = (v3-v2)^(v4-v3);
float dot_1234 = cp123*cp234;
bool not_crossed_over = (dot_1234>=0.0);
if (clampSegmentToEdge(va, vb, v1, v4)<0) return false;
if (clampSegmentToEdge(va, vb, v3, v2)<0) return false;
if (clampSegmentToEdge(va, vb, v2, v1)<0) return false;
if (not_crossed_over && clampSegmentToEdge(va, vb, v4, v3)<0) return false;
return true;
}
float checkBisectorAgainstBoundary(osg::Vec3 va, osg::Vec3 vb, float original_thickness)
{
float thickness = original_thickness;
osg::Vec3 before_outer, before_inner;
osg::Vec3 after_outer, after_inner;
for(unsigned int i=0; i<_segments.size(); ++i)
{
Segment& seg_before = _segments[ (i+_segments.size()-1) % _segments.size() ];
@@ -455,17 +455,17 @@ public:
computeBisectorPoint(i, before_outer, before_inner);
computeBisectorPoint(i+1, after_outer, after_inner);
if (doesSegmentIntersectQuad(va, vb, before_outer, after_outer, after_inner, before_inner))
{
float new_thickness = computeThicknessThatBisectorAndSegmentMeet(va, vb, i, original_thickness);
shorten(thickness, new_thickness);
shorten(seg_before.suggestedThickness, new_thickness);
shorten(seg_target.suggestedThickness, new_thickness);
shorten(seg_after.suggestedThickness, new_thickness);
}
}
return thickness;
}
@@ -574,7 +574,7 @@ public:
}
geometry->addPrimitiveSet(bevel);
}
protected:
virtual ~Boundary() {}
@@ -613,42 +613,42 @@ OSGTEXT_EXPORT osg::Geometry* computeGlyphGeometry(const osgText::Glyph3D* glyph
#if REPORT_TIME
osg::ElapsedTime timer;
#endif
float bevelThickness = bevel.getBevelThickness();
bool roundedWebs = bevel.getSmoothConcaveJunctions();
const osg::Vec3Array* source_vertices = glyph->getRawVertexArray();
const osg::Geometry::PrimitiveSetList& source_primitives = glyph->getRawFacePrimitiveSetList();
if (!source_vertices) return NULL;
if (source_primitives.empty()) return NULL;
#if 0
{
osg::ref_ptr<osg::Geometry> geom = new osg::Geometry;
geom->setVertexArray(const_cast<osg::Vec3Array*>(source_vertices));
geom->setPrimitiveSetList(source_primitives);
osgDB::writeNodeFile(*geom, "test.osgt");
}
#endif
#endif
osg::ref_ptr<osg::Vec3Array> orig_vertices = new osg::Vec3Array;
osg::Geometry::PrimitiveSetList orig_primitives;
orig_vertices->reserve(source_vertices->size());
orig_primitives.reserve(source_primitives.size());
typedef std::vector<int> Indices;
Indices remappedIndices(source_vertices->size(), -1);
float convexCornerInsertionWidth = 0.02;
float convexCornerCutoffAngle = osg::inDegrees(45.0f);
int num_vertices_on_web = 10;
for(osg::Geometry::PrimitiveSetList::const_iterator itr = source_primitives.begin();
itr != source_primitives.end();
@@ -666,11 +666,11 @@ OSGTEXT_EXPORT osg::Geometry* computeGlyphGeometry(const osgText::Glyph3D* glyph
int vi_before = (i==0) ? (*elements)[(elements->size()-2)] : (*elements)[i-1];
int vi_curr = (*elements)[i];
int vi_after = (*elements)[i+1];
osg::Vec3 va = (*source_vertices)[vi_before];
osg::Vec3 vb = (*source_vertices)[vi_curr];
osg::Vec3 vc = (*source_vertices)[vi_after];
// OSG_NOTICE<<" "<<vi_before<<", "<<vi_curr<<", "<<vi_after<<std::endl;
if (vi_curr>=static_cast<int>(remappedIndices.size())) remappedIndices.resize(vi_curr+1,-1);
@@ -682,14 +682,14 @@ OSGTEXT_EXPORT osg::Geometry* computeGlyphGeometry(const osgText::Glyph3D* glyph
orig_vertices->push_back(vb);
}
new_elements->push_back(new_index);
if (roundedWebs)
{
osg::Vec3 vab = vb-va;
osg::Vec3 vbc = vc-vb;
float len_vab = vab.normalize();
float len_vbc = vbc.normalize();
if (len_vab*len_vbc==0.0f)
{
OSG_NOTICE<<"Warning: len_vab="<<len_vab<<", len_vbc="<<len_vbc<<std::endl;
@@ -698,48 +698,48 @@ OSGTEXT_EXPORT osg::Geometry* computeGlyphGeometry(const osgText::Glyph3D* glyph
osg::Vec3 cross = vab ^ vbc;
if (cross.z()>0.0)
{
{
float dot = vab * vbc;
float theta = atan2(cross.z(), dot);
// OSG_NOTICE<<" convex segment vab=("<<vab<<") vbc=("<<vbc<<") theta"<<osg::RadiansToDegrees(theta)<<std::endl;
if (theta>convexCornerCutoffAngle)
{
vab.normalize();
vbc.normalize();
float min_len = osg::minimum(len_vab, len_vbc);
osg::Vec3 v_before = vb - vab*(min_len*convexCornerInsertionWidth);
osg::Vec3 v_after = vb + vbc*(min_len*convexCornerInsertionWidth);
osg::Vec3 v_mid = v_before + (v_after-v_before)*0.5f;
float h = (vb-v_mid).length();
float w = (v_after-v_before).length()*0.5f;
float l = w*w / h;
float r = sqrt(l*l + w*w);
float alpha = atan2(w,h);
float beta = osg::PI-alpha*2.0f;
// OSG_NOTICE<<" h = "<<h<<", w = "<<w<<", l = "<<l<<", r="<<r<<", alpha="<<osg::RadiansToDegrees(alpha)<<", beta="<<osg::RadiansToDegrees(beta)<<std::endl;
osg::Vec3 vertical = (vb-v_mid)*(1.0f/h);
osg::Vec3 horizontal = (v_after-v_before)*(r/(w*2.0f));
vertical.normalize();
osg::Vec3 v_center = v_mid-vertical*l;
vertical *= r;
(*orig_vertices)[new_index] = v_before;
for(int i=1; i<=num_vertices_on_web-1; ++i)
{
{
float gamma = ((static_cast<float>(i)/static_cast<float>(num_vertices_on_web))-0.5f) * beta;
// OSG_NOTICE<<" gamma = "<<osg::RadiansToDegrees(gamma)<<" sin(gamma)="<<sin(gamma)<<", cos(gamma)="<<cos(gamma)<<std::endl;
osg::Vec3 v = v_center + horizontal*sin(gamma) + vertical*cos(gamma);
new_elements->push_back(orig_vertices->size());
@@ -748,26 +748,26 @@ OSGTEXT_EXPORT osg::Geometry* computeGlyphGeometry(const osgText::Glyph3D* glyph
new_elements->push_back(orig_vertices->size());
orig_vertices->push_back(v_after);
}
}
}
}
}
// add the first element to creat the loop.
new_elements->push_back(new_elements->front());
}
}
if (!orig_vertices) return 0;
if (orig_primitives.empty()) return 0;
osg::ref_ptr<osg::Geometry> new_geometry = new osg::Geometry;
#define HANDLE_SHELL 0
typedef std::vector< osg::ref_ptr<Boundary> > Boundaries;
Boundaries innerBoundaries;
@@ -804,25 +804,25 @@ OSGTEXT_EXPORT osg::Geometry* computeGlyphGeometry(const osgText::Glyph3D* glyph
{
innerBoundaries[i]->getSuggestedThicknessRange(smallest, largest);
}
OSG_INFO<<"Smallest = "<<smallest<<std::endl;
OSG_INFO<<"Largest = "<<largest<<std::endl;
float targetThickness = largest*0.75f;
#if 1
for(unsigned int i=0; i<innerBoundaries.size(); ++i)
{
innerBoundaries[i]->applyThickness(targetThickness);
}
for(Boundaries::iterator itr = innerBoundaries.begin();
itr != innerBoundaries.end();
++itr)
{
(*itr)->removeAllSegmentsBelowThickness(targetThickness*0.75f);
}
#if 1
for(unsigned int i=0; i<innerBoundaries.size(); ++i)
{
@@ -858,8 +858,8 @@ OSGTEXT_EXPORT osg::Geometry* computeGlyphGeometry(const osgText::Glyph3D* glyph
(*itr)->applySuggestedThickness();
(*itr)->addBoundaryToGeometry(new_geometry.get(), -shellThickness, "", "shell");
}
osg::Vec3Array* vertices = dynamic_cast<osg::Vec3Array*>(new_geometry->getVertexArray());
@@ -911,11 +911,11 @@ OSGTEXT_EXPORT osg::Geometry* computeGlyphGeometry(const osgText::Glyph3D* glyph
if (prim->getName()!="face") new_geometry->addPrimitiveSet(prim);
}
}
#if REPORT_TIME
OSG_NOTICE<<"Time to compute 3d glyp geometry: "<<timer.elapsedTime_m()<<"ms"<<std::endl;
#endif
return new_geometry.release();
}
@@ -1049,7 +1049,7 @@ OSGTEXT_EXPORT osg::Geometry* computeTextGeometry(osg::Geometry* glyphGeometry,
OSG_NOTICE<<"Warning: computeTextGeometry(..) error, glyphGeometry="<<glyphGeometry<<std::endl;
return 0;
}
osg::Vec3Array* orig_vertices = dynamic_cast<osg::Vec3Array*>(glyphGeometry->getVertexArray());
if (!orig_vertices)
{