Changeset 7073

Timestamp:

Jun 2, 2010, 12:02:50 AM (15 years ago)

Author:

landauf

Message:

merged fps branch to presentation3

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• cmake/LibraryConfig.cmake (modified) (1 diff)
• data/levels/fps_test.oxw (copied) (copied from code/branches/fps/data/levels/fps_test.oxw) (1 prop)
• data/levels/includes/weaponsettings_fps.oxi (copied) (copied from code/branches/fps/data/levels/includes/weaponsettings_fps.oxi) (1 prop)
• data/levels/presentation_FS10.oxw (copied) (copied from code/branches/fps/data/levels/presentation_FS10.oxw) (1 prop)
• data/levels/presentation_FS10_ed.oxw (copied) (copied from code/branches/fps/data/levels/presentation_FS10_ed.oxw) (1 prop)
• data/levels/templates/fps.oxt (copied) (copied from code/branches/fps/data/levels/templates/fps.oxt) (1 prop)
• data/overlays/hudtamplates_fps.oxo (copied) (copied from code/branches/fps/data/overlays/hudtamplates_fps.oxo) (1 prop)
• src/libraries/tools/CMakeLists.txt (modified) (1 diff)
• src/libraries/tools/bsp (copied) (copied from code/branches/fps/src/libraries/tools/bsp)
• src/libraries/tools/bsp/CMakeLists.txt (copied) (copied from code/branches/fps/src/libraries/tools/bsp/CMakeLists.txt)
• src/libraries/tools/bsp/DemoApp.cpp (copied) (copied from code/branches/fps/src/libraries/tools/bsp/DemoApp.cpp)
• src/libraries/tools/bsp/DemoApp.hpp (copied) (copied from code/branches/fps/src/libraries/tools/bsp/DemoApp.hpp)
• src/libraries/tools/bsp/ExampleApplication.h (copied) (copied from code/branches/fps/src/libraries/tools/bsp/ExampleApplication.h)
• src/libraries/tools/bsp/ExampleFrameListener.h (copied) (copied from code/branches/fps/src/libraries/tools/bsp/ExampleFrameListener.h)
• src/libraries/tools/bsp/OgreFramework.cpp (copied) (copied from code/branches/fps/src/libraries/tools/bsp/OgreFramework.cpp)
• src/libraries/tools/bsp/OgreFramework.hpp (copied) (copied from code/branches/fps/src/libraries/tools/bsp/OgreFramework.hpp)
• src/libraries/tools/bsp/OgreGpuCommandBufferFlush.cpp (copied) (copied from code/branches/fps/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.cpp)
• src/libraries/tools/bsp/OgreGpuCommandBufferFlush.h (copied) (copied from code/branches/fps/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.h)
• src/libraries/tools/bsp/Q3Map.cpp (copied) (copied from code/branches/fps/src/libraries/tools/bsp/Q3Map.cpp)
• src/libraries/tools/bsp/Q3Map.h (copied) (copied from code/branches/fps/src/libraries/tools/bsp/Q3Map.h)
• src/libraries/tools/bsp/Q3Map_Bezier.cpp (copied) (copied from code/branches/fps/src/libraries/tools/bsp/Q3Map_Bezier.cpp)
• src/libraries/tools/bsp/Q3Map_Bezier.h (copied) (copied from code/branches/fps/src/libraries/tools/bsp/Q3Map_Bezier.h)
• src/libraries/tools/bsp/Q3Map_BspVertex.cpp (copied) (copied from code/branches/fps/src/libraries/tools/bsp/Q3Map_BspVertex.cpp)
• src/libraries/tools/bsp/Q3Map_BspVertex.h (copied) (copied from code/branches/fps/src/libraries/tools/bsp/Q3Map_BspVertex.h)
• src/libraries/tools/bsp/Q3Map_misc.h (copied) (copied from code/branches/fps/src/libraries/tools/bsp/Q3Map_misc.h)
• src/orxonox/controllers/NewHumanController.cc (modified) (3 diffs)
• src/orxonox/worldentities/ControllableEntity.h (modified) (2 diffs)
• src/orxonox/worldentities/pawns/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/pawns/FpsPlayer.cc (copied) (copied from code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.cc) (1 prop)
• src/orxonox/worldentities/pawns/FpsPlayer.h (copied) (copied from code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.h) (1 prop)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)

code/branches/presentation3/cmake/LibraryConfig.cmake

@@ -188 +188 @@
 
 # More plugins: Plugin_BSPSceneManager, Plugin_OctreeSceneManager
-SET(OGRE_PLUGINS_INT Plugin_ParticleFX)
+SET(OGRE_PLUGINS_INT "Plugin_ParticleFX;Plugin_BSPSceneManager")
 IF(WIN32)
   # CG program manager is probably DirectX related (not available under unix)

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

@@ -15 +15 @@
 COMPILATION_END
 )
+#ADD_SUBDIRECTORY(bsp)
 ADD_SUBDIRECTORY(interfaces)
 

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

@@ -216 +216 @@
                 {
                     if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket"))))
-                        this->showOverlays();
+                        {this->showOverlays();}
+                        
+                    if (this->getControllableEntity() &&  this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))\
+                        {this->showOverlays();
+                        this->hideArrows();}
 
                     this->crossHairOverlay_->setPosition(Vector2(static_cast<float>(this->currentYaw_)/2*-1+.5f-overlaySize_/2, static_cast<float>(this->currentPitch_)/2*-1+.5f-overlaySize_/2));
@@ -437 +441 @@
             HumanController::yaw(value);
 
-        this->currentYaw_ = value.x;
+        if (this->getControllableEntity() && !this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))
+            this->currentYaw_ = value.x;
     }
 
@@ -446 +451 @@
             HumanController::pitch(value);
 
-        this->currentPitch_ = value.x;
+        if (this->getControllableEntity() && !this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))
+            this->currentPitch_ = value.x;
     }
 

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

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

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

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

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

@@ -363 +363 @@
     {
         if (this->weaponSystem_)
+        {
             this->weaponSystem_->addWeaponPack(wPack);
+            this->addedWeaponPack(wPack);
+        }
     }
 
@@ -369 +372 @@
     {
         if (this->weaponSystem_)
+        {
             if (!this->weaponSystem_->addWeaponPack(wPack))
                 wPack->destroy();
+            else
+                this->addedWeaponPack(wPack);
+        }
     }
 

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

@@ -101 +101 @@
             void addWeaponPackXML(WeaponPack * wPack);
             WeaponPack * getWeaponPack(unsigned int index) const;
+            
+            virtual void addedWeaponPack(WeaponPack* wPack) {}
 
             inline const WorldEntity* getWorldEntity() const