Changeset 247 for osgVisual/trunk/src

Timestamp:

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

Author:

Torben Dannhauer

Message:

typo fix, clean up

Location:

osgVisual/trunk/src

Files:

• core/visual_core.cpp (modified) (1 diff)
• distortion/visual_distortion.cpp (modified) (1 diff)
• object/object_updater.cpp (modified) (2 diffs)
• sky_Silverlining/visual_skySilverLining.cpp (modified) (2 diffs)

osgVisual/trunk/src/core/visual_core.cpp

@@ -226 +226 @@
                 if(cur_node->type == XML_ELEMENT_NODE && node_name == "datetime")
                 {
-                        int hour, minute;
-                        int day=0,month=0,year=0;
+                        int day=-1,month=1-,year=-1, hour=-1, minute=-1;
 
                         xmlAttr  *attr = cur_node->properties;

osgVisual/trunk/src/distortion/visual_distortion.cpp

@@ -97 +97 @@
                                                         OSG_NOTIFY(osg::WARN) << "WARNING: Unable to parse Frustum values from '" << pre_cfg<<channelname<<post_cfg << "' -- continue without valid frustum values." << std::endl;
                                         }
-                                        if( attr_name == "renderimplemmentation" )
+                                        if( attr_name == "renderimplementation" )
                                         {
                                                 if(attr_value=="fbo")

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_;
 }

osgVisual/trunk/src/sky_Silverlining/visual_skySilverLining.cpp

@@ -95 +95 @@
         
         SilverLining::LocalTime t = atmosphere->GetConditions()->GetTime();
-        t.SetHour( hour_ );
-        t.SetMinutes( minute_ );
-        t.SetSeconds( second_ );
+        if(hour_) t.SetHour( hour_ );
+        if(minute_) t.SetMinutes( minute_ );
+        if(second_) t.SetSeconds( second_ );
         atmosphere->GetConditions()->SetTime( t );
 }
@@ -108 +108 @@
 
         SilverLining::LocalTime t = atmosphere->GetConditions()->GetTime();
-        t.SetYear( year_ );
-        t.SetMonth( month_ );
-        t.SetDay( day_ );
+        if(year_) t.SetYear( year_ );
+        if(month_) t.SetMonth( month_ );
+        if(day_) t.SetDay( day_ );
 }