Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/freestyle/intern/view_map')
-rw-r--r--source/blender/freestyle/intern/view_map/Functions1D.h6
-rw-r--r--source/blender/freestyle/intern/view_map/Interface1D.h10
-rw-r--r--source/blender/freestyle/intern/view_map/Silhouette.h16
-rw-r--r--source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp2
-rw-r--r--source/blender/freestyle/intern/view_map/ViewMap.h12
-rw-r--r--source/blender/freestyle/intern/view_map/ViewMapIterators.h2
6 files changed, 24 insertions, 24 deletions
diff --git a/source/blender/freestyle/intern/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h
index 532e89261ce..e45bc459bf0 100644
--- a/source/blender/freestyle/intern/view_map/Functions1D.h
+++ b/source/blender/freestyle/intern/view_map/Functions1D.h
@@ -328,7 +328,7 @@ class GetProjectedZF1D : public UnaryFunction1D<double> {
};
// Orientation2DF1D
-/** Returns the 2D orientation as a Vec2f*/
+/** Returns the 2D orientation as a #Vec2f. */
class Orientation2DF1D : public UnaryFunction1D<Vec2f> {
private:
Functions0D::VertexOrientation2DF0D _func;
@@ -525,7 +525,7 @@ class Curvature2DAngleF1D : public UnaryFunction1D<double> {
return "Curvature2DAngleF1D";
}
- /** the () operator.*/
+ /** the () operator. */
int operator()(Interface1D &inter)
{
result = integrate(_fun, inter.verticesBegin(), inter.verticesEnd(), _integration);
@@ -554,7 +554,7 @@ class Normal2DF1D : public UnaryFunction1D<Vec2f> {
return "Normal2DF1D";
}
- /** the () operator.*/
+ /** the () operator. */
int operator()(Interface1D &inter)
{
result = integrate(_fun, inter.verticesBegin(), inter.verticesEnd(), _integration);
diff --git a/source/blender/freestyle/intern/view_map/Interface1D.h b/source/blender/freestyle/intern/view_map/Interface1D.h
index 8d1879af31b..75ad71a373d 100644
--- a/source/blender/freestyle/intern/view_map/Interface1D.h
+++ b/source/blender/freestyle/intern/view_map/Interface1D.h
@@ -46,15 +46,15 @@ namespace Freestyle {
*/
typedef enum {
MEAN, /**< The value computed for the 1D element is the mean of the values obtained for the 0D
- elements.*/
+ elements. */
MIN, /**< The value computed for the 1D element is the minimum of the values obtained for the 0D
- elements.*/
+ elements. */
MAX, /**< The value computed for the 1D element is the maximum of the values obtained for the 0D
- elements.*/
+ elements. */
FIRST, /**< The value computed for the 1D element is the first of the values obtained for the 0D
- elements.*/
+ elements. */
LAST, /**< The value computed for the 1D element is the last of the values obtained for the 0D
- elements.*/
+ elements. */
} IntegrationType;
/** Returns a single value from a set of values evaluated at each 0D element of this 1D element.
diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h
index 10544f5e883..0ec9144595c 100644
--- a/source/blender/freestyle/intern/view_map/Silhouette.h
+++ b/source/blender/freestyle/intern/view_map/Silhouette.h
@@ -171,7 +171,7 @@ class SVertex : public Interface0D {
*/
void *userdata;
- /** Default constructor.*/
+ /** Default constructor. */
inline SVertex()
{
_Id = 0;
@@ -326,7 +326,7 @@ class SVertex : public Interface0D {
}
#if 0
- /* Fredo's normal and curvature*/
+ /* Fredo's normal and curvature. */
void setCurvatureFredo(real c)
{
_curvatureFredo = c;
@@ -941,7 +941,7 @@ class FEdge : public Interface1D {
inline Vec3r curvature2d_as_vector(int iCombination = 0) const;
- /* angle in degrees*/
+ /* Angle in degrees. */
inline real curvature2d_as_angle(int iCombination = 0) const;
#endif
@@ -1259,13 +1259,13 @@ class FEdgeSharp : public FEdge {
_bNormal = iNormal;
}
- /** Sets the index of the material lying on the right of the FEdge.*/
+ /** Sets the index of the material lying on the right of the FEdge. */
inline void setaFrsMaterialIndex(unsigned i)
{
_aFrsMaterialIndex = i;
}
- /** Sets the index of the material lying on the left of the FEdge.*/
+ /** Sets the index of the material lying on the left of the FEdge. */
inline void setbFrsMaterialIndex(unsigned i)
{
_bFrsMaterialIndex = i;
@@ -1917,19 +1917,19 @@ class SShape {
}
/* Modififers */
- /** Sets the Id of the shape.*/
+ /** Sets the Id of the shape. */
inline void setId(Id id)
{
_Id = id;
}
- /** Sets the name of the shape.*/
+ /** Sets the name of the shape. */
inline void setName(const string &name)
{
_Name = name;
}
- /** Sets the library path of the shape.*/
+ /** Sets the library path of the shape. */
inline void setLibraryPath(const string &path)
{
_LibraryPath = path;
diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
index 8d5955fc0ae..24c56572803 100644
--- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
@@ -601,7 +601,7 @@ OWXEdge ViewEdgeXBuilder::FindNextWEdge(const OWXEdge &iEdge)
}
if (((WXVertex *)v)->isFeature()) {
- return nullptr; /* XXX eeek? NULL? OWXEdge(NULL, true/false)?*/
+ return nullptr; /* XXX eeek? NULL? OWXEdge(NULL, true/false)? */
}
int faceMarks = retrieveFaceMarks(iEdge.e);
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h
index a3ef5eed6d8..bd7edad7642 100644
--- a/source/blender/freestyle/intern/view_map/ViewMap.h
+++ b/source/blender/freestyle/intern/view_map/ViewMap.h
@@ -56,7 +56,7 @@ class ViewEdge;
class ViewShape;
class TVertex;
-/** Class defining the ViewMap.*/
+/** Class defining the ViewMap. */
class ViewMap {
public:
typedef vector<ViewEdge *> viewedges_container;
@@ -295,7 +295,7 @@ class ViewVertex : public Interface0D {
*/
void *userdata;
- /** Default constructor.*/
+ /** Default constructor. */
inline ViewVertex()
{
userdata = NULL;
@@ -483,7 +483,7 @@ class TVertex : public ViewVertex {
_sortedEdges; // the list of the four ViewEdges, ordered in CCW order (in the image plan)
public:
- /** Default constructor.*/
+ /** Default constructor. */
inline TVertex() : ViewVertex(Nature::T_VERTEX)
{
_FrontSVertex = NULL;
@@ -758,7 +758,7 @@ class NonTVertex : public ViewVertex {
edges_container _ViewEdges;
public:
- /** Default constructor.*/
+ /** Default constructor. */
inline NonTVertex() : ViewVertex(Nature::NON_T_VERTEX)
{
_SVertex = NULL;
@@ -1182,7 +1182,7 @@ class ViewEdge : public Interface1D {
_FEdgeB = iFEdge;
}
- /** Sets the ViewShape to which this ViewEdge belongs to.*/
+ /** Sets the ViewShape to which this ViewEdge belongs to. */
inline void setShape(ViewShape *iVShape)
{
_Shape = iVShape;
@@ -1417,7 +1417,7 @@ class ViewShape {
*/
void *userdata;
- /** Default constructor.*/
+ /** Default constructor. */
inline ViewShape()
{
userdata = NULL;
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIterators.h b/source/blender/freestyle/intern/view_map/ViewMapIterators.h
index 7f98c2745f4..1df78e71d9d 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapIterators.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapIterators.h
@@ -208,7 +208,7 @@ class orientedViewEdgeIterator : public Iterator {
}
public:
- /** increments.*/
+ /** increments. */
virtual inline int increment()
{
if (_Nature & Nature::T_VERTEX) {