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

Fixed shadows warnings

Browse Source
This commit is contained in:
Robert Osfield
2016-05-25 11:30:49 +01:00
parent 9cb714cd39
commit 1cc0f31e30
3 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgSim/ElevationSlice.cpp
View File

@@ -452,10 +452,6 @@ struct LineConstructor
void pruneOverlappingSegments()
{
SegmentSet::iterator prevItr = _segments.begin();
SegmentSet::iterator nextItr = prevItr;
++nextItr;
double epsilon = 0.001;
for(SegmentSet::iterator itr = _segments.begin();

13
src/osgSim/OverlayNode.cpp
View File

@@ -241,8 +241,7 @@ public:
Faces removedFaces;
Faces::iterator itr;
for(itr = _faces.begin();
for(Faces::iterator itr = _faces.begin();
itr != _faces.end();
)
{
@@ -265,8 +264,8 @@ public:
Edges edges;
double numVerticesAdded=0.0;
osg::Vec3d center;
for(itr = removedFaces.begin();
osg::Vec3d faces_center;
for(Faces::iterator itr = removedFaces.begin();
itr != removedFaces.end();
++itr)
{
@@ -279,13 +278,13 @@ public:
if (a<b) ++edges[Edge(a,b)];
else ++edges[Edge(b,a)];
center += a;
faces_center += a;
numVerticesAdded += 1.0;
}
}
if (numVerticesAdded==0.0) return;
center /= numVerticesAdded;
faces_center /= numVerticesAdded;
typedef std::set<osg::Vec3> VertexSet;
VertexSet uniqueVertices;
@@ -304,7 +303,7 @@ public:
face.vertices.push_back(vertex);
face.vertices.push_back(edge.first);
face.vertices.push_back(edge.second);
if (face.plane.distance(center)<0.0) face.plane.flip();
if (face.plane.distance(faces_center)<0.0) face.plane.flip();
_faces.push_back(face);
uniqueVertices.insert(edge.first);

25
src/osgSim/SphereSegment.cpp
View File

@@ -1785,13 +1785,13 @@ namespace SphereSegmentIntersector
Edge* addEdge(unsigned int p1, unsigned int p2, Triangle* tri)
{
osg::ref_ptr<Edge> edge = new Edge(p1, p2);
EdgeSet::iterator itr = _edges.find(edge);
osg::ref_ptr<Edge> new_edge = new Edge(p1, p2);
EdgeSet::iterator itr = _edges.find(new_edge);
if (itr==_edges.end())
{
edge->addTriangle(tri);
_edges.insert(edge);
return edge.get();
new_edge->addTriangle(tri);
_edges.insert(new_edge);
return new_edge.get();
}
else
{
@@ -2045,14 +2045,10 @@ namespace SphereSegmentIntersector
osg::Vec3 start = (*sourceLine)[first-1]-_centre;
osg::Vec3 end = (*sourceLine)[first]-_centre;
float end1 = intersector1.distance(end);
float end2 = intersector2.distance(end);
// work out which intersector to use by discounting the one that
// isn't a plausible candidate.
bool possible1 = end1>=0.0;
bool possible2 = end2>=0.0;
bool possible1 = intersector1.distance(end)>=0.0;
bool possible2 = intersector2.distance(end)>=0.0;
if (possible1 && possible2)
{
@@ -2114,11 +2110,8 @@ namespace SphereSegmentIntersector
bool possible2 = start2>=0.0;
if (possible1 && possible2)
{
double end1 = intersector1.distance(end);
double end2 = intersector2.distance(end);
possible1 = end1<0.0;
possible2 = end2<0.0;
possible1 = intersector1.distance(end)<0.0;
possible2 = intersector2.distance(end)<0.0;
if (possible1 && possible2)
{