diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-26 12:58:15 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-26 12:58:15 +0400 |
commit | c301a059bd59672daf022755181f114ce70a21e9 (patch) | |
tree | 3819a1a1a6f647a1def1279bcd293df8b34d2534 /source/gameengine/Rasterizer/RAS_TexVert.h | |
parent | 5adff90b0868f88050e601092b35628fa3ae132b (diff) | |
parent | 06a5e9b58a0c1281609ee1ddb850fc058fe56c4f (diff) |
svn merge -r 16667:16741 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_TexVert.h')
-rw-r--r-- | source/gameengine/Rasterizer/RAS_TexVert.h | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/source/gameengine/Rasterizer/RAS_TexVert.h b/source/gameengine/Rasterizer/RAS_TexVert.h index 4ec4db19e53..54da109cbf1 100644 --- a/source/gameengine/Rasterizer/RAS_TexVert.h +++ b/source/gameengine/Rasterizer/RAS_TexVert.h @@ -44,15 +44,16 @@ class RAS_TexVert float m_uv1[2]; // 2*4 = 8 float m_uv2[2]; // 2*4 = 8 unsigned int m_rgba; // 4 - float m_tangent[4]; // 4*2 = 8 - float m_normal[3]; // 3*2 = 6 + float m_tangent[4]; // 4*4 = 16 + float m_normal[3]; // 3*4 = 12 short m_flag; // 2 + short m_softBodyIndex; //2 unsigned int m_unit; // 4 - unsigned int m_origindex; // 4 + unsigned int m_origindex; // 4 //--------- - // 56 + // 56+6+8+2=72 // 32 bytes total size, fits nice = 56 = not fit nice. - // We'll go for 64 bytes total size - 24 bytes left. + public: enum { FLAT = 1, @@ -91,6 +92,16 @@ public: return m_normal; } + short int getSoftBodyIndex() const + { + return m_softBodyIndex; + } + + void setSoftBodyIndex(short int sbIndex) + { + m_softBodyIndex = sbIndex; + } + const float* getTangent() const { return m_tangent; } |