Changeset 11859 for code/branches/3DPacman_FS18/src/modules/Pacman/PacmanPointSphere.cc

Timestamp:

Apr 12, 2018, 4:12:25 PM (6 years ago)

Author:

dreherm

Message:

Moving ghosts

File:

• code/branches/3DPacman_FS18/src/modules/Pacman/PacmanPointSphere.cc (modified) (5 diffs)

code/branches/3DPacman_FS18/src/modules/Pacman/PacmanPointSphere.cc

@@ -27 +27 @@
  */
 
-#include "PacmanGhost.h"
+#include "PacmanPointSphere.h"
 
 #include "core/CoreIncludes.h"
@@ -34 +34 @@
 namespace orxonox
 {
-    RegisterClass(PacmanGhost);
+    RegisterClass(PacmanPointSphere);
 
     /**
@@ -42 +42 @@
         The creator of this object.
     */
-    PacmanGhost::PacmanGhost(Context* context) : ControllableEntity(context)
+    PacmanPointSphere::PacmanPointSphere(Context* context) : ControllableEntity(context)
     {
-        RegisterObject(PacmanGhost);
-
-        this->myController_ = NULL;
-
-        this->localLinearAcceleration_.setValue(0, 0, 0);
-        this->localAngularAcceleration_.setValue(0, 0, 0);
-        this->primaryThrust_  = 100;
-        this->auxiliaryThrust_ = 100;
-        this->rotationThrust_ = 10;
-
-        this->setCollisionType(CollisionType::Dynamic);
+        RegisterObject(PacmanPointSphere);
+        this->setCollisionType(CollisionType::none); 
     }
 
@@ -61 +52 @@
         Destructor. Destroys controller, if present.
     */
-    PacmanGhost::~PacmanGhost()
+    PacmanPointSphere::~PacmanPointSphere()
     {
         // Deletes the controller if the object was initialized and the pointer to the controller is not NULL.
-        if( this->isInitialized() && this->myController_ != NULL )
-            delete this->myController_;
     }
 
@@ -72 +61 @@
         Method for creating a AutonomousDrone through XML.
     */
-    void PacmanGhost::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    void PacmanPointSphere::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        // This calls the XMLPort function of the parent class
-        SUPER(PacmanGhost, XMLPort, xmlelement, mode);
+        SUPER(PacmanPointSphere, XMLPort, xmlelement, mode);
 
-        XMLPortParam(PacmanGhost, "primaryThrust", setPrimaryThrust, getPrimaryThrust, xmlelement, mode);
-        // Make sure you add the variables auxiliaryThrust_ and rotationThrust_ to XMLPort.
-        // Variables can be added by the following command
-        // XMLPortParam(Classname, "xml-attribute-name (i.e. variablename)", setFunctionName, getFunctionName, xmlelement, mode);
-        // Also make sure that you also create the get- and set-functions in AutonomousDrone.h. As you can see, the get- and set-functions for the variable primaryThrust_ has already been specified there, so you can get your inspiration from there.
+        XMLPortParam(PacmanPointSphere, "resetposition", setResetPosition, getResetPosition, xmlelement, mode);
     }
 
-    /**
-    @brief
-        Defines which actions the AutonomousDrone has to take in each tick.
-    @param dt
-        The length of the tick.
-    */
-    void PacmanGhost::tick(float dt)
+
+    void PacmanPointSphere::tick(float dt)
     {
         SUPER(PacmanGhost, tick, dt);
-
-        this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() * getMass() * this->auxiliaryThrust_);
-        this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() * getMass() * this->auxiliaryThrust_);
-        if (this->localLinearAcceleration_.z() > 0)
-            this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->auxiliaryThrust_);
-        else
-            this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->primaryThrust_);
-        this->physicalBody_->applyCentralForce(physicalBody_->getWorldTransform().getBasis() * this->localLinearAcceleration_);
-        this->localLinearAcceleration_.setValue(0, 0, 0);
-
-        this->localAngularAcceleration_ *= this->getLocalInertia() * this->rotationThrust_;
-        this->physicalBody_->applyTorque(physicalBody_->getWorldTransform().getBasis() * this->localAngularAcceleration_);
-        this->localAngularAcceleration_.setValue(0, 0, 0);
-
     }
 
-    /**
-    @brief
-        Moves the AutonomousDrone in the negative z-direction (Front/Back) by an amount specified by the first component of the input 2-dim vector.
-    @param value
-        The vector determining the amount of the movement.
-    */
-    void PacmanGhost::moveFrontBack(const Vector2& value)
+    bool PacmanPointSphere::taken(Vector3 playerpos)
     {
-        this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() - value.x);
+      if((abs(this->resetposition.x - playerpos.x)<0.1) && (abs(this->resetposition.z - playerpos.z)<0.1)){
+        this->setPosition(Vector3(resetposition.x, -50, resetposition.z));
+        return true;
+      } 
+
+      return false;
     }
 
-    /**
-    @brief
-        Moves the AutonomousDrone in the x-direction (Right/Left) by an amount specified by the first component of the input 2-dim vector.
-    @param value
-        The vector determining the amount of the movement.
-    */
-    void PacmanGhost::moveRightLeft(const Vector2& value)
-    {
-        this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() + value.x);
+
+    void PacmanPointSphere::resetPacmanPointSphere(){
+        this->setPosition(resetposition);
     }
-
-    /**
-    @brief
-        Moves the AutonomousDrone in the y-direction (Up/Down) by an amount specified by the first component of the input 2-dim vector.
-    @param value
-        The vector determining the amount of the movement.
-    */
-    void PacmanGhost::moveUpDown(const Vector2& value)
-    {
-        this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() + value.x);
-    }
-
-    /**
-    @brief
-        Rotates the AutonomousDrone around the y-axis by the amount specified by the first component of the input 2-dim vector.
-    @param value
-        The vector determining the amount of the angular movement.
-    */
-    void PacmanGhost::rotateYaw(const Vector2& value)
-    {
-        this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() - value.x);
-    }
-
-    /**
-    @brief
-        Rotates the AutonomousDrone around the x-axis by the amount specified by the first component of the input 2-dim vector.
-    @param value
-        The vector determining the amount of the angular movement.
-    */
-    void PacmanGhost::rotatePitch(const Vector2& value)
-    {
-        this->localAngularAcceleration_.setX(this->localAngularAcceleration_.x() + value.x);
-    }
-
-    /**
-    @brief
-        Rotates the AutonomousDrone around the z-axis by the amount specified by the first component of the input 2-dim vector.
-    @param value
-        The vector determining the amount of the angular movement.
-    */
-    void PacmanGhost::rotateRoll(const Vector2& value)
-    {
-        this->localAngularAcceleration_.setZ(this->localAngularAcceleration_.z() + value.x);
-    }
-
 }