Commit 853805dd authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'fix_crash_vec2' into 'master'

Fix crash vec2

See merge request !16
parents cd820f70 c296b114
...@@ -139,7 +139,7 @@ inline void OMPropertyVisualizer<MeshT>::duplicateProperty_stage1() { ...@@ -139,7 +139,7 @@ inline void OMPropertyVisualizer<MeshT>::duplicateProperty_stage1() {
template <typename MeshT> template <typename MeshT>
QString OMPropertyVisualizer<MeshT>::getPropertyText(unsigned int index) QString OMPropertyVisualizer<MeshT>::getPropertyText(unsigned int /*index*/)
{ {
return ""; return "";
} }
...@@ -220,7 +220,7 @@ unsigned int OMPropertyVisualizer<MeshT>::getClosestPrimitiveId(unsigned int _fa ...@@ -220,7 +220,7 @@ unsigned int OMPropertyVisualizer<MeshT>::getClosestPrimitiveId(unsigned int _fa
} }
template <typename MeshT> template <typename MeshT>
unsigned int OMPropertyVisualizer<MeshT>::getClosestFaceId(unsigned int _face, ACG::Vec3d& _hitPoint) unsigned int OMPropertyVisualizer<MeshT>::getClosestFaceId(unsigned int _face, ACG::Vec3d& /*_hitPoint*/)
{ {
return _face; return _face;
} }
...@@ -405,25 +405,25 @@ void OMPropertyVisualizer<MeshT>::clearVertexProp() ...@@ -405,25 +405,25 @@ void OMPropertyVisualizer<MeshT>::clearVertexProp()
} }
template <typename MeshT> template <typename MeshT>
void OMPropertyVisualizer<MeshT>::setFacePropertyFromText(unsigned int index, QString text) void OMPropertyVisualizer<MeshT>::setFacePropertyFromText(unsigned int /*index*/, QString /*text*/)
{ {
emit log(LOGERR, "Setting face property not implemented"); emit log(LOGERR, "Setting face property not implemented");
} }
template <typename MeshT> template <typename MeshT>
void OMPropertyVisualizer<MeshT>::setEdgePropertyFromText(unsigned int index, QString text) void OMPropertyVisualizer<MeshT>::setEdgePropertyFromText(unsigned int /*index*/, QString /*text*/)
{ {
emit log(LOGERR, "Settingedge property not implemented"); emit log(LOGERR, "Settingedge property not implemented");
} }
template <typename MeshT> template <typename MeshT>
void OMPropertyVisualizer<MeshT>::setHalfedgePropertyFromText(unsigned int index, QString text) void OMPropertyVisualizer<MeshT>::setHalfedgePropertyFromText(unsigned int /*index*/, QString /*text*/)
{ {
emit log(LOGERR, "Setting halfedge property not implemented"); emit log(LOGERR, "Setting halfedge property not implemented");
} }
template <typename MeshT> template <typename MeshT>
void OMPropertyVisualizer<MeshT>::setVertexPropertyFromText(unsigned int index, QString text) void OMPropertyVisualizer<MeshT>::setVertexPropertyFromText(unsigned int /*index*/, QString /*text*/)
{ {
emit log(LOGERR, "Setting vertex property not implemented"); emit log(LOGERR, "Setting vertex property not implemented");
} }
......
...@@ -405,7 +405,7 @@ void OMPropertyVisualizerVector2<MeshT, VectorType>::visualizeHalfedgePropAsStro ...@@ -405,7 +405,7 @@ void OMPropertyVisualizerVector2<MeshT, VectorType>::visualizeHalfedgePropAsStro
typename MeshT::Point v1 = OMPropertyVisualizer<MeshT>::mesh->point(vh0) + 0.5 * (OMPropertyVisualizer<MeshT>::mesh->point(vh1) - OMPropertyVisualizer<MeshT>::mesh->point(vh0)); typename MeshT::Point v1 = OMPropertyVisualizer<MeshT>::mesh->point(vh0) + 0.5 * (OMPropertyVisualizer<MeshT>::mesh->point(vh1) - OMPropertyVisualizer<MeshT>::mesh->point(vh0));
VectorType v = OMPropertyVisualizer<MeshT>::mesh->property(prop, *he_it); VectorType v = OMPropertyVisualizer<MeshT>::mesh->property(prop, *he_it);
ACG::Vec3d normal = OMPropertyVisualizer<MeshT>::mesh->normal(*he_it); ACG::Vec3d normal = OMPropertyVisualizer<MeshT>::mesh->normal(OMPropertyVisualizer<MeshT>::mesh->face_handle(*he_it));
if (vectorWidget->normalize->isChecked() && v.sqrnorm() > 1e-12) if (vectorWidget->normalize->isChecked() && v.sqrnorm() > 1e-12)
v.normalize(); v.normalize();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment