diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:46 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:46 +0400 |
commit | 934767cf7f51ae82224138de2ffcafe7bae2b8fa (patch) | |
tree | 2b59a0b23431be2acc84d1e20d22b964e459a087 /intern/cycles/render/mesh.h | |
parent | 0509553b5eb240b3970848a4432e0bbfcbba8690 (diff) |
Cycles code refactor: change curve key to float4 for easier storage as attribute.
Diffstat (limited to 'intern/cycles/render/mesh.h')
-rw-r--r-- | intern/cycles/render/mesh.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h index 9c59aca4c72..5ae8f1f6033 100644 --- a/intern/cycles/render/mesh.h +++ b/intern/cycles/render/mesh.h @@ -46,6 +46,8 @@ public: /* Mesh Triangle */ struct Triangle { int v[3]; + + void bounds_grow(const float3 *verts, BoundBox& bounds) const; }; /* Mesh Curve */ @@ -55,11 +57,8 @@ public: uint shader; int num_segments() { return num_keys - 1; } - }; - struct CurveKey { - float3 co; - float radius; + void bounds_grow(const int k, const float4 *curve_keys, BoundBox& bounds) const; }; /* Displacement */ @@ -77,7 +76,7 @@ public: vector<uint> shader; vector<bool> smooth; - vector<CurveKey> curve_keys; + vector<float4> curve_keys; /* co + radius */ vector<Curve> curves; vector<uint> used_shaders; |