Changeset 222

Timestamp:

Feb 9, 2011, 9:11:44 AM (14 years ago)

Author:

Torben Dannhauer

Message:

Object definition via XML file: Angels are now interpreted as degree.

Location:

osgVisual/trunk

Files:

• include/object/visual_object.h (modified) (2 diffs)
• src/object/visual_object.cpp (modified) (4 diffs)

osgVisual/trunk/include/object/visual_object.h

@@ -387 +387 @@
 // Position
         /**
-         * Latitude of the object.
+         * Latitude of the object in RAD.
          */ 
         double lat;
 
         /**
-         * Longitude of the object.
+         * Longitude of the object in RAD.
          */ 
         double lon;
 
         /**
-         * Altitude of the object over the ellipsoid. 
+         * Altitude of the object over the ellipsoid in meter. 
          */ 
         double alt;
@@ -403 +403 @@
 // Attitude
         /**
-         * Azimuth angle (Rotation along Z axis, "heading") of the object 
+         * Azimuth angle (Rotation along Z axis, "heading") of the object in RAD.
          */ 
         double azimuthAngle_psi;
 
         /**
-         * Pitch ("nose relative to horizon") angle of the object 
+         * Pitch ("nose relative to horizon") angle of the object in RAD.
          */ 
         double pitchAngle_theta;
 
         /**
-         * Bank angle of the object.
+         * Bank angle of the object in RAD.
          */ 
         double bankAngle_phi;

osgVisual/trunk/src/object/visual_object.cpp

@@ -116 +116 @@
                                 std::string attr_name=reinterpret_cast<const char*>(attr->name);
                                 std::string attr_value=reinterpret_cast<const char*>(attr->children->content);
-                                if( attr_name == "lat" ) lat = util::strToDouble(attr_value);
-                                if( attr_name == "lon" ) lon = util::strToDouble(attr_value);
+                                if( attr_name == "lat" ) lat = osg::DegreesToRadians(util::strToDouble(attr_value));
+                                if( attr_name == "lon" ) lon = osg::DegreesToRadians(util::strToDouble(attr_value));
                                 if( attr_name == "alt" ) alt = util::strToDouble(attr_value);
 
@@ -131 +131 @@
                                 std::string attr_name=reinterpret_cast<const char*>(attr->name);
                                 std::string attr_value=reinterpret_cast<const char*>(attr->children->content);
-                                if( attr_name == "rot_x" ) rot_x = util::strToDouble(attr_value);
-                                if( attr_name == "rot_y" ) rot_y = util::strToDouble(attr_value);
-                                if( attr_name == "rot_z" ) rot_z = util::strToDouble(attr_value);
+                                if( attr_name == "rot_x" ) rot_x = osg::DegreesToRadians(util::strToDouble(attr_value));
+                                if( attr_name == "rot_y" ) rot_y = osg::DegreesToRadians(util::strToDouble(attr_value));
+                                if( attr_name == "rot_z" ) rot_z = osg::DegreesToRadians(util::strToDouble(attr_value));
 
                                 attr = attr->next; 
@@ -217 +217 @@
                                                 std::string attr_name=reinterpret_cast<const char*>(attr->name);
                                                 std::string attr_value=reinterpret_cast<const char*>(attr->children->content);
-                                                if( attr_name == "rot_x" ) cam_rot_x = util::strToDouble(attr_value);
-                                                if( attr_name == "rot_y" ) cam_rot_y = util::strToDouble(attr_value);
-                                                if( attr_name == "rot_z" ) cam_rot_z = util::strToDouble(attr_value);
+                                                if( attr_name == "rot_x" ) cam_rot_x = osg::DegreesToRadians(util::strToDouble(attr_value));
+                                                if( attr_name == "rot_y" ) cam_rot_y = osg::DegreesToRadians(util::strToDouble(attr_value));
+                                                if( attr_name == "rot_z" ) cam_rot_z = osg::DegreesToRadians(util::strToDouble(attr_value));
 
                                                 attr = attr->next; 
@@ -251 +251 @@
                                                 std::string attr_name=reinterpret_cast<const char*>(attr->name);
                                                 std::string attr_value=reinterpret_cast<const char*>(attr->children->content);
-                                                if( attr_name == "rot_x" ) geometry_rot_x = util::strToDouble(attr_value);
-                                                if( attr_name == "rot_y" ) geometry_rot_y = util::strToDouble(attr_value);
-                                                if( attr_name == "rot_z" ) geometry_rot_z = util::strToDouble(attr_value);
+                                                if( attr_name == "rot_x" ) geometry_rot_x = osg::DegreesToRadians(util::strToDouble(attr_value));
+                                                if( attr_name == "rot_y" ) geometry_rot_y = osg::DegreesToRadians(util::strToDouble(attr_value));
+                                                if( attr_name == "rot_z" ) geometry_rot_z = osg::DegreesToRadians(util::strToDouble(attr_value));
 
                                                 attr = attr->next;