Changeset 673 for code/branches/FICN/src/orxonox/objects

Timestamp:

Dec 22, 2007, 10:15:06 PM (17 years ago)

Author:

rgrieder

Message:

• deleted obsolete classes: BaseEntity, Entity, Light and SceneNode (please complain if not agreed)
• improved include guard naming consistency

Location:

code/branches/FICN/src/orxonox/objects

Files:

• Ambient.h (modified) (2 diffs)
• BaseEntity.cc (deleted)
• BaseEntity.h (deleted)
• BaseObject.cc (modified) (1 diff)
• BaseObject.h (modified) (1 diff)
• BillboardSet.h (modified) (2 diffs)
• CMakeLists.txt (modified) (2 diffs)
• Camera.h (modified) (2 diffs)
• Entity.cc (deleted)
• Entity.h (deleted)
• Explosion.h (modified) (1 diff)
• Fighter.h (modified) (1 diff)
• Light.cc (deleted)
• Light.h (deleted)
• Mesh.h (modified) (2 diffs)
• Model.h (modified) (1 diff)
• NPC.h (modified) (2 diffs)
• Projectile.h (modified) (1 diff)
• SceneNode.cc (deleted)
• SceneNode.h (deleted)
• Skybox.h (modified) (2 diffs)
• SpaceShip.h (modified) (1 diff)
• Tickable.h (modified) (1 diff)
• Timer.h (modified) (1 diff)
• WorldEntity.h (modified) (1 diff)
• weapon_system/AmmunitionDump.h (modified) (2 diffs)
• weapon_system/BarrelGun.h (modified) (2 diffs)
• weapon_system/BaseWeapon.h (modified) (2 diffs)
• weapon_system/Bullet.h (modified) (2 diffs)
• weapon_system/BulletManager.h (modified) (2 diffs)
• weapon_system/WeaponStation.h (modified) (2 diffs)

code/branches/FICN/src/orxonox/objects/Ambient.h

@@ -1 @@
-#ifndef _OBJECT_AMBIENT_H__
-#define _OBJECT_AMBIENT_H__
+#ifndef _Ambient_H__
+#define _Ambient_H__
 
 #include "BaseObject.h"
@@ -22 +22 @@
 }
 
-#endif
+#endif /* _Ambient_H__ */

code/branches/FICN/src/orxonox/objects/BaseObject.cc

@@ -59 +59 @@
         if (xmlElem->Attribute("name"))
         {
-            this->setName(xmlElem->Attribute("mesh"));
+            this->setName(xmlElem->Attribute("name"));
         }
     }

code/branches/FICN/src/orxonox/objects/BaseObject.h

@@ -24 +24 @@
 }
 
-#endif
+#endif /* _BaseObject_H__ */

code/branches/FICN/src/orxonox/objects/BillboardSet.h

@@ +1 @@
+#ifndef _BillboardSet_H__
+#define _BillboardSet_H__
+
 #include <string>
 
 #include "OgreBillboardSet.h"
-
-#ifndef _BillboardSet_H__
-#define _BillboardSet_H__
 
 namespace orxonox
@@ -27 +27 @@
 }
 
-#endif
+#endif /* _BillboardSet_H__ */

code/branches/FICN/src/orxonox/objects/CMakeLists.txt

@@ -9 +9 @@
   Ambient.cc
   Skybox.cc
-  SceneNode.cc
+#  SceneNode.cc
   BaseEntity.cc
-  Entity.cc
+#  Entity.cc
   Camera.cc
 #  SpaceshipSteeringObject.cc
@@ -19 +19 @@
   NPC.cc
   BillboardSet.cc
-  Light.cc
+#  Light.cc
   Projectile.cc
   weapon_system/AmmunitionDump.cc

code/branches/FICN/src/orxonox/objects/Camera.h

@@ -1 @@
-#ifndef _OBJECT_CAMERA_H__
-#define _OBJECT_CAMERA_H__
+#ifndef _Camera_H__
+#define _Camera_H__
 
 #include "BaseObject.h"
@@ -22 +22 @@
 }
 
-#endif
+#endif /* _Camera_H__ */

code/branches/FICN/src/orxonox/objects/Explosion.h

@@ -22 +22 @@
 }
 
-#endif
+#endif /* _Explosion_H__ */

code/branches/FICN/src/orxonox/objects/Fighter.h

@@ -92 +92 @@
 }
 
-#endif
+#endif /* _Fighter_H__ */

code/branches/FICN/src/orxonox/objects/Mesh.h

@@ +1 @@
+#ifndef _Mesh_H__
+#define _Mesh_H__
+
 #include <string>
 
 #include "OgreEntity.h"
