diff options
| author | MATILLAT Quentin <qmatillat@gmail.com> | 2019-08-20 16:07:23 +0300 |
|---|---|---|
| committer | MATILLAT Quentin <qmatillat@gmail.com> | 2019-08-20 16:07:23 +0300 |
| commit | 137754bba38f4a080545401a3db9857accfc7ace (patch) | |
| tree | bc8bf8e59f44b99338e49d5305b47788a0929b81 | |
| parent | cc6c338b250376dce6a8e6ea7fcd5ddc542ad470 (diff) | |
Update embree to support all kind of curve
| -rw-r--r-- | build_files/build_environment/patches/embree.diff | 22 | ||||
| -rw-r--r-- | intern/cycles/bvh/bvh_embree_converter.cpp | 2 |
2 files changed, 16 insertions, 8 deletions
diff --git a/build_files/build_environment/patches/embree.diff b/build_files/build_environment/patches/embree.diff index fc5106b6c24..d5e69a7e925 100644 --- a/build_files/build_environment/patches/embree.diff +++ b/build_files/build_environment/patches/embree.diff @@ -1,4 +1,4 @@ -From 1bd1456d289b3587e6c532085375c83bafccadf4 Mon Sep 17 00:00:00 2001 +From cb61d8802827da68b3627af66bc4421573668985 Mon Sep 17 00:00:00 2001 From: MATILLAT Quentin <qmatillat@gmail.com> Date: Sun, 18 Aug 2019 15:29:34 +0200 Subject: [PATCH] Add ability to export curve from BVH @@ -7,8 +7,8 @@ Subject: [PATCH] Add ability to export curve from BVH include/embree3/rtcore_builder.h | 22 +++ include/embree3/rtcore_common.h | 7 + kernels/bvh/bvh_builder_hair.cpp | 3 +- - kernels/common/rtcore_builder.cpp | 290 ++++++++++++++++++++++-------- - 4 files changed, 244 insertions(+), 78 deletions(-) + kernels/common/rtcore_builder.cpp | 298 ++++++++++++++++++++++-------- + 4 files changed, 252 insertions(+), 78 deletions(-) diff --git a/include/embree3/rtcore_builder.h b/include/embree3/rtcore_builder.h index af84035b0..77e754f7e 100644 @@ -77,7 +77,7 @@ index 14273787f..cad238123 100644 } #endif diff --git a/kernels/common/rtcore_builder.cpp b/kernels/common/rtcore_builder.cpp -index 56858294c..94d2e211f 100644 +index 56858294c..7c26c4193 100644 --- a/kernels/common/rtcore_builder.cpp +++ b/kernels/common/rtcore_builder.cpp @@ -29,8 +29,17 @@ @@ -98,7 +98,7 @@ index 56858294c..94d2e211f 100644 namespace isa // FIXME: support more ISAs for builders { struct BVH : public RefCount -@@ -334,92 +343,219 @@ namespace embree +@@ -334,92 +343,227 @@ namespace embree return root; } @@ -195,7 +195,15 @@ index 56858294c..94d2e211f 100644 + ++realNum; + } + } break; -+ case Geometry::GTY_ROUND_HERMITE_CURVE: { ++ case Geometry::GTY_FLAT_BEZIER_CURVE: ++ case Geometry::GTY_ROUND_BEZIER_CURVE: ++ case Geometry::GTY_ORIENTED_BEZIER_CURVE: ++ case Geometry::GTY_FLAT_BSPLINE_CURVE: ++ case Geometry::GTY_ROUND_BSPLINE_CURVE: ++ case Geometry::GTY_ORIENTED_BSPLINE_CURVE: ++ case Geometry::GTY_FLAT_HERMITE_CURVE: ++ case Geometry::GTY_ROUND_HERMITE_CURVE: ++ case Geometry::GTY_ORIENTED_HERMITE_CURVE: { + Curve8i *curve = reinterpret_cast<Curve8i*>(prim); + const auto N = curve->N; + for(size_t i = 0; i < N; i++) { @@ -396,5 +404,5 @@ index 56858294c..94d2e211f 100644 } - -- -2.22.1 +2.23.0 diff --git a/intern/cycles/bvh/bvh_embree_converter.cpp b/intern/cycles/bvh/bvh_embree_converter.cpp index ed804f59adf..969e941fafa 100644 --- a/intern/cycles/bvh/bvh_embree_converter.cpp +++ b/intern/cycles/bvh/bvh_embree_converter.cpp @@ -110,7 +110,7 @@ BVHNode *makeBVHTreeFromList(std::deque<BVHNode *> nodes) BVHNode *bvh_shrink(BVHNode *root) { if(root->is_leaf()) { - if(root->num_triangles() == 0) // Remove empty leafs + if(root->num_triangles() == 0) // Remove empty leafs return nullptr; else return root; |