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

at global level is illegal

Former-commit-id: 4b69d4b6e99c15c6a9b8192f84b378fee1ca1d4a
Alec Jacobson 10 жил өмнө
parent
commit
b65b01c3b0

+ 1 - 1
include/igl/cgal/peel_outer_hull_layers.cpp

@@ -17,7 +17,6 @@
 #include "../STR.h"
 #endif
 
-using namespace std;
 template <
   typename DerivedV,
   typename DerivedF,
@@ -126,6 +125,7 @@ IGL_INLINE size_t igl::cgal::peel_outer_hull_layers(
   Eigen::PlainObjectBase<Derivedodd > & odd,
   Eigen::PlainObjectBase<Derivedflip > & flip)
 {
+  using namespace std;
   Eigen::Matrix<typename DerivedV::Scalar,DerivedF::RowsAtCompileTime,3> N;
   per_face_normals(V,F,N);
   return peel_outer_hull_layers(V,F,N,odd,flip);

+ 1 - 1
include/igl/comiso/miq.cpp.REMOVED.git-id

@@ -1 +1 @@
-16464c7ad8917249fdb40e5b2be12ab61090ce28
+c3a59cef8b0ed62e24fe734dabfdb3cacf17548b

+ 5 - 1
include/igl/viewer/TextRenderer.cpp

@@ -17,12 +17,12 @@
 #define NANOVG_GL3
 #include <nanovg_gl.h>
 
-using namespace std;
 
   IGL_INLINE igl::viewer::TextRenderer::TextRenderer(): ctx(nullptr) {}
 
   IGL_INLINE int igl::viewer::TextRenderer::Init()
   {
+    using namespace std;
     #ifdef NDEBUG
       ctx = nvgCreateGL3(NVG_STENCIL_STROKES | NVG_ANTIALIAS);
     #else
@@ -37,6 +37,7 @@ using namespace std;
 
   IGL_INLINE int igl::viewer::TextRenderer::Shut()
   {
+    using namespace std;
     if(ctx)
       nvgDeleteGL3(ctx);
     return 0;
@@ -45,6 +46,7 @@ using namespace std;
   IGL_INLINE void igl::viewer::TextRenderer::BeginDraw(const Eigen::Matrix4f &view, const Eigen::Matrix4f &proj,
     const Eigen::Vector4f &_viewport, float _object_scale)
   {
+    using namespace std;
     viewport = _viewport;
     proj_matrix = proj;
     view_matrix = view;
@@ -67,11 +69,13 @@ using namespace std;
 
   IGL_INLINE void igl::viewer::TextRenderer::EndDraw()
   {
+    using namespace std;
     nvgEndFrame(ctx);
   }
 
   IGL_INLINE void igl::viewer::TextRenderer::DrawText(Eigen::Vector3d pos, Eigen::Vector3d normal, const std::string &text)
   {
+    using namespace std;
     pos += normal * 0.005f * object_scale;
     Eigen::Vector3f coord = igl::project(Eigen::Vector3f(pos(0), pos(1), pos(2)),
         view_matrix, proj_matrix, viewport);