Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6866 for code


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

commit by cyrill

Location:
code/branches/fps
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • code/branches/fps/data/levels/empty_level.oxw

    r6560 r6866  
    1717    skybox       = "Orxonox/Starbox"
    1818  >
    19    
     19 
     20  <MovableEntity position="0,0,0" rotationrate="10" >
     21    <attached>
     22      <Model scale="100" mesh="ast2.mesh" shadow=false />
     23    </attached>
     24  </MovableEntity>
     25       
    2026    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
    21     <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
     27    <SpawnPoint position="0,0,20" spawnclass=FpsPlayer pawndesign=spaceshipassff />
    2228  </Scene>
    2329</Level>
  • code/branches/fps/src/orxonox/Scene.cc

    r6417 r6866  
    338338        SmartPtr<WorldEntity> object0 = static_cast<WorldEntity*>(colObj0->getUserPointer());
    339339        SmartPtr<WorldEntity> object1 = static_cast<WorldEntity*>(colObj1->getUserPointer());
    340 
     340       
    341341        // false means that bullet will assume we didn't modify the contact
    342342        bool modified = false;
  • code/branches/fps/src/orxonox/controllers/HumanController.cc

    r6417 r6866  
    4141namespace orxonox
    4242{
     43   
    4344    SetConsoleCommand(HumanController, moveFrontBack, true).setAsInputCommand();
    4445    SetConsoleCommand(HumanController, moveRightLeft, true).setAsInputCommand();
  • code/branches/fps/src/orxonox/controllers/NewHumanController.cc

    r6502 r6866  
    210210                if (!controlPaused_ )
    211211                {
    212                     if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket"))))
     212                    if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket")) || this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer"))))
    213213                        this->showOverlays();
    214214
     
    425425            HumanController::yaw(value);
    426426
    427         this->currentYaw_ = value.x;
     427        if (this->getControllableEntity() && !this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))
     428            this->currentYaw_ = value.x;
    428429    }
    429430
     
    434435            HumanController::pitch(value);
    435436
    436         this->currentPitch_ = value.x;
     437        if (this->getControllableEntity() && !this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))
     438            this->currentPitch_ = value.x;
    437439    }
    438440
  • 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.