[Orxonox-commit 6372] r11029 - in code/branches/presentationHS15/src: modules/hover orxonox/worldentities

[landauf at orxonox.net]

Author: landauf
Date: 2016-01-03 20:49:23 +0100 (Sun, 03 Jan 2016)
New Revision: 11029

Modified:
   code/branches/presentationHS15/src/modules/hover/FlagHUD.h
   code/branches/presentationHS15/src/modules/hover/HoverFlag.cc
   code/branches/presentationHS15/src/modules/hover/HoverFlag.h
   code/branches/presentationHS15/src/modules/hover/HoverWall.cc
   code/branches/presentationHS15/src/modules/hover/HoverWall.h
   code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc
Log:
fixed compiler errors (MSVC): StaticEntity has no tick() function + two other errors in FlagHUD and ExplosionPart

Modified: code/branches/presentationHS15/src/modules/hover/FlagHUD.h
===================================================================
--- code/branches/presentationHS15/src/modules/hover/FlagHUD.h	2016-01-03 19:47:51 UTC (rev 11028)
+++ code/branches/presentationHS15/src/modules/hover/FlagHUD.h	2016-01-03 19:49:23 UTC (rev 11029)
@@ -42,7 +42,7 @@
 
 namespace orxonox
 {
-    class _OverlaysExport FlagHUD : public OrxonoxOverlay , public Tickable
+    class _HoverExport FlagHUD : public OrxonoxOverlay , public Tickable
     {
     public:
         FlagHUD(Context* context);

Modified: code/branches/presentationHS15/src/modules/hover/HoverFlag.cc
===================================================================
--- code/branches/presentationHS15/src/modules/hover/HoverFlag.cc	2016-01-03 19:47:51 UTC (rev 11028)
+++ code/branches/presentationHS15/src/modules/hover/HoverFlag.cc	2016-01-03 19:49:23 UTC (rev 11029)
@@ -105,23 +105,8 @@
         SUPER(HoverFlag, XMLPort, xmlelement, mode);
     }
 
-
-
-
     /**
     @brief
-        Is called every tick.
-    @param dt
-        The time since the last tick.
-    */
-    void HoverFlag::tick(float dt)
-    {
-        SUPER(HoverFlag, tick, dt);
-        
-    }
-
-    /**
-    @brief
         Checks if the Hovership collided with the flag
     */
     bool HoverFlag::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)

Modified: code/branches/presentationHS15/src/modules/hover/HoverFlag.h
===================================================================
--- code/branches/presentationHS15/src/modules/hover/HoverFlag.h	2016-01-03 19:47:51 UTC (rev 11028)
+++ code/branches/presentationHS15/src/modules/hover/HoverFlag.h	2016-01-03 19:49:23 UTC (rev 11029)
@@ -51,7 +51,6 @@
             HoverFlag(Context* context, int xCoordinate, int yCoordinate);
             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();
             void setCollided(bool setValue);

Modified: code/branches/presentationHS15/src/modules/hover/HoverWall.cc
===================================================================
--- code/branches/presentationHS15/src/modules/hover/HoverWall.cc	2016-01-03 19:47:51 UTC (rev 11028)
+++ code/branches/presentationHS15/src/modules/hover/HoverWall.cc	2016-01-03 19:49:23 UTC (rev 11029)
@@ -116,19 +116,4 @@
     {
         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);
-        
-    }
-
-    
 }

Modified: code/branches/presentationHS15/src/modules/hover/HoverWall.h
===================================================================
--- code/branches/presentationHS15/src/modules/hover/HoverWall.h	2016-01-03 19:47:51 UTC (rev 11028)
+++ code/branches/presentationHS15/src/modules/hover/HoverWall.h	2016-01-03 19:49:23 UTC (rev 11029)
@@ -50,7 +50,6 @@
             HoverWall(Context* context);            
             HoverWall(Context* context, int x, int y, int orientation);
             virtual ~HoverWall();
-            virtual void tick(float dt);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
         private:

Modified: code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc
===================================================================
--- code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc	2016-01-03 19:47:51 UTC (rev 11028)
+++ code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc	2016-01-03 19:49:23 UTC (rev 11029)
@@ -144,7 +144,7 @@
         velocityOffset.normalise();
         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_));
         this->explosionEntity_->setAngularVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1)).normalisedCopy() * Degree(400).valueRadians());