code cleanups - remove unneeded semicolons
This commit is contained in:
parent
721dace0c5
commit
ab3b3b3c5a
|
|
@ -639,11 +639,11 @@ void Torus(MeshType &m, float hRingRadius, float vRingRadius, int hRingDiv=24, i
|
||||||
template <class ScalarType>
|
template <class ScalarType>
|
||||||
static ScalarType _SQfnC(ScalarType a, ScalarType b){
|
static ScalarType _SQfnC(ScalarType a, ScalarType b){
|
||||||
return math::Sgn(cos(a))*pow(fabs(cos(a)),b);
|
return math::Sgn(cos(a))*pow(fabs(cos(a)),b);
|
||||||
};
|
}
|
||||||
template <class ScalarType>
|
template <class ScalarType>
|
||||||
static ScalarType _SQfnS(ScalarType a, ScalarType b){
|
static ScalarType _SQfnS(ScalarType a, ScalarType b){
|
||||||
return math::Sgn(sin(a))*pow(fabs(sin(a)),b);
|
return math::Sgn(sin(a))*pow(fabs(sin(a)),b);
|
||||||
};
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -119,6 +119,6 @@ struct _Face : public Face<_UsedTypes>{};
|
||||||
struct _Tetra : public TetraSimp<_UsedTypes>{};
|
struct _Tetra : public TetraSimp<_UsedTypes>{};
|
||||||
struct _HEdge : public HEdge<_UsedTypes>{};
|
struct _HEdge : public HEdge<_UsedTypes>{};
|
||||||
|
|
||||||
};
|
}
|
||||||
|
|
||||||
#endif // USED_TYPES_H
|
#endif // USED_TYPES_H
|
||||||
|
|
|
||||||
|
|
@ -121,7 +121,7 @@ namespace vcg {
|
||||||
solution_count++;
|
solution_count++;
|
||||||
}
|
}
|
||||||
return solution_count;
|
return solution_count;
|
||||||
}; // end of IntersectionSegmentSphere
|
} // end of IntersectionSegmentSphere
|
||||||
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|
@ -214,7 +214,7 @@ namespace vcg {
|
||||||
penetration_detected = (witness.SquaredNorm() <= (radius*radius));
|
penetration_detected = (witness.SquaredNorm() <= (radius*radius));
|
||||||
witness += center;
|
witness += center;
|
||||||
return penetration_detected;
|
return penetration_detected;
|
||||||
}; //end of IntersectionSphereTriangle
|
} //end of IntersectionSphereTriangle
|
||||||
|
|
||||||
/// intersection between line and plane
|
/// intersection between line and plane
|
||||||
template<class T>
|
template<class T>
|
||||||
|
|
|
||||||
|
|
@ -379,7 +379,7 @@ class Tetra
|
||||||
CoordType n1 = ((p2 - p0) ^ (p1 - p0)).normalized();
|
CoordType n1 = ((p2 - p0) ^ (p1 - p0)).normalized();
|
||||||
|
|
||||||
return M_PI - double(acos(n0 * n1));
|
return M_PI - double(acos(n0 * n1));
|
||||||
};
|
}
|
||||||
|
|
||||||
template <class TetraType>
|
template <class TetraType>
|
||||||
static typename TetraType::ScalarType SolidAngle(const TetraType &t, const size_t vidx)
|
static typename TetraType::ScalarType SolidAngle(const TetraType &t, const size_t vidx)
|
||||||
|
|
@ -390,7 +390,7 @@ class Tetra
|
||||||
ScalarType a2 = DihedralAngle(t, Tetra::EofV(vidx, 2));
|
ScalarType a2 = DihedralAngle(t, Tetra::EofV(vidx, 2));
|
||||||
|
|
||||||
return (a0 + a1 + a2) - M_PI;
|
return (a0 + a1 + a2) - M_PI;
|
||||||
};
|
}
|
||||||
|
|
||||||
template <class TetraType>
|
template <class TetraType>
|
||||||
static typename TetraType::ScalarType AspectRatio(const TetraType &t)
|
static typename TetraType::ScalarType AspectRatio(const TetraType &t)
|
||||||
|
|
|
||||||
|
|
@ -152,7 +152,7 @@ namespace vcg {
|
||||||
glVertex3f((float)b.min[0],(float)b.max[1],(float)b.max[2]);
|
glVertex3f((float)b.min[0],(float)b.max[1],(float)b.max[2]);
|
||||||
glEnd();
|
glEnd();
|
||||||
glPopAttrib();
|
glPopAttrib();
|
||||||
};
|
}
|
||||||
template <class T>
|
template <class T>
|
||||||
/// Funzione di utilita' per la visualizzazione in OpenGL (flat shaded)
|
/// Funzione di utilita' per la visualizzazione in OpenGL (flat shaded)
|
||||||
inline void glBoxFlat(Box3<T> const & b)
|
inline void glBoxFlat(Box3<T> const & b)
|
||||||
|
|
@ -190,7 +190,7 @@ inline void glBoxFlat(Box3<T> const & b)
|
||||||
glVertex3f(b.min[0], b.min[1], b.max[2]);
|
glVertex3f(b.min[0], b.min[1], b.max[2]);
|
||||||
glEnd();
|
glEnd();
|
||||||
glPopAttrib();
|
glPopAttrib();
|
||||||
};
|
}
|
||||||
|
|
||||||
|
|
||||||
template <class T>
|
template <class T>
|
||||||
|
|
@ -228,7 +228,7 @@ inline void glBoxClip(const Box3<T> & b)
|
||||||
glEnd();
|
glEnd();
|
||||||
|
|
||||||
glPopAttrib();
|
glPopAttrib();
|
||||||
};
|
}
|
||||||
template <class T>
|
template <class T>
|
||||||
inline void glPlane3( Plane3<T> p, Point3<T> c, T size ) {
|
inline void glPlane3( Plane3<T> p, Point3<T> c, T size ) {
|
||||||
Point3<T> w = p.Direction();
|
Point3<T> w = p.Direction();
|
||||||
|
|
|
||||||
|
|
@ -112,6 +112,6 @@ namespace vcg
|
||||||
return (_currentfreememory >= mem);
|
return (_currentfreememory >= mem);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
};
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
Loading…
Reference in New Issue