From f030154fe727e25a2afe1f78b3998c2d2dba95e4 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 18 Aug 2009 09:24:15 +0000 Subject: astyle cleanup, corrects not loading of material textures --- src/model/quad.h | 49 ++++++++++++++++++------------------------------- 1 file changed, 18 insertions(+), 31 deletions(-) (limited to 'src/model/quad.h') diff --git a/src/model/quad.h b/src/model/quad.h index 4728866..b7dd7af 100644 --- a/src/model/quad.h +++ b/src/model/quad.h @@ -21,85 +21,72 @@ public: * @brief a new quad with 4 vertices * this constructor assigns the face normal to every vertex normal */ - Quad(const math::Vector3f &v0,const math::Vector3f &v1, const math::Vector3f &v2, const math::Vector3f &v3, const math::Vector3f &normal, const bool detail = false); + Quad(const math::Vector3f &v0, const math::Vector3f &v1, const math::Vector3f &v2, const math::Vector3f &v3, const math::Vector3f &normal, const bool detail = false); /// delete quad ~Quad(); - + /// quad vertex 0 - inline math::Vector3f & v0() - { + inline math::Vector3f & v0() { return quad_v0; } - + /// quad vertex 0 normal - inline math::Vector3f & n0() - { + inline math::Vector3f & n0() { return quad_n0; } /// quad vertex 0 texture coordinates - inline math::Vector2f & t0() - { + inline math::Vector2f & t0() { return quad_t0; } /// quad vertex 1 - inline math::Vector3f & v1() - { + inline math::Vector3f & v1() { return quad_v1; } /// quad vertex 1 normal - inline math::Vector3f & n1() - { + inline math::Vector3f & n1() { return quad_n1; } /// quad vertex 1 texture coordinates - inline math::Vector2f & t1() - { + inline math::Vector2f & t1() { return quad_t1; } - + /// quad vertex 2 - inline math::Vector3f & v2() - { + inline math::Vector3f & v2() { return quad_v2; } /// quad vertex 2 normal - inline math::Vector3f & n2() - { + inline math::Vector3f & n2() { return quad_n2; } /// quad vertex 2 texture coordinates - inline math::Vector2f & t2() - { + inline math::Vector2f & t2() { return quad_t2; } /// quad vertex 3 - inline math::Vector3f & v3() - { + inline math::Vector3f & v3() { return quad_v3; } /// quad vertex 3 normal - inline math::Vector3f & n3() - { + inline math::Vector3f & n3() { return quad_n3; } /// quad vertex 3 texture coordinates - inline math::Vector2f & t3() - { + inline math::Vector2f & t3() { return quad_t3; } /// indidcates if this quad was generated from a detail brush - inline bool detail() const - { + inline bool detail() const { return quad_detail; } @@ -125,7 +112,7 @@ private: math::Vector3f quad_v3; math::Vector3f quad_n3; math::Vector2f quad_t3; - + math::Vector3f quad_normal; bool quad_detail; }; -- cgit v1.2.3