Changeset 247


Ignore:
Timestamp:
Feb 18, 2011, 5:59:39 PM (12 years ago)
Author:
Torben Dannhauer
Message:

typo fix, clean up

Location:
osgVisual/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • osgVisual/trunk/bin/osgVisualConfig.xml

    r240 r247  
    22<osgvisualconfiguration>
    33  <module name="distortion" enabled="no">
    4     <!-- XML configuration of the module "distortion"
    5       channelname = name of the channel, used to load the distortion- and blendmaps
    6       renderimplementation = technique to distort.
    7       Available options:
    8           fbo : renderImplementation = osg::Camera::FRAME_BUFFER_OBJECT
    9           pbuffer : renderImplementation = osg::Camera::PIXEL_BUFFER
    10           pbuffer-rtt :  renderImplementation = osg::Camera::PIXEL_BUFFER_RTT
    11           fb : renderImplementation = osg::Camera::FRAME_BUFFER
    12           window : renderImplementation = osg::Camera::SEPERATE_WINDOW
    13     -->
    14     <distortion channelname="center" renderimplemmentation="fbo" width="2048" height="2048" useshader="yes" hdr="yes" usetexturerectangle="no"></distortion>
    15     <!-- optional: <distortionmap filename="distmap.png"></distortionmap> to set distortionmap independend from channel map-->
    16     <!-- optional: <blendmap filename="blendmap.png"></blendmap> to set blendmap independend from channel map -->
     4    <distortion channelname="center" renderimplementation="fbo" width="2048" height="2048" useshader="yes" hdr="yes" usetexturerectangle="no"></distortion>
    175  </module>
    18  
    196  <module name="sky_silverlining" enabled="yes"></module>
    20 
    217  <module name="vista2d" enabled="yes">
    228    <vista2d filename="D:\osgVisual\osgVisual\bin\altimeterSimple.v" paintBackground="no" position_x="1" position_y="1" zoom="1.0" playanimation="yes"></vista2d>
    239  </module>
    24 
    2510  <module name="dataio" enabled="yes">
    26     <!-- XML configuration of the module "dataIO"
    27         The parameter "enabled" is ignored, because dataIO is mandatory for the visual system to place object etc.
    28        
    29         Available clusterroles:
    30         master: This role recieves all relevant information via the extLink implementation and sends it via cluster implementation to the slave nodes.
    31         slave: This role recieves all relevant rendering information via the cluster implementation.
    32         standalone: This role recieves all relevant data via the extLink and renders it. No cluster functionality is used.   
    33     -->
    3411    <dataio clusterrole="standalone"></dataio>
    3512    <cluster implementation="enet" hardsync="yes" master_ip="10.10.10.10" port="1234" use_zlib_compressor="yes" ></cluster>
     
    7350      <trackmodel id="2" updater_slot="TRACKING_ID"></trackmodel>
    7451    </models>
    75     <datetime day="0" month="0" year="0" hour="12" minute="30"></datetime>
     52    <datetime day="0" month="0" year="0" hour="12" minute="50"></datetime>
    7653    <visibility range="50000" turbidity="2.2" ></visibility>
    7754    <clouds>
  • osgVisual/trunk/include/sky_Silverlining/visual_skySilverLining.h

    r221 r247  
    144144
    145145        /**
    146          * \brief Set time for the sky system.
     146         * \brief Set time for the sky system. Only values >0 are set.
    147147         *
    148148         * @param hour_ : Hour to set. Ranging from 0 to 23
     
    153153
    154154        /**
    155          * \brief Sets the date for the sky system.
     155         * \brief Sets the date for the sky system. Only values >0 are set.
    156156         *
    157157         * @param year_ : Year to set. SilverLining can only handle Gregorian calendar years, which means that years before 1582 will not be accurately simulated.
  • osgVisual/trunk/src/core/visual_core.cpp

    r240 r247  
    226226                if(cur_node->type == XML_ELEMENT_NODE && node_name == "datetime")
    227227                {
    228                         int hour, minute;
    229                         int day=0,month=0,year=0;
     228                        int day=-1,month=1-,year=-1, hour=-1, minute=-1;
    230229
    231230                        xmlAttr  *attr = cur_node->properties;
  • osgVisual/trunk/src/distortion/visual_distortion.cpp

    r221 r247  
    9797                                                        OSG_NOTIFY(osg::WARN) << "WARNING: Unable to parse Frustum values from '" << pre_cfg<<channelname<<post_cfg << "' -- continue without valid frustum values." << std::endl;
    9898                                        }
    99                                         if( attr_name == "renderimplemmentation" )
     99                                        if( attr_name == "renderimplementation" )
    100100                                        {
    101101                                                if(attr_value=="fbo")
  • osgVisual/trunk/src/object/object_updater.cpp

    r224 r247  
    2727        updater_rot_y_rad = object_->getName()+"_ROT_Y";
    2828        updater_rot_z_rad = object_->getName()+"_ROT_Z";
     29        updater_label = object_->getName()+"_LABEL";
     30        object_->addLabel("default", " ");
    2931}
    3032
     
    7981void 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_)
    8082{
    81         if(lat_rad_!="")
    82                 updater_lat_rad = lat_rad_;
    83         if(lon_rad_!="")
    84                 updater_lon_rad = lon_rad_;
    85         if(alt_!="")
    86                 updater_alt = alt_;
    87         if(rot_x_rad_!="")
    88                 updater_rot_x_rad = rot_x_rad_;
    89         if(rot_y_rad_!="")
    90                 updater_rot_y_rad = rot_y_rad_;
    91         if(rot_z_rad_!="")
    92                 updater_rot_z_rad = rot_z_rad_;
    93 
    94         if(label_!="")
    95                 updater_label = label_;
    96         else
    97         {
    98                 updater_label = object_->getName()+"_LABEL";
    99                 object_->addLabel("default", " ");
    100         }
     83        updater_lat_rad = lat_rad_;
     84        updater_lon_rad = lon_rad_;
     85        updater_alt = alt_;
     86        updater_rot_x_rad = rot_x_rad_;
     87        updater_rot_y_rad = rot_y_rad_;
     88        updater_rot_z_rad = rot_z_rad_;
     89        updater_label = label_;
    10190}
  • osgVisual/trunk/src/sky_Silverlining/visual_skySilverLining.cpp

    r221 r247  
    9595       
    9696        SilverLining::LocalTime t = atmosphere->GetConditions()->GetTime();
    97         t.SetHour( hour_ );
    98         t.SetMinutes( minute_ );
    99         t.SetSeconds( second_ );
     97        if(hour_) t.SetHour( hour_ );
     98        if(minute_) t.SetMinutes( minute_ );
     99        if(second_) t.SetSeconds( second_ );
    100100        atmosphere->GetConditions()->SetTime( t );
    101101}
     
    108108
    109109        SilverLining::LocalTime t = atmosphere->GetConditions()->GetTime();
    110         t.SetYear( year_ );
    111         t.SetMonth( month_ );
    112         t.SetDay( day_ );
     110        if(year_) t.SetYear( year_ );
     111        if(month_) t.SetMonth( month_ );
     112        if(day_) t.SetDay( day_ );
    113113}
    114114
Note: See TracChangeset for help on using the changeset viewer.