Changeset 5100 in orxonox.OLD for trunk/src/lib
- Timestamp:
- Aug 22, 2005, 12:42:28 PM (19 years ago)
- Location:
- trunk/src/lib
- Files:
-
- 12 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/Makefile.in
r4826 r5100 189 189 esac; \ 190 190 done; \ 191 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/Makefile'; \191 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/Makefile'; \ 192 192 cd $(top_srcdir) && \ 193 $(AUTOMAKE) -- foreignsrc/lib/Makefile193 $(AUTOMAKE) --gnu src/lib/Makefile 194 194 .PRECIOUS: Makefile 195 195 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/collision_detection/Makefile.in
r4826 r5100 224 224 esac; \ 225 225 done; \ 226 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/collision_detection/Makefile'; \226 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/collision_detection/Makefile'; \ 227 227 cd $(top_srcdir) && \ 228 $(AUTOMAKE) -- foreignsrc/lib/collision_detection/Makefile228 $(AUTOMAKE) --gnu src/lib/collision_detection/Makefile 229 229 .PRECIOUS: Makefile 230 230 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/event/Makefile.in
r4826 r5100 212 212 esac; \ 213 213 done; \ 214 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/event/Makefile'; \214 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/event/Makefile'; \ 215 215 cd $(top_srcdir) && \ 216 $(AUTOMAKE) -- foreignsrc/lib/event/Makefile216 $(AUTOMAKE) --gnu src/lib/event/Makefile 217 217 .PRECIOUS: Makefile 218 218 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/graphics/Makefile.in
r4826 r5100 179 179 esac; \ 180 180 done; \ 181 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/graphics/Makefile'; \181 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/graphics/Makefile'; \ 182 182 cd $(top_srcdir) && \ 183 $(AUTOMAKE) -- foreignsrc/lib/graphics/Makefile183 $(AUTOMAKE) --gnu src/lib/graphics/Makefile 184 184 .PRECIOUS: Makefile 185 185 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/graphics/importer/Makefile.am
r4579 r5100 20 20 material.h \ 21 21 texture.h \ 22 array.h \23 22 anorms.h \ 24 23 anormtab.h -
trunk/src/lib/graphics/importer/Makefile.in
r4826 r5100 201 201 material.h \ 202 202 texture.h \ 203 array.h \204 203 anorms.h \ 205 204 anormtab.h … … 218 217 esac; \ 219 218 done; \ 220 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/graphics/importer/Makefile'; \219 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/graphics/importer/Makefile'; \ 221 220 cd $(top_srcdir) && \ 222 $(AUTOMAKE) -- foreignsrc/lib/graphics/importer/Makefile221 $(AUTOMAKE) --gnu src/lib/graphics/importer/Makefile 223 222 .PRECIOUS: Makefile 224 223 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/graphics/spatial_separation/Makefile.in
r4826 r5100 205 205 esac; \ 206 206 done; \ 207 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/graphics/spatial_separation/Makefile'; \207 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/graphics/spatial_separation/Makefile'; \ 208 208 cd $(top_srcdir) && \ 209 $(AUTOMAKE) -- foreignsrc/lib/graphics/spatial_separation/Makefile209 $(AUTOMAKE) --gnu src/lib/graphics/spatial_separation/Makefile 210 210 .PRECIOUS: Makefile 211 211 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/gui/Makefile.in
r4826 r5100 241 241 esac; \ 242 242 done; \ 243 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/gui/Makefile'; \243 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/gui/Makefile'; \ 244 244 cd $(top_srcdir) && \ 245 $(AUTOMAKE) -- foreignsrc/lib/gui/Makefile245 $(AUTOMAKE) --gnu src/lib/gui/Makefile 246 246 .PRECIOUS: Makefile 247 247 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/particles/Makefile.in
r4826 r5100 209 209 esac; \ 210 210 done; \ 211 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/particles/Makefile'; \211 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/particles/Makefile'; \ 212 212 cd $(top_srcdir) && \ 213 $(AUTOMAKE) -- foreignsrc/lib/particles/Makefile213 $(AUTOMAKE) --gnu src/lib/particles/Makefile 214 214 .PRECIOUS: Makefile 215 215 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/physics/Makefile.in
r4826 r5100 218 218 esac; \ 219 219 done; \ 220 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/physics/Makefile'; \220 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/physics/Makefile'; \ 221 221 cd $(top_srcdir) && \ 222 $(AUTOMAKE) -- foreignsrc/lib/physics/Makefile222 $(AUTOMAKE) --gnu src/lib/physics/Makefile 223 223 .PRECIOUS: Makefile 224 224 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/sound/Makefile.in
r4826 r5100 201 201 esac; \ 202 202 done; \ 203 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/sound/Makefile'; \203 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/sound/Makefile'; \ 204 204 cd $(top_srcdir) && \ 205 $(AUTOMAKE) -- foreignsrc/lib/sound/Makefile205 $(AUTOMAKE) --gnu src/lib/sound/Makefile 206 206 .PRECIOUS: Makefile 207 207 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/tinyxml/Makefile.in
r4826 r5100 204 204 esac; \ 205 205 done; \ 206 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/tinyxml/Makefile'; \206 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/tinyxml/Makefile'; \ 207 207 cd $(top_srcdir) && \ 208 $(AUTOMAKE) -- foreignsrc/lib/tinyxml/Makefile208 $(AUTOMAKE) --gnu src/lib/tinyxml/Makefile 209 209 .PRECIOUS: Makefile 210 210 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
trunk/src/lib/util/array.h
r5097 r5100 16 16 /*! 17 17 \file array.h 18 \brief Contains the Array Class that handles float arrays.18 \brief Contains the Array Class that handles arrays of classes. 19 19 this class creates a Array of a semi-Dynamic length. 20 20 beware, that after finalizing the array may not be resized again. … … 25 25 #include "debug.h" 26 26 27 //! Array Class that handles dynamic- floatarrays.27 //! Array Class that handles dynamic-type arrays. 28 28 template<class T> class Array 29 29 { … … 38 38 /** @returns The array */ 39 39 inline const T* getArray () const { return this->array; }; 40 inline const T getEntry(unsigned int number) const; 40 41 /** * @returns The Count of entries in the Array*/ 41 42 inline unsigned int getCount()const { return this->entryCount; }; … … 66 67 Array<T>::Array () 67 68 { 68 PRINTF( 4)("crating new Array\n");69 PRINTF(5)("crating new Array\n"); 69 70 this->firstEntry = new Entry; 70 71 this->firstEntry->next =NULL; … … 72 73 this->finalized = false; 73 74 this->entryCount = 0; //0 means one entry 75 } 76 77 template<class T> 78 const T Array<T>::getEntry(unsigned int number) const 79 { 80 if (this->finalized && number < this->entryCount) 81 return this->array[number]; 74 82 } 75 83 … … 81 89 Array<T>::~Array() 82 90 { 83 PRINTF( 4)("deleting array\n");91 PRINTF(5)("deleting array\n"); 84 92 Entry* walker = this->firstEntry; 85 93 Entry* previous; … … 91 99 } 92 100 if (finalized) 93 delete []this->array;101 delete[] this->array; 94 102 } 95 103 … … 101 109 void Array<T>::finalizeArray () 102 110 { 103 PRINTF(4)("Finalizing array. Length: %i\n", entryCount); 104 // if ((array = (GLfloat*)malloc( entryCount* sizeof(GLfloat))) == NULL) 105 if (!(this->array = new GLfloat [this->entryCount])) 106 PRINTF(0)("could not allocate %i data Blocks\n", this->entryCount); 111 PRINTF(5)("Finalizing array. Length: %i\n", entryCount); 112 if (!(this->array = new T [this->entryCount])) 113 PRINTF(1)("could not allocate %i data Blocks\n", this->entryCount); 107 114 Entry* walker = this->firstEntry; 108 115 for (int i=0; i<this->entryCount; i++)
Note: See TracChangeset
for help on using the changeset viewer.