Changeset 11416 for code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBGumba.cc

Timestamp:

May 11, 2017, 3:18:27 PM (7 years ago)

Author:

jkindle

Message:

Added the animation for the level end (walk into castle), Coins for the blocks, Castleblocks and Flagblocks

File:

• code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBGumba.cc (modified) (6 diffs)

code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBGumba.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Fabien Vultier
+ *      Julien Kindle
  *   Co-authors:
- *      ...
+ *      
  *
  */
@@ -76 +76 @@
     bool SOBGumba::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) {
 
-
+        //Every object with mass -1 does not change the direction of the Gumba. For example the ground floor! The other objects switch the direction of the gumba.
         if (changeAllowed_ && otherObject->getMass() != -1) {
             goesRight_ = !goesRight_;
@@ -91 +91 @@
     }
 
-    void SOBGumba::touchFigure()
-    {
 
-    }
 
     void SOBGumba::tick(float dt)
@@ -102 +99 @@
         if (!changeAllowed_) {
             changedOn_+= dt;
-            if (changedOn_> 200) {
+            // After a collision, we don't listen for collisions for 200ms - that's because one wall can cause several collisions!
+            if (changedOn_> 0.200) {
                 changeAllowed_ = true;
                 changedOn_ = 0.0;
@@ -119 +117 @@
         setVelocity(velocity);
 
-
-        
         lastPos_ = getPosition();
     }
@@ -126 +122 @@
 
 }
-/*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *                    > www.orxonox.net <
- *
- *
- *   License notice:
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation; either version 2
- *   of the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *   Author:
- *      Fabien Vultier
- *   Co-authors:
- *      ...
- *
- */
-
-/**
-    @file SOBGumba.h
-    @brief Declaration of the SOBGumba class.
-    @ingroup SOB
-*/
-
-#ifndef _SOBGumba_H__
-#define _SOBGumba_H__
-
-#include "superorxobros/SOBPrereqs.h"
-#include "worldentities/MovableEntity.h"
-
-
-namespace orxonox
-{
-    class _SOBExport SOBGumba : public MovableEntity
-    {
-    public:
-        SOBGumba(Context* context);
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
-        virtual void setFigure(SOBFigure* newFigure);
-        virtual void touchFigure();
-        virtual  bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
-        virtual void tick(float dt) override;
-
-        
-        bool attachedToFigure_;
-
-        void setSpeed(const float speed)
-        { this->speed_ = speed; }
-        float getSpeed() const
-        { return speed_; }
-
-        bool hasCollided_;
-    protected:
-        float gravityAcceleration_;
-        float speed_;
-        WeakPtr<SOBFigure> figure_;
-        bool goesRight_;
-        Vector3 lastPos_;
-        bool changeAllowed_;
-        float changedOn_;
-        
-    };
-}
-
-#endif /* _SOBGumba_H__ */