Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9869 in orxonox.OLD for trunk/src/world_entities/elements


Ignore:
Timestamp:
Oct 3, 2006, 12:19:30 AM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

Location:
trunk/src/world_entities/elements
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/elements/image_entity.cc

    r9406 r9869  
    3030
    3131
    32 CREATE_FACTORY(ImageEntity, CL_IMAGE_ENTITY);
     32#include "class_id_DEPRECATED.h"
     33ObjectListDefinitionID(ImageEntity, CL_IMAGE_ENTITY);
     34CREATE_FACTORY(ImageEntity);
    3335
    3436
    … …  
    5961void ImageEntity::init()
    6062{
    61   this->setClassID(CL_IMAGE_ENTITY, "ImageEntity");
     63  this->registerObject(this, ImageEntity::_objectList);
    6264  this->setName("ImageEntity");
    6365

  • trunk/src/world_entities/elements/image_entity.h

    r7751 r9869  
    2121//! A class that enables the
    2222class ImageEntity : public PNode, public Element2D {
     23  ObjectListDeclaration(ImageEntity);
    2324
    2425 public:

  • trunk/src/world_entities/elements/text_element.cc

    r9406 r9869  
    2727
    2828
    29 
    30 CREATE_FACTORY(TextElement, CL_TEXT_ELEMENT);
     29#include "class_id_DEPRECATED.h"
     30ObjectListDefinitionID(TextElement, CL_TEXT_ELEMENT);
     31CREATE_FACTORY(TextElement);
    3132
    3233
    … …  
    3637TextElement::TextElement (const TiXmlElement* root)
    3738{
    38   this->setClassID(CL_TEXT_ELEMENT, "TextElement");
     39  this->registerObject(this, TextElement::_objectList);
    3940  this->setName("TextElement");
    4041

  • trunk/src/world_entities/elements/text_element.h

    r7221 r9869  
    2121//! A class that enables the
    2222class TextElement : public Text {
     23  ObjectListDeclaration(TextElement);
    2324
    2425 public:
Note: See TracChangeset for help on using the changeset viewer.