Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 10, 2010, 12:40:49 PM (14 years ago)
Author:
freicy
Message:

commit by cyrill

Location:
code/branches/fps/src/orxonox/worldentities
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/fps/src/orxonox/worldentities/CameraPosition.cc

    r5929 r6866  
    6565    void CameraPosition::attachCamera(Camera* camera)
    6666    {
    67         if (!this->bDrag_)
     67       
     68        this->attach(camera);
     69                  if (!this->bDrag_)
    6870            camera->setDrag(false);
    69 
    70         this->attach(camera);
    7171
    7272        if (this->bDrag_)

  • code/branches/fps/src/orxonox/worldentities/ControllableEntity.h

    r6417 r6866  
    161161            inline void setHudTemplate(const std::string& name)
    162162                { this->hudtemplate_ = name; }
     163
     164            Ogre::SceneNode* cameraPositionRootNode_;
    163165
    164166        private:
    … …  
    208210            bool bMouseLook_;
    209211            float mouseLookSpeed_;
    210             Ogre::SceneNode* cameraPositionRootNode_;
    211212            std::list<SmartPtr<CameraPosition> > cameraPositions_;
    212213            CameraPosition* currentCameraPosition_;

  • code/branches/fps/src/orxonox/worldentities/pawns/CMakeLists.txt

    r5781 r6866  
    11ADD_SOURCE_FILES(ORXONOX_SRC_FILES
     2  FpsPlayer.cc
    23  Spectator.cc
    34  Pawn.cc
Note: See TracChangeset for help on using the changeset viewer.