Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 27, 2005, 7:14:55 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -r 4301:HEAD trunk/ branches/physics/
little conflict in particle-system resolved easily

File:
1 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/physics/src/lib/lang/base_object.cc

    r4283 r4332  
    3030{
    3131  this->className = NULL;
     32  this->id = -1;
    3233  this->finalized = false;
    3334}
    … …  
    4243}
    4344
    44 void BaseObject::setClassName (const char* className)
     45
     46/**
     47   \brief sets the class identifiers
     48   \param a number for the class from class_list.h enumeration
     49   \param the class name
     50*/
     51void BaseObject::setClassID(int id, const char* className)
     52{
     53  this->id = id;
     54  this->className = className;
     55}
     56
     57
     58/**
     59   \brief sets the class identifier
     60   \param a number for the class from class_list.h enumeration
     61*/
     62void BaseObject::setClassID (int id)
     63{
     64  this->id = id;
     65}
     66
     67
     68/**
     69   \brief sets the class identifiers
     70   \param the class name
     71*/
     72void BaseObject::setClassName(const char* className)
    4573{
    4674  this->className = className;
    4775}
    4876
     77
     78/**
     79   \brief sets the class identifiers
     80   \param a number for the class from class_list.h enumeration
     81   \param the class name
     82*/
    4983bool BaseObject::isA (char* className)
    5084{
    … …  
    5488}
    5589
     90
    5691/*
    57 bool BaseObject::isFinalized()
    58 {
    59  
    60 }
     92  \brief this finalizes an object and makes it ready to be garbage collected
    6193*/
    62 
    6394void BaseObject::finalize()
    6495{
Note: See TracChangeset for help on using the changeset viewer.