Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-08-09 21:11:55 +0000
committerStijn Buys <ingar@osirion.org>2009-08-09 21:11:55 +0000
commitbbd04914749b2e3918796fe331daf649b06163ea (patch)
tree0139a4024950ecc5533fd7018ee35942d2ba2680 /src/model/asefile.h
parent4f576711828f35179dc5d28cfda93eff47e80a74 (diff)
adds r_normals cvar, read normals from .ase models
Diffstat (limited to 'src/model/asefile.h')
-rw-r--r--src/model/asefile.h16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/model/asefile.h b/src/model/asefile.h
index bb731b7..7f5ab03 100644
--- a/src/model/asefile.h
+++ b/src/model/asefile.h
@@ -10,6 +10,7 @@
#include "math/vector3f.h"
#include "model/model.h"
+#include "model/triangle.h"
#include "filesystem/filestream.h"
#include <string>
@@ -31,12 +32,19 @@ public:
private:
- typedef std::map<size_t, math::Vector3f> VertexList;
+ typedef std::map<size_t, math::Vector3f *> VertexList;
+
+ typedef std::map<size_t, Triangle *> FaceList;
ASEFile(std::string const &name);
~ASEFile();
/**
+ * @brief read *MESH_NORMALS
+ */
+ bool read_mesh_normals(std::istream &is);
+
+ /**
* @brief read *MESH_FACE_LIST
*/
bool read_mesh_face_list(std::istream &is);
@@ -76,13 +84,11 @@ private:
VertexList ase_vertexlist;
+ FaceList ase_facelist;
+
math::Vector3f ase_maxbbox;
math::Vector3f ase_minbbox;
-
- math::Vector3f ase_center;
-
- Model *model;
};
} // namespace model