Changeset 6866

Timestamp:

May 10, 2010, 12:40:49 PM (15 years ago)

Author:

freicy

Message:

commit by cyrill

Location:

code/branches/fps

Files:

• data/levels/empty_level.oxw (modified) (1 diff)
• src/orxonox/Scene.cc (modified) (1 diff)
• src/orxonox/controllers/HumanController.cc (modified) (1 diff)
• src/orxonox/controllers/NewHumanController.cc (modified) (3 diffs)
• src/orxonox/worldentities/CameraPosition.cc (modified) (1 diff)
• src/orxonox/worldentities/ControllableEntity.h (modified) (2 diffs)
• src/orxonox/worldentities/pawns/CMakeLists.txt (modified) (1 diff)

code/branches/fps/data/levels/empty_level.oxw

@@ -17 +17 @@
     skybox       = "Orxonox/Starbox"
   >
-    
+  
+  <MovableEntity position="0,0,0" rotationrate="10" >
+    <attached>
+      <Model scale="100" mesh="ast2.mesh" shadow=false />
+    </attached>
+  </MovableEntity>
+        
     <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" />
-    <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <SpawnPoint position="0,0,20" spawnclass=FpsPlayer pawndesign=spaceshipassff />
   </Scene>
 </Level>

code/branches/fps/src/orxonox/Scene.cc

@@ -338 +338 @@
         SmartPtr<WorldEntity> object0 = static_cast<WorldEntity*>(colObj0->getUserPointer());
         SmartPtr<WorldEntity> object1 = static_cast<WorldEntity*>(colObj1->getUserPointer());
-
+        
         // false means that bullet will assume we didn't modify the contact
         bool modified = false;

code/branches/fps/src/orxonox/controllers/HumanController.cc

@@ -41 +41 @@
 namespace orxonox
 {
+    
     SetConsoleCommand(HumanController, moveFrontBack, true).setAsInputCommand();
     SetConsoleCommand(HumanController, moveRightLeft, true).setAsInputCommand();

code/branches/fps/src/orxonox/controllers/NewHumanController.cc

@@ -210 +210 @@
                 if (!controlPaused_ )
                 {
-                    if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket"))))
+                    if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket")) || this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer"))))
                         this->showOverlays();
 
@@ -425 +425 @@
             HumanController::yaw(value);
 
-        this->currentYaw_ = value.x;
+        if (this->getControllableEntity() && !this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))
+            this->currentYaw_ = value.x;
     }
 
@@ -434 +435 @@
             HumanController::pitch(value);
 
-        this->currentPitch_ = value.x;
+        if (this->getControllableEntity() && !this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))
+            this->currentPitch_ = value.x;
     }
 

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

@@ -65 +65 @@
     void CameraPosition::attachCamera(Camera* camera)
     {
-        if (!this->bDrag_)
+        
+        this->attach(camera);
+                  if (!this->bDrag_)
             camera->setDrag(false);
-
-        this->attach(camera);
 
         if (this->bDrag_)

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

@@ -161 +161 @@
             inline void setHudTemplate(const std::string& name)
                 { this->hudtemplate_ = name; }
+
+            Ogre::SceneNode* cameraPositionRootNode_;
 
         private:
@@ -208 +210 @@
             bool bMouseLook_;
             float mouseLookSpeed_;
-            Ogre::SceneNode* cameraPositionRootNode_;
             std::list<SmartPtr<CameraPosition> > cameraPositions_;
             CameraPosition* currentCameraPosition_;

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

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+  FpsPlayer.cc
   Spectator.cc
   Pawn.cc