clean up code

This commit is contained in:
Anakin
2016-11-12 12:05:03 +01:00
parent 2524971d19
commit b4bd314450
7 changed files with 19 additions and 47 deletions

View File

@@ -3,7 +3,6 @@
#include <list>
#include <fstream>
#include <string>
#include <gl\glew.h>
#include <glm\gtc\matrix_transform.hpp>
enum Mtyp {
@@ -22,16 +21,16 @@ struct ChunkHeader {
};
struct Modl {
std::string name;
std::string parent;
Mtyp type;
std::uint32_t renderFlags;
glm::mat4 m4x4Translation;
std::string texture;
float* vertex;
float* uv;
std::uint32_t* mesh;
std::uint32_t meshSize;
std::string name = "";
std::string parent = "";
Mtyp type = null;
std::int32_t renderFlags = -1;
glm::mat4 m4x4Translation = glm::mat4(1.0f);
std::string texture = "";
float* vertex = nullptr;
float* uv = nullptr;
std::uint32_t* mesh = nullptr;
std::uint32_t meshSize = 0;
};
@@ -49,7 +48,6 @@ private:
private:
void setModlDefault(Modl* model);
void loadChunks(std::list<ChunkHeader*> &destination, std::streampos start, const std::uint32_t end);
void analyseMsh2Chunks(std::list<ChunkHeader*> &chunkList);
void analyseMatdChunks(std::list<ChunkHeader*> &chunkList);

View File

@@ -1,11 +1,9 @@
#pragma once
#include <string>
#include <gl\glew.h>
#include <gl\glfw3.h>
#include <glm\glm.hpp>
#include <vector>
#include "Object.h"
#include "Texture.h"
#include <vector>
#define VERTEX_INDEX_XYZ 0
#define VERTEX_INDEX_UV 1