Changeset 8144 in orxonox.OLD

Timestamp:

Jun 4, 2006, 7:55:55 PM (18 years ago)

Author:

bensch

Message:

gui: better debugging system

Location:

branches/gui/src

Files:

• defs/debug.h (modified) (11 diffs)
• lib/collision_reaction/cr_engine.h (modified) (1 diff)
• lib/graphics/importer/primitive_model.cc (modified) (2 diffs)
• lib/graphics/importer/texture.cc (modified) (1 diff)
• lib/graphics/importer/texture.h (modified) (1 diff)
• lib/gui/gl/glgui_style.h (modified) (4 diffs)
• lib/gui/gl/glgui_widget.h (modified) (1 diff)
• lib/gui/qt/gui_general.cc (modified) (1 diff)
• lib/lang/base_object.cc (modified) (1 diff)
• lib/lang/class_list.cc (modified) (1 diff)
• lib/math/vector.h (modified) (1 diff)
• lib/shell/shell_buffer.cc (modified) (2 diffs)
• lib/shell/shell_buffer.h (modified) (1 diff)
• lib/shell/shell_command.h (modified) (1 diff)
• lib/util/count_pointer.h (modified) (1 diff)
• util/animation/t_animation.h (modified) (1 diff)
• util/hud.cc (modified) (5 diffs)
• util/hud.h (modified) (3 diffs)
• world_entities/player.cc (modified) (1 diff)

branches/gui/src/defs/debug.h

@@ -131 +131 @@
 #define PRINTF1 \
     if (SOFT_DEBUG_LEVEL >= ORX_ERR) \
