diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:45 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:45 +0400 |
| commit | 41d1675053b457370e70be137fd8105b9cd1890b (patch) | |
| tree | 1c0567bc1441dd9bd55f9f5b184b7ce346aa2073 /intern/cycles/render/object.cpp | |
| parent | 84470a1190b28cd37491e5002aea4695e4f26f44 (diff) | |
Cycles code refactor: move more geometry code into per primitive files.
Diffstat (limited to 'intern/cycles/render/object.cpp')
| -rw-r--r-- | intern/cycles/render/object.cpp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index b40f3616242..0a89642fc4a 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -203,20 +203,6 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene surface_area += triangle_area(p1, p2, p3); } - foreach(Mesh::Curve& curve, mesh->curves) { - int first_key = curve.first_key; - - for(int i = 0; i < curve.num_segments(); i++) { - float3 p1 = mesh->curve_keys[first_key + i].co; - float r1 = mesh->curve_keys[first_key + i].radius; - float3 p2 = mesh->curve_keys[first_key + i + 1].co; - float r2 = mesh->curve_keys[first_key + i + 1].radius; - - /* currently ignores segment overlaps*/ - surface_area += M_PI_F *(r1 + r2) * len(p1 - p2); - } - } - surface_area_map[mesh] = surface_area; } else @@ -232,23 +218,6 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene surface_area += triangle_area(p1, p2, p3); } - - foreach(Mesh::Curve& curve, mesh->curves) { - int first_key = curve.first_key; - - for(int i = 0; i < curve.num_segments(); i++) { - float3 p1 = mesh->curve_keys[first_key + i].co; - float r1 = mesh->curve_keys[first_key + i].radius; - float3 p2 = mesh->curve_keys[first_key + i + 1].co; - float r2 = mesh->curve_keys[first_key + i + 1].radius; - - p1 = transform_point(&tfm, p1); - p2 = transform_point(&tfm, p2); - - /* currently ignores segment overlaps*/ - surface_area += M_PI_F *(r1 + r2) * len(p1 - p2); - } - } } /* pack in texture */ |