Changeset 5439 in orxonox.OLD for trunk

Timestamp:

Oct 26, 2005, 11:31:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: BaseObject with Debug-Level

Location:

trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• lib/lang/base_object.cc (modified) (3 diffs)
• lib/particles/particle_engine.cc (modified) (1 diff)
• world_entities/power_ups/power_up.cc (modified) (2 diffs)
• world_entities/power_ups/turret_power_up.cc (modified) (2 diffs)

trunk/src/defs/debug.h

@@ -59 +59 @@
 ////////////////////
 // FRAMEWORK
-#define DEBUG_MODULE_ORXONOX            2
-#define DEBUG_MODULE_WORLD              2
-#define DEBUG_MODULE_NETWORK            2
+#define DEBUG_MODULE_BASE                  2
+#define DEBUG_MODULE_ORXONOX               2
+#define DEBUG_MODULE_WORLD                 2
+#define DEBUG_MODULE_NETWORK               2
 
 // LOADING
-#define DEBUG_MODULE_LOAD               2
-#define DEBUG_MODULE_IMPORTER           2
+#define DEBUG_MODULE_LOAD                  2
+#define DEBUG_MODULE_IMPORTER              2
 
 // ENGINES
-#define DEBUG_MODULE_GRAPHICS           2
-#define DEBUG_MODULE_EVENT              2
-#define DEBUG_MODULE_PHYSICS            2
-#define DEBUG_MODULE_GARBAGE_COLLECTOR  2
-#define DEBUG_MODULE_OBJECT_MANAGER     2
-#define DEBUG_MODULE_ANIM               2
-#define DEBUG_MODULE_COLLISON_DETECTION 2
-#define DEBUG_MODULE_SPATIAL_SEPARATION 2
-#define DEBUG_MODULE_GUI                2
+#define DEBUG_MODULE_GRAPHICS              2
+#define DEBUG_MODULE_EVENT                 2
+#define DEBUG_MODULE_PHYSICS               2
+#define DEBUG_MODULE_GARBAGE_COLLECTOR     2
+#define DEBUG_MODULE_OBJECT_MANAGER        2
+#define DEBUG_MODULE_ANIM                  2
+#define DEBUG_MODULE_COLLISON_DETECTION    2
+#define DEBUG_MODULE_SPATIAL_SEPARATION    2
+#define DEBUG_MODULE_GUI                   2
 
 // MISC
-#define DEBUG_MODULE_TRACK_MANAGER      2
-#define DEBUG_MODULE_MATH               2
-
-#define DEBUG_MODULE_PNODE              2
-#define DEBUG_MODULE_WORLD_ENTITY       2
-
-#define DEBUG_MODULE_WEAPON             2
+#define DEBUG_MODULE_TRACK_MANAGER         2
+#define DEBUG_MODULE_MATH                  2
+
+#define DEBUG_MODULE_PNODE                 2
+#define DEBUG_MODULE_WORLD_ENTITY          2
+
+#define DEBUG_MODULE_WEAPON                2
 
 #define HARD_DEBUG_LEVEL DEBUG_SPECIAL_MODULE

trunk/src/lib/lang/base_object.cc

@@ -15 +15 @@
    co-programmer: ...
 */
-
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_BASE
 
 #include "base_object.h"
@@ -29 +29 @@
  *  sets the name from a LoadXML-Element
  * @param root the element to load from
-*/
+ */
 BaseObject::BaseObject(const TiXmlElement* root)
 {
@@ -57 +57 @@
  *  loads parameters
  * @param root the element to load from
-*/
+ */
 void BaseObject::loadParams(const TiXmlElement* root)
 {

trunk/src/lib/particles/particle_engine.cc

@@ -120 +120 @@
 
 /**
-  \brief Connects a ParticleSystem to a ParticleSystem thus emitting Particles.
+* @brief Connects a ParticleSystem to a ParticleSystem thus emitting Particles.
 * @param emitter the Emitter to connect to the System
 * @param system the System to connect to the Emitter

trunk/src/world_entities/power_ups/power_up.cc

@@ -1 @@
-
-
 /*
    orxonox - the future of 3D-vertical-scrollers
@@ -12 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
 

trunk/src/world_entities/power_ups/turret_power_up.cc

@@ -14 +14 @@
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
 #include "turret_power_up.h"
@@ -53 +54 @@
   this->sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);
   this->sphereMaterial = new Material;
-  this->sphereMaterial->setTransparency(.0001);
+  this->sphereMaterial->setTransparency(.1);
   this->sphereMaterial->setDiffuse(.1, .1, .8);