diff --git a/VisualStudio/VisualStudio.dsw b/VisualStudio/VisualStudio.dsw index 28fe032f4..a1a9e256b 100644 --- a/VisualStudio/VisualStudio.dsw +++ b/VisualStudio/VisualStudio.dsw @@ -348,6 +348,9 @@ Package=<4> Project_Dep_Name Core osgProducer End Project Dependency Begin Project Dependency + Project_Dep_Name Core osgSim + End Project Dependency + Begin Project Dependency Project_Dep_Name Core osgUtil End Project Dependency }}} diff --git a/src/osgSim/SphereSegment.cpp b/src/osgSim/SphereSegment.cpp index 6f0252b80..db1b22b77 100644 --- a/src/osgSim/SphereSegment.cpp +++ b/src/osgSim/SphereSegment.cpp @@ -1158,7 +1158,7 @@ struct TriangleIntersectOperator _numInside(0), _numIntersecting(0) {} - class Triangle; + struct Triangle; struct Edge : public osg::Referenced { @@ -1524,7 +1524,7 @@ struct TriangleIntersectOperator double rad2 = vertex.length2(); double length_xy = sqrtf(vertex.x()*vertex.x() + vertex.y()*vertex.y()); - double elevation = atan2(vertex.z(),length_xy); + double elevation = atan2((double)vertex.z(),length_xy); double azim = atan2(vertex.x(),vertex.y()); if (azim<0.0) azim += 2.0*osg::PI;