-
-#ifndef _Mesh_H__
-#define _Mesh_H__
 
 namespace orxonox
@@ -27 +27 @@
 }
 
-#endif
+#endif /* _Mesh_H__ */

code/branches/FICN/src/orxonox/objects/Model.h

@@ -23 +23 @@
 }
 
-#endif
+#endif /* _Model_H__ */

code/branches/FICN/src/orxonox/objects/NPC.h

@@ -5 +5 @@
  */
 
-#ifndef MODULE_NPC_H
-#define MODULE_NPC_H
+#ifndef _NPC_H__
+#define _NPC_H__
 
 // includes
@@ -43 +43 @@
 
 }
-#endif
+#endif /* _NPC_H__ */

code/branches/FICN/src/orxonox/objects/Projectile.h

@@ -26 +26 @@
 }
 
-#endif
+#endif /* _Projectile_H__ */

code/branches/FICN/src/orxonox/objects/Skybox.h

@@ -1 @@
-#ifndef _OBJECT_SKYBOX_H__
-#define _OBJECT_SKYBOX_H__
+#ifndef _Skybox_H__
+#define _Skybox_H__
 
 #include "BaseObject.h"
@@ -22 +22 @@
 }
 
-#endif
+#endif /* _Skybox_H__ */

code/branches/FICN/src/orxonox/objects/SpaceShip.h

@@ -123 +123 @@
 }
 
-#endif
+#endif /* _SpaceShip_H__ */

code/branches/FICN/src/orxonox/objects/Tickable.h

@@ -81 +81 @@
 }
 
-#endif
+#endif /* _Tickable_H__ */

code/branches/FICN/src/orxonox/objects/Timer.h

@@ -192 +192 @@
 }
 
-#endif
+#endif /* _Timer_H__ */

code/branches/FICN/src/orxonox/objects/WorldEntity.h

@@ -146 +146 @@
 }
 
-#endif
+#endif /* _WorldEntity_H__ */

code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.h

@@ -27 +27 @@
 
 
-#ifndef AmmunitionDump_H
-#define AmmunitionDump_H
+#ifndef _AmmunitionDump_H__
+#define _AmmunitionDump_H__
 
 #include <OgrePrerequisites.h>
@@ -66 +66 @@
 }
 
-#endif /* AmmunitionDump_H */
+#endif /* _AmmunitionDump_H__ */

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

@@ -27 +27 @@
 
 
-#ifndef BARREL_GUN_H
-#define BARREL_GUN_H
+#ifndef _BarrelGun_H__
+#define _BarrelGun_H__
 
 #include <OgrePrerequisites.h>
@@ -62 +62 @@
 }
 
-#endif /* BARREL_GUN_H */
+#endif /* _BarrelGun_H__ */

code/branches/FICN/src/orxonox/objects/weapon_system/BaseWeapon.h

@@ -27 +27 @@
 
 
-#ifndef BASE_WEAPON_H
-#define BASE_WEAPON_H
+#ifndef _BaseWeapon_H__
+#define _BaseWeapon_H__
 
 #include <OgrePrerequisites.h>
@@ -124 +124 @@
 }
 
-#endif /* BASE_WEAPON_H */
+#endif /* _BaseWeapon_H__ */

code/branches/FICN/src/orxonox/objects/weapon_system/Bullet.h

@@ -27 +27 @@
 
 
-#ifndef BULLET_H
-#define BULLET_H
+#ifndef _Bullet_H__
+#define _Bullet_H__
 
 #include <OgrePrerequisites.h>
@@ -49 +49 @@
 }
 
-#endif /* BULLET_H */
+#endif /* _Bullet_H__ */

code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.h

@@ -27 +27 @@
 
 
-#ifndef BULLET_MANAGER_H
-#define BULLET_MANAGER_H
+#ifndef _BulletManager_H__
+#define _BulletManager_H__
 
 #include <OgrePrerequisites.h>
@@ -67 +67 @@
 }
 
-#endif /* BULLET_MANAGER_H */
+#endif /* _BulletManager_H__ */

code/branches/FICN/src/orxonox/objects/weapon_system/WeaponStation.h

@@ -27 +27 @@
 
 
-#ifndef WEAPON_STATION_H
-#define WEAPON_STATION_H
+#ifndef _WeaponStation_H__
+#define _WeaponStation_H__
 
 #include <OgrePrerequisites.h>
@@ -63 +63 @@
 }
 
-#endif /* WEAPON_STATION_H */
+#endif /* _WeaponStation_H__ */