Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 2, 2010, 12:02:50 AM (14 years ago)
Author:
landauf
Message:

merged fps branch to presentation3

Location:
code/branches/presentation3
Files:
7 edited
19 copied

Legend:

Unmodified
Added
Removed

  • code/branches/presentation3

  • code/branches/presentation3/src/libraries/tools/CMakeLists.txt

    r6417 r7073  
    1515COMPILATION_END
    1616)
     17#ADD_SUBDIRECTORY(bsp)
    1718ADD_SUBDIRECTORY(interfaces)
    1819

  • code/branches/presentation3/src/orxonox/controllers/NewHumanController.cc

    r6951 r7073  
    216216                {
    217217                    if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket"))))
    218                         this->showOverlays();
     218                        {this->showOverlays();}
     219                       
     220                    if (this->getControllableEntity() &&  this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))\
     221                        {this->showOverlays();
     222                        this->hideArrows();}
    219223
    220224                    this->crossHairOverlay_->setPosition(Vector2(static_cast<float>(this->currentYaw_)/2*-1+.5f-overlaySize_/2, static_cast<float>(this->currentPitch_)/2*-1+.5f-overlaySize_/2));
    … …  
    437441            HumanController::yaw(value);
    438442
    439         this->currentYaw_ = value.x;
     443        if (this->getControllableEntity() && !this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))
     444            this->currentYaw_ = value.x;
    440445    }
    441446
    … …  
    446451            HumanController::pitch(value);
    447452
    448         this->currentPitch_ = value.x;
     453        if (this->getControllableEntity() && !this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))
     454            this->currentPitch_ = value.x;
    449455    }
    450456

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

    r6994 r7073  
    163163            inline void setHudTemplate(const std::string& name)
    164164                { this->hudtemplate_ = name; }
     165
     166            Ogre::SceneNode* cameraPositionRootNode_;
    165167
    166168        private:
    … …  
    210212            bool bMouseLook_;
    211213            float mouseLookSpeed_;
    212             Ogre::SceneNode* cameraPositionRootNode_;
    213214            std::list<SmartPtr<CameraPosition> > cameraPositions_;
    214215            CameraPosition* currentCameraPosition_;

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

    r5781 r7073  
    11ADD_SOURCE_FILES(ORXONOX_SRC_FILES
     2  FpsPlayer.cc
    23  Spectator.cc
    34  Pawn.cc

  • code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.cc

    • Property svn:eol-style set to native

  • code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.h

    • Property svn:eol-style set to native

  • code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc

    r7045 r7073  
    363363    {
    364364        if (this->weaponSystem_)
     365        {
    365366            this->weaponSystem_->addWeaponPack(wPack);
     367            this->addedWeaponPack(wPack);
     368        }
    366369    }
    367370
    … …  
    369372    {
    370373        if (this->weaponSystem_)
     374        {
    371375            if (!this->weaponSystem_->addWeaponPack(wPack))
    372376                wPack->destroy();
     377            else
     378                this->addedWeaponPack(wPack);
     379        }
    373380    }
    374381

  • code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.h

    r6998 r7073  
    101101            void addWeaponPackXML(WeaponPack * wPack);
    102102            WeaponPack * getWeaponPack(unsigned int index) const;
     103           
     104            virtual void addedWeaponPack(WeaponPack* wPack) {}
    103105
    104106            inline const WorldEntity* getWorldEntity() const
Note: See TracChangeset for help on using the changeset viewer.