Changeset 215 for osgVisual/trunk/src/object

Timestamp:

Feb 1, 2011, 8:14:45 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/trunk/src/object

Files:

• object_updater.cpp (modified) (1 diff)
• visual_object.cpp (modified) (4 diffs)

osgVisual/trunk/src/object/object_updater.cpp

@@ -34 +34 @@
         //      try to search according variable in dataIO with direction TO_OBJ and copy value to visual_object.
 
-        
-        object_->lat = osg::DegreesToRadians(osgVisual::visual_dataIO::getInstance()->getSlotDataAsDouble(updater_lat, osgVisual::dataIO_slot::TO_OBJ ));
-        object_->lon = osg::DegreesToRadians(osgVisual::visual_dataIO::getInstance()->getSlotDataAsDouble(updater_lon, osgVisual::dataIO_slot::TO_OBJ ));
-        object_->alt = osgVisual::visual_dataIO::getInstance()->getSlotDataAsDouble(updater_alt, osgVisual::dataIO_slot::TO_OBJ );
-        object_->azimuthAngle_psi = osg::DegreesToRadians(osgVisual::visual_dataIO::getInstance()->getSlotDataAsDouble(updater_rot_z, osgVisual::dataIO_slot::TO_OBJ ));
-        object_->pitchAngle_theta = osg::DegreesToRadians(osgVisual::visual_dataIO::getInstance()->getSlotDataAsDouble(updater_rot_y, osgVisual::dataIO_slot::TO_OBJ ));
-        object_->bankAngle_phi = osg::DegreesToRadians(osgVisual::visual_dataIO::getInstance()->getSlotDataAsDouble(updater_rot_x, osgVisual::dataIO_slot::TO_OBJ ));
-        object_->updateLabelText("autoupdated", osgVisual::visual_dataIO::getInstance()->getSlotDataAsString(updater_label, osgVisual::dataIO_slot::TO_OBJ ));
+        if(!updater_lat.empty())
+                object_->lat = osg::DegreesToRadians(osgVisual::visual_dataIO::getInstance()->getSlotDataAsDouble(updater_lat, osgVisual::dataIO_slot::TO_OBJ ));
+        if(!updater_lon.empty())
+                object_->lon = osg::DegreesToRadians(osgVisual::visual_dataIO::getInstance()->getSlotDataAsDouble(updater_lon, osgVisual::dataIO_slot::TO_OBJ ));
+        if(!updater_alt.empty())
+                object_->alt = osgVisual::visual_dataIO::getInstance()->getSlotDataAsDouble(updater_alt, osgVisual::dataIO_slot::TO_OBJ );
+        if(!updater_rot_z.empty())
+                object_->azimuthAngle_psi = osg::DegreesToRadians(osgVisual::visual_dataIO::getInstance()->getSlotDataAsDouble(updater_rot_z, osgVisual::dataIO_slot::TO_OBJ ));
+        if(!updater_rot_y.empty())
+                object_->pitchAngle_theta = osg::DegreesToRadians(osgVisual::visual_dataIO::getInstance()->getSlotDataAsDouble(updater_rot_y, osgVisual::dataIO_slot::TO_OBJ ));
+        if(!updater_rot_x.empty())
+                object_->bankAngle_phi = osg::DegreesToRadians(osgVisual::visual_dataIO::getInstance()->getSlotDataAsDouble(updater_rot_x, osgVisual::dataIO_slot::TO_OBJ ));
+        if(!updater_label.empty())
+                object_->updateLabelText("autoupdated", osgVisual::visual_dataIO::getInstance()->getSlotDataAsString(updater_label, osgVisual::dataIO_slot::TO_OBJ ));
 
         // Finally execute nested PreUpdater

osgVisual/trunk/src/object/visual_object.cpp

@@ -59 +59 @@
         geometry = new osg::Group();
         this->addChild( geometry );
+        unsetGeometry();        // adds an osg::Node as geometry to make the visual_object trackable for node trackers.
 
         // Labelnode hinzufügen
@@ -75 +76 @@
                 return NULL;
 
-        OSG_NOTIFY( osg::ALWAYS ) << __FUNCTION__ << "Try to creating a new Model.." << std::endl;
+        OSG_NOTIFY( osg::ALWAYS ) << __FUNCTION__ << " - Try to creating a new Model.." << std::endl;
         
         // Prepare Variables
@@ -342 +343 @@
 
 
-
-
         osgVisual::visual_object* object = new osgVisual::visual_object( sceneRoot_, objectname );
         object->lat = lat;
@@ -462 +461 @@
         // remove old geometry
         geometry->removeChildren(0, geometry->getNumChildren());
+
+        // Set std OSG Node to allow tracking of an osgVisual without
+        geometry->addChild( new osg::Node() ); 
 }