-      printf("(EE)::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
-#else
-#define PRINTF1 if (ORX_NONE)
+      printf("(EE)::%s:%d:", __FILE__, __LINE__), PRINT_EXEC
+#else
+#define PRINTF1 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -139 +139 @@
 #define PRINTF2 \
      if (SOFT_DEBUG_LEVEL >= ORX_WARN) \
-       printf("(WW)::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
-
-#else
-#define PRINTF2 if (ORX_NONE)
+       printf("(WW)::%s:%d:", __FILE__, __LINE__), PRINT_EXEC
+
+#else
+#define PRINTF2 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -148 +148 @@
 #define PRINTF3 \
      if (SOFT_DEBUG_LEVEL >= ORX_INFO) \
-       printf("(II)::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
-#else
-#define PRINTF3 if (ORX_NONE)
+       printf("(II)::%s:%d:", __FILE__, __LINE__), PRINT_EXEC
+#else
+#define PRINTF3 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -156 +156 @@
 #define PRINTF4 \
      if (SOFT_DEBUG_LEVEL >= ORX_DEBUG) \
-       printf("(DD)::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
-#else
-#define PRINTF4 if (ORX_NONE)
+       printf("(DD)::%s:%d:", __FILE__, __LINE__), PRINT_EXEC
+#else
+#define PRINTF4 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -164 +164 @@
 #define PRINTF5 \
      if (SOFT_DEBUG_LEVEL >= ORX_vDEBUG) \
-       printf("(VD)::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
-#else
-#define PRINTF5 if (ORX_NONE)
+       printf("(VD)::%s:%d:", __FILE__, __LINE__), PRINT_EXEC
+#else
+#define PRINTF5 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -174 +174 @@
 
 #define PRINTF0 \
-    printf("%s:%d::", __FILE__, __LINE__) && PRINT_EXEC
+    printf("%s:%d::", __FILE__, __LINE__), PRINT_EXEC
 #endif
 
@@ -196 +196 @@
     PRINT_EXEC
 #else
-#define PRINT1 if (ORX_NONE)
+#define PRINT1 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -205 +205 @@
 
 #else
-#define PRINT2 if (ORX_NONE)
+#define PRINT2 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -213 +213 @@
     PRINT_EXEC
 #else
-#define PRINT3 if (ORX_NONE)
+#define PRINT3 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -221 +221 @@
     PRINT_EXEC
 #else
-#define PRINT4 if (ORX_NONE)
+#define PRINT4 if (ORX_NONE) PRINT_EXEC
 #endif
 
@@ -229 +229 @@
        PRINT_EXEC
 #else
-#define PRINT5 if (ORX_NONE)
+#define PRINT5 if (ORX_NONE) PRINT_EXEC
 #endif
 

branches/gui/src/lib/collision_reaction/cr_engine.h

@@ -51 +51 @@
 
   /** @returns an instance to a collision object. instead of creating new object this ones can be resycled */
-inline Collision* getCollisionObject() { /* return the first element of the cache list*/ }
+  inline Collision* getCollisionObject() { /* return the first element of the cache list*/ }
   /** @param collision: returns the Collision object back to the cache list */
   inline void putCollisionObject(Collision* collision) { this->cachedCollisions.push_back(collision); }

branches/gui/src/lib/graphics/importer/primitive_model.cc

@@ -104 +104 @@
 
   // defining the binding Faces.
-  unsigned int v1, v2, v3, v4;
+  int v1, v2, v3, v4;
   for (int i = 0; i <= detail * 2 -1; i++)
   {
@@ -235 +235 @@
     }
   //defining Faces
-  unsigned int v1, v2, v3, v4;
+  int v1, v2, v3, v4;
   for (int i = 0; i < detail-1; i++)
     for (int j = 0; j < detail-1; j++)

branches/gui/src/lib/graphics/importer/texture.cc

@@ -218 +218 @@
     this->setTexture(Texture::loadTexToGL(this->data->getStoredImage()));
   }
+  return true;
 }
 

branches/gui/src/lib/graphics/importer/texture.h

@@ -34 +34 @@
     bool setSurface(SDL_Surface* newSurface);
     /** @returns true if the Surface has an Alpha Value. */
-    bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; };
+    bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; return this->bAlpha; };
     bool setTexture(GLuint texture);
 

branches/gui/src/lib/gui/gl/glgui_style.h

@@ -1 +1 @@
 /*!
  * @file glgui_style.h
- * @brief Definition of ...
+ * @brief Definition of the OpenGL-GUI Style of a Class.
 */
 
@@ -19 +19 @@
   {
   public:
-    //! An enumerator that defines the different states Widgets may be in.
-    typedef enum {
-      Normal,           //!< Normal state of the GUI's Widgets.
-      Active,           //!< If the widget is Active.
-      Selected,         //!< If the Widget is Selected.
-      Insensitive       //!< If the Widget is insensitive.
-    } State;
 
     //! Where a Certain feature will be positioned at.
@@ -35 +28 @@
     } FeaturePosition;
 
+
+
   public:
     GLGuiStyle();
@@ -41 +36 @@
 
   private:
-
     float             _borderLeft;           //!< The Distance to the left Border of the widget, before any internal Element starts.
     float             _borderRight;          //!< The Distance to the right Border of the widget, before any internal Element starts.

branches/gui/src/lib/gui/gl/glgui_widget.h

@@ -35 +35 @@
    */
   class GLGuiWidget : public Element2D
-  {
+{
+  public:
+  //! An enumerator that defines the different states Widgets may be in.
+  typedef enum {
+    Normal,           //!< Normal state of the GUI's Widgets.
+    Active,           //!< If the widget is Active.
+    Selected,         //!< If the Widget is Selected.
+    Insensitive       //!< If the Widget is insensitive.
+  } State;
+
+
+
   public:
     GLGuiWidget(GLGuiWidget* parent = NULL);

branches/gui/src/lib/gui/qt/gui_general.cc

@@ -41 +41 @@
   */
   GuiGeneral::GuiGeneral(OrxGui::Gui* gui)
-      : Element(CONFIG_SECTION_GENERAL, gui), QGroupBox()
+  : QGroupBox(), Element(CONFIG_SECTION_GENERAL, gui)
   {
     QGridLayout* layout = new QGridLayout(this);

branches/gui/src/lib/lang/base_object.cc

@@ -154 +154 @@
   if (classID != CL_NULL)
     return this->isA(classID);
+  else
+    return false;
 }
 

branches/gui/src/lib/lang/class_list.cc

@@ -335 +335 @@
   PRINT(0)("| knows %d Classes\n|\n", ClassList::classList->size());
   char niceString[100];
-  unsigned int lenCount = 0;
+  int lenCount = 0;
 
   list<ClassList>::iterator cl;

branches/gui/src/lib/math/vector.h

@@ -79 +79 @@
   inline const Vector& operator= (const Vector& v) { this->x = v.x; this->y = v.y; this->z = v.z; return *this; };
   /** copy constructor* @param v the sVec3D to assign to this vector. @returns the vector v */
-  inline const Vector& operator= (const sVec3D& v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; }
-  inline const Vector& operator= (const float* v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; }
+  inline const Vector& operator= (const sVec3D& v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; return *this; }
+  inline const Vector& operator= (const float* v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; return *this; }
   /** @param v: the other vector \return the dot product of the vectors */
   float dot (const Vector& v) const { return x*v.x+y*v.y+z*v.z; };

branches/gui/src/lib/shell/shell_buffer.cc

@@ -64 +64 @@
    * @param line the Line as in the first argument in printf
    */
-  bool ShellBuffer::addBufferLineStatic(const char* line, ...)
+  void ShellBuffer::addBufferLineStatic(const char* line, ...)
   {
     static OrxThread::Mutex ShellBuffer__bufferMutex;
@@ -85 +85 @@
 #endif
       ShellBuffer::singletonRef->addBufferLine(ShellBuffer::bufferArray);
-    return true;
   }
 

branches/gui/src/lib/shell/shell_buffer.h

@@ -32 +32 @@
     inline static bool isInstanciated() { return (ShellBuffer::singletonRef == NULL)?false:true; };
 
-    static bool addBufferLineStatic(const char* line, ...);
+    static void addBufferLineStatic(const char* line, ...);
     void addBufferLine(const char* line);
 

branches/gui/src/lib/shell/shell_command.h

@@ -34 +34 @@
    * $ ClassName [ObjectName] commandNameInShell [parameters]
    */
-  //#define SHELL_COMMAND(command, class, function) \
-  //        ShellCommand* shell_command_##class##_##command = ShellCommand<class>::registerCommand(#command, #class, &class::function)
 #define SHELL_COMMAND(command, class, function) \
            OrxShell::ShellCommand* shell_command_##class##_##command = OrxShell::ShellCommand::registerCommand(#command, #class, createExecutor<class>(&class::function))

branches/gui/src/lib/util/count_pointer.h

@@ -11 +11 @@
     explicit CountPointer(X* p = 0) // allocate a new counter
         : itsCounter(0) { if (p) itsCounter = new counter(p); }
-    ~CountPointer() { release(); }
+    virtual ~CountPointer() { release(); }
     CountPointer(const CountPointer& r) { acquire(r.itsCounter); }
     CountPointer& operator=(const CountPointer& r)

branches/gui/src/util/animation/t_animation.h

@@ -242 +242 @@
       break;
     case ANIM_NEG_EXP:
-      {
         this->animFunc = &tAnimation<T>::negExp;
         expFactor =  - 1.0 / this->currentKeyFrame->duration * logf(DELTA_X);
         break;
-      }
     case ANIM_QUADRATIC:
       this->animFunc = &tAnimation<T>::quadratic;

branches/gui/src/util/hud.cc

@@ -62 +62 @@
 }
 
-void Hud::setEnergyWidget(GLGuiWidget* widget)
+void Hud::setEnergyWidget(OrxGui::GLGuiWidget* widget)
 {
   // decopple old widget
@@ -83 +83 @@
 }
 
-void Hud::setShiledWidget(GLGuiWidget* widget)
+void Hud::setShiledWidget(OrxGui::GLGuiWidget* widget)
 {
 }
 
-void Hud::setArmorWidget(GLGuiWidget* widget)
+void Hud::setArmorWidget(OrxGui::GLGuiWidget* widget)
 {
 }
@@ -115 +115 @@
 {
   // hide all the Widgets
-  std::list<GLGuiWidget*>::iterator weaponWidget;
+  std::list<OrxGui::GLGuiWidget*>::iterator weaponWidget;
   for (weaponWidget = this->weaponsWidgets.begin(); weaponWidget != this->weaponsWidgets.end(); weaponWidget++)
   {
@@ -140 +140 @@
 }
 
-void Hud::addWeaponWidget(GLGuiWidget* widget)
+void Hud::addWeaponWidget(OrxGui::GLGuiWidget* widget)
 {
 }
 
-void Hud::removeWeaponWidget(GLGuiWidget* widget)
+void Hud::removeWeaponWidget(OrxGui::GLGuiWidget* widget)
 {
 }
@@ -160 +160 @@
   this->setSize2D(.2 * this->resX, this->resY);
 
-  std::list<GLGuiWidget*>::iterator weaponWidget;
+  std::list<OrxGui::GLGuiWidget*>::iterator weaponWidget;
   float pos = .3;
   for (weaponWidget = this->weaponsWidgets.begin(); weaponWidget != this->weaponsWidgets.end(); weaponWidget++, pos+=.03)

branches/gui/src/util/hud.h

@@ -15 +15 @@
 
 //! A class that renders a HUD.
-class Hud : public OrxGui::GLGuiWidget
+class Hud : public Element2D
 {
 
@@ -26 +26 @@
 
   void setBackGround();
-  void setEnergyWidget(GLGuiWidget* widget);
-  void setShiledWidget(GLGuiWidget* widget);
-  void setArmorWidget(GLGuiWidget* widget);
+  void setEnergyWidget(OrxGui::GLGuiWidget* widget);
+  void setShiledWidget(OrxGui::GLGuiWidget* widget);
+  void setArmorWidget(OrxGui::GLGuiWidget* widget);
   void setWeaponManager(WeaponManager* weaponMan);
 
-  void addWeaponWidget(GLGuiWidget* widget);
-  void removeWeaponWidget(GLGuiWidget* widget);
+  void addWeaponWidget(OrxGui::GLGuiWidget* widget);
+  void removeWeaponWidget(OrxGui::GLGuiWidget* widget);
 
   void updateWeaponManager();
@@ -46 +46 @@
   unsigned int             resY;
 
-  GLGuiWidget*             energyWidget;
-  GLGuiWidget*             shieldWidget;
-  GLGuiWidget*             armorWidget;
+  OrxGui::GLGuiWidget*     energyWidget;
+  OrxGui::GLGuiWidget*     shieldWidget;
+  OrxGui::GLGuiWidget*     armorWidget;
 
   WeaponManager*           weaponManager;
 
-  std::list<GLGuiWidget*>  weaponsWidgets; //!< WeaponWidgets will be displayed one after another
+  std::list<OrxGui::GLGuiWidget*> weaponsWidgets; //!< WeaponWidgets will be displayed one after another
 };
 

branches/gui/src/world_entities/player.cc

@@ -38 +38 @@
 
   this->playable = NULL;
-  this->hud.show();
+  this->hud.setVisibility(true);
 
   this->subscribeEvent(ES_GAME, KeyMapper::PEV_CHANGE_SHIP);