Changeset 10218 for code/trunk/src/modules
- Timestamp:
- Jan 31, 2015, 11:29:45 PM (10 years ago)
- Location:
- code/trunk/src/modules
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/modules/jump/Jump.cc
r10215 r10218 595 595 596 596 newPlatform = new JumpPlatformStatic(center_->getContext()); 597 addPlatform(newPlatform, center_->getPlatformStaticTemplate(), 0.0, -0.05 *sectionLength);597 addPlatform(newPlatform, center_->getPlatformStaticTemplate(), 0.0, -0.05f*sectionLength); 598 598 599 599 platformWidth_ = newPlatform->getWidth(); … … 603 603 { 604 604 newPlatform = new JumpPlatformStatic(center_->getContext()); 605 addPlatform(newPlatform, center_->getPlatformStaticTemplate(), xPosition, -0.05 *sectionLength);605 addPlatform(newPlatform, center_->getPlatformStaticTemplate(), xPosition, -0.05f*sectionLength); 606 606 newPlatform = new JumpPlatformStatic(center_->getContext()); 607 addPlatform(newPlatform, center_->getPlatformStaticTemplate(), -xPosition, -0.05 *sectionLength);607 addPlatform(newPlatform, center_->getPlatformStaticTemplate(), -xPosition, -0.05f*sectionLength); 608 608 } 609 609 } … … 616 616 float sectionEnd = (1 + sectionNumber_) * sectionLength; 617 617 618 int numI = 6;619 int numJ = 4;618 const int numI = 6; 619 const int numJ = 4; 620 620 621 621 enum PlatformType … … 1263 1263 { 1264 1264 float platformSpeed = center_->getPlatformSpeed(); 1265 return randomPosition(0.5 *platformSpeed, 1.5*platformSpeed);1265 return randomPosition(0.5f*platformSpeed, 1.5f*platformSpeed); 1266 1266 } 1267 1267 -
code/trunk/src/modules/jump/JumpFigure.cc
r10215 r10218 184 184 // Move through the left and right screen boundaries 185 185 Vector3 position = getPosition(); 186 if (position.x < -fieldWidth_*1.1 )187 { 188 position.x = fieldWidth_*1.1 ;189 } 190 else if (position.x > fieldWidth_*1.1 )191 { 192 position.x = -fieldWidth_*1.1 ;186 if (position.x < -fieldWidth_*1.1f) 187 { 188 position.x = fieldWidth_*1.1f; 189 } 190 else if (position.x > fieldWidth_*1.1f) 191 { 192 position.x = -fieldWidth_*1.1f; 193 193 } 194 194 setPosition(position); … … 207 207 { 208 208 Vector3 velocity = getVelocity(); 209 velocity.z = (bootsActive_ ? 1.2 *jumpSpeed_ : jumpSpeed_);209 velocity.z = (bootsActive_ ? 1.2f*jumpSpeed_ : jumpSpeed_); 210 210 setVelocity(velocity); 211 211 … … 221 221 { 222 222 Vector3 velocity = getVelocity(); 223 velocity.z = 1.2 *jumpSpeed_;223 velocity.z = 1.2f*jumpSpeed_; 224 224 setVelocity(velocity); 225 225 } -
code/trunk/src/modules/jump/JumpPrereqs.h
r10078 r10218 43 43 //----------------------------------------------------------------------- 44 44 45 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined( PONG_STATIC_BUILD)46 # ifdef PONG_SHARED_BUILD45 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(JUMP_STATIC_BUILD) 46 # ifdef JUMP_SHARED_BUILD 47 47 # define _JumpExport __declspec(dllexport) 48 48 # else -
code/trunk/src/modules/objects/controllers/TeamTargetProxy.h
r10215 r10218 30 30 #define _TeamTargetProxy_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "objects/ObjectsPrereqs.h" 33 33 #include "controllers/FormationController.h" 34 34 … … 45 45 has to be controllable and ticks every second (performance?) 46 46 */ 47 class _O rxonoxExport TeamTargetProxy : public FormationController, public Tickable47 class _ObjectsExport TeamTargetProxy : public FormationController, public Tickable 48 48 { 49 49 public: -
code/trunk/src/modules/objects/controllers/TurretController.cc
r10215 r10218 29 29 #include "TurretController.h" 30 30 #include "worldentities/pawns/Pawn.h" 31 #include " Turret.h"31 #include "objects/Turret.h" 32 32 33 33 namespace orxonox -
code/trunk/src/modules/objects/controllers/TurretController.h
r10215 r10218 34 34 #define _TurretController_H__ 35 35 36 #include " OrxonoxPrereqs.h"36 #include "objects/ObjectsPrereqs.h" 37 37 #include "controllers/ArtificialController.h" 38 38 … … 45 45 The controllableEntity gets casted to Turret, so this controller won't work for anything else. 46 46 */ 47 class _O rxonoxExport TurretController : public ArtificialController, public Tickable47 class _ObjectsExport TurretController : public ArtificialController, public Tickable 48 48 { 49 49 public:
Note: See TracChangeset
for help on using the changeset viewer.