Changeset 4746 in orxonox.OLD for orxonox/trunk/src/lib/graphics

Timestamp:

Jul 1, 2005, 12:48:48 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: changed (void) → ()

Location:

orxonox/trunk/src/lib/graphics

Files:

• graphics_engine.cc (modified) (5 diffs)
• graphics_engine.h (modified) (3 diffs)
• importer/array.h (modified) (4 diffs)
• importer/material.cc (modified) (1 diff)
• importer/material.h (modified) (1 diff)
• importer/model.cc (modified) (9 diffs)
• importer/model.h (modified) (3 diffs)
• importer/texture.cc (modified) (1 diff)
• importer/texture.h (modified) (1 diff)
• light.cc (modified) (4 diffs)
• light.h (modified) (5 diffs)
• text_engine.cc (modified) (17 diffs)
• text_engine.h (modified) (6 diffs)

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -119 +119 @@
    \brief Sets the GL-attributes
 */
-int GraphicsEngine::setGLattribs(void)
+int GraphicsEngine::setGLattribs()
 {
   // Set video mode
@@ -208 +208 @@
    this is a GL-Projection-mode, that is orthogonal, for placing the font in fron of everything else
 */
-void GraphicsEngine::enter2DMode(void)
+void GraphicsEngine::enter2DMode()
 {
   GraphicsEngine::storeMatrices();
@@ -242 +242 @@
 
 /**
-   \brief leaves the 2DMode again also \see Font::enter2DMode(void)
-*/
-void GraphicsEngine::leave2DMode(void)
+   \brief leaves the 2DMode again also \see Font::enter2DMode()
+*/
+void GraphicsEngine::leave2DMode()
 {
   glMatrixMode(GL_MODELVIEW);
@@ -258 +258 @@
    \brief stores the GL_matrices
 */
-void GraphicsEngine::storeMatrices(void)
+void GraphicsEngine::storeMatrices()
 {
   glGetDoublev(GL_PROJECTION_MATRIX, GraphicsEngine::projMat);
@@ -277 +277 @@
    \brief outputs all the Fullscreen modes.
 */
-void GraphicsEngine::listModes(void)
+void GraphicsEngine::listModes()
 {
   /* Get available fullscreen/hardware modes */

orxonox/trunk/src/lib/graphics/graphics_engine.h

@@ -27 +27 @@
     virtual ~GraphicsEngine();
     /** \returns a Pointer to the only object of this Class */
-    inline static GraphicsEngine* getInstance(void) { if (!singletonRef) singletonRef = new GraphicsEngine();  return singletonRef; };
+    inline static GraphicsEngine* getInstance() { if (!singletonRef) singletonRef = new GraphicsEngine();  return singletonRef; };
 
     int initVideo();
 
     void setWindowName(const char* windowName, const char* icon);
-    int setGLattribs(void);
+    int setGLattribs();
     int setResolution(int width, int height, int bpp);
     void setFullscreen(bool fullscreen = false);
@@ -38 +38 @@
 
     /** \returns the x resolution */
-    inline int getResolutionX(void) const { return this->resolutionX; };
+    inline int getResolutionX() const { return this->resolutionX; };
     /** \returns the y resolution */
-    inline int getResolutionY(void) const { return this->resolutionY; };
+    inline int getResolutionY() const { return this->resolutionY; };
     /** \returns the Bits Per Pixel */
-    inline int getbbp(void) const { return this->bitsPerPixel; };
+    inline int getbbp() const { return this->bitsPerPixel; };
 
     int resolutionChanged(SDL_ResizeEvent* resizeInfo);
 
-    static void enter2DMode(void);
-    static void leave2DMode(void);
+    static void enter2DMode();
+    static void leave2DMode();
 
-    static void storeMatrices(void);
+    static void storeMatrices();
     static GLdouble modMat[16];
     static GLdouble projMat[16];
@@ -57 +57 @@
     void displayFPS(bool display);
 
-    void listModes(void);
+    void listModes();
 
     /** \brief swaps the GL_BUFFERS */
-    static void swapBuffers(void) { SDL_GL_SwapBuffers(); };
+    static void swapBuffers() { SDL_GL_SwapBuffers(); };
 
   public:

orxonox/trunk/src/lib/graphics/importer/array.h

@@ -32 +32 @@
     ~Array();
 
-    void finalizeArray (void);
+    void finalizeArray ();
     void addEntry (T entry);
     void addEntry(T entry0, T entry1, T entry2);
@@ -39 +39 @@
     inline const T* getArray () const { return this->array; };
     /**   \returns The Count of entries in the Array*/
-    inline unsigned int getCount(void)const { return this->entryCount; };
-    void debug(void) const ;
+    inline unsigned int getCount()const { return this->entryCount; };
+    void debug() const ;
 
   private:
@@ -97 +97 @@
 */
 template<class T>
-void Array<T>::finalizeArray (void)
+void Array<T>::finalizeArray ()
 {
   PRINTF(4)("Finalizing array. Length: %i\n", entryCount);
@@ -157 +157 @@
 */
 template<class T>
-void Array<T>::debug (void) const
+void Array<T>::debug () const
 {
   PRINT(0)("entryCount=%i, address=%p\n", this->entryCount, this->array);

orxonox/trunk/src/lib/graphics/importer/material.cc

@@ -64 +64 @@
    \brief sets the material with which the following Faces will be painted
 */
-bool Material::select (void)
+bool Material::select ()
 {
   // setting diffuse color

orxonox/trunk/src/lib/graphics/importer/material.h

@@ -28 +28 @@
   ~Material ();
 
-  bool select (void);
+  bool select ();
 
   void setIllum (int illum);

orxonox/trunk/src/lib/graphics/importer/model.cc

@@ -113 +113 @@
    actually does the same as the delete Operator, but does not delete the predecessing group
 */
-void ModelGroup::cleanup(void)
+void ModelGroup::cleanup()
 {
   PRINTF(5)("Cleaning up group\n");
@@ -164 +164 @@
    Looks if any from model allocated space is still in use, and if so deleted it.
 */
-Model::~Model(void)
+Model::~Model()
 {
   PRINTF(4)("Deleting Model ");
@@ -198 +198 @@
    \brief Finalizes an Object. This can be done outside of the Class.
 */
-void Model::finalize(void)
+void Model::finalize()
 {
   // this creates the display List.
@@ -218 +218 @@
    It does this by just calling the Lists that must have been created earlier.
 */
-void Model::draw (void) const
+void Model::draw () const
 {
   PRINTF(4)("drawing the 3D-Models\n");
@@ -292 +292 @@
    \brief deletes all the arrays
 */
-bool Model::deleteArrays(void)
+bool Model::deleteArrays()
 {
   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.
 */
-bool Model::cleanup(void)
+bool Model::cleanup()
 {
   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
 */
-bool Model::importToDisplayList(void)
+bool Model::importToDisplayList()
 {
   // finalize the Arrays
@@ -794 +794 @@
    \brief reads and includes the Faces/Materials into the openGL state Machine
 */
-bool Model::importToVertexArray(void)
+bool Model::importToVertexArray()
 {
   // finalize the Arrays
@@ -857 +857 @@
    This will inject a Cube, because this is the most basic model.
 */
-void Model::cubeModel(void)
+void Model::cubeModel()
 {
   this->addVertex (-0.5, -0.5, 0.5);

orxonox/trunk/src/lib/graphics/importer/model.h

@@ -99 +99 @@
  public:
   Model(const char* modelName = NULL, MODEL_TYPE type = MODEL_DISPLAY_LIST);
-  virtual ~Model(void);
+  virtual ~Model();
 
-  void draw(void) const;
+  void draw() const;
   void draw(int groupNumber) const;
   void draw(char* groupName) const;
 
   /** \returns Count of the Models (Groups) in this File */
-  inline int getGroupCount(void) const { return this->groupCount; };
+  inline int getGroupCount() const { return this->groupCount; };
 
   /** \returns a Pointer to the Vertex-Array, if it was deleted it returns NULL */
-  inline const GLfloat* getVertexArray(void) const { return this->vertices->getArray(); };
+  inline const GLfloat* getVertexArray() const { return this->vertices->getArray(); };
   /** \returns the VertexCount of this Model */
-  inline unsigned int getVertexCount(void) const { return this->vertexCount; };
+  inline unsigned int getVertexCount() const { return this->vertexCount; };
 
   /** \returns a Pointer to the Normals-Array, if it was deleted it returns NULL */
-  inline const GLfloat* getNormalsArray(void) const { return this->normals->getArray(); };
+  inline const GLfloat* getNormalsArray() const { return this->normals->getArray(); };
   /** \returns the NormalsCount of this Model */
-  inline unsigned int getNormalsCount(void) const { return this->normalCount; };
+  inline unsigned int getNormalsCount() const { return this->normalCount; };
 
   /** \returns a Pointer to the TexCoord-Array, if it was deleted it returns NULL */
-  inline const GLfloat* getTexCoordArray(void) const { return this->vTexture->getArray(); };
+  inline const GLfloat* getTexCoordArray() const { return this->vTexture->getArray(); };
   /** \returns the TexCoord-Count of this Model */
-  inline unsigned int getTexCoordCount(void) const { return this->texCoordCount; };
+  inline unsigned int getTexCoordCount() const { return this->texCoordCount; };
 
   /** \returns the Count of Faces of this Model */
@@ -141 +141 @@
   bool setMaterial(const char* mtlString);
   bool setMaterial(Material* mtl);
-  void finalize(void);
+  void finalize();
 
 
  protected:
-  void cubeModel(void);
+  void cubeModel();
 
   Material* findMaterialByName(const char* materialName);
@@ -154 +154 @@
 
  private:
-  bool buildVertexNormals(void);
+  bool buildVertexNormals();
 
-  bool importToDisplayList(void);
+  bool importToDisplayList();
   bool addGLElement(ModelFaceElement* elem);
 
-  bool importToVertexArray(void);
+  bool importToVertexArray();
 
-  bool deleteArrays(void);
-  bool cleanup(void);
+  bool deleteArrays();
+  bool cleanup();
 
  private:

orxonox/trunk/src/lib/graphics/importer/texture.cc

@@ -43 +43 @@
    Frees Data, and deletes the textures from GL
 */
-Texture::~Texture(void)
+Texture::~Texture()
 {
   if (this->texture)

orxonox/trunk/src/lib/graphics/importer/texture.h

@@ -25 +25 @@
   //  Texture(TEXTURE_TYPE type, int resolution);
 
-  ~Texture(void);
+  ~Texture();
 
   /** \returns The textureID of this texture.  */
-  inline GLuint getTexture(void) {return this->texture;} 
+  inline GLuint getTexture() {return this->texture;} 
   GLuint loadTexToGL (SDL_Surface* surface);
   /** \returns true if texture has alpha, false otherwise */
-  inline bool hasAlpha(void) const {return bAlpha;}
+  inline bool hasAlpha() const {return bAlpha;}
 
   bool loadImage(const char* imageName);

orxonox/trunk/src/lib/graphics/light.cc

@@ -73 +73 @@
    \brief destroys a Light
 */
-Light::~Light(void)
+Light::~Light()
 {
   glDisable(lightsV[this->lightNumber]);
@@ -181 +181 @@
    \brief draws this Light. Being a World-entity the possibility to do this lies at hand.
 */
-void Light::draw(void) const
+void Light::draw() const
 {
   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
 */
-void Light::debug(void) const
+void Light::debug() const
 {
   PRINT(0)(":: %d ::  -- reference %p\n", this->lightNumber, this);
@@ -348 +348 @@
    \brief outputs debug information about the Class and its lights
 */
-void LightManager::debug(void) const
+void LightManager::debug() const
 {
   PRINT(0)("=================================\n");

orxonox/trunk/src/lib/graphics/light.h

@@ -27 +27 @@
  public:
   Light(const TiXmlElement* root = NULL);
-  virtual ~Light(void);
+  virtual ~Light();
 
   void loadParams(const TiXmlElement* root);
@@ -39 +39 @@
 
   /** \returns the lightNumber*/
-  int getLightNumber(void) const {return this->lightNumber;}
+  int getLightNumber() const {return this->lightNumber;}
 
   virtual void draw() const;
 
-  void debug(void) const;
+  void debug() const;
 
   // attributes
@@ -84 +84 @@
 
    for some nice output just use:
-   \li void debug(void) const; (either on LightManager for a resume or on any Light for single information.)
+   \li void debug() const; (either on LightManager for a resume or on any Light for single information.)
 */
 class LightManager : public BaseObject
@@ -91 +91 @@
 
  public:
-  virtual ~LightManager(void);
+  virtual ~LightManager();
   /** \returns a Pointer to the only object of this Class */
-  inline static LightManager* getInstance(void) { if (!singletonRef) singletonRef = new LightManager();  return singletonRef; };
+  inline static LightManager* getInstance() { if (!singletonRef) singletonRef = new LightManager();  return singletonRef; };
 
   void loadParams(const TiXmlElement* root);
@@ -105 +105 @@
   void draw() const;
 
-  void debug(void) const;
+  void debug() const;
 
  private:
-  LightManager(void);
+  LightManager();
 
   int  registerLight(Light* light);

orxonox/trunk/src/lib/graphics/text_engine.cc

@@ -71 +71 @@
    This also ereases the text from the textList of the TextEngine
 */
-Text::~Text(void)
+Text::~Text()
 {
   TextEngine::getInstance()->deleteText(this);
@@ -167 +167 @@
    this is only for TEXT_STATIC-mode
 */
-void Text::createTexture(void)
+void Text::createTexture()
 {
   SDL_Surface* tmpSurf;
@@ -187 +187 @@
    \brief draws the Font
 */
-void Text::draw(void) const
+void Text::draw() const
 {
   // setting the Position of this Text.
@@ -271 +271 @@
    \brief prints out some nice debug information about this text
 */
-void Text::debug(void) const
+void Text::debug() const
 {
   PRINT(0)("=== TEXT: %s ===\n", this->text);
@@ -415 +415 @@
    \brief destructs a font
 */
-Font::~Font(void)
+Font::~Font()
 {
   // deleting the List of all Texts
@@ -509 +509 @@
    \returns the maximum height of the Font, if the font was initialized, 0 otherwise
 */
-int Font::getMaxHeight(void)
+int Font::getMaxHeight()
 {
   if (likely (this->font != NULL))
@@ -522 +522 @@
    the ascent is the pixels of the font above the baseline
 */
-int Font::getMaxAscent(void)
+int Font::getMaxAscent()
 {
   if (likely(this->font != NULL))
@@ -535 +535 @@
    the descent is the pixels of the font below the baseline
 */
-int Font::getMaxDescent(void)
+int Font::getMaxDescent()
 {
   if (likely(this->font != NULL))
@@ -568 +568 @@
 }
 
-GLuint Font::createFastTexture(void)
+GLuint Font::createFastTexture()
 {
   /* interesting GLYPHS:
@@ -730 +730 @@
    openGL-version < 1.2 compatibility ( and because it is realy easy like this :))
 */
-int Font::findOptimalFastTextureSize(void)
+int Font::findOptimalFastTextureSize()
 {
   int i;
@@ -775 +775 @@
    \brief a simple function to get some interesting information about this class
 */
-void Font::debug(void)
+void Font::debug()
 {
   // print the loaded font's style
@@ -832 +832 @@
    \brief function to enable TTF_Fonts
 */
-void TextEngine::enableFonts(void)
+void TextEngine::enableFonts()
 {
   if (!TTF_WasInit())
@@ -848 +848 @@
    \brief function to disable TTF_fonts
 */
-void TextEngine::disableFonts(void)
+void TextEngine::disableFonts()
 {
   if (TTF_WasInit())
@@ -900 +900 @@
    \brief deletes all the Text, and tries to delete all allocated fonts
 */
-void TextEngine::flush(void)
+void TextEngine::flush()
 {
   tIterator<Text>* textIterator = textList->getIterator();
@@ -915 +915 @@
    \brief draws all the Texts that have been initialized
 */
-void TextEngine::draw(void) const
+void TextEngine::draw() const
 {
   // entering 3D-mode
@@ -937 +937 @@
    \todo there should also be something outputted about Font
 */
-void TextEngine::debug(void) const
+void TextEngine::debug() const
 {
   PRINT(0)("+-------------------------------+\n");
@@ -960 +960 @@
    \returns true if match, false otherwise
 */
-bool TextEngine::checkVersion(void)
+bool TextEngine::checkVersion()
 {
   SDL_version compile_version;

orxonox/trunk/src/lib/graphics/text_engine.h

@@ -108 +108 @@
   friend class TextEngine;
  public:
-  ~Text(void);
+  ~Text();
 
   void setBindNode(PNode* bindNode);
@@ -124 +124 @@
   void createTexture();
 
-  void draw(void) const;
-
-  void debug(void) const;
+  void draw() const;
+
+  void debug() const;
 
  private:
@@ -175 +175 @@
 
   /** \returns a Pointer to the Array of Glyphs */
-  inline Glyph** getGlyphArray(void) const {return glyphArray;}
+  inline Glyph** getGlyphArray() const {return glyphArray;}
   /** \returns the texture to the fast-texture */
-  inline GLuint getFastTextureID(void) const {return fastTextureID;}
-
- private:
-  int getMaxHeight(void);
-  int getMaxAscent(void);
-  int getMaxDescent(void);
+  inline GLuint getFastTextureID() const {return fastTextureID;}
+
+ private:
+  int getMaxHeight();
+  int getMaxAscent();
+  int getMaxDescent();
   Glyph* getGlyphMetrics(Uint16 character);
 
@@ -188 +188 @@
 
   void initGlyphs(Uint16 from, Uint16 count);
-  int findOptimalFastTextureSize(void);
-
-  void debug(void);
+  int findOptimalFastTextureSize();
+
+  void debug();
 
  private:
@@ -216 +216 @@
 {
  public:
-  virtual ~TextEngine(void);
+  virtual ~TextEngine();
   /** \returns a Pointer to the only object of this Class */
-  inline static TextEngine* getInstance(void) { if (!singletonRef) singletonRef = new TextEngine();  return singletonRef; };
+  inline static TextEngine* getInstance() { if (!singletonRef) singletonRef = new TextEngine();  return singletonRef; };
 
   Text* createText(const char* fontFile,
@@ -228 +228 @@
 
   void deleteText(Text* text);
-  void flush(void);
-
-  void draw(void) const;
-
-  void debug(void) const;
-
- private:
-  TextEngine(void);
+  void flush();
+
+  void draw() const;
+
+  void debug() const;
+
+ private:
+  TextEngine();
   static TextEngine* singletonRef;
 
   // general
-  static void enableFonts(void);
-  static void disableFonts(void);
-  static bool checkVersion(void);
+  static void enableFonts();
+  static void disableFonts();
+  static bool checkVersion();
 
  private: