Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 29, 2007, 12:09:24 AM (17 years ago)
Author:
landauf
Message:

some changes (yes! CHANGES! unbelievable! they exist! well, ok, not in politics)

Location:
code/branches/FICN/src/orxonox/core
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc

    r715 r717  
    4848        this->classname_ = classname;
    4949        this->varname_ = varname;
    50         this->type_ = Int;
     50        this->type_ = VT_Int;
    5151
    5252        this->defvalueString_ = number2String(defvalue, "0");                       // Try to convert the default-value to a string
    … …  
    7070        this->classname_ = classname;
    7171        this->varname_ = varname;
    72         this->type_ = uInt;
     72        this->type_ = VT_uInt;
    7373
    7474        this->defvalueString_ = number2String(defvalue, "0");                       // Try to convert the default-value to a string
    … …  
    9292        this->classname_ = classname;
    9393        this->varname_ = varname;
    94         this->type_ = Char;
     94        this->type_ = VT_Char;
    9595
    9696        this->defvalueString_ = number2String((int)defvalue, "0");                  // Try to convert the default-value to a string
    … …  
    114114        this->classname_ = classname;
    115115        this->varname_ = varname;
    116         this->type_ = uChar;
     116        this->type_ = VT_uChar;
    117117
    118118        this->defvalueString_ = number2String((unsigned int)defvalue, "0");         // Try to convert the default-value to a string
    … …  
    136136        this->classname_ = classname;
    137137        this->varname_ = varname;
    138         this->type_ = Float;
     138        this->type_ = VT_Float;
    139139
    140140        this->defvalueString_ = number2String(defvalue, "0.000000");                // Try to convert the default-value to a string
    … …  
    158158        this->classname_ = classname;
    159159        this->varname_ = varname;
    160         this->type_ = Double;
     160        this->type_ = VT_Double;
    161161
    162162        this->defvalueString_ = number2String(defvalue, "0.000000");                // Try to convert the default-value to a string
    … …  
    180180        this->classname_ = classname;
    181181        this->varname_ = varname;
    182         this->type_ = LongDouble;
     182        this->type_ = VT_LongDouble;
    183183
    184184        this->defvalueString_ = number2String(defvalue, "0.000000");                // Try to convert the default-value to a string
    … …  
    202202        this->classname_ = classname;
    203203        this->varname_ = varname;
    204         this->type_ = Bool;
     204        this->type_ = VT_Bool;
    205205
    206206        // Convert the default-value from bool to string
    … …  
    228228        this->classname_ = classname;
    229229        this->varname_ = varname;
    230         this->type_ = _String;
     230        this->type_ = VT_String;
    231231
    232232        this->defvalueString_ = "\"" + defvalue + "\"";                             // Convert the string to a "config-file-string" with quotes
    … …  
    249249        this->classname_ = classname;
    250250        this->varname_ = varname;
    251         this->type_ = ConstChar;
     251        this->type_ = VT_ConstChar;
    252252
    253253        this->defvalueString_ = "\"" + std::string(defvalue) + "\"";                // Convert the string to a "config-file-string" with quotes
    … …  
    270270        this->classname_ = classname;
    271271        this->varname_ = varname;
    272         this->type_ = _Vector2;
     272        this->type_ = VT_Vector2;
    273273
    274274        // Try to convert the default-value from Vector2 to string
    … …  
    297297        this->classname_ = classname;
    298298        this->varname_ = varname;
    299         this->type_ = _Vector3;
     299        this->type_ = VT_Vector3;
    300300
    301301        // Try to convert the default-value from Vector3 to string
    … …  
    324324        this->classname_ = classname;
    325325        this->varname_ = varname;
    326         this->type_ = _ColourValue;
     326        this->type_ = VT_ColourValue;
    327327
    328328        // Try to convert the default-value from ColourValue to string
    … …  
    346346    bool ConfigValueContainer::parseSting(const std::string& input)
    347347    {
    348         if (this->type_ == ConfigValueContainer::Int)
     348        if (this->type_ == ConfigValueContainer::VT_Int)
    349349            return this->parseSting(input, this->value_.value_int_);
    350         else if (this->type_ == ConfigValueContainer::uInt)
     350        else if (this->type_ == ConfigValueContainer::VT_uInt)
    351351            return this->parseSting(input, this->value_.value_uint_);
    352         else if (this->type_ == ConfigValueContainer::Char)
     352        else if (this->type_ == ConfigValueContainer::VT_Char)
    353353            return this->parseSting(input, this->value_.value_char_);
    354         else if (this->type_ == ConfigValueContainer::uChar)
     354        else if (this->type_ == ConfigValueContainer::VT_uChar)
    355355            return this->parseSting(input, this->value_.value_uchar_);
    356         else if (this->type_ == ConfigValueContainer::Float)
     356        else if (this->type_ == ConfigValueContainer::VT_Float)
    357357            return this->parseSting(input, this->value_.value_float_);
    358         else if (this->type_ == ConfigValueContainer::Double)
     358        else if (this->type_ == ConfigValueContainer::VT_Double)
    359359            return this->parseSting(input, this->value_.value_double_);
    360         else if (this->type_ == ConfigValueContainer::LongDouble)
     360        else if (this->type_ == ConfigValueContainer::VT_LongDouble)
    361361            return this->parseSting(input, this->value_.value_long_double_);
    362         else if (this->type_ == ConfigValueContainer::Bool)
     362        else if (this->type_ == ConfigValueContainer::VT_Bool)
    363363            return this->parseSting(input, this->value_.value_bool_);
    364         else if (this->type_ == ConfigValueContainer::_String)
     364        else if (this->type_ == ConfigValueContainer::VT_String)
    365365            return this->parseSting(input, this->value_string_);
    366         else if (this->type_ == ConfigValueContainer::ConstChar)
     366        else if (this->type_ == ConfigValueContainer::VT_ConstChar)
    367367            return this->parseSting(input, this->value_string_);
    368         else if (this->type_ == ConfigValueContainer::_Vector2)
     368        else if (this->type_ == ConfigValueContainer::VT_Vector2)
    369369            return this->parseSting(input, this->value_vector2_);
    370         else if (this->type_ == ConfigValueContainer::_Vector3)
     370        else if (this->type_ == ConfigValueContainer::VT_Vector3)
    371371            return this->parseSting(input, this->value_vector3_);
    372         else if (this->type_ == ConfigValueContainer::_ColourValue)
     372        else if (this->type_ == ConfigValueContainer::VT_ColourValue)
    373373            return this->parseSting(input, this->value_colourvalue_);
    374374
    … …  
    377377
    378378    /**
    379         @brief Parses a given String into a value of the type int and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
     379        @brief Parses a given std::string into a value of the type int and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
    380380        @param input The string to convert
    381381        @param defvalue The default-value
    … …  
    388388
    389389    /**
    390         @brief Parses a given String into a value of the type unsigned int and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
     390        @brief Parses a given std::string into a value of the type unsigned int and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
    391391        @param input The string to convert
    392392        @param defvalue The default-value
    … …  
    399399
    400400    /**
    401         @brief Parses a given String into a value of the type char and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
     401        @brief Parses a given std::string into a value of the type char and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
    402402        @param input The string to convert
    403403        @param defvalue The default-value
    … …  
    411411
    412412    /**
    413         @brief Parses a given String into a value of the type unsigned char and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
     413        @brief Parses a given std::string into a value of the type unsigned char and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
    414414        @param input The string to convert
    415415        @param defvalue The default-value
    … …  
    423423
    424424    /**
    425         @brief Parses a given String into a value of the type float and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
     425        @brief Parses a given std::string into a value of the type float and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
    426426        @param input The string to convert
    427427        @param defvalue The default-value
    … …  
    434434
    435435    /**
    436         @brief Parses a given String into a value of the type double and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
     436        @brief Parses a given std::string into a value of the type double and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
    437437        @param input The string to convert
    438438        @param defvalue The default-value
    … …  
    445445
    446446    /**
    447         @brief Parses a given String into a value of the type long double and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
     447        @brief Parses a given std::string into a value of the type long double and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
    448448        @param input The string to convert
    449449        @param defvalue The default-value
    … …  
    456456
    457457    /**
    458         @brief Parses a given String into a value of the type bool and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
     458        @brief Parses a given std::string into a value of the type bool and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
    459459        @param input The string to convert
    460460        @param defvalue The default-value
    … …  
    484484
    485485    /**
    486         @brief Parses a given String into a value of the type String and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
     486        @brief Parses a given std::string into a value of the type std::string and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
    487487        @param input The string to convert
    488488        @param defvalue The default-value
    … …  
    509509
    510510    /**
    511         @brief Parses a given String into a value of the type const char* and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
     511        @brief Parses a given std::string into a value of the type const char* and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
    512512        @param input The string to convert
    513513        @param defvalue The default-value
    … …  
    534534
    535535    /**
    536         @brief Parses a given String into a value of the type _Vector2 and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
     536        @brief Parses a given std::string into a value of the type _Vector2 and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
    537537        @param input The string to convert
    538538        @param defvalue The default-value
    … …  
    568568
    569569    /**
    570         @brief Parses a given String into a value of the type Vector3 and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
     570        @brief Parses a given std::string into a value of the type Vector3 and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
    571571        @param input The string to convert
    572572        @param defvalue The default-value
    … …  
    607607
    608608    /**
    609         @brief Parses a given String into a value of the type ColourValue and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
     609        @brief Parses a given std::string into a value of the type ColourValue and assigns it to the right variable. If the conversion failed, the default-value gets assigned.
    610610        @param input The string to convert
    611611        @param defvalue The default-value

  • code/branches/FICN/src/orxonox/core/ConfigValueContainer.h

    r716 r717  
    7474            enum VariableType
    7575            {
    76                 Int,
    77                 uInt,
    78                 Char,
    79                 uChar,
    80                 Float,
    81                 Double,
    82                 LongDouble,
    83                 Bool,
    84                 ConstChar,
    85                 _String,
    86                 _Vector2,
    87                 _Vector3,
    88                 _ColourValue
     76                VT_Int,
     77                VT_uInt,
     78                VT_Char,
     79                VT_uChar,
     80                VT_Float,
     81                VT_Double,
     82                VT_LongDouble,
     83                VT_Bool,
     84                VT_ConstChar,
     85                VT_String,
     86                VT_Vector2,
     87                VT_Vector3,
     88                VT_ColourValue
    8989            };
    9090
    … …  
    180180
    181181            std::string         value_string_;                  //!< The value, if the variable is of the type string
    182             Vector2       value_vector2_;                 //!< The value, if the variable is of the type Vector2
    183             Vector3       value_vector3_;                 //!< The value, if the variable is of the type Vector3
    184             ColourValue   value_colourvalue_;             //!< The value, if the variable is of the type ColourValue
     182            Vector2             value_vector2_;                 //!< The value, if the variable is of the type Vector2
     183            Vector3             value_vector3_;                 //!< The value, if the variable is of the type Vector3
     184            ColourValue         value_colourvalue_;             //!< The value, if the variable is of the type ColourValue
    185185
    186186            std::list<std::string>::iterator configFileLine_;   //!< An iterator, pointing to the entry of the variable in the config-file
Note: See TracChangeset for help on using the changeset viewer.