Changeset 6958

Timestamp:

06/13/07 15:41:23

Author:

robert

Message:

Added better handling of 0,0,0 values

Files:

• OpenSceneGraph/trunk/include/osg/CoordinateSystemNode (modified) (1 diff)
• OpenSceneGraph/trunk/src/osg/CoordinateSystemNode.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osg/CoordinateSystemNode

@@ -159 +159 @@
-    // http://www.colorado.edu/geography/gcraft/notes/datum/gif/xyzllh.gif
-    double p = sqrt(X*X + Y*Y);
-(Z*_radiusEquator/
+2(Z*_radiusEquator ,
-    double eDashSquared = (_radiusEquator*_radiusEquator - _radiusPolar*_radiusPolar)/
-                          (_radiusPolar*_radiusPolar);

OpenSceneGraph/trunk/src/osg/CoordinateSystemNode.cpp

@@ -52 +52 @@
-        _ellipsoidModel->convertXYZToLatLongHeight(position.x(),position.y(),position.z(),latitude, longitude, height);
-        _ellipsoidModel->computeLocalToWorldTransformFromLatLongHeight(latitude, longitude, 0.0f, localToWorld);
-        
-        osg::notify(osg::INFO)<<"lat="<<latitude<<"\tlong="<<longitude<<"\theight"<<height<<std::endl;
-    
-        //_ellipsoidModel->computeLocalToWorldTransformFromXYZ(position.x(),position.y(),position.z(), localToWorld);
-
-        return localToWorld;