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

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: changed (void) → ()

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• array.h (modified) (4 diffs)
• material.cc (modified) (1 diff)
• material.h (modified) (1 diff)
• model.cc (modified) (9 diffs)
• model.h (modified) (3 diffs)
• texture.cc (modified) (1 diff)
• texture.h (modified) (1 diff)

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);