Changeset 4277 in orxonox.OLD for orxonox/trunk/src

Timestamp:

May 24, 2005, 11:23:12 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: defined new datatype MD2Data to be used as data container for md2 models

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• md2Model.cc (modified) (2 diffs)
• md2Model.h (modified) (2 diffs)

orxonox/trunk/src/lib/graphics/importer/md2Model.cc

@@ -21 +21 @@
 
 #include <fstream>
-#include <string>
-#include <vector>
+
 
 
@@ -83 +82 @@
   this->numGLCommands = 0;
   
-  this->textureID = 0;
   this->scaleFactor = 1.0f;
 

orxonox/trunk/src/lib/graphics/importer/md2Model.h

@@ -146 +146 @@
 
 
-
-//! This is a MD2 Model class
-class MD2Model : public AbstractModel {
-
-public:
-  MD2Model();
-  virtual ~MD2Model();
-  
-  bool loadModel(const char* filename);
-  bool loadSkin(const char* filename);
-  
-  void drawFrame(int frame);
-  void draw();
-  void draw2();
-  
-  void setAnim(int type);
-  void scaleModel(float scaleFactor) { this->scaleFactor = scaleFactor;}
-
-  void tick(float dtS);
-  void debug();
-
-
-private:
-  void animate();  
-  void processLighting();
-  void interpolate(sVec3D* verticesList);
-  void renderFrame();
-
+//! class to store the md2 data in
+class MD2Data
+{
  public:
-  /* these variables are static, because they are all the same for every model */
-  static sVec3D anorms[NUM_VERTEX_NORMALS];
-  static float anormsDots[SHADEDOT_QUANT][256];
-  static sAnim animationList[21];
-
- private:
+  MD2Data();
+  virtual ~MD2Data();
+
+  bool loadModel(const char* fileName);
+  bool loadSkin(const char* fileName);
+
   int numFrames;
   int numVertices;
@@ -194 +169 @@
   glCommandVertex* pGLCommands2;
 
-  unsigned int textureID;
+  Material* material;
+  float scaleFactor;
+};
+
+
+//! This is a MD2 Model class
+class MD2Model : public AbstractModel {
+
+public:
+  MD2Model();
+  virtual ~MD2Model();
+  
+  bool loadModel(const char* filename);
+  bool loadSkin(const char* filename);
+  
+  void drawFrame(int frame);
+  void draw();
+  void draw2();
+  
+  void setAnim(int type);
+  void scaleModel(float scaleFactor) { this->scaleFactor = scaleFactor;}
+
+  void tick(float dtS);
+  void debug();
+
+
+private:
+  void animate();  
+  void processLighting();
+  void interpolate(sVec3D* verticesList);
+  void renderFrame();
+
+ public:
+  /* these variables are static, because they are all the same for every model */
+  static sVec3D anorms[NUM_VERTEX_NORMALS];
+  static float anormsDots[SHADEDOT_QUANT][256];
+  static sAnim animationList[21];
+
+ private:
+  MD2Data* data;
+
+  int numFrames;
+  int numVertices;
+  int numTriangles;
+  int numGLCommands;
+  char* fileName;
+  char* skinFileName;
+  tMd2Header* header;
+
+  sVec3D* pVertices;
+  int* pGLCommands;
+  int* pLightNormals;
+  glCommandVertex* pGLCommands2;
+
   Material* material;
   sAnimState animationState;