Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2151 for code/branches


Ignore:
Timestamp:
Nov 6, 2008, 12:55:07 PM (16 years ago)
Author:
rgrieder
Message:

Renamed PositionableEntity to StaticEntity and added dummy classes DynamicEntity and KinematicEntity.

Location:
code/branches/physics
Files:
4 added
20 edited
2 moved

Legend:

Unmodified
Added
Removed

  • code/branches/physics/src/orxonox/CMakeLists.txt

    r2141 r2151  
    5757  objects/Scene.cc
    5858  objects/worldentities/WorldEntity.cc
    59   objects/worldentities/PositionableEntity.cc
     59  objects/worldentities/StaticEntity.cc
     60  objects/worldentities/KinematicEntity.cc
     61  objects/worldentities/DynamicEntity.cc
    6062  objects/worldentities/MovableEntity.cc
    6163  objects/worldentities/ControllableEntity.cc

  • code/branches/physics/src/orxonox/OrxonoxPrereqs.h

    r2096 r2151  
    103103
    104104    class WorldEntity;
    105     class PositionableEntity;
     105    class StaticEntity;
    106106    class MovableEntity;
    107107    class ControllableEntity;

  • code/branches/physics/src/orxonox/objects/worldentities/Backlight.h

    r2103 r2151  
    3232#include "OrxonoxPrereqs.h"
    3333
    34 #include "PositionableEntity.h"
     34#include "StaticEntity.h"
    3535#include "tools/BillboardSet.h"
    3636
    3737namespace orxonox
    3838{
    39     class _OrxonoxExport Backlight : public PositionableEntity
     39    class _OrxonoxExport Backlight : public StaticEntity
    4040    {
    4141        public:

  • code/branches/physics/src/orxonox/objects/worldentities/Billboard.cc

    r2087 r2151  
    3838    CreateFactory(Billboard);
    3939
    40     Billboard::Billboard(BaseObject* creator) : PositionableEntity(creator)
     40    Billboard::Billboard(BaseObject* creator) : StaticEntity(creator)
    4141    {
    4242        RegisterObject(Billboard);

  • code/branches/physics/src/orxonox/objects/worldentities/Billboard.h

    r2087 r2151  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 #include "PositionableEntity.h"
     33#include "StaticEntity.h"
    3434#include "util/Math.h"
    3535#include "tools/BillboardSet.h"
    … …  
    3737namespace orxonox
    3838{
    39     class _OrxonoxExport Billboard : public PositionableEntity
     39    class _OrxonoxExport Billboard : public StaticEntity
    4040    {
    4141        public:

  • code/branches/physics/src/orxonox/objects/worldentities/Camera.cc

    r2103 r2151  
    4747    CreateFactory(Camera);
    4848
    49     Camera::Camera(BaseObject* creator) : PositionableEntity(creator)
     49    Camera::Camera(BaseObject* creator) : StaticEntity(creator)
    5050    {
    5151        RegisterObject(Camera);

  • code/branches/physics/src/orxonox/objects/worldentities/Camera.h

    r2103 r2151  
    3333
    3434#include <OgrePrerequisites.h>
    35 #include "objects/worldentities/PositionableEntity.h"
     35#include "objects/worldentities/StaticEntity.h"
    3636#include "objects/Tickable.h"
    3737
    3838namespace orxonox
    3939{
    40     class _OrxonoxExport Camera : public PositionableEntity, public Tickable
     40    class _OrxonoxExport Camera : public StaticEntity, public Tickable
    4141    {
    4242        friend class CameraManager;

  • code/branches/physics/src/orxonox/objects/worldentities/CameraPosition.cc

    r2087 r2151  
    3838    CreateFactory(CameraPosition);
    3939
    40     CameraPosition::CameraPosition(BaseObject* creator) : PositionableEntity(creator)
     40    CameraPosition::CameraPosition(BaseObject* creator) : StaticEntity(creator)
    4141    {
    4242        RegisterObject(CameraPosition);

  • code/branches/physics/src/orxonox/objects/worldentities/CameraPosition.h

    r2087 r2151  
    3232#include "OrxonoxPrereqs.h"
    3333
    34 #include "objects/worldentities/PositionableEntity.h"
     34#include "objects/worldentities/StaticEntity.h"
    3535
    3636namespace orxonox
    3737{
    38     class _OrxonoxExport CameraPosition : public PositionableEntity
     38    class _OrxonoxExport CameraPosition : public StaticEntity
    3939    {
    4040        public:

  • code/branches/physics/src/orxonox/objects/worldentities/Light.cc

    r2087 r2151  
    4747    CreateFactory(Light);
    4848
    49     Light::Light(BaseObject* creator) : PositionableEntity(creator)
     49    Light::Light(BaseObject* creator) : StaticEntity(creator)
    5050    {
    5151        RegisterObject(Light);

  • code/branches/physics/src/orxonox/objects/worldentities/Light.h

    r2087 r2151  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 #include "PositionableEntity.h"
     33#include "StaticEntity.h"
    3434
    3535#include <string>
    … …  
    4040namespace orxonox
    4141{
    42     class _OrxonoxExport Light : public PositionableEntity
     42    class _OrxonoxExport Light : public StaticEntity
    4343    {
    4444        public:

  • code/branches/physics/src/orxonox/objects/worldentities/Model.cc

    r2087 r2151  
    3838    CreateFactory(Model);
    3939
    40     Model::Model(BaseObject* creator) : PositionableEntity(creator)
     40    Model::Model(BaseObject* creator) : StaticEntity(creator)
    4141    {
    4242        RegisterObject(Model);

  • code/branches/physics/src/orxonox/objects/worldentities/Model.h

    r2087 r2151  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 #include "PositionableEntity.h"
     33#include "StaticEntity.h"
    3434#include "tools/Mesh.h"
    3535
    3636namespace orxonox
    3737{
    38     class _OrxonoxExport Model : public PositionableEntity
     38    class _OrxonoxExport Model : public StaticEntity
    3939    {
    4040        public:
    … …  
    7070}
    7171
    72 #endif /* _PositionableEntity_H__ */
     72#endif /* _Model_H__ */

  • code/branches/physics/src/orxonox/objects/worldentities/ParticleEmitter.cc

    r2087 r2151  
    4545    CreateFactory(ParticleEmitter);
    4646
    47     ParticleEmitter::ParticleEmitter(BaseObject* creator) : PositionableEntity(creator)
     47    ParticleEmitter::ParticleEmitter(BaseObject* creator) : StaticEntity(creator)
    4848    {
    4949        RegisterObject(ParticleEmitter);

  • code/branches/physics/src/orxonox/objects/worldentities/ParticleEmitter.h

    r2087 r2151  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 #include "PositionableEntity.h"
     33#include "StaticEntity.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport ParticleEmitter : public PositionableEntity
     37    class _OrxonoxExport ParticleEmitter : public StaticEntity
    3838    {
    3939        public:

  • code/branches/physics/src/orxonox/objects/worldentities/SpawnPoint.cc

    r2087 r2151  
    3838    CreateFactory(SpawnPoint);
    3939
    40     SpawnPoint::SpawnPoint(BaseObject* creator) : PositionableEntity(creator)
     40    SpawnPoint::SpawnPoint(BaseObject* creator) : StaticEntity(creator)
    4141    {
    4242        RegisterObject(SpawnPoint);

  • code/branches/physics/src/orxonox/objects/worldentities/SpawnPoint.h

    r2087 r2151  
    3434#include "core/Identifier.h"
    3535#include "core/Template.h"
    36 #include "PositionableEntity.h"
     36#include "StaticEntity.h"
    3737#include "objects/worldentities/pawns/Pawn.h"
    3838
    3939namespace orxonox
    4040{
    41     class _OrxonoxExport SpawnPoint : public PositionableEntity
     41    class _OrxonoxExport SpawnPoint : public StaticEntity
    4242    {
    4343        public:

  • code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.cc

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.ccmergedeligible
      /code/branches/ceguilua/src/orxonox/objects/worldentities/PositionableEntity.cc1802-1808
      /code/branches/core3/src/orxonox/objects/worldentities/PositionableEntity.cc1572-1739
      /code/branches/gcc43/src/orxonox/objects/worldentities/PositionableEntity.cc1580
      /code/branches/gui/src/orxonox/objects/worldentities/PositionableEntity.cc1635-1723
      /code/branches/input/src/orxonox/objects/worldentities/PositionableEntity.cc1629-1636
      /code/branches/physics/src/orxonox/objects/worldentities/PositionableEntity.cc1912-2055
      /code/branches/pickups/src/orxonox/objects/worldentities/PositionableEntity.cc1926-2086
      /code/branches/questsystem/src/orxonox/objects/worldentities/PositionableEntity.cc1894-2088
      /code/branches/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.cc1295-1953,​1955
      /code/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.cc1925-2094
    r2144 r2151  
    2828
    2929#include "OrxonoxStableHeaders.h"
    30 #include "PositionableEntity.h"
     30#include "StaticEntity.h"
    3131#include "core/CoreIncludes.h"
    3232
    3333namespace orxonox
    3434{
    35     CreateFactory(PositionableEntity);
     35    CreateFactory(StaticEntity);
    3636
    37     PositionableEntity::PositionableEntity(BaseObject* creator) : WorldEntity(creator)
     37    StaticEntity::StaticEntity(BaseObject* creator) : WorldEntity(creator)
    3838    {
    39         RegisterObject(PositionableEntity);
     39        RegisterObject(StaticEntity);
    4040
    4141        this->registerVariables();
    4242    }
    4343
    44     PositionableEntity::~PositionableEntity()
     44    StaticEntity::~StaticEntity()
    4545    {
    4646    }
    4747
    48     void PositionableEntity::registerVariables()
     48    void StaticEntity::registerVariables()
    4949    {
    5050        REGISTERDATA(this->getPosition().x, network::direction::toclient);

  • code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.h

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.hmergedeligible
      /code/branches/ceguilua/src/orxonox/objects/worldentities/PositionableEntity.h1802-1808
      /code/branches/core3/src/orxonox/objects/worldentities/PositionableEntity.h1572-1739
      /code/branches/gcc43/src/orxonox/objects/worldentities/PositionableEntity.h1580
      /code/branches/gui/src/orxonox/objects/worldentities/PositionableEntity.h1635-1723
      /code/branches/input/src/orxonox/objects/worldentities/PositionableEntity.h1629-1636
      /code/branches/physics/src/orxonox/objects/worldentities/PositionableEntity.h1912-2055
      /code/branches/pickups/src/orxonox/objects/worldentities/PositionableEntity.h1926-2086
      /code/branches/questsystem/src/orxonox/objects/worldentities/PositionableEntity.h1894-2088
      /code/branches/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.h1295-1953,​1955
      /code/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.h1925-2094
    r2144 r2151  
    2727 */
    2828
    29 #ifndef _PositionableEntity_H__
    30 #define _PositionableEntity_H__
     29#ifndef _StaticEntity_H__
     30#define _StaticEntity_H__
    3131
    3232#include "OrxonoxPrereqs.h"
    … …  
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport PositionableEntity : public WorldEntity
     37    class _OrxonoxExport StaticEntity : public WorldEntity
    3838    {
    3939        public:
    40             PositionableEntity(BaseObject* creator);
    41             virtual ~PositionableEntity();
     40            StaticEntity(BaseObject* creator);
     41            virtual ~StaticEntity();
    4242
    4343            void registerVariables();
    … …  
    7474}
    7575
    76 #endif /* _PositionableEntity_H__ */
     76#endif /* _StaticEntity_H__ */

  • code/branches/physics/src/orxonox/objects/worldentities/triggers/Trigger.cc

    r2103 r2151  
    4444  CreateFactory(Trigger);
    4545
    46   Trigger::Trigger(BaseObject* creator) : PositionableEntity(creator)
     46  Trigger::Trigger(BaseObject* creator) : StaticEntity(creator)
    4747  {
    4848    RegisterObject(Trigger);

  • code/branches/physics/src/orxonox/objects/worldentities/triggers/Trigger.h

    r2103 r2151  
    3636
    3737#include "objects/Tickable.h"
    38 #include "objects/worldentities/PositionableEntity.h"
     38#include "objects/worldentities/StaticEntity.h"
    3939#include "tools/BillboardSet.h"
    4040
    … …  
    4848  };
    4949
    50   class _OrxonoxExport Trigger : public PositionableEntity, public Tickable
     50  class _OrxonoxExport Trigger : public StaticEntity, public Tickable
    5151  {
    5252    public:

  • code/branches/physics/visual_studio/vc8/orxonox.vcproj

    r2124 r2151  
    301301                                        </File>
    302302                                        <File
     303                                                RelativePath="..\..\src\orxonox\objects\worldentities\DynamicEntity.cc"
     304                                                >
     305                                        </File>
     306                                        <File
     307                                                RelativePath="..\..\src\orxonox\objects\worldentities\KinematicEntity.cc"
     308                                                >
     309                                        </File>
     310                                        <File
    303311                                                RelativePath="..\..\src\orxonox\objects\worldentities\Light.cc"
    304312                                                >
    … …  
    321329                                        </File>
    322330                                        <File
    323                                                 RelativePath="..\..\src\orxonox\objects\worldentities\PositionableEntity.cc"
    324                                                 >
    325                                         </File>
    326                                         <File
    327331                                                RelativePath="..\..\src\orxonox\objects\worldentities\SpawnPoint.cc"
     332                                                >
     333                                        </File>
     334                                        <File
     335                                                RelativePath="..\..\src\orxonox\objects\worldentities\StaticEntity.cc"
    328336                                                >
    329337                                        </File>
    … …  
    933941                                        </File>
    934942                                        <File
     943                                                RelativePath="..\..\src\orxonox\objects\worldentities\DynamicEntity.h"
     944                                                >
     945                                        </File>
     946                                        <File
     947                                                RelativePath="..\..\src\orxonox\objects\worldentities\KinematicEntity.h"
     948                                                >
     949                                        </File>
     950                                        <File
    935951                                                RelativePath="..\..\src\orxonox\objects\worldentities\Light.h"
    936952                                                >
    … …  
    953969                                        </File>
    954970                                        <File
    955                                                 RelativePath="..\..\src\orxonox\objects\worldentities\PositionableEntity.h"
    956                                                 >
    957                                         </File>
    958                                         <File
    959971                                                RelativePath="..\..\src\orxonox\objects\worldentities\SpawnPoint.h"
     972                                                >
     973                                        </File>
     974                                        <File
     975                                                RelativePath="..\..\src\orxonox\objects\worldentities\StaticEntity.h"
    960976                                                >
    961977                                        </File>
Note: See TracChangeset for help on using the changeset viewer.