Changeset 247 for osgVisual/trunk/src/object

Timestamp:

Feb 18, 2011, 5:59:39 PM (14 years ago)

Author:

Torben Dannhauer

Message:

typo fix, clean up

File:

• osgVisual/trunk/src/object/object_updater.cpp (modified) (2 diffs)

osgVisual/trunk/src/object/object_updater.cpp

@@ -27 +27 @@
         updater_rot_y_rad = object_->getName()+"_ROT_Y";
         updater_rot_z_rad = object_->getName()+"_ROT_Z";
+        updater_label = object_->getName()+"_LABEL";
+        object_->addLabel("default", " ");
 }
 
@@ -79 +81 @@
 void object_updater::setUpdaterSlotNames( osgVisual::visual_object* object_, std::string lat_rad_, std::string lon_rad_, std::string alt_, std::string rot_x_rad_, std::string rot_y_rad_, std::string rot_z_rad_, std::string label_)
 {
-        if(lat_rad_!="")
-                updater_lat_rad = lat_rad_;
-        if(lon_rad_!="")
-                updater_lon_rad = lon_rad_;
-        if(alt_!="")
-                updater_alt = alt_;
-        if(rot_x_rad_!="")
-                updater_rot_x_rad = rot_x_rad_;
-        if(rot_y_rad_!="")
-                updater_rot_y_rad = rot_y_rad_;
-        if(rot_z_rad_!="")
-                updater_rot_z_rad = rot_z_rad_;
-
-        if(label_!="")
-                updater_label = label_;
-        else
-        {
-                updater_label = object_->getName()+"_LABEL";
-                object_->addLabel("default", " ");
-        }
+        updater_lat_rad = lat_rad_;
+        updater_lon_rad = lon_rad_;
+        updater_alt = alt_;
+        updater_rot_x_rad = rot_x_rad_;
+        updater_rot_y_rad = rot_y_rad_;
+        updater_rot_z_rad = rot_z_rad_;
+        updater_label = label_;
 }