Changeset 708 for code/branches/FICN/src/orxonox/objects/weapon_system/BarrelGun.cc

Timestamp:

Dec 28, 2007, 10:30:29 PM (16 years ago)

Author:

rgrieder

Message:

• added Vector2, Vector3, Matrix3, ColourValue, Quaternion and String to the misc folder as header files (each of them contains #include <string> … typedef std::string String , etc.)
• please use String from now on by including <misc/String.h"
• removed #include <OgreVector3.h", etc. from "CoreIncludes.h" (adjusted all source files)
• adjusted all the source files (except network, that keeps <string> for the moment) (what a mess..)
• moved usleep hack to misc/Sleep.h
• relative include paths for files from other root directories (like misc, network, etc.) (but it stills writes "../Orxonox.h" when in folder orxonox/objects)
• "OgreSceneManager.h" —> <OgreSceneManager.h>
• included OrxonoxPrereqs in every file in folder orxonox
• moved HUD and ParticleInterface to namespace orxonox
• removed some using namespace Ogre/std when appropriate
• I hope I haven't forgotten important points..

File:

• code/branches/FICN/src/orxonox/objects/weapon_system/BarrelGun.cc (modified) (5 diffs)

code/branches/FICN/src/orxonox/objects/weapon_system/BarrelGun.cc

@@ -26 +26 @@
  */
 
-#include "OgreMath.h"
-#include "OgreVector3.h"
-#include "OgreStringConverter.h"
-#include "OgreSceneNode.h"
-#include "OgreEntity.h"
-#include "OgreSceneManager.h"
+#include <OgreStringConverter.h>
+#include <OgreSceneNode.h>
+#include <OgreEntity.h>
+#include <OgreSceneManager.h>
 
+#include "misc/Vector3.h"
 #include "Bullet.h"
 #include "BulletManager.h"
@@ -42 +41 @@
 
 namespace orxonox {
-  using namespace Ogre;
-
   CreateFactory(BarrelGun);
 
@@ -78 +75 @@
 
     Ogre::Entity* bulletEntity = sceneMgr_->createEntity("BulletEntity"
-          + StringConverter::toString(bulletCounter_++), "Barrel.mesh");
+      + Ogre::StringConverter::toString(bulletCounter_++), "Barrel.mesh");
 
     Vector3 speed = (temp->getOrientation() * Vector3(1, 0, 0))
@@ -106 +103 @@
 
 
-
   void BarrelGun::secondaryFire()
   {
@@ -120 +116 @@
 
     Ogre::Entity* bulletEntity = sceneMgr_->createEntity("BulletEntity"
-          + StringConverter::toString(bulletCounter_++), "Barrel.mesh");
+      + Ogre::StringConverter::toString(bulletCounter_++), "Barrel.mesh");
 
     Vector3 speed = (temp->getOrientation() * Vector3(1, 0, 0))