Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 6, 2008, 4:21:56 PM (16 years ago)
Author:
landauf
Message:

Added new 'MultiType', replacing MultiTypePrimitive, MultiTypeString and MultiTypeMath. MultiType can hold all types MultiTypeMath was able to hold, namely all primitives, pointers, string and several math objects (vector2, 3 and 4, quaternion, colourvalue, radian, degree).

The new MultiType has a completely changed behaviour, I'll explain this on a wiki page somewhen.
But to say the most important things in a few words:
The MultiType has a fixed type. This type is determined by the first assigned value (by using setValue(value), operator=(value) or MultiType(value)). Every other value getting assigned later, will be converted to the first type. But you can change the type (setType<T>()), convert the value (convert<T>()) or force the type of a newly assigned value manually (setValue<T>(value)) by using template functions.

In contrast, the old MultiTypeMath changed it's internal type whenever a new type was assigned. So be aware of this important change.

At the moment I can't see any issues, but there might very well be several problems yet to discover, so further tests will be done.

Location:
code/branches/core3/src/core
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • code/branches/core3/src/core/CommandEvaluation.cc

    r1586 r1716  
    218218    }
    219219
    220     void CommandEvaluation::setEvaluatedParameter(unsigned int index, MultiTypeMath param)
     220    void CommandEvaluation::setEvaluatedParameter(unsigned int index, MultiType param)
    221221    {
    222222        if (index >= 0 && index < MAX_FUNCTOR_ARGUMENTS)
    … …  
    224224    }
    225225
    226     MultiTypeMath CommandEvaluation::getEvaluatedParameter(unsigned int index) const
     226    MultiType CommandEvaluation::getEvaluatedParameter(unsigned int index) const
    227227    {
    228228        if (index >= 0 && index < MAX_FUNCTOR_ARGUMENTS)
    … …  
    240240    }
    241241
    242     MultiTypeMath CommandEvaluation::getReturnvalue() const
     242    MultiType CommandEvaluation::getReturnvalue() const
    243243    {
    244244        if (this->function_)
    245245            return this->function_->getReturnvalue();
    246246
    247         return MultiTypeMath();
     247        return MultiType();
    248248    }
    249249

  • code/branches/core3/src/core/CommandEvaluation.h

    r1505 r1716  
    3737#include "ArgumentCompletionListElement.h"
    3838#include "util/SubString.h"
    39 #include "util/MultiTypeMath.h"
     39#include "util/MultiType.h"
    4040
    4141namespace orxonox
    … …  
    8181                { return (this->additionalParameter_ != "") ? (" " + this->additionalParameter_) : ""; }
    8282
    83             void setEvaluatedParameter(unsigned int index, MultiTypeMath param);
    84             MultiTypeMath getEvaluatedParameter(unsigned int index) const;
     83            void setEvaluatedParameter(unsigned int index, MultiType param);
     84            MultiType getEvaluatedParameter(unsigned int index) const;
    8585
    8686            bool hasReturnvalue() const;
    87             MultiTypeMath getReturnvalue() const;
     87            MultiType getReturnvalue() const;
    8888
    8989        private:
    … …  
    115115
    116116            bool bEvaluatedParams_;
    117             MultiTypeMath param_[5];
     117            MultiType param_[5];
    118118    };
    119119}

  • code/branches/core3/src/core/ConfigValueContainer.cc

    r1658 r1716  
    6464        @brief Does some special initialization for single config-values.
    6565    */
    66     void ConfigValueContainer::initValue(const MultiTypeMath& defvalue)
     66    void ConfigValueContainer::initValue(const MultiType& defvalue)
    6767    {
    6868        this->value_ = defvalue;
    … …  
    8282        for (unsigned int i = 0; i < this->valueVector_.size(); i++)
    8383        {
    84             ConfigFileManager::getInstance()->getValue(this->type_, this->sectionname_, this->varname_, i, this->valueVector_[i].toString(), this->value_.isA(MT_string));
    85             this->defvalueStringVector_.push_back(this->valueVector_[i].toString());
     84            ConfigFileManager::getInstance()->getValue(this->type_, this->sectionname_, this->varname_, i, this->valueVector_[i], this->value_.isType(MT_string));
     85            this->defvalueStringVector_.push_back(this->valueVector_[i]);
    8686        }
    8787
    … …  
    103103        @return True if the new value was successfully assigned
    104104    */
    105     bool ConfigValueContainer::set(const MultiTypeMath& input)
    106     {
    107         if (this->bIsVector_)
    108         {
    109             return this->callFunctionWithIndex(&ConfigValueContainer::set, input.toString());
     105    bool ConfigValueContainer::set(const MultiType& input)
     106    {
     107        if (this->bIsVector_)
     108        {
     109            return this->callFunctionWithIndex(&ConfigValueContainer::set, input);
    110110        }
    111111        else
    … …  
    113113            if (this->tset(input))
    114114            {
    115                 ConfigFileManager::getInstance()->setValue(this->type_, this->sectionname_, this->varname_, input.toString(), this->value_.isA(MT_string));
     115                ConfigFileManager::getInstance()->setValue(this->type_, this->sectionname_, this->varname_, input, this->value_.isType(MT_string));
    116116                return true;
    117117            }
    … …  
    126126        @return True if the new value was successfully assigned
    127127    */
    128     bool ConfigValueContainer::set(unsigned int index, const MultiTypeMath& input)
     128    bool ConfigValueContainer::set(unsigned int index, const MultiType& input)
    129129    {
    130130        if (this->bIsVector_)
    … …  
    132132            if (this->tset(index, input))
    133133            {
    134                 ConfigFileManager::getInstance()->setValue(this->type_, this->sectionname_, this->varname_, index, input.toString(), this->value_.isA(MT_string));
     134                ConfigFileManager::getInstance()->setValue(this->type_, this->sectionname_, this->varname_, index, input, this->value_.isType(MT_string));
    135135                return true;
    136136            }
    … …  
    148148        @return True if the new value was successfully assigned
    149149    */
    150     bool ConfigValueContainer::tset(const MultiTypeMath& input)
    151     {
    152         if (this->bIsVector_)
    153         {
    154             return this->callFunctionWithIndex(&ConfigValueContainer::tset, input.toString());
    155         }
    156         else
    157         {
    158             MultiTypeMath temp = this->value_;
    159             if (temp.assimilate(input))
    160             {
    161                 this->value_ = temp;
     150    bool ConfigValueContainer::tset(const MultiType& input)
     151    {
     152        if (this->bIsVector_)
     153        {
     154            return this->callFunctionWithIndex(&ConfigValueContainer::tset, input);
     155        }
     156        else
     157        {
     158//            MultiType temp = this->value_;
     159//            if (temp.assimilate(input))
     160//            {
     161//                this->value_ = temp;
     162                this->value_ = input;
    162163                if (this->identifier_)
    163164                    this->identifier_->updateConfigValues();
    164165
    165166                return true;
    166             }
     167//            }
    167168        }
    168169        return false;
    … …  
    175176        @return True if the new value was successfully assigned
    176177    */
    177     bool ConfigValueContainer::tset(unsigned int index, const MultiTypeMath& input)
     178    bool ConfigValueContainer::tset(unsigned int index, const MultiType& input)
    178179    {
    179180        if (this->bIsVector_)
    … …  
    189190                for (unsigned int i = this->valueVector_.size(); i <= index; i++)
    190191                {
    191                     this->valueVector_.push_back(MultiTypeMath());
     192                    this->valueVector_.push_back(MultiType());
    192193                }
    193194            }
    194195
    195             MultiTypeMath temp = this->value_;
    196             if (temp.assimilate(input))
    197             {
    198                 this->valueVector_[index] = temp;
     196//            MultiType temp = this->value_;
     197//            if (temp.assimilate(input))
     198//            {
     199//                this->valueVector_[index] = temp;
     200                this->valueVector_[index] = input;
    199201
    200202                if (this->identifier_)
    … …  
    202204
    203205                return true;
    204             }
     206//            }
    205207        }
    206208        else
    … …  
    216218        @return True if the new entry was successfully added
    217219    */
    218     bool ConfigValueContainer::add(const MultiTypeMath& input)
     220    bool ConfigValueContainer::add(const MultiType& input)
    219221    {
    220222        if (this->bIsVector_)
    … …  
    239241                this->valueVector_.erase(this->valueVector_.begin() + index);
    240242                for (unsigned int i = index; i < this->valueVector_.size(); i++)
    241                     ConfigFileManager::getInstance()->setValue(this->type_, this->sectionname_, this->varname_, i, this->valueVector_[i], this->value_.isA(MT_string));
     243                    ConfigFileManager::getInstance()->setValue(this->type_, this->sectionname_, this->varname_, i, this->valueVector_[i], this->value_.isType(MT_string));
    242244                ConfigFileManager::getInstance()->deleteVectorEntries(this->type_, this->sectionname_, this->varname_, this->valueVector_.size());
    243245
    … …  
    275277    {
    276278        if (!this->bIsVector_)
    277             this->value_.fromString(ConfigFileManager::getInstance()->getValue(this->type_, this->sectionname_, this->varname_, this->defvalueString_, this->value_.isA(MT_string)));
     279            this->value_ = ConfigFileManager::getInstance()->getValue(this->type_, this->sectionname_, this->varname_, this->defvalueString_, this->value_.isType(MT_string));
    278280        else
    279281        {
    … …  
    283285                if (i < this->defvalueStringVector_.size())
    284286                {
    285                     this->value_.fromString(ConfigFileManager::getInstance()->getValue(this->type_, this->sectionname_, this->varname_, i, this->defvalueStringVector_[i], this->value_.isA(MT_string)));
     287                    this->value_ = ConfigFileManager::getInstance()->getValue(this->type_, this->sectionname_, this->varname_, i, this->defvalueStringVector_[i], this->value_.isType(MT_string));
    286288                }
    287289                else
    288290                {
    289                     this->value_.fromString(ConfigFileManager::getInstance()->getValue(this->type_, this->sectionname_, this->varname_, i, MultiTypeMath(), this->value_.isA(MT_string)));
     291                    this->value_ = ConfigFileManager::getInstance()->getValue(this->type_, this->sectionname_, this->varname_, i, MultiType(), this->value_.isType(MT_string));
    290292                }
    291293
    … …  
    301303        @return The returnvalue of the functioncall
    302304    */
    303     bool ConfigValueContainer::callFunctionWithIndex(bool (ConfigValueContainer::* function) (unsigned int, const MultiTypeMath&), const std::string& input)
     305    bool ConfigValueContainer::callFunctionWithIndex(bool (ConfigValueContainer::* function) (unsigned int, const MultiType&), const std::string& input)
    304306    {
    305307        SubString token(input, " ", SubString::WhiteSpaces, true, '\\', false, '"', false, '(', ')', false, '\0');

  • code/branches/core3/src/core/ConfigValueContainer.h

    r1611 r1716  
    5050
    5151#include "util/Math.h"
    52 #include "util/MultiTypeMath.h"
     52#include "util/MultiType.h"
    5353#include "ConfigFileManager.h"
    5454
    … …  
    124124                this->value_ = V();
    125125                for (unsigned int i = 0; i < defvalue.size(); i++)
    126                     this->valueVector_.push_back(MultiTypeMath(defvalue[i]));
     126                    this->valueVector_.push_back(MultiType(defvalue[i]));
    127127
    128128                this->initVector();
    … …  
    247247            }
    248248
    249             bool set(const MultiTypeMath& input);
    250             bool tset(const MultiTypeMath& input);
    251 
    252             bool set(unsigned int index, const MultiTypeMath& input);
    253             bool tset(unsigned int index, const MultiTypeMath& input);
    254             bool add(const MultiTypeMath& input);
     249            bool set(const MultiType& input);
     250            bool tset(const MultiType& input);
     251
     252            bool set(unsigned int index, const MultiType& input);
     253            bool tset(unsigned int index, const MultiType& input);
     254            bool add(const MultiType& input);
    255255            bool remove(unsigned int index);
    256256
    … …  
    260260            /** @brief Converts the config-value to a string. @return The string */
    261261            inline std::string toString() const
    262                 { return this->value_.toString(); }
     262                { return this->value_; }
    263263            /** @brief Returns the typename of the assigned config-value. @return The typename */
    264264            inline std::string getTypename() const
    … …  
    267267        private:
    268268            void init(ConfigFileType type, Identifier* identifier, const std::string& varname);
    269             void initValue(const MultiTypeMath& defvalue);
     269            void initValue(const MultiType& defvalue);
    270270            void initVector();
    271             bool callFunctionWithIndex(bool (ConfigValueContainer::* function) (unsigned int, const MultiTypeMath&), const std::string& input);
     271            bool callFunctionWithIndex(bool (ConfigValueContainer::* function) (unsigned int, const MultiType&), const std::string& input);
    272272
    273273            bool                       bIsVector_;                  //!< True if the container contains a std::vector
    … …  
    280280            std::vector<std::string>   defvalueStringVector_;       //!< A vector, containg the strings of the default-values in case we're storing a vector
    281281
    282             MultiTypeMath              value_;                      //!< The value
    283             std::vector<MultiTypeMath> valueVector_;                //!< A vector, containg the values in case we're storing a vector
     282            MultiType                  value_;                      //!< The value
     283            std::vector<MultiType>    valueVector_;                //!< A vector, containg the values in case we're storing a vector
    284284
    285285            bool                       bAddedDescription_;          //!< True if a description was added

  • code/branches/core3/src/core/ConsoleCommand.h

    r1594 r1716  
    9393            inline ConsoleCommand& descriptionReturnvalue(const std::string& description)
    9494                { this->ExecutorStatic::setDescriptionReturnvalue(description); return (*this); }
    95             inline ConsoleCommand& defaultValues(const MultiTypeMath& param1)
     95            inline ConsoleCommand& defaultValues(const MultiType& param1)
    9696                { this->ExecutorStatic::setDefaultValues(param1); return (*this); }
    97             inline ConsoleCommand& defaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2)
     97            inline ConsoleCommand& defaultValues(const MultiType& param1, const MultiType& param2)
    9898                { this->ExecutorStatic::setDefaultValues(param1, param2); return (*this); }
    99             inline ConsoleCommand& defaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3)
     99            inline ConsoleCommand& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3)
    100100                { this->ExecutorStatic::setDefaultValues(param1, param2, param3); return (*this); }
    101             inline ConsoleCommand& defaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4)
     101            inline ConsoleCommand& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4)
    102102                { this->ExecutorStatic::setDefaultValues(param1, param2, param3, param4); return (*this); }
    103             inline ConsoleCommand& defaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4, const MultiTypeMath& param5)
     103            inline ConsoleCommand& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5)
    104104                { this->ExecutorStatic::setDefaultValues(param1, param2, param3, param4, param5); return (*this); }
    105             inline ConsoleCommand& defaultValue(unsigned int index, const MultiTypeMath& param)
     105            inline ConsoleCommand& defaultValue(unsigned int index, const MultiType& param)
    106106                { this->ExecutorStatic::setDefaultValue(index, param); return (*this); }
    107107

  • code/branches/core3/src/core/Executor.cc

    r1505 r1716  
    6565    }
    6666
    67     bool Executor::evaluate(const std::string& params, MultiTypeMath param[5], const std::string& delimiter) const
     67    bool Executor::evaluate(const std::string& params, MultiType param[5], const std::string& delimiter) const
    6868    {
    6969        unsigned int paramCount = this->functor_->getParamCount();
    … …  
    171171    }
    172172
    173     Executor& Executor::setDefaultValues(const MultiTypeMath& param1)
    174     {
    175         this->defaultValue_[0] = param1;
    176         this->bAddedDefaultValue_[0] = true;
    177 
    178         return (*this);
    179     }
    180 
    181     Executor& Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2)
    182     {
    183         this->defaultValue_[0] = param1;
    184         this->bAddedDefaultValue_[0] = true;
    185         this->defaultValue_[1] = param2;
    186         this->bAddedDefaultValue_[1] = true;
    187 
    188         return (*this);
    189     }
    190 
    191     Executor& Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3)
     173    Executor& Executor::setDefaultValues(const MultiType& param1)
     174    {
     175        this->defaultValue_[0] = param1;
     176        this->bAddedDefaultValue_[0] = true;
     177
     178        return (*this);
     179    }
     180
     181    Executor& Executor::setDefaultValues(const MultiType& param1, const MultiType& param2)
     182    {
     183        this->defaultValue_[0] = param1;
     184        this->bAddedDefaultValue_[0] = true;
     185        this->defaultValue_[1] = param2;
     186        this->bAddedDefaultValue_[1] = true;
     187
     188        return (*this);
     189    }
     190
     191    Executor& Executor::setDefaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3)
    192192    {
    193193        this->defaultValue_[0] = param1;
    … …  
    201201    }
    202202
    203     Executor& Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4)
     203    Executor& Executor::setDefaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4)
    204204    {
    205205        this->defaultValue_[0] = param1;
    … …  
    215215    }
    216216
    217     Executor& Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4, const MultiTypeMath& param5)
     217    Executor& Executor::setDefaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5)
    218218    {
    219219        this->defaultValue_[0] = param1;
    … …  
    231231    }
    232232
    233     Executor& Executor::setDefaultValue(unsigned int index, const MultiTypeMath& param)
     233    Executor& Executor::setDefaultValue(unsigned int index, const MultiType& param)
    234234    {
    235235        if (index >= 0 && index < MAX_FUNCTOR_ARGUMENTS)

  • code/branches/core3/src/core/Executor.h

    r1586 r1716  
    6464        { \
    6565            COUT(5) << "Calling Executor " << this->name_ << " through parser with one parameter, using whole string: " << params << std::endl; \
    66             EXECUTOR_PARSE_FUNCTORCALL(mode)(EXECUTOR_PARSE_OBJECT(mode, 1) MultiTypeMath(params)); \
     66            EXECUTOR_PARSE_FUNCTORCALL(mode)(EXECUTOR_PARSE_OBJECT(mode, 1) MultiType(params)); \
    6767        } \
    6868        else if (this->bAddedDefaultValue_[0]) \
    … …  
    9090        } \
    9191        \
    92         MultiTypeMath param[MAX_FUNCTOR_ARGUMENTS]; \
     92        MultiType param[MAX_FUNCTOR_ARGUMENTS]; \
    9393        COUT(5) << "Calling Executor " << this->name_ << " through parser with " << paramCount << " parameters, using " << tokens.size() << " tokens ("; \
    9494        for (unsigned int i = 0; i < tokens.size() && i < MAX_FUNCTOR_ARGUMENTS; i++) \
    … …  
    145145            inline void operator()() const
    146146                { (*this->functor_)(this->defaultValue_[0], this->defaultValue_[1], this->defaultValue_[2], this->defaultValue_[3], this->defaultValue_[4]); }
    147             inline void operator()(const MultiTypeMath& param1) const
     147            inline void operator()(const MultiType& param1) const
    148148                { (*this->functor_)(param1, this->defaultValue_[1], this->defaultValue_[2], this->defaultValue_[3], this->defaultValue_[4]); }
    149             inline void operator()(const MultiTypeMath& param1, const MultiTypeMath& param2) const
     149            inline void operator()(const MultiType& param1, const MultiType& param2) const
    150150                { (*this->functor_)(param1, param2, this->defaultValue_[2], this->defaultValue_[3], this->defaultValue_[4]); }
    151             inline void operator()(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3) const
     151            inline void operator()(const MultiType& param1, const MultiType& param2, const MultiType& param3) const
    152152                { (*this->functor_)(param1, param2, param3, this->defaultValue_[3], this->defaultValue_[4]); }
    153             inline void operator()(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4) const
     153            inline void operator()(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4) const
    154154                { (*this->functor_)(param1, param2, param3, param4, this->defaultValue_[4]); }
    155             inline void operator()(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4, const MultiTypeMath& param5) const
     155            inline void operator()(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5) const
    156156                { (*this->functor_)(param1, param2, param3, param4, param5); }
    157157
    158158            bool parse(const std::string& params, const std::string& delimiter = " ") const;
    159159
    160             bool evaluate(const std::string& params, MultiTypeMath param[5], const std::string& delimiter = " ") const;
     160            bool evaluate(const std::string& params, MultiType param[5], const std::string& delimiter = " ") const;
    161161
    162162            Executor& setDescription(const std::string& description);
    … …  
    177177            inline FunctionType getType() const
    178178                { return this->functor_->getType(); }
    179             inline MultiTypeMath getReturnvalue() const
     179            inline MultiType getReturnvalue() const
    180180                { return this->functor_->getReturnvalue(); }
    181181            inline std::string getTypenameParam(unsigned int param) const
    … …  
    189189                { return this->name_; }
    190190
    191             Executor& setDefaultValues(const MultiTypeMath& param1);
    192             Executor& setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2);
    193             Executor& setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3);
    194             Executor& setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4);
    195             Executor& setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4, const MultiTypeMath& param5);
    196             Executor& setDefaultValue(unsigned int index, const MultiTypeMath& param);
    197 
    198             inline MultiTypeMath getDefaultValue(unsigned int index) const
     191            Executor& setDefaultValues(const MultiType& param1);
     192            Executor& setDefaultValues(const MultiType& param1, const MultiType& param2);
     193            Executor& setDefaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3);
     194            Executor& setDefaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4);
     195            Executor& setDefaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5);
     196            Executor& setDefaultValue(unsigned int index, const MultiType& param);
     197
     198            inline MultiType getDefaultValue(unsigned int index) const
    199199            {
    200200                if (index >= 0 && index < MAX_FUNCTOR_ARGUMENTS)
    … …  
    216216            Functor* functor_;
    217217            std::string name_;
    218             MultiTypeMath defaultValue_[MAX_FUNCTOR_ARGUMENTS];
     218            MultiType defaultValue_[MAX_FUNCTOR_ARGUMENTS];
    219219            bool bAddedDefaultValue_[MAX_FUNCTOR_ARGUMENTS];
    220220
    … …  
    245245            inline void operator()(T* object) const
    246246                { (*((FunctorMember<T>*)this->functor_))(object, this->defaultValue_[0], this->defaultValue_[1], this->defaultValue_[2], this->defaultValue_[3], this->defaultValue_[4]); }
    247             inline void operator()(T* object, const MultiTypeMath& param1) const
     247            inline void operator()(T* object, const MultiType& param1) const
    248248                { (*((FunctorMember<T>*)this->functor_))(object, param1, this->defaultValue_[1], this->defaultValue_[2], this->defaultValue_[3], this->defaultValue_[4]); }
    249             inline void operator()(T* object, const MultiTypeMath& param1, const MultiTypeMath& param2) const
     249            inline void operator()(T* object, const MultiType& param1, const MultiType& param2) const
    250250                { (*((FunctorMember<T>*)this->functor_))(object, param1, param2, this->defaultValue_[2], this->defaultValue_[3], this->defaultValue_[4]); }
    251             inline void operator()(T* object, const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3) const
     251            inline void operator()(T* object, const MultiType& param1, const MultiType& param2, const MultiType& param3) const
    252252                { (*((FunctorMember<T>*)this->functor_))(object, param1, param2, param3, this->defaultValue_[3], this->defaultValue_[4]); }
    253             inline void operator()(T* object, const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4) const
     253            inline void operator()(T* object, const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4) const
    254254                { (*((FunctorMember<T>*)this->functor_))(object, param1, param2, param3, param4, this->defaultValue_[4]); }
    255             inline void operator()(T* object, const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4, const MultiTypeMath& param5) const
     255            inline void operator()(T* object, const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5) const
    256256                { (*((FunctorMember<T>*)this->functor_))(object, param1, param2, param3, param4, param5); }
    257257
    … …  
    259259            inline void operator()(const T* object) const
    260260                { (*((FunctorMember<T>*)this->functor_))(object, this->defaultValue_[0], this->defaultValue_[1], this->defaultValue_[2], this->defaultValue_[3], this->defaultValue_[4]); }
    261             inline void operator()(const T* object, const MultiTypeMath& param1) const
     261            inline void operator()(const T* object, const MultiType& param1) const
    262262                { (*((FunctorMember<T>*)this->functor_))(object, param1, this->defaultValue_[1], this->defaultValue_[2], this->defaultValue_[3], this->defaultValue_[4]); }
    263             inline void operator()(const T* object, const MultiTypeMath& param1, const MultiTypeMath& param2) const
     263            inline void operator()(const T* object, const MultiType& param1, const MultiType& param2) const
    264264                { (*((FunctorMember<T>*)this->functor_))(object, param1, param2, this->defaultValue_[2], this->defaultValue_[3], this->defaultValue_[4]); }
    265             inline void operator()(const T* object, const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3) const
     265            inline void operator()(const T* object, const MultiType& param1, const MultiType& param2, const MultiType& param3) const
    266266                { (*((FunctorMember<T>*)this->functor_))(object, param1, param2, param3, this->defaultValue_[3], this->defaultValue_[4]); }
    267             inline void operator()(const T* object, const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4) const
     267            inline void operator()(const T* object, const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4) const
    268268                { (*((FunctorMember<T>*)this->functor_))(object, param1, param2, param3, param4, this->defaultValue_[4]); }
    269             inline void operator()(const T* object, const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4, const MultiTypeMath& param5) const
     269            inline void operator()(const T* object, const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5) const
    270270                { (*((FunctorMember<T>*)this->functor_))(object, param1, param2, param3, param4, param5); }
    271271

  • code/branches/core3/src/core/Functor.h

    r1592 r1716  
    3333#include "CorePrereqs.h"
    3434
    35 #include "util/MultiTypeMath.h"
     35#include "util/MultiType.h"
    3636#include "util/Debug.h"
    3737
    … …  
    9595            virtual ~Functor() {}
    9696
    97             virtual void operator()(const MultiTypeMath& param1 = MT_null, const MultiTypeMath& param2 = MT_null, const MultiTypeMath& param3 = MT_null, const MultiTypeMath& param4 = MT_null, const MultiTypeMath& param5 = MT_null) = 0;
     97            virtual void operator()(const MultiType& param1 = MT_null, const MultiType& param2 = MT_null, const MultiType& param3 = MT_null, const MultiType& param4 = MT_null, const MultiType& param5 = MT_null) = 0;
    9898
    9999            inline unsigned int getParamCount() const { return this->numParams_; }
    100100            inline bool hasReturnvalue() const { return this->hasReturnValue_; }
    101101            inline FunctionType getType() const { return this->type_; }
    102             inline MultiTypeMath getReturnvalue() const { return this->returnedValue_; }
     102            inline MultiType getReturnvalue() const { return this->returnedValue_; }
    103103
    104104            std::string getTypenameParam(unsigned int param) const { return (param >= 0 && param < 5) ? this->typeParam_[param] : ""; }
    105105            std::string getTypenameReturnvalue() const { return this->typeReturnvalue_; }
    106106
    107             virtual void evaluateParam(unsigned int index, MultiTypeMath& param) const = 0;
     107            virtual void evaluateParam(unsigned int index, MultiType& param) const = 0;
    108108
    109109        protected:
    … …  
    111111            bool hasReturnValue_;
    112112            FunctionType type_;
    113             MultiTypeMath returnedValue_;
     113            MultiType returnedValue_;
    114114
    115115            std::string typeReturnvalue_;
    … …  
    121121        public:
    122122            virtual ~FunctorStatic() {}
    123             virtual void operator()(const MultiTypeMath& param1 = MT_null, const MultiTypeMath& param2 = MT_null, const MultiTypeMath& param3 = MT_null, const MultiTypeMath& param4 = MT_null, const MultiTypeMath& param5 = MT_null) = 0;
     123            virtual void operator()(const MultiType& param1 = MT_null, const MultiType& param2 = MT_null, const MultiType& param3 = MT_null, const MultiType& param4 = MT_null, const MultiType& param5 = MT_null) = 0;
    124124    };
    125125
    … …  
    136136            virtual ~FunctorMember() {}
    137137
    138             virtual void operator()(T* object, const MultiTypeMath& param1 = MT_null, const MultiTypeMath& param2 = MT_null, const MultiTypeMath& param3 = MT_null, const MultiTypeMath& param4 = MT_null, const MultiTypeMath& param5 = MT_null) = 0;
    139             virtual void operator()(const T* object, const MultiTypeMath& param1 = MT_null, const MultiTypeMath& param2 = MT_null, const MultiTypeMath& param3 = MT_null, const MultiTypeMath& param4 = MT_null, const MultiTypeMath& param5 = MT_null) = 0;
    140 
    141             virtual void operator()(const MultiTypeMath& param1 = MT_null, const MultiTypeMath& param2 = MT_null, const MultiTypeMath& param3 = MT_null, const MultiTypeMath& param4 = MT_null, const MultiTypeMath& param5 = MT_null)
     138            virtual void operator()(T* object, const MultiType& param1 = MT_null, const MultiType& param2 = MT_null, const MultiType& param3 = MT_null, const MultiType& param4 = MT_null, const MultiType& param5 = MT_null) = 0;
     139            virtual void operator()(const T* object, const MultiType& param1 = MT_null, const MultiType& param2 = MT_null, const MultiType& param3 = MT_null, const MultiType& param4 = MT_null, const MultiType& param5 = MT_null) = 0;
     140
     141            virtual void operator()(const MultiType& param1 = MT_null, const MultiType& param2 = MT_null, const MultiType& param3 = MT_null, const MultiType& param4 = MT_null, const MultiType& param5 = MT_null)
    142142            {
    143143                if (this->bConstObject_)
    … …  
    280280
    281281
    282 
     282/*
    283283#define FUNCTOR_EVALUATE_PARAM(numparams) FUNCTOR_EVALUATE_PARAM##numparams
    284284#define FUNCTOR_EVALUATE_PARAM0
    … …  
    303303    else if (index == 3) { P4 temp = param; param = temp; } \
    304304    else if (index == 4) { P5 temp = param; param = temp; }
    305 
     305*/
     306#define FUNCTOR_EVALUATE_PARAM(numparams) FUNCTOR_EVALUATE_PARAM##numparams
     307#define FUNCTOR_EVALUATE_PARAM0
     308#define FUNCTOR_EVALUATE_PARAM1 \
     309    if (index == 0) { param.convert<P1>(); }
     310#define FUNCTOR_EVALUATE_PARAM2 \
     311    if (index == 0) { param.convert<P1>(); } \
     312    else if (index == 1) { param.convert<P2>(); }
     313#define FUNCTOR_EVALUATE_PARAM3 \
     314    if (index == 0) { param.convert<P1>(); } \
     315    else if (index == 1) { param.convert<P2>(); } \
     316    else if (index == 2) { param.convert<P3>(); }
     317#define FUNCTOR_EVALUATE_PARAM4 \
     318    if (index == 0) { param.convert<P1>(); } \
     319    else if (index == 1) { param.convert<P2>(); } \
     320    else if (index == 2) { param.convert<P3>(); } \
     321    else if (index == 3) { param.convert<P4>(); }
     322#define FUNCTOR_EVALUATE_PARAM5 \
     323    if (index == 0) { param.convert<P1>(); } \
     324    else if (index == 1) { param.convert<P2>(); } \
     325    else if (index == 2) { param.convert<P3>(); } \
     326    else if (index == 3) { param.convert<P4>(); } \
     327    else if (index == 4) { param.convert<P5>(); }
    306328
    307329
    … …  
    324346            } \
    325347    \
    326             void operator()(const MultiTypeMath& param1 = MT_null, const MultiTypeMath& param2 = MT_null, const MultiTypeMath& param3 = MT_null, const MultiTypeMath& param4 = MT_null, const MultiTypeMath& param5 = MT_null) \
     348            void operator()(const MultiType& param1 = MT_null, const MultiType& param2 = MT_null, const MultiType& param3 = MT_null, const MultiType& param4 = MT_null, const MultiType& param5 = MT_null) \
    327349            { \
    328350                FUNCTOR_STORE_RETURNVALUE(returnvalue, (*this->functionPointer_)(FUNCTOR_FUNCTION_CALL(numparams))); \
    329351            } \
    330352    \
    331             virtual void evaluateParam(unsigned int index, MultiTypeMath& param) const \
     353            virtual void evaluateParam(unsigned int index, MultiType& param) const \
    332354            { \
    333355                FUNCTOR_EVALUATE_PARAM(numparams); \
    … …  
    362384            } \
    363385    \
    364             void operator()(T* object, const MultiTypeMath& param1 = MT_null, const MultiTypeMath& param2 = MT_null, const MultiTypeMath& param3 = MT_null, const MultiTypeMath& param4 = MT_null, const MultiTypeMath& param5 = MT_null) \
     386            void operator()(T* object, const MultiType& param1 = MT_null, const MultiType& param2 = MT_null, const MultiType& param3 = MT_null, const MultiType& param4 = MT_null, const MultiType& param5 = MT_null) \
    365387            { \
    366388                FUNCTOR_STORE_RETURNVALUE(returnvalue, (*object.*this->functionPointer_)(FUNCTOR_FUNCTION_CALL(numparams))); \
    367389            } \
    368390    \
    369             void operator()(const T* object, const MultiTypeMath& param1 = MT_null, const MultiTypeMath& param2 = MT_null, const MultiTypeMath& param3 = MT_null, const MultiTypeMath& param4 = MT_null, const MultiTypeMath& param5 = MT_null) \
     391            void operator()(const T* object, const MultiType& param1 = MT_null, const MultiType& param2 = MT_null, const MultiType& param3 = MT_null, const MultiType& param4 = MT_null, const MultiType& param5 = MT_null) \
    370392            { \
    371393                COUT(1) << "An error occurred in Functor.h:" << std::endl; \
    … …  
    373395            } \
    374396    \
    375             virtual void evaluateParam(unsigned int index, MultiTypeMath& param) const \
     397            virtual void evaluateParam(unsigned int index, MultiType& param) const \
    376398            { \
    377399                FUNCTOR_EVALUATE_PARAM(numparams); \
    … …  
    395417            } \
    396418    \
    397             void operator()(T* object, const MultiTypeMath& param1 = MT_null, const MultiTypeMath& param2 = MT_null, const MultiTypeMath& param3 = MT_null, const MultiTypeMath& param4 = MT_null, const MultiTypeMath& param5 = MT_null) \
     419            void operator()(T* object, const MultiType& param1 = MT_null, const MultiType& param2 = MT_null, const MultiType& param3 = MT_null, const MultiType& param4 = MT_null, const MultiType& param5 = MT_null) \
    398420            { \
    399421                FUNCTOR_STORE_RETURNVALUE(returnvalue, (*object.*this->functionPointer_)(FUNCTOR_FUNCTION_CALL(numparams))); \
    400422            } \
    401423    \
    402             void operator()(const T* object, const MultiTypeMath& param1 = MT_null, const MultiTypeMath& param2 = MT_null, const MultiTypeMath& param3 = MT_null, const MultiTypeMath& param4 = MT_null, const MultiTypeMath& param5 = MT_null) \
     424            void operator()(const T* object, const MultiType& param1 = MT_null, const MultiType& param2 = MT_null, const MultiType& param3 = MT_null, const MultiType& param4 = MT_null, const MultiType& param5 = MT_null) \
    403425            { \
    404426                FUNCTOR_STORE_RETURNVALUE(returnvalue, (*object.*this->functionPointer_)(FUNCTOR_FUNCTION_CALL(numparams))); \
    405427            } \
    406428    \
    407             virtual void evaluateParam(unsigned int index, MultiTypeMath& param) const \
     429            virtual void evaluateParam(unsigned int index, MultiType& param) const \
    408430            { \
    409431                FUNCTOR_EVALUATE_PARAM(numparams); \

  • code/branches/core3/src/core/XMLPort.h

    r1610 r1716  
    3434#include "util/Debug.h"
    3535#include "util/XMLIncludes.h"
    36 #include "util/MultiTypeMath.h"
     36#include "util/MultiType.h"
    3737#include "tinyxml/ticpp.h"
    3838#include "Executor.h"
    … …  
    107107            virtual const std::string& getDescription() = 0;
    108108
    109             virtual XMLPortParamContainer& defaultValue(unsigned int index, const MultiTypeMath& param) = 0;
    110             virtual XMLPortParamContainer& defaultValues(const MultiTypeMath& param1) = 0;
    111             virtual XMLPortParamContainer& defaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2) = 0;
    112             virtual XMLPortParamContainer& defaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3) = 0;
    113             virtual XMLPortParamContainer& defaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4) = 0;
    114             virtual XMLPortParamContainer& defaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4, const MultiTypeMath& param5) = 0;
     109            virtual XMLPortParamContainer& defaultValue(unsigned int index, const MultiType& param) = 0;
     110            virtual XMLPortParamContainer& defaultValues(const MultiType& param1) = 0;
     111            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2) = 0;
     112            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3) = 0;
     113            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4) = 0;
     114            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5) = 0;
    115115
    116116        protected:
    … …  
    197197                { return this->loadexecutor_->getDescription(); }
    198198
    199             virtual XMLPortParamContainer& defaultValue(unsigned int index, const MultiTypeMath& param)
     199            virtual XMLPortParamContainer& defaultValue(unsigned int index, const MultiType& param)
    200200            {
    201201                if (!this->loadexecutor_->defaultValueSet(index))
    … …  
    203203                return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
    204204            }
    205             virtual XMLPortParamContainer& defaultValues(const MultiTypeMath& param1)
     205            virtual XMLPortParamContainer& defaultValues(const MultiType& param1)
    206206            {
    207207                if (!this->loadexecutor_->defaultValueSet(0))
    … …  
    209209                return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
    210210            }
    211             virtual XMLPortParamContainer& defaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2)
     211            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2)
    212212            {
    213213                if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)))
    … …  
    215215                return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
    216216            }
    217             virtual XMLPortParamContainer& defaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3)
     217            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3)
    218218            {
    219219                if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)) || (!this->loadexecutor_->defaultValueSet(2)))
    … …  
    221221                return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
    222222            }
    223             virtual XMLPortParamContainer& defaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4)
     223            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4)
    224224            {
    225225                if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)) || (!this->loadexecutor_->defaultValueSet(2)) || (!this->loadexecutor_->defaultValueSet(3)))
    … …  
    227227                return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
    228228            }
    229             virtual XMLPortParamContainer& defaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4, const MultiTypeMath& param5)
     229            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5)
    230230            {
    231231                if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)) || (!this->loadexecutor_->defaultValueSet(2)) || (!this->loadexecutor_->defaultValueSet(3)) || (!this->loadexecutor_->defaultValueSet(4)))

  • code/branches/core3/src/core/input/InputManager.cc

    r1596 r1716  
    321321    if (joySticksSize_)
    322322    {
    323       std::vector<MultiTypeMath> coeffPos;
    324       std::vector<MultiTypeMath> coeffNeg;
    325       std::vector<MultiTypeMath> zero;
     323      std::vector<double> coeffPos;
     324      std::vector<double> coeffNeg;
     325      std::vector<int> zero;
    326326      coeffPos.resize(24);
    327327      coeffNeg.resize(24);
Note: See TracChangeset for help on using the changeset viewer.