Changeset 4746 in orxonox.OLD for orxonox/trunk/src/lib
- Timestamp:
- Jul 1, 2005, 12:48:48 PM (19 years ago)
- Location:
- orxonox/trunk/src/lib
- Files:
-
- 59 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/lib/collision_detection/cd_engine.h
r4710 r4746 34 34 35 35 public: 36 virtual ~CDEngine( void);36 virtual ~CDEngine(); 37 37 /** \returns a Pointer to the only object of this Class */ 38 static CDEngine* getInstance( void) { if (!singletonRef) singletonRef = new CDEngine(); return singletonRef; }38 static CDEngine* getInstance() { if (!singletonRef) singletonRef = new CDEngine(); return singletonRef; } 39 39 void init(); 40 40 … … 55 55 56 56 private: 57 CDEngine( void);57 CDEngine(); 58 58 static CDEngine* singletonRef; 59 59 -
orxonox/trunk/src/lib/collision_detection/lin_alg.h
r4674 r4746 180 180 private: 181 181 void ComputeEigenpair(int); 182 void matrixUpdate( void);183 void getP( void);184 void printMatrix( void);182 void matrixUpdate(); 183 void getP(); 184 void printMatrix(); 185 185 186 186 private: … … 330 330 } 331 331 // 332 void EVJacobi::printMatrix( void)332 void EVJacobi::printMatrix() 333 333 { 334 334 for (int i=1; i<=ndim; ++i) … … 339 339 } 340 340 // 341 void EVJacobi::matrixUpdate( void)341 void EVJacobi::matrixUpdate() 342 342 { 343 343 double a_new[NDIM][NDIM], vec_new[NDIM][NDIM]; … … 404 404 // ev[1] <= ev[2] <= ... <= ev[ndim]. 405 405 // 406 void EVJacobi::getP( void)406 void EVJacobi::getP() 407 407 { 408 408 for (int i=1; i<=ndim; ++i) p[i] = i; -
orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc
r4718 r4746 998 998 999 999 1000 void OBBTreeNode::debug( void) const1000 void OBBTreeNode::debug() const 1001 1001 { 1002 1002 -
orxonox/trunk/src/lib/collision_detection/obb_tree_node.h
r4702 r4746 38 38 virtual void drawBV(int depth, int drawMode); 39 39 40 void debug( void) const;40 void debug() const; 41 41 42 42 private: -
orxonox/trunk/src/lib/coord/p_node.h
r4610 r4746 104 104 inline void parentDirChanged () { this->bRelDirChanged = true; } 105 105 /** \returns the last calculated coordinate */ 106 inline Vector getLastAbsCoor( void) {return this->lastAbsCoordinate;}106 inline Vector getLastAbsCoor() {return this->lastAbsCoordinate;} 107 107 108 108 -
orxonox/trunk/src/lib/event/event_handler.h
r4519 r4746 19 19 20 20 public: 21 virtual ~EventHandler( void);21 virtual ~EventHandler(); 22 22 /** \returns a Pointer to the only object of this Class */ 23 inline static EventHandler* getInstance( void) { if (!singletonRef) singletonRef = new EventHandler(); return singletonRef; };23 inline static EventHandler* getInstance() { if (!singletonRef) singletonRef = new EventHandler(); return singletonRef; }; 24 24 void init(); 25 25 … … 34 34 35 35 private: 36 EventHandler( void);36 EventHandler(); 37 37 38 38 -
orxonox/trunk/src/lib/graphics/graphics_engine.cc
r4739 r4746 119 119 \brief Sets the GL-attributes 120 120 */ 121 int GraphicsEngine::setGLattribs( void)121 int GraphicsEngine::setGLattribs() 122 122 { 123 123 // Set video mode … … 208 208 this is a GL-Projection-mode, that is orthogonal, for placing the font in fron of everything else 209 209 */ 210 void GraphicsEngine::enter2DMode( void)210 void GraphicsEngine::enter2DMode() 211 211 { 212 212 GraphicsEngine::storeMatrices(); … … 242 242 243 243 /** 244 \brief leaves the 2DMode again also \see Font::enter2DMode( void)245 */ 246 void GraphicsEngine::leave2DMode( void)244 \brief leaves the 2DMode again also \see Font::enter2DMode() 245 */ 246 void GraphicsEngine::leave2DMode() 247 247 { 248 248 glMatrixMode(GL_MODELVIEW); … … 258 258 \brief stores the GL_matrices 259 259 */ 260 void GraphicsEngine::storeMatrices( void)260 void GraphicsEngine::storeMatrices() 261 261 { 262 262 glGetDoublev(GL_PROJECTION_MATRIX, GraphicsEngine::projMat); … … 277 277 \brief outputs all the Fullscreen modes. 278 278 */ 279 void GraphicsEngine::listModes( void)279 void GraphicsEngine::listModes() 280 280 { 281 281 /* Get available fullscreen/hardware modes */ -
orxonox/trunk/src/lib/graphics/graphics_engine.h
r4681 r4746 27 27 virtual ~GraphicsEngine(); 28 28 /** \returns a Pointer to the only object of this Class */ 29 inline static GraphicsEngine* getInstance( void) { if (!singletonRef) singletonRef = new GraphicsEngine(); return singletonRef; };29 inline static GraphicsEngine* getInstance() { if (!singletonRef) singletonRef = new GraphicsEngine(); return singletonRef; }; 30 30 31 31 int initVideo(); 32 32 33 33 void setWindowName(const char* windowName, const char* icon); 34 int setGLattribs( void);34 int setGLattribs(); 35 35 int setResolution(int width, int height, int bpp); 36 36 void setFullscreen(bool fullscreen = false); … … 38 38 39 39 /** \returns the x resolution */ 40 inline int getResolutionX( void) const { return this->resolutionX; };40 inline int getResolutionX() const { return this->resolutionX; }; 41 41 /** \returns the y resolution */ 42 inline int getResolutionY( void) const { return this->resolutionY; };42 inline int getResolutionY() const { return this->resolutionY; }; 43 43 /** \returns the Bits Per Pixel */ 44 inline int getbbp( void) const { return this->bitsPerPixel; };44 inline int getbbp() const { return this->bitsPerPixel; }; 45 45 46 46 int resolutionChanged(SDL_ResizeEvent* resizeInfo); 47 47 48 static void enter2DMode( void);49 static void leave2DMode( void);48 static void enter2DMode(); 49 static void leave2DMode(); 50 50 51 static void storeMatrices( void);51 static void storeMatrices(); 52 52 static GLdouble modMat[16]; 53 53 static GLdouble projMat[16]; … … 57 57 void displayFPS(bool display); 58 58 59 void listModes( void);59 void listModes(); 60 60 61 61 /** \brief swaps the GL_BUFFERS */ 62 static void swapBuffers( void) { SDL_GL_SwapBuffers(); };62 static void swapBuffers() { SDL_GL_SwapBuffers(); }; 63 63 64 64 public: -
orxonox/trunk/src/lib/graphics/importer/array.h
r4580 r4746 32 32 ~Array(); 33 33 34 void finalizeArray ( void);34 void finalizeArray (); 35 35 void addEntry (T entry); 36 36 void addEntry(T entry0, T entry1, T entry2); … … 39 39 inline const T* getArray () const { return this->array; }; 40 40 /** \returns The Count of entries in the Array*/ 41 inline unsigned int getCount( void)const { return this->entryCount; };42 void debug( void) const ;41 inline unsigned int getCount()const { return this->entryCount; }; 42 void debug() const ; 43 43 44 44 private: … … 97 97 */ 98 98 template<class T> 99 void Array<T>::finalizeArray ( void)99 void Array<T>::finalizeArray () 100 100 { 101 101 PRINTF(4)("Finalizing array. Length: %i\n", entryCount); … … 157 157 */ 158 158 template<class T> 159 void Array<T>::debug ( void) const159 void Array<T>::debug () const 160 160 { 161 161 PRINT(0)("entryCount=%i, address=%p\n", this->entryCount, this->array); -
orxonox/trunk/src/lib/graphics/importer/material.cc
r4584 r4746 64 64 \brief sets the material with which the following Faces will be painted 65 65 */ 66 bool Material::select ( void)66 bool Material::select () 67 67 { 68 68 // setting diffuse color -
orxonox/trunk/src/lib/graphics/importer/material.h
r4584 r4746 28 28 ~Material (); 29 29 30 bool select ( void);30 bool select (); 31 31 32 32 void setIllum (int illum); -
orxonox/trunk/src/lib/graphics/importer/model.cc
r4677 r4746 113 113 actually does the same as the delete Operator, but does not delete the predecessing group 114 114 */ 115 void ModelGroup::cleanup( void)115 void ModelGroup::cleanup() 116 116 { 117 117 PRINTF(5)("Cleaning up group\n"); … … 164 164 Looks if any from model allocated space is still in use, and if so deleted it. 165 165 */ 166 Model::~Model( void)166 Model::~Model() 167 167 { 168 168 PRINTF(4)("Deleting Model "); … … 198 198 \brief Finalizes an Object. This can be done outside of the Class. 199 199 */ 200 void Model::finalize( void)200 void Model::finalize() 201 201 { 202 202 // this creates the display List. … … 218 218 It does this by just calling the Lists that must have been created earlier. 219 219 */ 220 void Model::draw ( void) const220 void Model::draw () const 221 221 { 222 222 PRINTF(4)("drawing the 3D-Models\n"); … … 292 292 \brief deletes all the arrays 293 293 */ 294 bool Model::deleteArrays( void)294 bool Model::deleteArrays() 295 295 { 296 296 if (this->vertices) … … 310 310 This funcion is needed, to delete all the Lists, and arrays that are no more needed because they are already imported into openGL. This will be applied at the end of the importing Process. 311 311 */ 312 bool Model::cleanup( void)312 bool Model::cleanup() 313 313 { 314 314 PRINTF(4)("cleaning up the 3D-Model to save Memory.\n"); … … 702 702 \brief reads and includes the Faces/Materials into the openGL state Machine 703 703 */ 704 bool Model::importToDisplayList( void)704 bool Model::importToDisplayList() 705 705 { 706 706 // finalize the Arrays … … 794 794 \brief reads and includes the Faces/Materials into the openGL state Machine 795 795 */ 796 bool Model::importToVertexArray( void)796 bool Model::importToVertexArray() 797 797 { 798 798 // finalize the Arrays … … 857 857 This will inject a Cube, because this is the most basic model. 858 858 */ 859 void Model::cubeModel( void)859 void Model::cubeModel() 860 860 { 861 861 this->addVertex (-0.5, -0.5, 0.5); -
orxonox/trunk/src/lib/graphics/importer/model.h
r4678 r4746 99 99 public: 100 100 Model(const char* modelName = NULL, MODEL_TYPE type = MODEL_DISPLAY_LIST); 101 virtual ~Model( void);101 virtual ~Model(); 102 102 103 void draw( void) const;103 void draw() const; 104 104 void draw(int groupNumber) const; 105 105 void draw(char* groupName) const; 106 106 107 107 /** \returns Count of the Models (Groups) in this File */ 108 inline int getGroupCount( void) const { return this->groupCount; };108 inline int getGroupCount() const { return this->groupCount; }; 109 109 110 110 /** \returns a Pointer to the Vertex-Array, if it was deleted it returns NULL */ 111 inline const GLfloat* getVertexArray( void) const { return this->vertices->getArray(); };111 inline const GLfloat* getVertexArray() const { return this->vertices->getArray(); }; 112 112 /** \returns the VertexCount of this Model */ 113 inline unsigned int getVertexCount( void) const { return this->vertexCount; };113 inline unsigned int getVertexCount() const { return this->vertexCount; }; 114 114 115 115 /** \returns a Pointer to the Normals-Array, if it was deleted it returns NULL */ 116 inline const GLfloat* getNormalsArray( void) const { return this->normals->getArray(); };116 inline const GLfloat* getNormalsArray() const { return this->normals->getArray(); }; 117 117 /** \returns the NormalsCount of this Model */ 118 inline unsigned int getNormalsCount( void) const { return this->normalCount; };118 inline unsigned int getNormalsCount() const { return this->normalCount; }; 119 119 120 120 /** \returns a Pointer to the TexCoord-Array, if it was deleted it returns NULL */ 121 inline const GLfloat* getTexCoordArray( void) const { return this->vTexture->getArray(); };121 inline const GLfloat* getTexCoordArray() const { return this->vTexture->getArray(); }; 122 122 /** \returns the TexCoord-Count of this Model */ 123 inline unsigned int getTexCoordCount( void) const { return this->texCoordCount; };123 inline unsigned int getTexCoordCount() const { return this->texCoordCount; }; 124 124 125 125 /** \returns the Count of Faces of this Model */ … … 141 141 bool setMaterial(const char* mtlString); 142 142 bool setMaterial(Material* mtl); 143 void finalize( void);143 void finalize(); 144 144 145 145 146 146 protected: 147 void cubeModel( void);147 void cubeModel(); 148 148 149 149 Material* findMaterialByName(const char* materialName); … … 154 154 155 155 private: 156 bool buildVertexNormals( void);156 bool buildVertexNormals(); 157 157 158 bool importToDisplayList( void);158 bool importToDisplayList(); 159 159 bool addGLElement(ModelFaceElement* elem); 160 160 161 bool importToVertexArray( void);161 bool importToVertexArray(); 162 162 163 bool deleteArrays( void);164 bool cleanup( void);163 bool deleteArrays(); 164 bool cleanup(); 165 165 166 166 private: -
orxonox/trunk/src/lib/graphics/importer/texture.cc
r4662 r4746 43 43 Frees Data, and deletes the textures from GL 44 44 */ 45 Texture::~Texture( void)45 Texture::~Texture() 46 46 { 47 47 if (this->texture) -
orxonox/trunk/src/lib/graphics/importer/texture.h
r4466 r4746 25 25 // Texture(TEXTURE_TYPE type, int resolution); 26 26 27 ~Texture( void);27 ~Texture(); 28 28 29 29 /** \returns The textureID of this texture. */ 30 inline GLuint getTexture( void) {return this->texture;}30 inline GLuint getTexture() {return this->texture;} 31 31 GLuint loadTexToGL (SDL_Surface* surface); 32 32 /** \returns true if texture has alpha, false otherwise */ 33 inline bool hasAlpha( void) const {return bAlpha;}33 inline bool hasAlpha() const {return bAlpha;} 34 34 35 35 bool loadImage(const char* imageName); -
orxonox/trunk/src/lib/graphics/light.cc
r4739 r4746 73 73 \brief destroys a Light 74 74 */ 75 Light::~Light( void)75 Light::~Light() 76 76 { 77 77 glDisable(lightsV[this->lightNumber]); … … 181 181 \brief draws this Light. Being a World-entity the possibility to do this lies at hand. 182 182 */ 183 void Light::draw( void) const183 void Light::draw() const 184 184 { 185 185 float pos[4] = {this->getAbsCoor().x, this->getAbsCoor().y, this->getAbsCoor().z, 1.0}; … … 192 192 \brief Prints out some nice formated debug information about the Light 193 193 */ 194 void Light::debug( void) const194 void Light::debug() const 195 195 { 196 196 PRINT(0)(":: %d :: -- reference %p\n", this->lightNumber, this); … … 348 348 \brief outputs debug information about the Class and its lights 349 349 */ 350 void LightManager::debug( void) const350 void LightManager::debug() const 351 351 { 352 352 PRINT(0)("=================================\n"); -
orxonox/trunk/src/lib/graphics/light.h
r4738 r4746 27 27 public: 28 28 Light(const TiXmlElement* root = NULL); 29 virtual ~Light( void);29 virtual ~Light(); 30 30 31 31 void loadParams(const TiXmlElement* root); … … 39 39 40 40 /** \returns the lightNumber*/ 41 int getLightNumber( void) const {return this->lightNumber;}41 int getLightNumber() const {return this->lightNumber;} 42 42 43 43 virtual void draw() const; 44 44 45 void debug( void) const;45 void debug() const; 46 46 47 47 // attributes … … 84 84 85 85 for some nice output just use: 86 \li void debug( void) const; (either on LightManager for a resume or on any Light for single information.)86 \li void debug() const; (either on LightManager for a resume or on any Light for single information.) 87 87 */ 88 88 class LightManager : public BaseObject … … 91 91 92 92 public: 93 virtual ~LightManager( void);93 virtual ~LightManager(); 94 94 /** \returns a Pointer to the only object of this Class */ 95 inline static LightManager* getInstance( void) { if (!singletonRef) singletonRef = new LightManager(); return singletonRef; };95 inline static LightManager* getInstance() { if (!singletonRef) singletonRef = new LightManager(); return singletonRef; }; 96 96 97 97 void loadParams(const TiXmlElement* root); … … 105 105 void draw() const; 106 106 107 void debug( void) const;107 void debug() const; 108 108 109 109 private: 110 LightManager( void);110 LightManager(); 111 111 112 112 int registerLight(Light* light); -
orxonox/trunk/src/lib/graphics/text_engine.cc
r4709 r4746 71 71 This also ereases the text from the textList of the TextEngine 72 72 */ 73 Text::~Text( void)73 Text::~Text() 74 74 { 75 75 TextEngine::getInstance()->deleteText(this); … … 167 167 this is only for TEXT_STATIC-mode 168 168 */ 169 void Text::createTexture( void)169 void Text::createTexture() 170 170 { 171 171 SDL_Surface* tmpSurf; … … 187 187 \brief draws the Font 188 188 */ 189 void Text::draw( void) const189 void Text::draw() const 190 190 { 191 191 // setting the Position of this Text. … … 271 271 \brief prints out some nice debug information about this text 272 272 */ 273 void Text::debug( void) const273 void Text::debug() const 274 274 { 275 275 PRINT(0)("=== TEXT: %s ===\n", this->text); … … 415 415 \brief destructs a font 416 416 */ 417 Font::~Font( void)417 Font::~Font() 418 418 { 419 419 // deleting the List of all Texts … … 509 509 \returns the maximum height of the Font, if the font was initialized, 0 otherwise 510 510 */ 511 int Font::getMaxHeight( void)511 int Font::getMaxHeight() 512 512 { 513 513 if (likely (this->font != NULL)) … … 522 522 the ascent is the pixels of the font above the baseline 523 523 */ 524 int Font::getMaxAscent( void)524 int Font::getMaxAscent() 525 525 { 526 526 if (likely(this->font != NULL)) … … 535 535 the descent is the pixels of the font below the baseline 536 536 */ 537 int Font::getMaxDescent( void)537 int Font::getMaxDescent() 538 538 { 539 539 if (likely(this->font != NULL)) … … 568 568 } 569 569 570 GLuint Font::createFastTexture( void)570 GLuint Font::createFastTexture() 571 571 { 572 572 /* interesting GLYPHS: … … 730 730 openGL-version < 1.2 compatibility ( and because it is realy easy like this :)) 731 731 */ 732 int Font::findOptimalFastTextureSize( void)732 int Font::findOptimalFastTextureSize() 733 733 { 734 734 int i; … … 775 775 \brief a simple function to get some interesting information about this class 776 776 */ 777 void Font::debug( void)777 void Font::debug() 778 778 { 779 779 // print the loaded font's style … … 832 832 \brief function to enable TTF_Fonts 833 833 */ 834 void TextEngine::enableFonts( void)834 void TextEngine::enableFonts() 835 835 { 836 836 if (!TTF_WasInit()) … … 848 848 \brief function to disable TTF_fonts 849 849 */ 850 void TextEngine::disableFonts( void)850 void TextEngine::disableFonts() 851 851 { 852 852 if (TTF_WasInit()) … … 900 900 \brief deletes all the Text, and tries to delete all allocated fonts 901 901 */ 902 void TextEngine::flush( void)902 void TextEngine::flush() 903 903 { 904 904 tIterator<Text>* textIterator = textList->getIterator(); … … 915 915 \brief draws all the Texts that have been initialized 916 916 */ 917 void TextEngine::draw( void) const917 void TextEngine::draw() const 918 918 { 919 919 // entering 3D-mode … … 937 937 \todo there should also be something outputted about Font 938 938 */ 939 void TextEngine::debug( void) const939 void TextEngine::debug() const 940 940 { 941 941 PRINT(0)("+-------------------------------+\n"); … … 960 960 \returns true if match, false otherwise 961 961 */ 962 bool TextEngine::checkVersion( void)962 bool TextEngine::checkVersion() 963 963 { 964 964 SDL_version compile_version; -
orxonox/trunk/src/lib/graphics/text_engine.h
r4662 r4746 108 108 friend class TextEngine; 109 109 public: 110 ~Text( void);110 ~Text(); 111 111 112 112 void setBindNode(PNode* bindNode); … … 124 124 void createTexture(); 125 125 126 void draw( void) const;127 128 void debug( void) const;126 void draw() const; 127 128 void debug() const; 129 129 130 130 private: … … 175 175 176 176 /** \returns a Pointer to the Array of Glyphs */ 177 inline Glyph** getGlyphArray( void) const {return glyphArray;}177 inline Glyph** getGlyphArray() const {return glyphArray;} 178 178 /** \returns the texture to the fast-texture */ 179 inline GLuint getFastTextureID( void) const {return fastTextureID;}180 181 private: 182 int getMaxHeight( void);183 int getMaxAscent( void);184 int getMaxDescent( void);179 inline GLuint getFastTextureID() const {return fastTextureID;} 180 181 private: 182 int getMaxHeight(); 183 int getMaxAscent(); 184 int getMaxDescent(); 185 185 Glyph* getGlyphMetrics(Uint16 character); 186 186 … … 188 188 189 189 void initGlyphs(Uint16 from, Uint16 count); 190 int findOptimalFastTextureSize( void);191 192 void debug( void);190 int findOptimalFastTextureSize(); 191 192 void debug(); 193 193 194 194 private: … … 216 216 { 217 217 public: 218 virtual ~TextEngine( void);218 virtual ~TextEngine(); 219 219 /** \returns a Pointer to the only object of this Class */ 220 inline static TextEngine* getInstance( void) { if (!singletonRef) singletonRef = new TextEngine(); return singletonRef; };220 inline static TextEngine* getInstance() { if (!singletonRef) singletonRef = new TextEngine(); return singletonRef; }; 221 221 222 222 Text* createText(const char* fontFile, … … 228 228 229 229 void deleteText(Text* text); 230 void flush( void);231 232 void draw( void) const;233 234 void debug( void) const;235 236 private: 237 TextEngine( void);230 void flush(); 231 232 void draw() const; 233 234 void debug() const; 235 236 private: 237 TextEngine(); 238 238 static TextEngine* singletonRef; 239 239 240 240 // general 241 static void enableFonts( void);242 static void disableFonts( void);243 static bool checkVersion( void);241 static void enableFonts(); 242 static void disableFonts(); 243 static bool checkVersion(); 244 244 245 245 private: -
orxonox/trunk/src/lib/gui/gui.cc
r4427 r4746 123 123 \brief starts the OrxonoxGUI 124 124 */ 125 void Gui::startGui( void)125 void Gui::startGui() 126 126 { 127 127 mainloopGUI(); … … 145 145 \brief Destructor. 146 146 */ 147 Gui::~Gui( void)147 Gui::~Gui() 148 148 { 149 149 delete video; -
orxonox/trunk/src/lib/gui/gui.h
r4427 r4746 24 24 public: 25 25 Gui(int argc, char *argv[]); 26 ~Gui( void);26 ~Gui(); 27 27 28 void startGui( void);29 void printHelp( void);28 void startGui(); 29 void printHelp(); 30 30 31 31 static bool startOrxonox; -
orxonox/trunk/src/lib/gui/gui_audio.cc
r4427 r4746 31 31 \brief Creates an Audio-Frame 32 32 */ 33 GuiAudio::GuiAudio( void)33 GuiAudio::GuiAudio() 34 34 { 35 35 Frame* audioFrame; //!< The Frame that holds the audio Options. … … 74 74 \brief Destructs the Audio-Stuff 75 75 */ 76 GuiAudio::~GuiAudio( void)76 GuiAudio::~GuiAudio() 77 77 { 78 78 // nothing to do here. -
orxonox/trunk/src/lib/gui/gui_audio.h
r4427 r4746 13 13 { 14 14 public: 15 GuiAudio( void);16 ~GuiAudio( void);15 GuiAudio(); 16 ~GuiAudio(); 17 17 }; 18 18 #endif /* _GUI_AUDIO_H */ -
orxonox/trunk/src/lib/gui/gui_banner.cc
r4427 r4746 34 34 \brief Creates a new BannerEventBox and its content. 35 35 */ 36 GuiBanner::GuiBanner( void)36 GuiBanner::GuiBanner() 37 37 { 38 38 // the banner Frame … … 92 92 \brief Destructs it. 93 93 */ 94 GuiBanner::~GuiBanner( void)94 GuiBanner::~GuiBanner() 95 95 { 96 96 // nothing to do here -
orxonox/trunk/src/lib/gui/gui_banner.h
r4427 r4746 15 15 { 16 16 public: 17 GuiBanner( void);18 ~GuiBanner( void);17 GuiBanner(); 18 ~GuiBanner(); 19 19 }; 20 20 -
orxonox/trunk/src/lib/gui/gui_element.h
r4427 r4746 18 18 19 19 /** \returns the main Widget of this GuiElement. */ 20 Widget* getWidget( void) {return this->mainWidget;}20 Widget* getWidget() {return this->mainWidget;} 21 21 protected: 22 22 void setMainWidget(Widget* widget); -
orxonox/trunk/src/lib/gui/gui_exec.cc
r4427 r4746 41 41 \brief Creates the Exec-Frame 42 42 */ 43 GuiExec::GuiExec( void)43 GuiExec::GuiExec() 44 44 { 45 45 Frame* execFrame; //!< The Frame that holds the ExecutionOptions. … … 133 133 \brief Destructs the Execution-stuff 134 134 */ 135 GuiExec::~GuiExec( void)135 GuiExec::~GuiExec() 136 136 { 137 137 if(this->confFile) … … 178 178 \returns The name of the Configuration-File 179 179 */ 180 const char* GuiExec::getConfigFile( void) const180 const char* GuiExec::getConfigFile() const 181 181 { 182 182 return this->confFile; -
orxonox/trunk/src/lib/gui/gui_exec.h
r4427 r4746 33 33 34 34 public: 35 GuiExec( void);36 ~GuiExec( void);35 GuiExec(); 36 ~GuiExec(); 37 37 38 38 void setConfDir(const char* confDir); 39 39 void setConfFile(const char* confFile); 40 const char* getConfigFile( void) const;41 int shouldsave( void);40 const char* getConfigFile() const; 41 int shouldsave(); 42 42 void writeToFile(Widget* widget); 43 43 void writeFileText(Widget* widget, int depth); -
orxonox/trunk/src/lib/gui/gui_flags.cc
r4427 r4746 29 29 \brief Creates the Flags-Frame 30 30 */ 31 GuiFlags::GuiFlags( void)31 GuiFlags::GuiFlags() 32 32 { 33 33 this->flagsFrame = new Frame("Orxonox-Startup-Flags:"); … … 48 48 \brief Destructs the Flags-stuff 49 49 */ 50 GuiFlags::~GuiFlags( void)50 GuiFlags::~GuiFlags() 51 51 { 52 52 // nothing to do here -
orxonox/trunk/src/lib/gui/gui_flags.h
r4427 r4746 21 21 22 22 public: 23 GuiFlags( void);24 ~GuiFlags( void);23 GuiFlags(); 24 ~GuiFlags(); 25 25 26 26 void setTextFromFlags(Widget* widget); -
orxonox/trunk/src/lib/gui/gui_gtk.cc
r4427 r4746 66 66 \brief enters the GUI's main-loop 67 67 */ 68 bool mainloopGUI( void)68 bool mainloopGUI() 69 69 { 70 70 #ifdef HAVE_GTK2 … … 146 146 \brief constructs a Widget 147 147 */ 148 Widget::Widget( void)148 Widget::Widget() 149 149 { 150 150 next = NULL; … … 156 156 This is still pretty crappy. 157 157 */ 158 Widget::~Widget( void)158 Widget::~Widget() 159 159 { 160 160 if (this->title) … … 190 190 \brief makes the widget visible. 191 191 */ 192 void Widget::show( void)192 void Widget::show() 193 193 { 194 194 #ifdef HAVE_GTK2 … … 200 200 \brief hides the widget. 201 201 */ 202 void Widget::hide( void)202 void Widget::hide() 203 203 { 204 204 #ifdef HAVE_GTK2 … … 571 571 \brief Constructs a Packer 572 572 */ 573 Packer::Packer( void)573 Packer::Packer() 574 574 { 575 575 this->down = NULL; … … 580 580 \brief Destroys a Packer. 581 581 */ 582 Packer::~Packer( void)582 Packer::~Packer() 583 583 { 584 584 PRINTF(5)("deleting the Packer part.\n"); … … 611 611 sets the Container-Specific defaults. 612 612 */ 613 Container::Container( void)613 Container::Container() 614 614 { 615 615 this->optionType = GUI_CONTAINER; … … 619 619 \brief Destroys a Container. 620 620 */ 621 Container::~Container( void)621 Container::~Container() 622 622 { 623 623 PRINTF(5)("deleting the Container part.\n"); … … 694 694 \brief Destructs a Window. 695 695 */ 696 Window::~Window( void)696 Window::~Window() 697 697 { 698 698 PRINTF(5)("deleting the Window: %s\n", this->title); … … 725 725 \brief Shows all Widgets that are included within this->widget. 726 726 */ 727 void Window::showall( void)727 void Window::showall() 728 728 { 729 729 #ifdef HAVE_GTK2 … … 753 753 \brief opens up a Window and fixes the Focus to it 754 754 */ 755 void Window::open( void)755 void Window::open() 756 756 { 757 757 if (this != mainWindow) … … 768 768 \brief closes up a Window and removes the Focus from it 769 769 */ 770 void Window::close( void)770 void Window::close() 771 771 { 772 772 if (this != mainWindow) … … 831 831 \brief destrcucts a Frame 832 832 */ 833 Frame::~Frame( void)833 Frame::~Frame() 834 834 { 835 835 PRINTF(5)("deleting the Frame: %s\n", this->title); … … 872 872 \brief destructs an EventBox. 873 873 */ 874 EventBox::~EventBox( void)874 EventBox::~EventBox() 875 875 { 876 876 PRINTF(5)("deleting the EventBox: %s\n", this->title); … … 899 899 \brief destructs a Box. 900 900 */ 901 Box::~Box( void)901 Box::~Box() 902 902 { 903 903 PRINTF(5)("deleting the Box: %s\n", this->title); … … 934 934 sets all Option-Specific-Values to their defaults. 935 935 */ 936 Option::Option( void)936 Option::Option() 937 937 { 938 938 this->value = 0; … … 950 950 \brief Destroys an Option. 951 951 */ 952 Option::~Option( void)952 Option::~Option() 953 953 { 954 954 PRINTF(5)("deleting the Option Part.\n"); … … 1051 1051 this is a default Option save 1052 1052 */ 1053 char* Option::save( void)1053 char* Option::save() 1054 1054 { 1055 1055 char* value = new char [30]; … … 1072 1072 \returns The saveable-state. 1073 1073 */ 1074 bool Option::isSaveable( void)1074 bool Option::isSaveable() 1075 1075 { 1076 1076 return this->saveable; … … 1114 1114 \brief destructs a Button. 1115 1115 */ 1116 Button::~Button( void)1116 Button::~Button() 1117 1117 { 1118 1118 PRINTF(5)("deleting the Label: %s\n", this->title); … … 1138 1138 \todo not implemented yet 1139 1139 */ 1140 void Button::redraw( void)1140 void Button::redraw() 1141 1141 { 1142 1142 } … … 1147 1147 \todo Actions for non-GTK-mode 1148 1148 */ 1149 void Button::changeOption( void)1149 void Button::changeOption() 1150 1150 { 1151 1151 // This will possibly be used for ACTIONS ! … … 1178 1178 \brief destructs a CheckButton. 1179 1179 */ 1180 CheckButton::~CheckButton( void)1180 CheckButton::~CheckButton() 1181 1181 { 1182 1182 if (this->title) … … 1204 1204 \returns the Active state of the checkButton 1205 1205 */ 1206 bool CheckButton::isActive( void)1206 bool CheckButton::isActive() 1207 1207 { 1208 1208 #ifdef HAVE_GTK2 … … 1214 1214 \brief Changed the Option, call this Function 1215 1215 */ 1216 void CheckButton::changeOption( void)1216 void CheckButton::changeOption() 1217 1217 { 1218 1218 #ifdef HAVE_GTK2 … … 1234 1234 Example: if new settings are loaded the Button must be redrawn for the GUI to display that Change 1235 1235 */ 1236 void CheckButton::redraw( void)1236 void CheckButton::redraw() 1237 1237 { 1238 1238 #ifdef HAVE_GTK2 … … 1270 1270 \brief destructs a Slider. 1271 1271 */ 1272 Slider::~Slider( void)1272 Slider::~Slider() 1273 1273 { 1274 1274 PRINTF(5)("deleting the Slider: %s\n", this->title); … … 1298 1298 /** 1299 1299 \brief Redraws the widget 1300 Example: see void CheckButton::redraw( void)1301 */ 1302 void Slider::redraw( void)1300 Example: see void CheckButton::redraw() 1301 */ 1302 void Slider::redraw() 1303 1303 { 1304 1304 #ifdef HAVE_GTK2 … … 1310 1310 \brief Changed the Option, call this Function 1311 1311 */ 1312 void Slider::changeOption( void)1312 void Slider::changeOption() 1313 1313 { 1314 1314 #ifdef HAVE_GTK2 … … 1328 1328 } 1329 1329 1330 char* Slider::save( void)1330 char* Slider::save() 1331 1331 { 1332 1332 char* value = new char [30]; … … 1380 1380 \brief destructs a Menu. 1381 1381 */ 1382 Menu::~Menu( void)1382 Menu::~Menu() 1383 1383 { 1384 1384 PRINTF(5)("deleting the Menu: %s\n", this->title); … … 1401 1401 \brief Initializes a new Menu with no items 1402 1402 */ 1403 void Menu::init( void)1403 void Menu::init() 1404 1404 { 1405 1405 this->optionType = GUI_INT; … … 1418 1418 \returns the name of the selected Menu-Item 1419 1419 */ 1420 char* Menu::save( void)1420 char* Menu::save() 1421 1421 { 1422 1422 MenuItem* tmpItem = this->firstItem; … … 1491 1491 /** 1492 1492 \brief Redraws the widget 1493 Example: see void CheckButton::redraw( void)1494 */ 1495 void Menu::redraw( void)1493 Example: see void CheckButton::redraw() 1494 */ 1495 void Menu::redraw() 1496 1496 { 1497 1497 #ifdef HAVE_GTK2 … … 1503 1503 \brief Changed the Option, call this Function 1504 1504 */ 1505 void Menu::changeOption( void)1505 void Menu::changeOption() 1506 1506 { 1507 1507 #ifdef HAVE_GTK2 … … 1540 1540 \brief destructs an OptionLabel. 1541 1541 */ 1542 OptionLabel::~OptionLabel( void)1542 OptionLabel::~OptionLabel() 1543 1543 { 1544 1544 PRINTF(5)("deleting the OptionLabel: %s\n", this->title); … … 1564 1564 \brief Redraws an OptionLabel(not implemented yet, but it works). 1565 1565 */ 1566 void OptionLabel::redraw( void)1566 void OptionLabel::redraw() 1567 1567 { 1568 1568 #ifdef HAVE_GTK2 … … 1574 1574 \brief Changed the Option, call this Function 1575 1575 */ 1576 void OptionLabel::changeOption( void)1576 void OptionLabel::changeOption() 1577 1577 { 1578 1578 #ifdef HAVE_GTK2 … … 1592 1592 \returns the String to save. 1593 1593 */ 1594 char* OptionLabel::save( void)1594 char* OptionLabel::save() 1595 1595 { 1596 1596 return cValue; … … 1630 1630 \brief destructs a Label. 1631 1631 */ 1632 Label::~Label( void)1632 Label::~Label() 1633 1633 { 1634 1634 PRINTF(5)("deleting the Label: %s\n", this->title); … … 1653 1653 \brief ereases the Text of a Label 1654 1654 */ 1655 void Label::ereaseText( void)1655 void Label::ereaseText() 1656 1656 { 1657 1657 this->setTitle(""); … … 1698 1698 \return The Text the Label holds. 1699 1699 */ 1700 const char* Label::getText( void)1700 const char* Label::getText() 1701 1701 { 1702 1702 return this->title; … … 1728 1728 \brief destructs a ProgressBar 1729 1729 */ 1730 ProgressBar::~ProgressBar( void)1730 ProgressBar::~ProgressBar() 1731 1731 { 1732 1732 PRINTF(5)("deleting the ProgressBar: %s\n", this->title); … … 1762 1762 \brief returns the Progress Status 1763 1763 */ 1764 double ProgressBar::getProgress( void)1764 double ProgressBar::getProgress() 1765 1765 { 1766 1766 return this->progress; … … 1800 1800 \brief destructs an Image. 1801 1801 */ 1802 Image::~Image( void)1802 Image::~Image() 1803 1803 { 1804 1804 PRINTF(5)("deleting the Image: %s\n", this->title); … … 1861 1861 \brief destructs a FileDialog 1862 1862 */ 1863 FileDialog::~FileDialog( void)1863 FileDialog::~FileDialog() 1864 1864 { 1865 1865 PRINTF(5)("deleting FileDialog %s\n", this->title); … … 1903 1903 \brief disables the File Operator Buttons 1904 1904 */ 1905 void FileDialog::disableFileOpts( void)1905 void FileDialog::disableFileOpts() 1906 1906 { 1907 1907 #ifdef HAVE_GTK2 … … 1913 1913 \brief The ok-button has been pressed 1914 1914 */ 1915 void FileDialog::okEvent( void)1915 void FileDialog::okEvent() 1916 1916 { 1917 1917 if (this->okFunc) … … 1936 1936 \biref opens up the FileDialog-Window 1937 1937 */ 1938 void FileDialog::open( void)1938 void FileDialog::open() 1939 1939 { 1940 1940 isOpen = true; … … 1948 1948 \closes the FileDialog-Window 1949 1949 */ 1950 void FileDialog::close( void)1950 void FileDialog::close() 1951 1951 { 1952 1952 this->isOpen = false; -
orxonox/trunk/src/lib/gui/gui_gtk.h
r4427 r4746 45 45 46 46 bool initGUI(int argc, char* argv[]); 47 bool mainloopGUI( void);47 bool mainloopGUI(); 48 48 49 49 //! This is the topmost object that can be displayed all others are derived from it. … … 53 53 54 54 public: 55 Widget( void);56 virtual ~Widget( void);57 58 void show( void);59 void hide( void);55 Widget(); 56 virtual ~Widget(); 57 58 void show(); 59 void hide(); 60 60 void setSize(int width, int height); 61 61 62 62 virtual void setTitle(const char* title); //!< An abstract Function, that sets the title of Widgets. 63 virtual const char* getTitle( void) const { return this->title; };63 virtual const char* getTitle() const { return this->title; }; 64 64 65 65 Widget* findWidgetByName(char* name, unsigned int depth); … … 115 115 { 116 116 public: 117 Packer( void);118 virtual ~Packer( void);117 Packer(); 118 virtual ~Packer(); 119 119 120 120 Widget* down; //!< this points to the Widget below this. … … 123 123 void setGroupName(const char* name); 124 124 /** \returns the GroupName if existent NULL otherwise */ 125 inline const char* getGroupName( void) const {return this->groupName;}125 inline const char* getGroupName() const {return this->groupName;} 126 126 127 127 … … 142 142 143 143 public: 144 Container( void);145 virtual ~Container( void);144 Container(); 145 virtual ~Container(); 146 146 147 147 void setBorderWidth(int borderwidth); … … 163 163 164 164 Window(const char* windowName = NULL); 165 virtual ~Window( void);165 virtual ~Window(); 166 166 167 167 virtual void setTitle(const char* title); 168 void showall( void);169 void open( void);170 void close( void);168 void showall(); 169 void open(); 170 void close(); 171 171 172 172 #ifdef HAVE_GTK2 … … 189 189 public: 190 190 Frame(const char* frameName = NULL); 191 virtual ~Frame( void);191 virtual ~Frame(); 192 192 193 193 virtual void setTitle(const char* title); … … 202 202 public: 203 203 EventBox(const char* eventBoxName = NULL); 204 virtual ~EventBox( void);204 virtual ~EventBox(); 205 205 }; 206 206 … … 215 215 public: 216 216 Box(char boxtype = 'h'); 217 virtual ~Box( void);217 virtual ~Box(); 218 218 219 219 virtual void fill(Widget* lowerWidget); … … 230 230 231 231 public: 232 Option( void);233 virtual ~Option( void);232 Option(); 233 virtual ~Option(); 234 234 235 235 int value; //!< every option has a value either true or false(0,1) or something else like 25 for 25% of the volume … … 242 242 243 243 void saveability(bool isSaveable = true); 244 virtual char* save( void);244 virtual char* save(); 245 245 virtual void load(char* loadString); 246 246 247 bool isSaveable( void);247 bool isSaveable(); 248 248 void setDefaultValue(int defaultValue); 249 249 void setFlagName(const char* flagname, int defaultvalue); … … 251 251 void setDescription(const char* shortDescription, const char* longDescription = NULL); 252 252 253 virtual void redraw( void) = 0; //!< A Option must be able to redraw itself.254 virtual void changeOption( void) = 0; //!< What to do, if an Option is Changed. eacht option decides for itself.253 virtual void redraw() = 0; //!< A Option must be able to redraw itself. 254 virtual void changeOption() = 0; //!< What to do, if an Option is Changed. eacht option decides for itself. 255 255 #ifdef HAVE_GTK2 256 256 // Signals … … 267 267 public: 268 268 Button(const char* buttonName = NULL); 269 virtual ~Button( void);269 virtual ~Button(); 270 270 271 271 virtual void setTitle(const char* title); 272 virtual void redraw( void);273 virtual void changeOption( void);272 virtual void redraw(); 273 virtual void changeOption(); 274 274 }; 275 275 … … 281 281 public: 282 282 CheckButton(const char* buttonName = NULL); 283 virtual ~CheckButton( void);284 285 bool isActive( void);283 virtual ~CheckButton(); 284 285 bool isActive(); 286 286 287 287 virtual void setTitle(const char* title); 288 virtual void redraw( void);289 virtual void changeOption( void);288 virtual void redraw(); 289 virtual void changeOption(); 290 290 }; 291 291 … … 302 302 public: 303 303 Slider(const char* slidername, float start, float end); 304 virtual ~Slider( void);304 virtual ~Slider(); 305 305 306 306 void setExactness(int exactness); 307 307 void setValue(float value); 308 virtual void redraw( void);309 virtual void changeOption( void);310 311 virtual char* save( void);308 virtual void redraw(); 309 virtual void changeOption(); 310 311 virtual char* save(); 312 312 virtual void load(char* loadString); 313 313 }; … … 338 338 Menu(const char* menuName); 339 339 Menu(char* menuname, ...); 340 virtual ~Menu( void);341 void init( void);342 343 virtual char* save( void);340 virtual ~Menu(); 341 void init(); 342 343 virtual char* save(); 344 344 virtual void load(char* loadString); 345 345 346 346 void addItem(char* itemName); 347 virtual void redraw( void);348 virtual void changeOption( void);347 virtual void redraw(); 348 virtual void changeOption(); 349 349 }; 350 350 … … 354 354 public: 355 355 OptionLabel(const char* label, const char* value); 356 virtual ~OptionLabel( void);356 virtual ~OptionLabel(); 357 357 358 358 void setValue(const char* newValue); 359 359 360 virtual char* save( void);360 virtual char* save(); 361 361 virtual void load(char* loadString); 362 362 363 virtual void redraw( void);364 virtual void changeOption( void);363 virtual void redraw(); 364 virtual void changeOption(); 365 365 366 366 char* cValue; //!< The Value the Label will have. \todo make private … … 372 372 public: 373 373 EntryField(const char* name = NULL); 374 virtual ~EntryField( void);374 virtual ~EntryField(); 375 375 376 376 void setValue(const char* newValue); 377 virtual char* save( void);377 virtual char* save(); 378 378 virtual void load(char* loadString); 379 379 380 virtual void redraw( void);381 virtual void changeOption( void);380 virtual void redraw(); 381 virtual void changeOption(); 382 382 }; 383 383 … … 387 387 public: 388 388 Label(const char* text = NULL); 389 virtual ~Label( void);389 virtual ~Label(); 390 390 391 391 virtual void setTitle(const char* text); 392 void ereaseText( void);392 void ereaseText(); 393 393 void appendText(char* textToAppend); 394 394 void appendInt(int intToAppend); 395 const char* getText( void);395 const char* getText(); 396 396 }; 397 397 … … 401 401 public: 402 402 ProgressBar(const char* label = NULL); 403 virtual ~ProgressBar( void);403 virtual ~ProgressBar(); 404 404 405 405 void setProgress(double progress); 406 406 void setTotalSize(double totalSize); 407 double getProgress( void);407 double getProgress(); 408 408 409 409 private: … … 425 425 Image(const char* imgaeName); 426 426 Image(char** imageData); 427 virtual ~Image( void);427 virtual ~Image(); 428 428 void init(const char* name); 429 429 }; … … 441 441 public: 442 442 FileDialog(const char* fileDialogName); 443 virtual ~FileDialog( void);443 virtual ~FileDialog(); 444 444 445 445 void setChangeOption(OptionLabel* changeOption); … … 448 448 void setDefaultFileName(const char* defaultFileName); 449 449 void setMask(const char* mask); 450 void disableFileOpts( void);450 void disableFileOpts(); 451 451 452 452 void okEvent(); -
orxonox/trunk/src/lib/gui/gui_keys.cc
r4427 r4746 31 31 \brief Creates an Keyboard-Frame 32 32 */ 33 GuiKeys::GuiKeys( void)33 GuiKeys::GuiKeys() 34 34 { 35 35 Frame* keysFrame; //!< The Frame that holds the keyOptions. … … 79 79 \brief Destructs the Keys-stuff 80 80 */ 81 GuiKeys::~GuiKeys( void)81 GuiKeys::~GuiKeys() 82 82 { 83 83 // nothing to do here. … … 149 149 \returns the OpenButton of a Player 150 150 */ 151 Button* PlayerKeys::getOpenButton( void)151 Button* PlayerKeys::getOpenButton() 152 152 { 153 153 return this->openButton; … … 214 214 \returns the OpenButton of a Misc 215 215 */ 216 Button* MiscKeys::getOpenButton( void)216 Button* MiscKeys::getOpenButton() 217 217 { 218 218 return this->openButton; -
orxonox/trunk/src/lib/gui/gui_keys.h
r4427 r4746 27 27 { 28 28 public: 29 GuiKeys( void);30 ~GuiKeys( void);29 GuiKeys(); 30 ~GuiKeys(); 31 31 32 32 static Window* inputWindow; //!< A Window that gets keyboard clicks. Static, because only one needed. … … 44 44 PlayerKeys(char* player); 45 45 46 Button* getOpenButton( void);46 Button* getOpenButton(); 47 47 }; 48 48 … … 55 55 MiscKeys(); 56 56 57 Button* getOpenButton( void);57 Button* getOpenButton(); 58 58 }; 59 59 -
orxonox/trunk/src/lib/gui/gui_update.cc
r4427 r4746 35 35 \brief Creates an Update-Frame 36 36 */ 37 GuiUpdate::GuiUpdate( void)37 GuiUpdate::GuiUpdate() 38 38 { 39 39 FileDialog* dataDirDialog; //!< A FileDialog for the selection of the DataRepos … … 100 100 \brief Destructs the Update-stuff 101 101 */ 102 GuiUpdate::~GuiUpdate( void)102 GuiUpdate::~GuiUpdate() 103 103 { 104 104 … … 128 128 \brief Look what info we can get from this system 129 129 */ 130 bool GuiUpdate::getSystemInfo( void)130 bool GuiUpdate::getSystemInfo() 131 131 { 132 132 PRINTF(5)("Grabbing system information\n"); … … 155 155 156 156 #ifdef HAVE_CURL 157 bool* GuiUpdate::checkForUpdates( void)157 bool* GuiUpdate::checkForUpdates() 158 158 { 159 159 PRINTF(4)("checking for new version of orxonox\n"); … … 169 169 \brief Creates a window, and all it contains for the Data-update. 170 170 */ 171 void GuiUpdate::updateDataWindowCreate( void)171 void GuiUpdate::updateDataWindowCreate() 172 172 { 173 173 this->updateDataWindow = new Window("update orxonox::Data"); … … 208 208 \returns A Pointer to the Button of the UpdaterDataWindow 209 209 */ 210 Button* GuiUpdate::updateDataWindowGetButton( void)210 Button* GuiUpdate::updateDataWindowGetButton() 211 211 { 212 212 return this->updateDataWindowButton; … … 216 216 \brief Creates a window, and all it contains for the Source-update. 217 217 */ 218 void GuiUpdate::updateSourceWindowCreate( void)218 void GuiUpdate::updateSourceWindowCreate() 219 219 { 220 220 // the button, that opens this Window. … … 247 247 \returns A Pointer to the Button of the UpdaterSourceWindow 248 248 */ 249 Button* GuiUpdate::updateSourceWindowGetButton( void)249 Button* GuiUpdate::updateSourceWindowGetButton() 250 250 { 251 251 return this->updateSourceWindowButton; -
orxonox/trunk/src/lib/gui/gui_update.h
r4427 r4746 37 37 char* userName; //!< The user logged in. 38 38 39 bool getSystemInfo( void);39 bool getSystemInfo(); 40 40 41 41 // Window creation. … … 99 99 100 100 public: 101 GuiUpdate( void);102 ~GuiUpdate( void);101 GuiUpdate(); 102 ~GuiUpdate(); 103 103 104 104 #ifdef HAVE_CURL 105 void updateDataWindowCreate( void);106 Button* updateDataWindowGetButton( void);105 void updateDataWindowCreate(); 106 Button* updateDataWindowGetButton(); 107 107 108 void updateSourceWindowCreate( void);109 Button* updateSourceWindowGetButton( void);108 void updateSourceWindowCreate(); 109 Button* updateSourceWindowGetButton(); 110 110 111 bool* checkForUpdates( void);111 bool* checkForUpdates(); 112 112 113 113 #endif /* HAVE_CURL */ -
orxonox/trunk/src/lib/gui/gui_video.cc
r4427 r4746 34 34 \brief Creates the Video-Option-Frame 35 35 */ 36 GuiVideo::GuiVideo( void)36 GuiVideo::GuiVideo() 37 37 { 38 38 Frame* videoFrame; //!< The Frame that holds the video options. … … 76 76 \brief Destructs the Video-stuff 77 77 */ 78 GuiVideo::~GuiVideo( void)78 GuiVideo::~GuiVideo() 79 79 { 80 80 // nothing to do here. … … 84 84 \brief Creates a window, and all it contains for the Source-update. 85 85 */ 86 Widget* GuiVideo::advancedWindowCreate( void)86 Widget* GuiVideo::advancedWindowCreate() 87 87 { 88 88 // advanced-Performance-Options -
orxonox/trunk/src/lib/gui/gui_video.h
r4427 r4746 17 17 { 18 18 private: 19 // Button* advancedWindowGetButton( void);19 // Button* advancedWindowGetButton(); 20 20 21 21 public: 22 GuiVideo( void);23 ~GuiVideo( void);22 GuiVideo(); 23 ~GuiVideo(); 24 24 25 25 private: 26 26 void getResolutions(Menu* menu); 27 Widget* advancedWindowCreate( void);27 Widget* advancedWindowCreate(); 28 28 }; 29 29 #endif /* _GUI_VIDEO_H */ -
orxonox/trunk/src/lib/lang/base_object.cc
r4744 r4746 114 114 * @brief displays everything this class is 115 115 */ 116 void BaseObject::whatIs( void) const116 void BaseObject::whatIs() const 117 117 { 118 118 PRINT(0)("object %s of class %s: ", this->getName(), this->getClassName()); -
orxonox/trunk/src/lib/lang/base_object.h
r4744 r4746 28 28 void setName (const char* newName); 29 29 /** \brief returns the Name of this Object */ 30 inline const char* getName ( void)const { return this->objectName; };30 inline const char* getName ()const { return this->objectName; }; 31 31 32 32 /** \returns the className of the corresponding Object */ 33 inline const char* getClassName( void) const { return this->className; };33 inline const char* getClassName() const { return this->className; }; 34 34 /** \returns the classID of the corresponding Object */ 35 inline int getClassID( void) const { return this->classID; }35 inline int getClassID() const { return this->classID; } 36 36 37 37 bool isA (ClassID classID) const; 38 void whatIs( void) const;38 void whatIs() const; 39 39 40 40 /** \returns if the object is finalized */ … … 46 46 47 47 /** \brief this finalizes an object and makes it ready to be garbage collected */ 48 void finalize( void) { this->finalized = true; };48 void finalize() { this->finalized = true; }; 49 49 50 50 private: -
orxonox/trunk/src/lib/math/curve.cc
r4472 r4746 36 36 \brief default constructor for a Curve 37 37 */ 38 Curve::Curve( void)38 Curve::Curve() 39 39 { 40 40 nodeCount = 0; … … 128 128 \brief Outputs information about the state of this Curve 129 129 */ 130 void Curve::debug( void)130 void Curve::debug() 131 131 { 132 132 printf("<<-------------------------------\n"); … … 150 150 \brief Creates a new BezierCurve 151 151 */ 152 BezierCurve::BezierCurve ( void)152 BezierCurve::BezierCurve () 153 153 { 154 154 this->derivation = 0; … … 170 170 It does this by freeing all the space taken over from the nodes 171 171 */ 172 BezierCurve::~BezierCurve( void)172 BezierCurve::~BezierCurve() 173 173 { 174 174 PathNode* tmpNode; … … 187 187 \brief Rebuilds a Curve 188 188 */ 189 void BezierCurve::rebuild( void)189 void BezierCurve::rebuild() 190 190 { 191 191 PathNode* tmpNode = firstNode; … … 291 291 \return a Vector to the calculated position 292 292 */ 293 Vector BezierCurve::getPos( void) const293 Vector BezierCurve::getPos() const 294 294 { 295 295 return curvePoint; -
orxonox/trunk/src/lib/math/curve.h
r4597 r4746 31 31 32 32 public: 33 Curve( void);33 Curve(); 34 34 35 35 void addNode(const Vector& newNode); … … 37 37 Vector getNode(unsigned int nodeToFind); 38 38 /** \returns the count of nodes in this curve */ 39 inline int getNodeCount( void) const { return this->nodeCount; };39 inline int getNodeCount() const { return this->nodeCount; }; 40 40 /** \returns the directional Curve */ 41 Curve* getDirCurve( void) const { return this->dirCurve; };41 Curve* getDirCurve() const { return this->dirCurve; }; 42 42 43 43 /** \param t the value on the curve [0-1] \returns Vector to the position */ … … 51 51 52 52 // DEBUG 53 void debug( void);53 void debug(); 54 54 55 55 private: 56 56 /** \brief rebuilds the curve */ 57 virtual void rebuild( void) = 0;57 virtual void rebuild() = 0; 58 58 59 59 protected: … … 78 78 { 79 79 public: 80 BezierCurve( void);80 BezierCurve(); 81 81 BezierCurve(int derivation); 82 virtual ~BezierCurve( void);82 virtual ~BezierCurve(); 83 83 84 84 virtual Vector calcPos(float t); … … 88 88 89 89 90 Vector getPos( void) const;90 Vector getPos() const; 91 91 92 92 private: 93 void rebuild( void);93 void rebuild(); 94 94 }; 95 95 -
orxonox/trunk/src/lib/math/vector.cc
r4611 r4746 59 59 \brief Outputs the values of the Vector 60 60 */ 61 void Vector::debug( void) const61 void Vector::debug() const 62 62 { 63 63 PRINT(0)("Vector Debug information\n"); … … 391 391 \brief outputs some nice formated debug information about this quaternion 392 392 */ 393 void Quaternion::debug( void)393 void Quaternion::debug() 394 394 { 395 395 PRINT(0)("Quaternion Debug Information\n"); -
orxonox/trunk/src/lib/particles/particle_emitter.cc
r4726 r4746 159 159 } 160 160 161 const char* ParticleEmitter::getTypeC( void) const161 const char* ParticleEmitter::getTypeC() const 162 162 { 163 163 if (this->type == EMITTER_PLANE) … … 310 310 \brief outputs some nice debug information 311 311 */ 312 void ParticleEmitter::debug( void) const312 void ParticleEmitter::debug() const 313 313 { 314 314 PRINT(0)(" Emitter %s\n", this->getName()); -
orxonox/trunk/src/lib/particles/particle_emitter.h
r4726 r4746 36 36 float emissionRate = 1.0, float velocity = 1.0); 37 37 ParticleEmitter(const TiXmlElement* root); 38 virtual ~ParticleEmitter( void);38 virtual ~ParticleEmitter(); 39 39 40 40 void init(); … … 59 59 60 60 /** \returns the type of the emitter */ 61 inline EMITTER_TYPE getType( void) const { return this->type; };61 inline EMITTER_TYPE getType() const { return this->type; }; 62 62 /** \returns the Type as a const char * */ 63 const char* getTypeC( void) const;63 const char* getTypeC() const; 64 64 /** \returns the Size of the emitter */ 65 inline float getSize( void) const { return this->emitterSize; };65 inline float getSize() const { return this->emitterSize; }; 66 66 /** \returns the emissionRate */ 67 inline float getEmissionRate( void) const { return this->emissionRate; };67 inline float getEmissionRate() const { return this->emissionRate; }; 68 68 /** \returns the inherit-speed-factor */ 69 inline float getInheritSpeed( void) const { return this->inheritSpeed; };69 inline float getInheritSpeed() const { return this->inheritSpeed; }; 70 70 /** \returns the SpreadAngle of the emitter */ 71 inline float getSpread( void) const { return this->angle; };71 inline float getSpread() const { return this->angle; }; 72 72 /** \returns the EmissionVelocity of the emitter */ 73 inline float getEmissionVelocity( void) const { return this->velocity; };73 inline float getEmissionVelocity() const { return this->velocity; }; 74 74 /** \returns the EmissionMomentum of this emitter */ 75 inline float getEmissionMomentum( void) const { return this->momentum; };75 inline float getEmissionMomentum() const { return this->momentum; }; 76 76 77 void debug( void) const;77 void debug() const; 78 78 79 79 private: -
orxonox/trunk/src/lib/particles/particle_engine.cc
r4726 r4746 389 389 \brief outputs some nice debug information 390 390 */ 391 void ParticleEngine::debug( void)391 void ParticleEngine::debug() 392 392 { 393 393 PRINT(0)("+-----------------------------------+\n"); -
orxonox/trunk/src/lib/particles/particle_engine.h
r4726 r4746 33 33 34 34 public: 35 virtual ~ParticleEngine( void);35 virtual ~ParticleEngine(); 36 36 /** \returns a Pointer to the only object of this Class */ 37 inline static ParticleEngine* getInstance( void) { if (!singletonRef) singletonRef = new ParticleEngine(); return singletonRef; };37 inline static ParticleEngine* getInstance() { if (!singletonRef) singletonRef = new ParticleEngine(); return singletonRef; }; 38 38 39 39 void loadParams(const TiXmlElement* root); 40 40 41 41 void tick(float dt); 42 void draw( void) const;42 void draw() const; 43 43 44 44 void addSystem(ParticleSystem* system); … … 61 61 62 62 private: 63 ParticleEngine( void);63 ParticleEngine(); 64 64 static ParticleEngine* singletonRef; //!< The reference to the engine. 65 65 -
orxonox/trunk/src/lib/particles/particle_system.cc
r4732 r4746 89 89 \brief initializes the ParticleSystem with default values 90 90 */ 91 void ParticleSystem::init( void)91 void ParticleSystem::init() 92 92 { 93 93 this->setClassID(CL_PARTICLE_SYSTEM, "ParticleSystem"); … … 367 367 * \returns the count of Faces of this ParticleSystem 368 368 */ 369 unsigned int ParticleSystem::getFaceCount( void) const369 unsigned int ParticleSystem::getFaceCount() const 370 370 { 371 371 switch (this->particleType) … … 389 389 This is just the fastest Way to do this, but will most likely be changed in the future. 390 390 */ 391 void ParticleSystem::draw( void) const391 void ParticleSystem::draw() const 392 392 { 393 393 glPushAttrib(GL_ENABLE_BIT); … … 581 581 \brief outputs some nice debug information 582 582 */ 583 void ParticleSystem::debug( void) const583 void ParticleSystem::debug() const 584 584 { 585 585 PRINT(0)(" ParticleSystem %s, type: ", this->getName()); -
orxonox/trunk/src/lib/particles/particle_system.h
r4727 r4746 73 73 virtual ~ParticleSystem(); 74 74 75 void init( void);75 void init(); 76 76 void loadParams(const TiXmlElement* root); 77 77 … … 90 90 91 91 /** \returns the Type of the particles */ 92 inline PARTICLE_TYPE getType( void) const { return this->particleType; };92 inline PARTICLE_TYPE getType() const { return this->particleType; }; 93 93 /** \returns the Material that lies on this particles */ 94 inline const Material* getMaterial( void) const { return this->material; };94 inline const Material* getMaterial() const { return this->material; }; 95 95 /** \returns the lifespan of the particles */ 96 inline float getLifeSpan( void) const { return this->lifeSpan; };96 inline float getLifeSpan() const { return this->lifeSpan; }; 97 97 /** \returns the starting-radius of the particles */ 98 inline float getStartRadius( void) { return this->radiusAnim.getValue(0.0); };98 inline float getStartRadius() { return this->radiusAnim.getValue(0.0); }; 99 99 /** \returns the end-radius of the particles */ 100 inline float getEndRadius( void) { return this->radiusAnim.getValue(1.0); };100 inline float getEndRadius() { return this->radiusAnim.getValue(1.0); }; 101 101 /** \returns the conserve-factor of the particles */ 102 inline float getConserve( void) const { return this->conserve; };102 inline float getConserve() const { return this->conserve; }; 103 103 /** \returns the initial mass of the particles */ 104 inline float getMass( void) const { return this->initialMass; };104 inline float getMass() const { return this->initialMass; }; 105 105 106 virtual unsigned int getFaceCount( void) const;106 virtual unsigned int getFaceCount() const; 107 107 108 108 … … 114 114 115 115 virtual void tick(float dt); 116 virtual void draw( void) const;116 virtual void draw() const; 117 117 118 void debug( void) const;118 void debug() const; 119 119 120 120 private: -
orxonox/trunk/src/lib/particles/quick_animation.cc
r4657 r4746 30 30 \brief standard constructor 31 31 */ 32 QuickAnimation::QuickAnimation ( void)32 QuickAnimation::QuickAnimation () 33 33 { 34 34 this->setClassID(CL_QUICK_ANIMATION, "QuickAnimation"); … … 45 45 \brief deletes all the deconstructor stuff 46 46 */ 47 QuickAnimation::~QuickAnimation ( void)47 QuickAnimation::~QuickAnimation () 48 48 { 49 49 this->current = this->first; … … 228 228 \brief outputs some nice information about this class 229 229 */ 230 void QuickAnimation::debug( void)230 void QuickAnimation::debug() 231 231 { 232 232 this->current = this->first; -
orxonox/trunk/src/lib/particles/quick_animation.h
r4657 r4746 49 49 float getValue(float position); 50 50 51 void debug( void);51 void debug(); 52 52 53 53 private: -
orxonox/trunk/src/lib/physics/fields/field.cc
r4730 r4746 44 44 \brief initializes a Field 45 45 */ 46 void Field::init( void)46 void Field::init() 47 47 { 48 48 this->setClassID(CL_FIELD, "Field"); -
orxonox/trunk/src/lib/physics/fields/field.h
r4730 r4746 38 38 virtual ~Field(); 39 39 40 void init( void);40 void init(); 41 41 void loadParams(const TiXmlElement* root); 42 42 … … 49 49 void setMagnitude(float magnitude); 50 50 /** \returns The Magnitude of the Field */ 51 inline const float& getMagnitude( void) const {return this->magnitude;}51 inline const float& getMagnitude() const {return this->magnitude;} 52 52 53 53 void setAttenuation(float attenuation); 54 54 /** \returns The Attenuation of the Fiels */ 55 inline const float& getAttenuation( void) const {return this->attenuation;}55 inline const float& getAttenuation() const {return this->attenuation;} 56 56 57 57 private: -
orxonox/trunk/src/lib/physics/physics_connection.cc
r4731 r4746 101 101 \brief applies the Force to some Object. 102 102 */ 103 void PhysicsConnection::apply( void) const103 void PhysicsConnection::apply() const 104 104 { 105 105 if (likely(this->type == PCON_PhysIField && this->field->getMagnitude() != 0.0 -
orxonox/trunk/src/lib/physics/physics_connection.h
r4731 r4746 37 37 void setField(const char* fieldName); 38 38 39 void apply( void) const;39 void apply() const; 40 40 41 41 private: -
orxonox/trunk/src/lib/physics/physics_engine.cc
r4733 r4746 31 31 \brief standard constructor 32 32 */ 33 PhysicsEngine::PhysicsEngine( void)33 PhysicsEngine::PhysicsEngine() 34 34 { 35 35 this->setClassID(CL_PHYSICS_ENGINE, "PhysicsEngine"); … … 49 49 50 50 */ 51 PhysicsEngine::~PhysicsEngine( void)51 PhysicsEngine::~PhysicsEngine() 52 52 { 53 53 PhysicsEngine::singletonRef = NULL; … … 268 268 \brief print out interesting debug information of this class 269 269 */ 270 void PhysicsEngine::debug( void) const270 void PhysicsEngine::debug() const 271 271 { 272 272 PRINT(0)("====================================\n"); -
orxonox/trunk/src/lib/physics/physics_engine.h
r4733 r4746 22 22 23 23 public: 24 virtual ~PhysicsEngine( void);24 virtual ~PhysicsEngine(); 25 25 /** \returns a Pointer to the only object of this Class */ 26 inline static PhysicsEngine* getInstance( void) { if (!singletonRef) singletonRef = new PhysicsEngine(); return singletonRef; };26 inline static PhysicsEngine* getInstance() { if (!singletonRef) singletonRef = new PhysicsEngine(); return singletonRef; }; 27 27 28 28 void loadParams(const TiXmlElement* root); … … 45 45 void tick(float dt); 46 46 47 void debug( void) const;47 void debug() const; 48 48 49 49 private: 50 PhysicsEngine( void);50 PhysicsEngine(); 51 51 52 52 private: -
orxonox/trunk/src/lib/sound/sound_engine.cc
r4605 r4746 79 79 } 80 80 81 SoundBuffer::~SoundBuffer( void)81 SoundBuffer::~SoundBuffer() 82 82 { 83 83 SoundEngine::getInstance()->removeBuffer(this); … … 115 115 \brief deletes a SoundSource 116 116 */ 117 SoundSource::~SoundSource( void)117 SoundSource::~SoundSource() 118 118 { 119 119 SoundEngine::getInstance()->removeSource(this); … … 306 306 \brief updates all The positions, Directions and Velocities of all Sounds 307 307 */ 308 void SoundEngine::update( void)308 void SoundEngine::update() 309 309 { 310 310 … … 351 351 \brief Removes all the Buffers that are not anymore needed by any Sources 352 352 */ 353 void SoundEngine::flushUnusedBuffers( void)353 void SoundEngine::flushUnusedBuffers() 354 354 { 355 355 tIterator<SoundBuffer>* bufferIterator = this->bufferList->getIterator(); … … 376 376 \brief SourceEngine::flushAllBuffers 377 377 */ 378 void SoundEngine::flushAllBuffers( void)378 void SoundEngine::flushAllBuffers() 379 379 { 380 380 tIterator<SoundBuffer>* bufferIterator = this->bufferList->getIterator(); … … 391 391 \brief initializes Audio in general 392 392 */ 393 bool SoundEngine::initAudio( void)393 bool SoundEngine::initAudio() 394 394 { 395 395 ALenum result; -
orxonox/trunk/src/lib/sound/sound_engine.h
r4597 r4746 24 24 public: 25 25 SoundBuffer(const char* fileName); 26 ~SoundBuffer( void);26 ~SoundBuffer(); 27 27 28 28 /** \returns the ID of the buffer used in this SoundBuffer */ 29 inline ALuint getID( void) { return this->bufferID; }29 inline ALuint getID() { return this->bufferID; } 30 30 31 31 private: … … 41 41 public: 42 42 SoundSource(SoundBuffer* buffer, PNode* sourceNode = NULL); 43 ~SoundSource( void);43 ~SoundSource(); 44 44 45 45 // user interaction … … 51 51 // development functions 52 52 /** \returns The ID of this Source */ 53 inline ALuint getID( void) const { return this->sourceID; }53 inline ALuint getID() const { return this->sourceID; } 54 54 /** \returns the SoundBuffer of this Source */ 55 inline SoundBuffer* getBuffer( void) const { return this->buffer; }55 inline SoundBuffer* getBuffer() const { return this->buffer; } 56 56 /** \returns the SourceNode of this Source */ 57 inline PNode* getNode( void) const { return this->sourceNode;}57 inline PNode* getNode() const { return this->sourceNode;} 58 58 59 59 void setRolloffFactor(ALfloat rolloffFactor); … … 71 71 72 72 public: 73 virtual ~SoundEngine( void);73 virtual ~SoundEngine(); 74 74 /** \returns a Pointer to the only object of this Class */ 75 inline static SoundEngine* getInstance( void) { if (!singletonRef) singletonRef = new SoundEngine(); return singletonRef; };75 inline static SoundEngine* getInstance() { if (!singletonRef) singletonRef = new SoundEngine(); return singletonRef; }; 76 76 77 77 SoundSource* createSource(const char* fileName, PNode* sourceNode = NULL); … … 86 86 void removeSource(SoundSource* source); 87 87 88 void update( void);88 void update(); 89 89 90 90 // administrative 91 void flushUnusedBuffers( void);92 void flushAllBuffers( void);93 bool initAudio( void);91 void flushUnusedBuffers(); 92 void flushAllBuffers(); 93 bool initAudio(); 94 94 95 95 // error handling: … … 99 99 100 100 private: 101 SoundEngine( void);101 SoundEngine(); 102 102 static SoundEngine* singletonRef; //!< Reference to this class 103 103
Note: See TracChangeset
for help on using the changeset viewer.