Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 25, 2011, 11:44:04 PM (13 years ago)
Author:
dafrick
Message:

The Camera doesn't need to be a MovableEntity, which also averts problems when moving through a portal, that admits all MovableEntities.

Location:
code/branches/presentation/src/orxonox
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation/src/orxonox/graphics/Camera.cc

    r8580 r8587  
    4848    CreateFactory(Camera);
    4949
    50     Camera::Camera(BaseObject* creator) : MovableEntity(creator)
     50    Camera::Camera(BaseObject* creator) : StaticEntity(creator)
    5151    {
    5252        RegisterObject(Camera);
  • code/branches/presentation/src/orxonox/graphics/Camera.h

    r8580 r8587  
    3636#include "tools/interfaces/Tickable.h"
    3737#include "tools/interfaces/TimeFactorListener.h"
    38 #include "worldentities/MovableEntity.h"
     38#include "worldentities/StaticEntity.h"
    3939
    4040namespace orxonox
    4141{
    4242
    43     class _OrxonoxExport Camera : public MovableEntity, public TimeFactorListener, public WindowEventListener
     43    class _OrxonoxExport Camera : public StaticEntity, public Tickable, public TimeFactorListener, public WindowEventListener
    4444    {
    4545        friend class CameraManager;
  • code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc

    r8583 r8587  
    8181        this->cameraOriginalPosition_ = Vector3::UNIT_SCALE;
    8282        this->cameraOriginalOrientation_ = Quaternion::IDENTITY;
    83        
    8483
    8584        this->shakeFrequency_ = 15;
Note: See TracChangeset for help on using the changeset viewer.