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

Timestamp:

Feb 2, 2006, 2:45:07 PM (18 years ago)

Author:

bensch

Message:

trunk: some virtuals

Location:

trunk/src/lib/graphics/importer

Files:

• height_map.h (modified) (6 diffs)
• media_container.h (modified) (2 diffs)
• movie_player.h (modified) (1 diff)
• texture.h (modified) (1 diff)
• texture_sequence.h (modified) (1 diff)

trunk/src/lib/graphics/importer/height_map.h

@@ -28 +28 @@
 class HeightMap;
 
-class Tile 
+class Tile
 {
 public:
@@ -40 +40 @@
 float x;
 float z;
-~Tile();
+virtual ~Tile();
 
 
@@ -47 +47 @@
 HeightMap* hmref;
 VertexArrayModel* highResModel;
-VertexArrayModel* lowResModel; 
+VertexArrayModel* lowResModel;
 int highRes;
 int lowRes;
@@ -60 +60 @@
 void load(int Mode);
 void load(const char*, int Mode);
-void scale( Vector V); 
+void scale( Vector V);
 void setAbsCoor(Vector V);
-float getHeight(float x, float y); 
+float getHeight(float x, float y);
 float getNormal(float x, float y);
 HeightMap();
 HeightMap(const char*);
 HeightMap(const char*, const char*);
-~HeightMap();
+virtual ~HeightMap();
 
 friend class Tile;
@@ -74 +74 @@
 SDL_Surface* heightMap;
 SDL_Surface* colourMap;
-unsigned char* heights; 
+unsigned char* heights;
 unsigned char* colours;
 
@@ -80 +80 @@
 void drawRect(int xBottomLeft, int yBottomLeft, int xTopRight, int yTopRight );
 void fixBoarder(int xBottomLeft, int yBottomLeft, int xTopRight, int yTopRight);
-Vector  **  normalVectorField ; 
+Vector  **  normalVectorField ;
 Tile    ***  tiles;
 Vector    camCoords;
-Vector offsetCoords;  
+Vector offsetCoords;
 Material * tmp_mat;
 Material* red_mat;

trunk/src/lib/graphics/importer/media_container.h

@@ -45 +45 @@
 
   MediaContainer(const char* filename = NULL);
-  ~MediaContainer();
+  virtual ~MediaContainer();
 
   bool loadMedia(const char* filename);
@@ -53 +53 @@
 
 private:
-  
+
   GLuint getNextFrame();
   void unloadMedia();

trunk/src/lib/graphics/importer/movie_player.h

@@ -59 +59 @@
 
   MoviePlayer(const char* filename = NULL);
-  ~MoviePlayer();
+  virtual ~MoviePlayer();
 
   bool loadMovie(const char* filename);

trunk/src/lib/graphics/importer/texture.h

@@ -20 +20 @@
       Texture(const char* imageName = NULL, GLenum target = GL_TEXTURE_2D);
   //  Texture(TEXTURE_TYPE type, int resolution);
-      ~Texture();
+      virtual ~Texture();
 
       bool loadImage(const char* imageName, GLenum target = GL_TEXTURE_2D);

trunk/src/lib/graphics/importer/texture_sequence.h

@@ -23 +23 @@
     TextureSequence(unsigned int count = 0, ...);
   //  Texture(TEXTURE_TYPE type, int resolution);
-    ~TextureSequence();
+    virtual ~TextureSequence();
 
     bool loadImageSeries(unsigned int count, ...);