Changeset 10218

Timestamp:

Jan 31, 2015, 11:29:45 PM (9 years ago)

Author:

landauf

Message:

fixed build and warnings with MSVC

Location:

code/trunk/src/modules

Files:

• jump/Jump.cc (modified) (4 diffs)
• jump/JumpFigure.cc (modified) (3 diffs)
• jump/JumpPrereqs.h (modified) (1 diff)
• objects/controllers/TeamTargetProxy.h (modified) (2 diffs)
• objects/controllers/TurretController.cc (modified) (1 diff)
• objects/controllers/TurretController.h (modified) (2 diffs)

code/trunk/src/modules/jump/Jump.cc

@@ -595 +595 @@
 
         newPlatform = new JumpPlatformStatic(center_->getContext());
-        addPlatform(newPlatform, center_->getPlatformStaticTemplate(), 0.0, -0.05*sectionLength);
+        addPlatform(newPlatform, center_->getPlatformStaticTemplate(), 0.0, -0.05f*sectionLength);
 
         platformWidth_ = newPlatform->getWidth();
@@ -603 +603 @@
         {
             newPlatform = new JumpPlatformStatic(center_->getContext());
-            addPlatform(newPlatform, center_->getPlatformStaticTemplate(), xPosition, -0.05*sectionLength);
+            addPlatform(newPlatform, center_->getPlatformStaticTemplate(), xPosition, -0.05f*sectionLength);
             newPlatform = new JumpPlatformStatic(center_->getContext());
-            addPlatform(newPlatform, center_->getPlatformStaticTemplate(), -xPosition, -0.05*sectionLength);
+            addPlatform(newPlatform, center_->getPlatformStaticTemplate(), -xPosition, -0.05f*sectionLength);
         }
     }
@@ -616 +616 @@
         float sectionEnd = (1 + sectionNumber_) * sectionLength;
 
-        int numI = 6;
-        int numJ = 4;
+        const int numI = 6;
+        const int numJ = 4;
 
         enum PlatformType
@@ -1263 +1263 @@
     {
         float platformSpeed = center_->getPlatformSpeed();
-        return randomPosition(0.5*platformSpeed, 1.5*platformSpeed);
+        return randomPosition(0.5f*platformSpeed, 1.5f*platformSpeed);
     }
 

code/trunk/src/modules/jump/JumpFigure.cc

@@ -184 +184 @@
         // Move through the left and right screen boundaries
         Vector3 position = getPosition();
-        if (position.x < -fieldWidth_*1.1)
-        {
-            position.x = fieldWidth_*1.1;
-        }
-        else if (position.x > fieldWidth_*1.1)
-        {
-            position.x = -fieldWidth_*1.1;
+        if (position.x < -fieldWidth_*1.1f)
+        {
+            position.x = fieldWidth_*1.1f;
+        }
+        else if (position.x > fieldWidth_*1.1f)
+        {
+            position.x = -fieldWidth_*1.1f;
         }
         setPosition(position);
@@ -207 +207 @@
         {
             Vector3 velocity = getVelocity();
-            velocity.z = (bootsActive_ ? 1.2*jumpSpeed_ : jumpSpeed_);
+            velocity.z = (bootsActive_ ? 1.2f*jumpSpeed_ : jumpSpeed_);
             setVelocity(velocity);
 
@@ -221 +221 @@
         {
             Vector3 velocity = getVelocity();
-            velocity.z = 1.2*jumpSpeed_;
+            velocity.z = 1.2f*jumpSpeed_;
             setVelocity(velocity);
         }

code/trunk/src/modules/jump/JumpPrereqs.h

@@ -43 +43 @@
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(PONG_STATIC_BUILD)
-#  ifdef PONG_SHARED_BUILD
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(JUMP_STATIC_BUILD)
+#  ifdef JUMP_SHARED_BUILD
 #    define _JumpExport __declspec(dllexport)
 #  else

code/trunk/src/modules/objects/controllers/TeamTargetProxy.h

@@ -30 +30 @@
 #define _TeamTargetProxy_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
 #include "controllers/FormationController.h"
 
@@ -45 +45 @@
             has to be controllable and ticks every second (performance?)
     */
-    class _OrxonoxExport TeamTargetProxy : public FormationController, public Tickable
+    class _ObjectsExport TeamTargetProxy : public FormationController, public Tickable
     {
         public:

code/trunk/src/modules/objects/controllers/TurretController.cc

@@ -29 +29 @@
 #include "TurretController.h"
 #include "worldentities/pawns/Pawn.h"
-#include "Turret.h"
+#include "objects/Turret.h"
 
  namespace orxonox

code/trunk/src/modules/objects/controllers/TurretController.h

@@ -34 +34 @@
 #define _TurretController_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
 #include "controllers/ArtificialController.h"
 
@@ -45 +45 @@
         The controllableEntity gets casted to Turret, so this controller won't work for anything else.
     */
-    class _OrxonoxExport TurretController : public ArtificialController, public Tickable
+    class _ObjectsExport TurretController : public ArtificialController, public Tickable
     {
         public: