Changeset 4194 in orxonox.OLD for orxonox/branches/openAL/src/lib/graphics/importer/array.h

Timestamp:

May 16, 2005, 1:33:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/openAL: merged trunk back to openAL
merged with command:

svn merge ../trunk/ openAL/ -r 3920:HEAD

no conflicts at all

Location:

orxonox/branches/openAL

Files:

• . (modified) (1 prop)
• src/lib/graphics/importer/array.h (modified) (1 diff)

orxonox/branches/openAL

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

orxonox/branches/openAL/src/lib/graphics/importer/array.h

@@ -23 +23 @@
   void addEntry(GLfloat entry0, GLfloat entry1, GLfloat entry2);
   
-  GLfloat* getArray ();
-  int getCount();
-  void debug(void);
+  /** \returns The array */
+  inline const GLfloat* getArray () const {return this->array;}
+  /**   \returns The Count of entries in the Array*/
+  inline int getCount(void)const {return this->entryCount;}
+  void debug(void) const ;
  private:
   //! One entry of the Array

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+