Changeset 5357 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Oct 10, 2005, 9:15:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some minor cleanup, of the mess i made with AutoMake-sh

Location:

trunk/src/world_entities

Files:

• camera.cc (modified) (1 diff)
• environment.cc (modified) (1 diff)
• npc.cc (modified) (1 diff)
• npc2.cc (modified) (1 diff)
• player.cc (modified) (1 diff)
• satellite.cc (modified) (1 diff)
• skybox.cc (modified) (2 diffs)
• skybox.h (modified) (4 diffs)
• terrain.cc (modified) (2 diffs)
• terrain.h (modified) (1 diff)
• test_entity.cc (modified) (1 diff)
• weapons/crosshair.cc (modified) (1 diff)
• weapons/projectile.cc (modified) (1 diff)
• weapons/test_bullet.cc (modified) (1 diff)
• weapons/test_gun.cc (modified) (1 diff)
• weapons/turret.cc (modified) (1 diff)
• weapons/weapon.cc (modified) (2 diffs)

trunk/src/world_entities/camera.cc

@@ -15 +15 @@
    co-programmer: ...
 */
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
 #include "camera.h"

trunk/src/world_entities/environment.cc

@@ -15 +15 @@
    co-programmer:
 */
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
 

trunk/src/world_entities/npc.cc

@@ -15 +15 @@
    co-programmer:
 */
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
 

trunk/src/world_entities/npc2.cc

@@ -15 +15 @@
    co-programmer:
 */
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
 

trunk/src/world_entities/player.cc

@@ -14 +14 @@
 */
 
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PLAYER
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
 #include "player.h"

trunk/src/world_entities/satellite.cc

@@ -15 +15 @@
    co-programmer:
 */
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
 

trunk/src/world_entities/skybox.cc

@@ -1 @@
-
 /*
    orxonox - the future of 3D-vertical-scrollers
@@ -17 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-
 #include "skybox.h"
 
 #include "load_param.h"
 #include "factory.h"
-#include "list.h"
 
 using namespace std;
+
 CREATE_FACTORY(SkyBox);
 
 /**
- *  Constructs a SkyBox and takes fileName as a map.
+ * Constructs a SkyBox and takes fileName as a map.
  * @param fileName the file to take as input for the SkyBox
 */

trunk/src/world_entities/skybox.h

@@ -1 +1 @@
 /*!
  * @file skybox.h
-  *  Definition of the SkyBox, that handles the Display of an atmosphere for orxonox.
-
-    A SkyBox is always centered at the current working Camera, and will only obey the cameras
-    movment but not its rotation.
+ *  Definition of the SkyBox, that handles the Display of an atmosphere for orxonox.
+ *
+ * A SkyBox is always centered at the current working Camera, and will only obey the cameras
+ * movment but not its rotation.
 */
 
@@ -14 +14 @@
 
 /* FORWARD DEFINITION */
-class Material;
-class Vector;
 
 //! A Class to handle a SkyBox
@@ -26 +24 @@
   virtual ~SkyBox();
 
+  void init();
   void preInit();
 
@@ -35 +34 @@
   void setSize(float size);
   /** assumes jpg as input-format */
-  void setTexture(const char* name) { setTextureAndType (name, "jpg"); };
+  void setTexture(const char* name) { this->setTextureAndType (name, "jpg"); };
 
   void setTextureAndType(const char* name, const char* extension);

trunk/src/world_entities/terrain.cc

@@ -13 +13 @@
    co-programmer: ...
 */
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
 
@@ -27 +28 @@
 /**
  *  standard constructor
-
-*/
+ */
 Terrain::Terrain (const TiXmlElement* root)
 {

trunk/src/world_entities/terrain.h

@@ -13 +13 @@
 #include "world_entity.h"
 
-// FORWARD DEFINITION \\
-class TiXmlElement;
+// FORWARD DEFINITION
 class SpatialSeparation;
 

trunk/src/world_entities/test_entity.cc

@@ -15 +15 @@
    co-programmer:
 */
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
 

trunk/src/world_entities/weapons/crosshair.cc

@@ -14 +14 @@
 */
 
-//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
 #include "crosshair.h"

trunk/src/world_entities/weapons/projectile.cc

@@ -15 +15 @@
    co-programmer:
 */
-
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
 #include "projectile.h"

trunk/src/world_entities/weapons/test_bullet.cc

@@ -15 +15 @@
    co-programmer:
 */
-
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
 #include "test_bullet.h"

trunk/src/world_entities/weapons/test_gun.cc

@@ -19 +19 @@
    @todo: a target to set/hit
 */
-
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
 #include "test_gun.h"

trunk/src/world_entities/weapons/turret.cc

@@ -13 +13 @@
    co-programmer:
 */
-
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
 #include "turret.h"

trunk/src/world_entities/weapons/weapon.cc

@@ -169 +169 @@
 void Weapon::prepareProjectiles(unsigned int count)
 {
-  if (this->projectileFactory != NULL)
+  if (likely(this->projectileFactory != NULL))
     projectileFactory->prepare(count);
   else
-    PRINTF(2)("unable to create %d projectile for Weapon %s\n", count, this->getName());
+    PRINTF(2)("unable to create %d projectile for Weapon %s (%s)\n", count, this->getName(), this->getClassName());
 }
 
@@ -181 +181 @@
 Projectile* Weapon::getProjectile()
 {
-  if (this->projectileFactory)
+  if (likely (this->projectileFactory != NULL))
     return dynamic_cast<Projectile*>(this->projectileFactory->resurrect());
   else
   {
-    PRINTF(2)("No projectile defined for Weapon %s cant return any\n", this->getName());
+    PRINTF(2)("No projectile defined for Weapon %s(%s) cant return any\n", this->getName(), this->getClassName());
     return NULL;
   }