removed unused things from FileInterface

This commit is contained in:
Anakin
2017-01-02 15:07:39 +01:00
parent 876c689a1d
commit 24d26cfdfa
3 changed files with 25 additions and 23 deletions

View File

@@ -8,27 +8,18 @@
#include <QOpenGLFunctions>
struct VertexData
{
QVector3D position;
QVector2D texCoord;
};
enum ModelTyp {
null,
dynamicMesh,
cloth,
bone,
staticMesh,
shadowMesh = 6
};
struct BoundingBox {
QQuaternion rotation;
QVector3D center;
QVector3D extents;
};
struct VertexData
{
QVector3D position;
QVector2D texCoord;
};
struct Segment {
std::uint32_t textureIndex = 0;
QVector<VertexData> vertices;
@@ -38,8 +29,6 @@ struct Segment {
struct Model {
std::string name = "";
std::string parent = "";
ModelTyp type = null; //TODO: should be removed
std::int32_t renderFlags = -1; //TODO: should be removed
QMatrix4x4 m4x4Translation;
std::vector<Segment*> segmList;
};

View File

@@ -8,6 +8,14 @@ struct ChunkHeader {
std::streampos position;
};
enum ModelTyp {
null,
dynamicMesh,
cloth,
bone,
staticMesh,
shadowMesh = 6
};
class MshFile : public FileInterface
{
@@ -16,6 +24,9 @@ public:
virtual ~MshFile();
private:
ModelTyp m_currentType = ModelTyp::null;
std::int32_t m_currentRenderFlag = -1;
virtual void import() Q_DECL_OVERRIDE Q_DECL_FINAL;
void loadChunks(std::list<ChunkHeader*> &destination, std::streampos start, const std::uint32_t length);