diff --git a/WFObj.h b/WFObj.h index ff2052a..a0e654c 100644 --- a/WFObj.h +++ b/WFObj.h @@ -23,29 +23,29 @@ public: class WFMtl { - public: - WFMtl(WFObj * obj) { m_obj = obj; } - bool load(const FileLoader::Path & path); - void renderBegin(const std::string & mtlname, - bool doTextureInfo = true, - bool enableBlending = false); - void renderEnd(const std::string & mtlname, - bool doTextureInfo = true, - bool enableBlending = false); + public: + WFMtl(WFObj * obj) { m_obj = obj; } + bool load(const FileLoader::Path & path); + void renderBegin(const std::string & mtlname, + bool doTextureInfo = true, + bool enableBlending = false); + void renderEnd(const std::string & mtlname, + bool doTextureInfo = true, + bool enableBlending = false); - protected: - /* methods */ - void clear(); - void processInputLine(const std::string & input); - void pushAttributes(); - bool load(std::istream & istr, unsigned int size); + protected: + /* methods */ + void clear(); + void processInputLine(const std::string & input); + void pushAttributes(); + bool load(std::istream & istr, unsigned int size); - /* variables */ - std::map< std::string, std::vector< std::vector > > m_data; - std::string m_currentMaterialName; - bool m_attributesPushed; - FileLoader::Path m_path; - WFObj * m_obj; + /* variables */ + std::map< std::string, std::vector< std::vector > > m_data; + std::string m_currentMaterialName; + bool m_attributesPushed; + FileLoader::Path m_path; + WFObj * m_obj; }; enum { VERTEX, VERTEX_TEXTURE, VERTEX_NORMAL, VERTEX_TYPES }; @@ -64,12 +64,12 @@ protected: /* types */ class Vertex { - public: - float operator[](int idx) const { return data[idx]; } - float & operator[](int idx) { return data[idx]; } - float * getData() { return data; } - private: - float data[4]; + public: + float operator[](int idx) const { return data[idx]; } + float & operator[](int idx) { return data[idx]; } + float * getData() { return data; } + private: + float data[4]; }; class VertexRef