Skip to content

Commit a206dc0

Browse files
authored
Update ray_mesh_intersection.cpp
1 parent 5d2d5bb commit a206dc0

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/ray_mesh_intersection.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ using Intersector = EmbreeIntersector;
1111
void hack_extra_ray_mesh_bindings(pybind11::module& m) {
1212
py::class_<Intersector, std::shared_ptr<Intersector>>(m, "_RayMeshIntersectorInternal")
1313
.def(py::init([]() {
14-
return std::shared_ptr<Intersector>(new igl::embree::EmbreeIntersector());
14+
return std::shared_ptr<Intersector>(new EmbreeIntersector());
1515
}));
1616
}
1717

1818

1919
npe_function(_populate_ray_intersector_internal)
2020
npe_arg(v, dense_float, dense_double)
2121
npe_arg(f, dense_int32, dense_int64, dense_uint32, dense_uint64)
22-
npe_arg(isector, std::shared_ptr<igl::embree::EmbreeIntersector>)
22+
npe_arg(isector, std::shared_ptr<EmbreeIntersector>)
2323
npe_begin_code()
24-
igl::embree::EmbreeIntersector::PointMatrixType v_copy = v.template cast<float>();
25-
igl::embree::EmbreeIntersector::FaceMatrixType f_copy = f.template cast<int>();
24+
EmbreeIntersector::PointMatrixType v_copy = v.template cast<float>();
25+
EmbreeIntersector::FaceMatrixType f_copy = f.template cast<int>();
2626
isector->init(v_copy, f_copy, true /*is_static*/);
2727
npe_end_code()
2828

@@ -64,7 +64,7 @@ npe_begin_code()
6464
o_i = Eigen::RowVector3f((float)ray_o(i, 0), (float)ray_o(i, 1), (float)ray_o(i, 2));
6565
}
6666
Eigen::RowVector3f d_i((float)ray_d(i, 0), (float)ray_d(i, 1), (float)ray_d(i, 2));
67-
igl::Hit hit;
67+
Hit hit;
6868

6969
bool is_hit = isector->intersectRay(o_i, d_i, hit, ray_near, ray_far);
7070
if (is_hit) {
@@ -135,10 +135,10 @@ npe_begin_code()
135135
validate_mesh(v, f);
136136

137137

138-
igl::embree::EmbreeIntersector isector;
138+
EmbreeIntersector isector;
139139

140-
igl::embree::EmbreeIntersector::PointMatrixType v_copy = v.template cast<float>();
141-
igl::embree::EmbreeIntersector::FaceMatrixType f_copy = f.template cast<int>();
140+
EmbreeIntersector::PointMatrixType v_copy = v.template cast<float>();
141+
EmbreeIntersector::FaceMatrixType f_copy = f.template cast<int>();
142142
isector.init(v_copy, f_copy, true /*is_static*/);
143143

144144
npe_Matrix_f ret_fid(ray_d.rows(), 1);
@@ -152,7 +152,7 @@ npe_begin_code()
152152
o_i = Eigen::RowVector3f((float)ray_o(i, 0), (float)ray_o(i, 1), (float)ray_o(i, 2));
153153
}
154154
Eigen::RowVector3f d_i((float)ray_d(i, 0), (float)ray_d(i, 1), (float)ray_d(i, 2));
155-
igl::Hit hit;
155+
Hit hit;
156156

157157
bool is_hit = isector.intersectRay(o_i, d_i, hit, ray_near, ray_far);
158158
if (is_hit) {

0 commit comments

Comments
 (0)