Эх сурвалжийг харах

python fixes

Former-commit-id: 6b3df962c16e4b16e04c3b1d61b8c1fb5b5d637c
Daniele Panozzo 9 жил өмнө
parent
commit
b976d8c144

+ 6 - 1
python/CMakeLists.txt

@@ -72,11 +72,16 @@ endif(NOT APPLE)
 
 
 # include nanogui and dependencies
+
+set(NANOGUI_BUILD_PYTHON OFF CACHE BOOL " " FORCE)
+set(NANOGUI_BUILD_EXAMPLE OFF CACHE BOOL " " FORCE)
+set(NANOGUI_BUILD_SHARED OFF CACHE BOOL " " FORCE)
+
 add_subdirectory("../external/nanogui/" "nanogui")
 include_directories("../external/nanogui/include")
 include_directories("../external/nanogui/ext/glfw/include")
 include_directories("../external/nanogui/ext/nanovg/src")
-list(APPEND SHARED_LIBRARIES "nanogui" "glfw" ${OPENGL_LIBRARIES})
+list(APPEND SHARED_LIBRARIES "nanogui" ${OPENGL_LIBRARIES})
 
 # include comiso if available
 

+ 6 - 1
python/py_igl/py_arap.cpp

@@ -40,7 +40,12 @@ m.def("arap_precomputation", []
   igl::ARAPData & data
 )
 {
-  return igl::arap_precomputation(V,F,dim,b,data);
+  assert_is_VectorX("b",b);
+  Eigen::VectorXi bt;
+  if (b.size() != 0)
+    bt = b;
+
+  return igl::arap_precomputation(V,F,dim,bt,data);
 }, __doc_igl_arap,
 py::arg("V"), py::arg("F"), py::arg("dim"), py::arg("b"), py::arg("data"));
 

+ 4 - 4
python/py_igl_viewer.cpp

@@ -152,16 +152,16 @@ py::class_<igl::viewer::ViewerCore> viewercore_class(me, "ViewerCore");
     [](const igl::viewer::ViewerCore& core) {return Eigen::MatrixXd(core.background_color.cast<double>());},
     [](igl::viewer::ViewerCore& core, const Eigen::MatrixXd& v)
     {
-      assert_is_Vector3("background_color",v);
-      core.background_color = Eigen::Vector3f(v.cast<float>());
+      assert_is_Vector4("background_color",v);
+      core.background_color << Eigen::Vector4f(v.cast<float>());
     })
 
     .def_property("line_color",
     [](const igl::viewer::ViewerCore& core) {return Eigen::MatrixXd(core.line_color.cast<double>());},
     [](igl::viewer::ViewerCore& core, const Eigen::MatrixXd& v)
     {
-      assert_is_Vector3("line_color",v);
-      core.line_color = Eigen::Vector3f(v.cast<float>());
+      assert_is_Vector4("line_color",v);
+      core.line_color = Eigen::Vector4f(v.cast<float>());
     })
 
     .def_property("light_position",