Changeset 5048 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Aug 16, 2005, 9:35:31 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: debug, and shoot-intervall

Location:

orxonox/trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• story_entities/world.cc (modified) (2 diffs)
• world_entities/weapons/test_gun.cc (modified) (1 diff)

orxonox/trunk/src/defs/debug.h

@@ -55 +55 @@
 #else /* DEBUG_SPECIAL_MODULE */
 // DEFINE MODULES
-#define DEBUG_MODULE_ORXONOX            0
-#define DEBUG_MODULE_WORLD              0
-#define DEBUG_MODULE_PNODE              0
-#define DEBUG_MODULE_WORLD_ENTITY       0
-#define DEBUG_MODULE_COMMAND_NODE       0
-#define DEBUG_MODULE_GRAPHICS           0
+#define DEBUG_MODULE_ORXONOX            2
+#define DEBUG_MODULE_WORLD              2
+#define DEBUG_MODULE_PNODE              2
+#define DEBUG_MODULE_WORLD_ENTITY       2
+#define DEBUG_MODULE_COMMAND_NODE       2
+#define DEBUG_MODULE_GRAPHICS           2
 #define DEBUG_MODULE_LOAD               2
 
-#define DEBUG_MODULE_IMPORTER           0
+#define DEBUG_MODULE_IMPORTER           2
 #define DEBUG_MODULE_TRACK_MANAGER      2
-#define DEBUG_MODULE_GARBAGE_COLLECTOR  0
+#define DEBUG_MODULE_GARBAGE_COLLECTOR  2
 #define DEBUG_MODULE_OBJECT_MANAGER     2
-#define DEBUG_MODULE_LIGHT              0
-#define DEBUG_MODULE_PLAYER             1
-#define DEBUG_MODULE_WEAPON             3
-#define DEBUG_MODULE_MATH               0
-#define DEBUG_MODULE_FONT               1
-#define DEBUG_MODULE_ANIM               1
-#define DEBUG_MODULE_PARTICLE           1
-#define DEBUG_MODULE_PHYSICS            1
-#define DEBUG_MODULE_EVENT              3
-
-#define DEBUG_MODULE_NULL_PARENT        0
-#define DEBUG_MODULE_NETWORK            0
-
-#define DEBUG_MODULE_COLLISON_DETECTION 0
-#define DEBUG_MODULE_SPATIAL_SEPARATION 0
+#define DEBUG_MODULE_LIGHT              2
+#define DEBUG_MODULE_PLAYER             2
+#define DEBUG_MODULE_WEAPON             2
+#define DEBUG_MODULE_MATH               2
+#define DEBUG_MODULE_FONT               2
+#define DEBUG_MODULE_ANIM               2
+#define DEBUG_MODULE_PARTICLE           2
+#define DEBUG_MODULE_PHYSICS            2
+#define DEBUG_MODULE_EVENT              2
+
+#define DEBUG_MODULE_NULL_PARENT        2
+#define DEBUG_MODULE_NETWORK            2
+
+#define DEBUG_MODULE_COLLISON_DETECTION 2
+#define DEBUG_MODULE_SPATIAL_SEPARATION 2
 
 #define HARD_DEBUG_LEVEL DEBUG_SPECIAL_MODULE

orxonox/trunk/src/story_entities/world.cc

@@ -752 +752 @@
     {
       ++this->cycle;
-      PRINTF(3)("World::mainloop() - number of entities: %i\n", this->entities->getSize());
+      PRINTF(4)("World::mainloop() - number of entities: %i\n", this->entities->getSize());
       // Network
       this->synchronize ();
@@ -828 +828 @@
              nothing.
           */
-          PRINTF(2)("fps = 1000 - frame rate is adjusted\n");
+          PRINTF(3)("fps = 1000 - frame rate is adjusted\n");
           SDL_Delay(10-dt);
           this->dt = 10;

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -120 +120 @@
   this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
-  this->setStateDuration(WS_SHOOTING, .4);
+  this->setStateDuration(WS_SHOOTING, .1);
   this->setStateDuration(WS_RELOADING, 1);
   this->setStateDuration(WS_ACTIVATING, .4);
   this->setStateDuration(WS_DEACTIVATING, .4);
 
-  this->setMaximumEnergy(1000, 10);
-  this->increaseEnergy(100);
+  this->setMaximumEnergy(1000, 100);
+  this->increaseEnergy(1000);
   //this->minCharge = 2;