Changeset 3454 in orxonox.OLD for orxonox/trunk
- Timestamp:
- Mar 3, 2005, 6:35:04 PM (20 years ago)
- Location:
- orxonox/trunk/src/importer
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/importer/material.cc
r3427 r3454 110 110 \returns Material named mtlName if it is found. NULL otherwise. 111 111 */ 112 Material* Material::search 112 Material* Material::search(char* mtlName) 113 113 { 114 114 PRINTF(2)("Searching for material %s", mtlName); -
orxonox/trunk/src/importer/material.h
r3427 r3454 31 31 void init(void); 32 32 33 Material* search 33 Material* search(char* mtlName); 34 34 bool select (void); 35 35 … … 52 52 53 53 void addTexturePath(char* pathName); 54 char* searchTextureInPaths(char* texName) const;55 54 // MAPPING // 56 55 void setDiffuseMap(char* dMap); -
orxonox/trunk/src/importer/model.cc
r3427 r3454 224 224 } 225 225 226 /** 227 \brief sets a name to the Model 228 \param name The name to set to this Model 229 */ 226 230 void Model::setName(const char* name) 227 231 { … … 858 862 } 859 863 860 864 /** 865 \brief Builds a Sphere into the Model 866 */ 861 867 void Model::sphereModel() 862 868 { -
orxonox/trunk/src/importer/model.h
r3427 r3454 17 17 using namespace std; 18 18 19 //! Specification of different primitives the Model knows 19 20 enum PRIMITIVE {PLANE, CUBE, SPHERE, CYLINDER}; 20 21 -
orxonox/trunk/src/importer/objModel.h
r3396 r3454 1 1 /*! 2 \file obj model.h2 \file objModel.h 3 3 \brief Contains the OBJ-model Class, that reads in a Model from a .obj-file 4 4 */ -
orxonox/trunk/src/importer/texture.cc
r3365 r3454 190 190 \brief Loads a Texture to the openGL-environment. 191 191 \param pImage The Image to load to openGL 192 \param texture The Texture to apply it to.193 192 */ 194 193 bool Texture::loadTexToGL (Image* pImage) … … 260 259 \brief Makes the Programm ready to Read-in a texture-File 261 260 1. Checks what type of Image should be imported 262 2. ToDO:Checks where to find the Image261 \todo Checks where to find the Image 263 262 */ 264 263 bool Texture::loadImage(char* imageName) … … 304 303 \brief reads in a Windows BMP-file, and imports it to openGL. 305 304 \param bmpName The name of the Image to load. 306 \param texture A pointer to the Texture which should be read to.307 305 */ 308 306 bool Texture::loadBMP (char* bmpName) … … 408 406 \brief reads in a jpg-file 409 407 \param jpgName the Name of the Image to load 410 \param texture a reference to the Texture to write the image to411 408 */ 412 409 bool Texture::loadJPG (char* jpgName) … … 508 505 \brief reads in a tga-file 509 506 \param tgaName the Name of the Image to load 510 \param texture a reference to the Texture to write the image to511 507 */ 512 508 bool Texture::loadTGA(const char * tgaName) … … 565 561 \param filename the Name of the Image to load 566 562 \param fTGA a Pointer to a File, that should be read 567 \param texture a reference to the Texture to write the image to568 563 */ 569 564 bool Texture::loadUncompressedTGA(const char * filename, FILE * fTGA) … … 639 634 \param filename the Name of the Image to load 640 635 \param fTGA a Pointer to a File, that should be read 641 \param texture a reference to the Texture to write the image to642 636 */ 643 637 bool Texture::loadCompressedTGA(const char * filename, FILE * fTGA) … … 816 810 817 811 818 /*819 static int ST_is_power_of_two(unsigned int number)820 {821 return (number & (number - 1)) == 0;822 }823 */824 825 812 /** 826 813 \brief reads in a png-file 827 814 \param pngName the Name of the Image to load 828 \param texture a reference to the Texture to write the image to829 815 */ 830 816 bool Texture::loadPNG(const char* pngName) -
orxonox/trunk/src/importer/texture.h
r3365 r3454 11 11 12 12 #include "../stdincl.h" 13 extern int verbose;14 13 #ifdef HAVE_SDL_SDL_IMAGE_H 15 14 #include <SDL/SDL_image.h> … … 65 64 GLubyte *data; //!< The Image Data comes here! DANGER: uncompressed data. 66 65 }; 67 Image* pImage; 68 GLuint texture; 69 SDL_Surface* map; 66 Image* pImage; //!< The data of an Image 67 GLuint texture; //!< The Texture-ID of opengl from this Texture. 68 SDL_Surface* map; //!< The map SDL initializes for this element. 70 69 char* searchTextureInPaths(char* texName) const; 71 70 inline void swap(unsigned char &a, unsigned char &b); … … 73 72 Texture(void); 74 73 ~Texture(void); 75 76 inline GLuint getTexture(void) {return this->texture;} //!< \returns The textureID of this texture.74 /** \returns The textureID of this texture. */ 75 inline GLuint getTexture(void) {return this->texture;} 77 76 bool loadTexToGL (Image* pImage); 78 77 … … 90 89 bool loadCompressedTGA(const char * filename, FILE * fTGA); 91 90 92 bool loadPNG(const char* pngName , GLuint* texture);91 bool loadPNG(const char* pngName); 93 92 #endif 94 93 -
orxonox/trunk/src/importer/windowHandler.cc
r3140 r3454 16 16 #include "windowHandler.h" 17 17 #include <stdio.h> 18 19 /** 20 \brief Resizes the Window 21 \param width the new size in the width. 22 \param height the new size in the height. 23 */ 18 24 void WindowHandler::ReSizeGLScene(GLsizei width, GLsizei height) // Resize And Initialize The GL Window 19 25 { … … 39 45 } 40 46 41 47 /** 48 \brief initializes openGL 49 */ 42 50 int WindowHandler::InitGL(GLvoid) // All Setup For OpenGL Goes Here 43 51 { … … 53 61 } 54 62 55 63 /** 64 \brief kills the window 65 */ 56 66 GLvoid WindowHandler::KillGLWindow(GLvoid) // Properly Kill The Window 57 67 { … … 59 69 } 60 70 61 71 /** 72 \brief creates a new Window for the scene 73 \param title the name of the Window 74 \param width the width of the window 75 \param height the height of the window 76 \param bits the bits per pixel to use 77 \param fullscreenflag TRUE if fullscreen FALSE if windowed/ 78 \returns FALSE if initialisation failed, TRUE otherwise 79 */ 62 80 BOOL WindowHandler::CreateGLWindow(char* title, int width, int height, int bits, BOOL fullscreenflag) 63 81 { -
orxonox/trunk/src/importer/windowHandler.h
r3196 r3454 1 /*! 2 \file windowHandler.h 3 \brief contains the WindowHandler class for the minimal display system 4 */ 5 6 1 7 #ifndef _WINDOWHANDLER_H 2 8 #define _WINDOWHANDLER_H … … 16 22 #endif /* __WIN32__ */ 17 23 18 #define TRUE 1 19 #define FALSE 0 20 #define BOOL int 24 #define TRUE 1 //!< define true 25 #define FALSE 0 //!< define false 26 #define BOOL int //!< define BOOL 21 27 28 //! A simple class to handle a minimal display system 22 29 class WindowHandler 23 30 { … … 27 34 GLvoid KillGLWindow(GLvoid); 28 35 BOOL CreateGLWindow(char* title, int width, int height, int bits, BOOL fullscreenflag); 29 SDL_Surface* screen; 36 SDL_Surface* screen; //!< The screen to which to display the rendered stuff 30 37 private: 31 38 int InitGL(GLvoid);
Note: See TracChangeset
for help on using the changeset viewer.