Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8144 in orxonox.OLD for branches/gui/src/lib


Ignore:
Timestamp:
Jun 4, 2006, 7:55:55 PM (19 years ago)
Author:
bensch
Message:

gui: better debugging system

Location:
branches/gui/src/lib
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • branches/gui/src/lib/collision_reaction/cr_engine.h

    r7927 r8144  
    5151
    5252  /** @returns an instance to a collision object. instead of creating new object this ones can be resycled */
    53 inline Collision* getCollisionObject() { /* return the first element of the cache list*/ }
     53  inline Collision* getCollisionObject() { /* return the first element of the cache list*/ }
    5454  /** @param collision: returns the Collision object back to the cache list */
    5555  inline void putCollisionObject(Collision* collision) { this->cachedCollisions.push_back(collision); }
  • branches/gui/src/lib/graphics/importer/primitive_model.cc

    r7729 r8144  
    104104
    105105  // defining the binding Faces.
    106   unsigned int v1, v2, v3, v4;
     106  int v1, v2, v3, v4;
    107107  for (int i = 0; i <= detail * 2 -1; i++)
    108108  {
     
    235235    }
    236236  //defining Faces
    237   unsigned int v1, v2, v3, v4;
     237  int v1, v2, v3, v4;
    238238  for (int i = 0; i < detail-1; i++)
    239239    for (int j = 0; j < detail-1; j++)
  • branches/gui/src/lib/graphics/importer/texture.cc

    r7790 r8144  
    218218    this->setTexture(Texture::loadTexToGL(this->data->getStoredImage()));
    219219  }
     220  return true;
    220221}
    221222
  • branches/gui/src/lib/graphics/importer/texture.h

    r7790 r8144  
    3434    bool setSurface(SDL_Surface* newSurface);
    3535    /** @returns true if the Surface has an Alpha Value. */
    36     bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; };
     36    bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; return this->bAlpha; };
    3737    bool setTexture(GLuint texture);
    3838
  • branches/gui/src/lib/gui/gl/glgui_style.h

    r8143 r8144  
    11/*!
    22 * @file glgui_style.h
    3  * @brief Definition of ...
     3 * @brief Definition of the OpenGL-GUI Style of a Class.
    44*/
    55
     
    1919  {
    2020  public:
    21     //! An enumerator that defines the different states Widgets may be in.
    22     typedef enum {
    23       Normal,           //!< Normal state of the GUI's Widgets.
    24       Active,           //!< If the widget is Active.
    25       Selected,         //!< If the Widget is Selected.
    26       Insensitive       //!< If the Widget is insensitive.
    27     } State;
    2821
    2922    //! Where a Certain feature will be positioned at.
     
    3528    } FeaturePosition;
    3629
     30
     31
    3732  public:
    3833    GLGuiStyle();
     
    4136
    4237  private:
    43 
    4438    float             _borderLeft;           //!< The Distance to the left Border of the widget, before any internal Element starts.
    4539    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

    r8140 r8144  
    3535   */
    3636  class GLGuiWidget : public Element2D
    37   {
     37{
     38  public:
     39  //! An enumerator that defines the different states Widgets may be in.
     40  typedef enum {
     41    Normal,           //!< Normal state of the GUI's Widgets.
     42    Active,           //!< If the widget is Active.
     43    Selected,         //!< If the Widget is Selected.
     44    Insensitive       //!< If the Widget is insensitive.
     45  } State;
     46
     47
     48
    3849  public:
    3950    GLGuiWidget(GLGuiWidget* parent = NULL);
  • branches/gui/src/lib/gui/qt/gui_general.cc

    r7855 r8144  
    4141  */
    4242  GuiGeneral::GuiGeneral(OrxGui::Gui* gui)
    43       : Element(CONFIG_SECTION_GENERAL, gui), QGroupBox()
     43  : QGroupBox(), Element(CONFIG_SECTION_GENERAL, gui)
    4444  {
    4545    QGridLayout* layout = new QGridLayout(this);
  • branches/gui/src/lib/lang/base_object.cc

    r7954 r8144  
    154154  if (classID != CL_NULL)
    155155    return this->isA(classID);
     156  else
     157    return false;
    156158}
    157159
  • branches/gui/src/lib/lang/class_list.cc

    r7429 r8144  
    335335  PRINT(0)("| knows %d Classes\n|\n", ClassList::classList->size());
    336336  char niceString[100];
    337   unsigned int lenCount = 0;
     337  int lenCount = 0;
    338338
    339339  list<ClassList>::iterator cl;
  • branches/gui/src/lib/math/vector.h

    r8035 r8144  
    7979  inline const Vector& operator= (const Vector& v) { this->x = v.x; this->y = v.y; this->z = v.z; return *this; };
    8080  /** copy constructor* @param v the sVec3D to assign to this vector. @returns the vector v */
    81   inline const Vector& operator= (const sVec3D& v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; }
    82   inline const Vector& operator= (const float* v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; }
     81  inline const Vector& operator= (const sVec3D& v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; return *this; }
     82  inline const Vector& operator= (const float* v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; return *this; }
    8383  /** @param v: the other vector \return the dot product of the vectors */
    8484  float dot (const Vector& v) const { return x*v.x+y*v.y+z*v.z; };
  • branches/gui/src/lib/shell/shell_buffer.cc

    r8123 r8144  
    6464   * @param line the Line as in the first argument in printf
    6565   */
    66   bool ShellBuffer::addBufferLineStatic(const char* line, ...)
     66  void ShellBuffer::addBufferLineStatic(const char* line, ...)
    6767  {
    6868    static OrxThread::Mutex ShellBuffer__bufferMutex;
     
    8585#endif
    8686      ShellBuffer::singletonRef->addBufferLine(ShellBuffer::bufferArray);
    87     return true;
    8887  }
    8988
  • branches/gui/src/lib/shell/shell_buffer.h

    r8123 r8144  
    3232    inline static bool isInstanciated() { return (ShellBuffer::singletonRef == NULL)?false:true; };
    3333
    34     static bool addBufferLineStatic(const char* line, ...);
     34    static void addBufferLineStatic(const char* line, ...);
    3535    void addBufferLine(const char* line);
    3636
  • branches/gui/src/lib/shell/shell_command.h

    r7742 r8144  
    3434   * $ ClassName [ObjectName] commandNameInShell [parameters]
    3535   */
    36   //#define SHELL_COMMAND(command, class, function) \
    37   //        ShellCommand* shell_command_##class##_##command = ShellCommand<class>::registerCommand(#command, #class, &class::function)
    3836#define SHELL_COMMAND(command, class, function) \
    3937           OrxShell::ShellCommand* shell_command_##class##_##command = OrxShell::ShellCommand::registerCommand(#command, #class, createExecutor<class>(&class::function))
  • branches/gui/src/lib/util/count_pointer.h

    r6669 r8144  
    1111    explicit CountPointer(X* p = 0) // allocate a new counter
    1212        : itsCounter(0) { if (p) itsCounter = new counter(p); }
    13     ~CountPointer() { release(); }
     13    virtual ~CountPointer() { release(); }
    1414    CountPointer(const CountPointer& r) { acquire(r.itsCounter); }
    1515    CountPointer& operator=(const CountPointer& r)
Note: See TracChangeset for help on using the changeset viewer.