Changeset 11029 for code/branches

Timestamp:

Jan 3, 2016, 8:49:23 PM (9 years ago)

Author:

landauf

Message:

fixed compiler errors (MSVC): StaticEntity has no tick() function + two other errors in FlagHUD and ExplosionPart

Location:

code/branches/presentationHS15/src

Files:

• modules/hover/FlagHUD.h (modified) (1 diff)
• modules/hover/HoverFlag.cc (modified) (1 diff)
• modules/hover/HoverFlag.h (modified) (1 diff)
• modules/hover/HoverWall.cc (modified) (1 diff)
• modules/hover/HoverWall.h (modified) (1 diff)
• orxonox/worldentities/ExplosionPart.cc (modified) (1 diff)

code/branches/presentationHS15/src/modules/hover/FlagHUD.h

@@ -43 +43 @@
 namespace orxonox
 {
-    class _OverlaysExport FlagHUD : public OrxonoxOverlay , public Tickable
+    class _HoverExport FlagHUD : public OrxonoxOverlay , public Tickable
     {
     public:

code/branches/presentationHS15/src/modules/hover/HoverFlag.cc

@@ -106 +106 @@
     }
 
-
-
-
-    /**
-    @brief
-        Is called every tick.
-    @param dt
-        The time since the last tick.
-    */
-    void HoverFlag::tick(float dt)
-    {
-        SUPER(HoverFlag, tick, dt);
-        
-    }
-
     /**
     @brief

code/branches/presentationHS15/src/modules/hover/HoverFlag.h

@@ -52 +52 @@
             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint);            
             virtual ~HoverFlag();
-            virtual void tick(float dt);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             bool getCollided();

code/branches/presentationHS15/src/modules/hover/HoverWall.cc

@@ -117 +117 @@
         SUPER(HoverWall, XMLPort, xmlelement, mode);
     }
-
-    /**
-    @brief
-        Is called every tick.
-        Handles the movement of the ball and its interaction with the boundaries and bats.
-    @param dt
-        The time since the last tick.
-    */
-    void HoverWall::tick(float dt)
-    {
-        SUPER(HoverWall, tick, dt);
-        
-    }
-
-    
 }

code/branches/presentationHS15/src/modules/hover/HoverWall.h

@@ -51 +51 @@
             HoverWall(Context* context, int x, int y, int orientation);
             virtual ~HoverWall();
-            virtual void tick(float dt);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 

code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc

@@ -145 +145 @@
         direction_.normalise();
 
-        Vector3 finalDirection = direction_ + sin((rnd(0, angle_))*M_PI/180)*velocityOffset;
+        Vector3 finalDirection = direction_ + sin((rnd(0, angle_))*math::pi/180)*velocityOffset;
 
         this->explosionEntity_->setVelocity(finalDirection*rnd(minSpeed_,maxSpeed_));