Changeset 9907

Timestamp:

Dec 16, 2013, 2:22:45 PM (11 years ago)

Author:

smerkli

Message:

Merged spacestationentry branch

Location:

code/branches/presentationHS13

Files:

• . (modified) (1 prop)
• data/gui/layouts/UndockingDialog.layout (copied) (copied from code/branches/spacestationentry/data/gui/layouts/UndockingDialog.layout)
• data/gui/scripts/UndockingDialog.lua (copied) (copied from code/branches/spacestationentry/data/gui/scripts/UndockingDialog.lua)
• data/levels/EntryTest.oxw (copied) (copied from code/branches/spacestationentry/data/levels/EntryTest.oxw)
• data/levels/FPSTest.oxw (modified) (1 diff)
• data/levels/docking.oxw (modified) (1 diff)
• data/levels/dockingToASpaceStation.oxw (copied) (copied from code/branches/spacestationentry/data/levels/dockingToASpaceStation.oxw)
• src/modules/docking/Dock.cc (modified) (4 diffs)
• src/modules/docking/Dock.h (modified) (3 diffs)
• src/modules/docking/MoveToDockingTarget.cc (modified) (1 diff)
• src/modules/objects/ForceField.cc (modified) (5 diffs)
• src/modules/objects/ForceField.h (modified) (6 diffs)
• src/orxonox/infos/PlayerInfo.cc (modified) (1 diff)

code/branches/presentationHS13/data/levels/FPSTest.oxw

@@ +1 @@
+<!-- -->
 <LevelInfo
  name = "FPS testlevel"

code/branches/presentationHS13/data/levels/docking.oxw

@@ +1 @@
+<!-- -->
 <LevelInfo
  name = "Transporter"

code/branches/presentationHS13/src/modules/docking/Dock.cc

@@ -69 +69 @@
         XMLPortObject(Dock, DockingAnimation, "animations", addAnimation, getAnimation, xmlelement, mode);
         XMLPortEventSink(Dock, BaseObject, "execute", execute, xmlelement, mode);
+        XMLPortEventSink(Dock, BaseObject, "undocking", undocking, xmlelement, mode);
+
     }
 
@@ -76 +78 @@
 
         XMLPortEventSink(Dock, BaseObject, "execute", execute, xmlelement, mode);
-    }
+
+        XMLPortEventSink(Dock, BaseObject, "undocking", undocking, xmlelement, mode);
+    }
+
+
+    bool Dock::undocking(bool bTriggered, BaseObject* trigger)
+    {
+
+        PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
+        PlayerInfo* player = NULL;
+
+        // Check whether it is a player trigger and extract pawn from it
+        if(pTrigger != NULL)
+        {
+              if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
+              orxout(verbose, context::docking) << "Docking:execute PlayerTrigger was not triggered by a player.." << endl;
+              return false;
+              }
+              player = pTrigger->getTriggeringPlayer();
+        }
+        else
+        {
+              orxout(verbose, context::docking) << "Docking::execute Not a player trigger, can't extract pawn from it.." << endl;
+              return false;
+        }
+        if(player == NULL)
+        {
+              orxout(verbose, context::docking) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << endl;
+              return false;
+        }
+
+            if(bTriggered)
+        {
+              // Add player to this Docks candidates
+              candidates_.insert(player);
+
+              // Show docking dialog
+              this->showUndockingDialogHelper(player);
+        }
+        else
+        {
+              // Remove player from candidates list
+              candidates_.erase(player);
+        }
+
+        return true;
+    }
+
+
 
     bool Dock::execute(bool bTriggered, BaseObject* trigger)
@@ -119 +169 @@
         return true;
     }
+
+
+    void Dock::showUndockingDialogHelper(PlayerInfo* player)
+        {
+            assert(player);
+
+            if(!player->isHumanPlayer())
+                return;
+
+            if(GameMode::isMaster())
+            {
+                if(GameMode::showsGraphics())
+                    GUIManager::showGUI("UndockingDialog");
+            }
+            else
+                callStaticNetworkFunction(Dock::showDockingDialog, player->getClientID());
+
+        }
 
     void Dock::showDockingDialogHelper(PlayerInfo* player)
@@ -177 +245 @@
         if (animations_.empty())
             return dockingAnimationFinished(player);
+
         else
             DockingAnimation::invokeAnimation(true, player, animations_);

code/branches/presentationHS13/src/modules/docking/Dock.h

@@ -62 +62 @@
             // Trigger interface
             bool execute(bool bTriggered, BaseObject* trigger);
+            bool undocking(bool bTriggered, BaseObject* trigger);
 
             // XML interface
@@ -85 +86 @@
             void dock()
                 { this->dock(HumanController::getLocalControllerSingleton()->getPlayer()); }
+            void undock()
+                { this->undock(HumanController::getLocalControllerSingleton()->getPlayer()); }
             static unsigned int getNumberOfActiveDocks();
             static Dock* getActiveDockAtIndex(unsigned int index);
@@ -95 +98 @@
             // Network functions
             void showDockingDialogHelper(PlayerInfo* player);
+            void showUndockingDialogHelper(PlayerInfo* player);
             static void showDockingDialog();
 

code/branches/presentationHS13/src/modules/docking/MoveToDockingTarget.cc

