/[hegemonie]/hegemonie/Headers/Map/MapDisplay.h
ViewVC logotype

Diff of /hegemonie/Headers/Map/MapDisplay.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.6 by gabby, Wed Jul 23 12:23:39 2003 UTC revision 1.7 by zaral, Wed Jul 23 13:51:15 2003 UTC
# Line 24  Line 24 
24  #ifndef MAP_DISPLAY_H  #ifndef MAP_DISPLAY_H
25  #define MAP_DISPLAY_H  #define MAP_DISPLAY_H
26    
 //#include <GL/glut.h>  
27  #include <GL/gl.h>  #include <GL/gl.h>
28    
29  #include "Map/MapDisplayPoint.h"  #include "Map/MapDisplayPoint.h"
# Line 35  Line 34 
34   */   */
35    
36  @class Camera;  @class Camera;
 @class TextureLoader;  
37    
38  #define LAND_TEX 0    #define LAND_TEX 0  
39    
# Line 74  Line 72 
72    BOOL _enableTexture;    BOOL _enableTexture;
73    tex_coord_t _tex;    tex_coord_t _tex;
74    
   TextureLoader *_textureLoader;  
75    GLuint _texture[1];    GLuint _texture[1];
76  }  }
77    
78  - (id) initWithImageName: (NSString *)imageName  - (id) initWithImageName: (NSString *)imageName
79           colorsImageName: (NSString *)colorsImageName           colorsImageName: (NSString *)colorsImageName
80                 mapShadow: (MapShadow *)mapShadow                 mapShadow: (MapShadow *)mapShadow;
            textureLoader: (TextureLoader *) textureLoader;  
   
 - (void) setTextureLoader: (TextureLoader *) textureLoader;  
81    
82  - (void) displayWithCamera: (Camera *)camera  - (void) displayWithCamera: (Camera *)camera
83                 numberOfRay: (int)nbRay                 numberOfRay: (int)nbRay

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26