Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9869 in orxonox.OLD for trunk/src/lib/physics/fields


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/lib/physics/fields
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/physics/fields/field.cc

    r9406 r9869  
    2323#include "util/loading/load_param.h"
    2424
     25ObjectListDefinition(Field);
    2526
    2627/**
    27  * standard constructor
     28 * @brief standard constructor
    2829*/
    2930Field::Field ()
    … …  
    3334
    3435/**
    35  *  standard deconstructor
    36 
    37 */
     36 * @brief standard deconstructor
     37 */
    3838Field::~Field ()
    3939{
    … …  
    4242
    4343/**
    44   \brief initializes a Field
    45 */
     44  * @brief initializes a Field
     45 */
    4646void Field::init()
    4747{
    48   this->setClassID(CL_FIELD, "Field");
     48  this->registerObject(this, Field::_objectList);
    4949  this->setMagnitude(1);
    5050  this->setAttenuation(0);
    … …  
    5454
    5555/**
    56 * @param root The XML-element to load settings from
     56 * @param root The XML-element to load settings from
    5757 */
    5858void Field::loadParams(const TiXmlElement* root)

  • trunk/src/lib/physics/fields/field.h

    r6512 r9869  
    1616/*!
    1717 * @file field.h
    18   * abstract definition of a Physical Field
    19 
    20    This is a totally abstract class, that only enables different Physical Fields to
    21    exist on a common Level.
    22 */
     18 * abstract definition of a Physical Field
     19 *
     20 * This is a totally abstract class, that only enables different Physical Fields to
     21 * exist on a common Level.
     22 */
    2323
    2424#ifndef _FIELD_H
    … …  
    3434class Field : public PNode
    3535{
     36  ObjectListDeclaration(Field);
    3637 public:
    3738  Field();

  • trunk/src/lib/physics/fields/gravity.cc

    r9406 r9869  
    2121#include "util/loading/factory.h"
    2222
     23#include "class_id_DEPRECATED.h"
     24ObjectListDefinitionID(Gravity, CL_FIELD_GRAVITY);
    2325
    24 
    25 CREATE_FACTORY(Gravity, CL_FIELD_GRAVITY);
     26CREATE_FACTORY(Gravity);
    2627
    2728Gravity::Gravity(const TiXmlElement* root)
    2829{
    29   this->setClassID(CL_FIELD_GRAVITY, "Gravity");
     30  this->registerObject(this, Gravity::_objectList);
    3031
    3132  if (root != NULL)

  • trunk/src/lib/physics/fields/gravity.h

    r6512 r9869  
    1616//! A class for ...
    1717class Gravity : public Field {
     18  ObjectListDeclaration(Gravity);
    1819
    1920 public:

  • trunk/src/lib/physics/fields/point_gravity.cc

    r9406 r9869  
    2020
    2121
     22#include "class_id_DEPRECATED.h"
     23ObjectListDefinitionID(PointGravity, CL_FIELD_POINT_GRAVITY);
     24
    2225
    2326/**
    … …  
    2730PointGravity::PointGravity ()
    2831{
    29    this->setClassID(CL_FIELD_POINT_GRAVITY, "PointGravity");
     32  this->registerObject(this, PointGravity::_objectList);
    3033}
    3134

  • trunk/src/lib/physics/fields/point_gravity.h

    r5405 r9869  
    1 /*! 
     1/*!
    22 * @file point_gravity.h
    33  *  Definition of ...
    … …  
    1616//! A class for ...
    1717class PointGravity : public Field {
     18  ObjectListDeclaration(PointGravity);
    1819
    1920 public:

  • trunk/src/lib/physics/fields/twirl.cc

    r9406 r9869  
    2020
    2121
     22#include "class_id_DEPRECATED.h"
     23ObjectListDefinitionID(Twirl, CL_FIELD_TWIRL);
     24
    2225
    2326/**
    … …  
    2730Twirl::Twirl ()
    2831{
    29    this->setClassID(CL_FIELD_TWIRL, "Twirl");
     32  this->registerObject(this, Twirl::_objectList);
    3033}
    3134

  • trunk/src/lib/physics/fields/twirl.h

    r5405 r9869  
    1 /*! 
     1/*!
    22 * @file twirl.h
    33  *  Definition of ...
    … …  
    1616//! A class for ...
    1717class Twirl : public Field {
     18  ObjectListDeclaration(Twirl);
    1819
    1920 public:
Note: See TracChangeset for help on using the changeset viewer.