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-18 09:24:15 +0000
committerStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
commitf030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch)
treecd92baf9e4fa8a136523b9eb570e9811846c9250 /src/model/quad.h
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/model/quad.h')
-rw-r--r--src/model/quad.h49
1 files changed, 18 insertions, 31 deletions
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;
};