Context Navigation

Changeset 8348 in orxonox.OLD

Timestamp:

Jun 13, 2006, 5:33:14 PM (18 years ago)

Author:

patrick

Message:

bsp: compiles again

Location:

branches/bsp_model/src/lib/graphics/importer/md3

Files:

-                      r8342
+                      r8348
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
+#include "md3_animation.h"
+using namespace std;

-                      r8342
+                      r8348
 typedef struct AnuimationType
+typedef struct AnimationType
 {};
 …
     MD3Animation(std::string line) : first(0), numFrames(0), fps(0) { /* loadAnimation(); */ }
     std::string toString() { return String("Type: " + this->type + " - name: " + this->name + " - fps: " + fps); }
+    std::string toString() { return std::string("Name: " + this->name); }

-                      r8343
+                      r8348
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
+#include "md3_bone_frame.h"
+using namespace std;

-                      r8342
+                      r8348
  */
 #ifndef _MD3_BONE_FRAME_H
 #define _MD3_BONE_FRAME_H
+#ifndef _MD3_ANIMATION_H
+#define _MD3_ANIMATION_H
 #include "vector.h"
+#include <string>
+class MD3Tag;
 …
     /** create a MD3BoneFrame object with the data coming from the specified input stream */
     MD3BoneFrame(int tagNum /*, DataInput din*/) { /* loadBoneFrame(this, din) */ }
     MD3BoneFrame(int tagNum) { /* this->tags = new MD3Tag[tagNum] */ }
     virtual ~MD3BondeFrame();
+    MD3BoneFrame(/*int tagNum*/) { /* this->tags = new MD3Tag[tagNum] */ }
+    virtual ~MD3BoneFrame();
 …
     float          scale;             //!< scale of the box
     //MD3Tag      tags[];            //!< arrays of tags size
+    MD3Tag*        tags;              //!< arrays of tags size
 …
 #endif /* _MD3_BONE_FRAME_H */
+#endif /* _MD3_ANIMATION_H */

-                      r8347
+                      r8348
+    }
+#if 0
   this->fileName =fileName;
   /* got the data: map it to locals */
 …
+    }
     PRINTF(4)("Finished loading the md2 file\n");
+#endif
   delete [] buffer;

-                      r8346
+                      r8348
 */
 #ifndef _MD2MODEL_H
+#ifndef _MD3_DATA_H
 #define _MD3_DATA_H
 …
 #include "material.h"
 #include "md_model_structure.h"
 //! These are the needed defines for the max values when loading .MD2 files

r8343	r8348
15	15	#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
16	16
	17	#include "md3_mesh.h"

-                      r8343
+                      r8348
 #define _MD3_MESH_H
+#include <string>
+#include "md_model_structure.h"
+#include "vector.h"
 class MD3Mesh
+{
 …
     MD3Mesh() { /* loadMesh(this, din) */ }
     virtual ~MD3Mesh();
+//     FILE *pFile;                            //file stream
 …
     int*               triangles;               //!< indices into mesh frames and texture coord arrays
     float*             textureCoords;           //!< U/V textures coordinates of vertices
     sVec3D*            meshFrames;              //!< mesh frames
+    Vector             meshFrames;              //!< mesh frames
 };

-                      r8346
+                      r8348
 #include "md3_model.h"
-#include "material.h"
-#include "debug.h"
-#include "util/loading/resource_manager.h"

-                      r8347
+                      r8348
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
+#include "md3_tag.h"
+using namespace std;

Note: See TracChangeset for help on using the changeset viewer.