@@ -66 +66 @@
     {
         //TODO: Investigate strange things...
-        this->parent_->detach((WorldEntity*)player->getControllableEntity());
+        //this->parent_->detach((WorldEntity*)player->getControllableEntity());
 
+        //TODO: Check the issue with this detach call.
+        //I have removed the line because the detach call only caused a warning and terminated. And because I didn't find a attach call either.
+        //Didn't find the need for the line.
         this->parent_->undockingAnimationFinished(player);
         return true;

code/branches/presentationHS13/src/modules/objects/ForceField.cc

@@ -45 +45 @@
     /*static*/ const std::string ForceField::modeSphere_s = "sphere";
     /*static*/ const std::string ForceField::modeInvertedSphere_s = "invertedSphere";
+
+    /*static*/ const std::string ForceField::modeHomogen_s = "homogen";
+
     /*static*/ const std::string ForceField::modeNewtonianGravity_s = "newtonianGravity";
     /*static*/ const float ForceField::gravConstant_ = 6.673e-11;
     /*static*/ const float ForceField::attenFactor_ = 1;
+
 
     /**
@@ -89 +93 @@
         XMLPortParam(ForceField, "length", setLength  , getLength  , xmlelement, mode).defaultValues(2000);
         XMLPortParam(ForceField, "mode", setMode, getMode, xmlelement, mode);
+        XMLPortParam(ForceField, "forcedirection", setForceDirection, getForceDirection, xmlelement, mode).defaultValues(Vector3(0,-400,0));
     }
     
@@ -196 +201 @@
             }
         }
+        else if(this->mode_ == forceFieldMode::homogen)
+        {
+                // Iterate over all objects that could possibly be affected by the ForceField.
+                for (ObjectList<MobileEntity>::iterator it = ObjectList<MobileEntity>::begin(); it != ObjectList<MobileEntity>::end(); ++it)
+                {
+                        Vector3 distanceVector = it->getWorldPosition() - this->getWorldPosition();
+                    float distance = distanceVector.length();
+                    if (distance < this->radius_ && distance > this->massRadius_)
+                    {
+                        // Add a Acceleration in forceDirection_.
+                        // Vector3(0,0,0) is the direction, where the force should work.
+                        it->addAcceleration(forceDirection_ , Vector3(0,0,0));
+                    }
+                }
+        }
     }
 
@@ -214 +234 @@
         else if(mode == ForceField::modeNewtonianGravity_s)
             this->mode_ = forceFieldMode::newtonianGravity;
+
+        else if(mode == ForceField::modeHomogen_s)
+            this->mode_ = forceFieldMode::homogen;
+
         else
         {
@@ -239 +263 @@
             case forceFieldMode::newtonianGravity:
                 return ForceField::modeNewtonianGravity_s;
+
+            case forceFieldMode::homogen:
+                return ForceField::modeHomogen_s;
+
             default:
                 return ForceField::modeTube_s;

code/branches/presentationHS13/src/modules/objects/ForceField.h

@@ +1 @@
+
 /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
@@ -57 +58 @@
             sphere, //!< The ForceField has a spherical shape.
             invertedSphere, //!< The ForceField has a spherical shape but "inverted" behavior.
-            newtonianGravity //!< The ForceField imitates Newtonian gravitation for use in stellar bodies.
+            newtonianGravity, //!< The ForceField imitates Newtonian gravitation for use in stellar bodies.
+            homogen //!< Local homogenous Force field with changeable direction for the Space Station
         };
     }
@@ -66 +68 @@
 
         The following parameters can be set to specify the behavior of the ForceField.
+        - @b forcedirection The direction and the strength of the homogenous force field. Default is 0,-400,0.
         - @b velocity The amount of force the ForceField excerts. Default is 100.
         - @b diameter The diameter of the ForceField. Default is 500.
@@ -147 +150 @@
                 { return this->halfLength_*2; }
 
+            inline void setForceDirection(Vector3 forcedir)
+                { this->forceDirection_ = forcedir; }
+
+            inline Vector3 getForceDirection()
+                { return this->forceDirection_; }
+
+
             void setMode(const std::string& mode); //!< Set the mode of the ForceField.
             const std::string& getMode(void); //!< Get the mode of the ForceField.
@@ -156 +166 @@
             static const std::string modeInvertedSphere_s;
             static const std::string modeNewtonianGravity_s;
+
+            static const std::string modeHomogen_s;
 
             float velocity_; //!< The velocity of the ForceField.
@@ -167 +179 @@
             //! Attenuation factor for Newtonian ForceFields
             static const float attenFactor_;
+            Vector3 forceDirection_;
   };
 }

code/branches/presentationHS13/src/orxonox/infos/PlayerInfo.cc

@@ -229 +229 @@
             return;
 
-        this->controllableEntity_->getController()->setActive(false);
+        Controller* tmp =this->controllableEntity_->getController();
+        if (tmp == NULL)
+        {
+                orxout(verbose) <<  "PlayerInfo: pauseControl, Controller is NULL " << endl;
+                return;
+        }
+        tmp->setActive(false);
         //this->controllableEntity_->getController()->setControllableEntity(NULL);
         this->controllableEntity_->setController(0);