diff options
Diffstat (limited to 'source/blender/freestyle')
26 files changed, 43 insertions, 43 deletions
diff --git a/source/blender/freestyle/intern/geometry/FastGrid.h b/source/blender/freestyle/intern/geometry/FastGrid.h index a3b20661fa6..367c233d799 100644 --- a/source/blender/freestyle/intern/geometry/FastGrid.h +++ b/source/blender/freestyle/intern/geometry/FastGrid.h @@ -60,7 +60,7 @@ class FastGrid : public Grid { */ virtual void configure(const Vec3r &orig, const Vec3r &size, unsigned nb); - /*! returns the cell whose coordinates are pased as argument */ + /*! returns the cell whose coordinates are passed as argument */ Cell *getCell(const Vec3u &p); /*! Fills the case p with the cell iCell */ diff --git a/source/blender/freestyle/intern/geometry/GeomUtils.cpp b/source/blender/freestyle/intern/geometry/GeomUtils.cpp index e6b1c947476..4c4f12faaba 100644 --- a/source/blender/freestyle/intern/geometry/GeomUtils.cpp +++ b/source/blender/freestyle/intern/geometry/GeomUtils.cpp @@ -488,7 +488,7 @@ bool intersectRayTriangle(const Vec3r &orig, } } else { - return false; // ray is parallell to the plane of the triangle + return false; // ray is parallel to the plane of the triangle } u *= inv_det; diff --git a/source/blender/freestyle/intern/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h index 6090eeb122a..0a9fa5dc85a 100644 --- a/source/blender/freestyle/intern/geometry/Grid.h +++ b/source/blender/freestyle/intern/geometry/Grid.h @@ -243,7 +243,7 @@ class Grid { /*! Fills the case corresponding to coord with the cell */ virtual void fillCell(const Vec3u &coord, Cell &cell) = 0; - /*! returns the cell whose coordinates are pased as argument */ + /*! returns the cell whose coordinates are passed as argument */ virtual Cell *getCell(const Vec3u &coord) = 0; /*! returns the cell containing the point passed as argument. diff --git a/source/blender/freestyle/intern/geometry/HashGrid.h b/source/blender/freestyle/intern/geometry/HashGrid.h index 73751d820ab..4bb92859775 100644 --- a/source/blender/freestyle/intern/geometry/HashGrid.h +++ b/source/blender/freestyle/intern/geometry/HashGrid.h @@ -81,7 +81,7 @@ class HashGrid : public Grid { */ virtual void configure(const Vec3r &orig, const Vec3r &size, unsigned nb); - /*! returns the cell whose coordinates are pased as argument */ + /*! returns the cell whose coordinates are passed as argument */ virtual Cell *getCell(const Vec3u &p) { Cell *found_cell = NULL; diff --git a/source/blender/freestyle/intern/geometry/VecMat.h b/source/blender/freestyle/intern/geometry/VecMat.h index acc593e8ac9..ee1cc42876c 100644 --- a/source/blender/freestyle/intern/geometry/VecMat.h +++ b/source/blender/freestyle/intern/geometry/VecMat.h @@ -474,7 +474,7 @@ template<class T> class HVec3 : public Vec<T, 4> { return this->_coord[3]; } - // Acces to non-homogeneous coordinates in 3D + // Access to non-homogeneous coordinates in 3D inline value_type x() const { return this->_coord[0] / this->_coord[3]; diff --git a/source/blender/freestyle/intern/image/GaussianFilter.h b/source/blender/freestyle/intern/image/GaussianFilter.h index f933e66dc94..f8e2524fa4f 100644 --- a/source/blender/freestyle/intern/image/GaussianFilter.h +++ b/source/blender/freestyle/intern/image/GaussianFilter.h @@ -39,7 +39,7 @@ namespace Freestyle { class GaussianFilter { protected: - /* The mask is a symetrical 2d array (with respect to the middle point). + /* The mask is a symmetrical 2d array (with respect to the middle point). * Thus, M(i,j) = M(-i,j) = M(i,-j) = M(-i,-j). * For this reason, to represent a NxN array (N odd), we only store a ((N+1)/2)x((N+1)/2) array. */ diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp index 10417c07f33..d2575b3b5e9 100644 --- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp +++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp @@ -197,7 +197,7 @@ static PyObject *Iterator_name_get(BPy_Iterator *self, void *UNUSED(closure)) } PyDoc_STRVAR(Iterator_is_begin_doc, - "True if the interator points the first element.\n" + "True if the iterator points to the first element.\n" "\n" ":type: bool"); @@ -207,7 +207,7 @@ static PyObject *Iterator_is_begin_get(BPy_Iterator *self, void *UNUSED(closure) } PyDoc_STRVAR(Iterator_is_end_doc, - "True if the interator points the last element.\n" + "True if the iterator points to the last element.\n" "\n" ":type: bool"); diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp index 13a981920f3..8428badc0fd 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp @@ -180,7 +180,7 @@ static PyObject *Interface0DIterator_u_get(BPy_Interface0DIterator *self, void * } PyDoc_STRVAR(Interface0DIterator_at_last_doc, - "True if the interator points to the last valid element.\n" + "True if the iterator points to the last valid element.\n" "For its counterpart (pointing to the first valid element), use it.is_begin.\n" "\n" ":type: bool"); diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp index 70de25aaf84..4269dfb3cdd 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp @@ -254,7 +254,7 @@ static PyObject *StrokeVertexIterator_u_get(BPy_StrokeVertexIterator *self, void } PyDoc_STRVAR(StrokeVertexIterator_at_last_doc, - "True if the interator points to the last valid element.\n" + "True if the iterator points to the last valid element.\n" "For its counterpart (pointing to the first valid element), use it.is_begin.\n" "\n" ":type: bool"); diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h index 5163a0af07e..183464e697d 100644 --- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h +++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h @@ -42,7 +42,7 @@ class IndexedFaceSet : public Rep { }; /*! User-specified face and edge marks for feature edge detection */ - /* XXX Why in hel not use an enum here too? */ + /* XXX Why in hell not use an enum here too? */ typedef unsigned char FaceEdgeMark; static const FaceEdgeMark FACE_MARK = 1 << 0; static const FaceEdgeMark EDGE_MARK_V1V2 = 1 << 1; @@ -167,8 +167,8 @@ class IndexedFaceSet : public Rep { return *this; } - /*! Desctructor - * desallocates all the resources + /*! Destructor + * deallocates all the resources */ virtual ~IndexedFaceSet(); diff --git a/source/blender/freestyle/intern/scene_graph/NodeGroup.h b/source/blender/freestyle/intern/scene_graph/NodeGroup.h index f40deb13a3e..5ef16255e46 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeGroup.h +++ b/source/blender/freestyle/intern/scene_graph/NodeGroup.h @@ -54,7 +54,7 @@ class NodeGroup : public Node { /*! Detaches all the children */ virtual void DetachChildren(); - /*! Detached the sepcified child */ + /*! Detached the specified child */ virtual void DetachChild(Node *iChild); /*! Retrieve children */ diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp index 843395c136c..2c014c86d36 100644 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp @@ -57,7 +57,7 @@ int ConstantThicknessShader::shade(Stroke &stroke) const int i = 0; int size = stroke.strokeVerticesSize(); for (v = stroke.strokeVerticesBegin(), vend = stroke.strokeVerticesEnd(); v != vend; ++v) { - // XXX What's the use of i here? And is not the thickness always overriden by the last line of + // XXX What's the use of i here? And is not the thickness always overridden by the last line of // the loop? if ((1 == i) || (size - 2 == i)) { v->attribute().setThickness(_thickness / 4.0, _thickness / 4.0); @@ -77,7 +77,7 @@ int ConstantExternThicknessShader::shade(Stroke &stroke) const int i = 0; int size = stroke.strokeVerticesSize(); for (v = stroke.strokeVerticesBegin(), vend = stroke.strokeVerticesEnd(); v != vend; ++v) { - // XXX What's the use of i here? And is not the thickness always overriden by the last line of + // XXX What's the use of i here? And is not the thickness always overridden by the last line of // the loop? if ((1 == i) || (size - 2 == i)) { v->attribute().setThickness(_thickness / 2.0, 0); @@ -156,7 +156,7 @@ int LengthDependingThicknessShader::shade(Stroke &stroke) const int i = 0; int size = stroke.strokeVerticesSize(); for (v = stroke.strokeVerticesBegin(), vend = stroke.strokeVerticesEnd(); v != vend; ++v) { - // XXX What's the use of i here? And is not the thickness always overriden by the last line of + // XXX What's the use of i here? And is not the thickness always overridden by the last line of // the loop? if ((1 == i) || (size - 2 == i)) { v->attribute().setThickness(thickness / 4.0, thickness / 4.0); @@ -427,7 +427,7 @@ int BezierCurveShader::shade(Stroke &stroke) const int newsize = stroke.strokeVerticesSize(); int nExtraVertex = 0; if (newsize < originalSize) { - cerr << "Warning: unsufficient resampling" << endl; + cerr << "Warning: insufficient resampling" << endl; } else { nExtraVertex = newsize - originalSize; diff --git a/source/blender/freestyle/intern/stroke/Chain.h b/source/blender/freestyle/intern/stroke/Chain.h index 2c19748771e..7cd0c64cc16 100644 --- a/source/blender/freestyle/intern/stroke/Chain.h +++ b/source/blender/freestyle/intern/stroke/Chain.h @@ -39,7 +39,7 @@ class Chain : public Curve { _fedgeB; // the last FEdge of the ViewEdge passed to the last call for push_viewedge_back(). public: - /*! Defult constructor. */ + /*! Default constructor. */ Chain() : Curve() { _splittingId = 0; diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h index 3e079256161..7eadfa830ce 100644 --- a/source/blender/freestyle/intern/stroke/Curve.h +++ b/source/blender/freestyle/intern/stroke/Curve.h @@ -205,7 +205,7 @@ class CurvePoint : public Interface0D { Vec3r _Point3d; public: - /*! Defult Constructor. */ + /*! Default Constructor. */ CurvePoint(); /*! Builds a CurvePoint from two SVertex and an interpolation parameter. diff --git a/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h b/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h index 9999950e240..662222524f1 100644 --- a/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h +++ b/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h @@ -50,8 +50,8 @@ class CurvePoint_nonconst_traits : public Nonconst_traits<CurvePoint *> { /* */ /**********************************/ -/*! iterator on a curve. Allows an iterating outside initial vertices. A CurvePoint is - * instanciated an returned when the iterator is dereferenced. +/*! iterator on a curve. Allows an iterating outside initial vertices. A CurvePoint is + * instantiated and returned when the iterator is dereferenced. */ template<class Traits> class __point_iterator : public IteratorBase<Traits, BidirectionalIteratorTag_Traits> { diff --git a/source/blender/freestyle/intern/stroke/CurveIterators.h b/source/blender/freestyle/intern/stroke/CurveIterators.h index 0ebbd0509ca..3ac7ede0954 100644 --- a/source/blender/freestyle/intern/stroke/CurveIterators.h +++ b/source/blender/freestyle/intern/stroke/CurveIterators.h @@ -30,7 +30,7 @@ namespace Freestyle { namespace CurveInternal { /*! iterator on a curve. Allows an iterating outside - * initial vertices. A CurvePoint is instanciated an returned + * initial vertices. A CurvePoint is instantiated an returned * when the iterator is dereferenced. */ diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index ec722516d2a..a4c5af1d10c 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -653,7 +653,7 @@ class Stroke : public Interface1D { return _textureId; } - /*! Returns the spacing of texture coordinates along the stroke lenght */ + /*! Returns the spacing of texture coordinates along the stroke length */ inline float getTextureStep() { return _textureStep; diff --git a/source/blender/freestyle/intern/system/BaseIterator.h b/source/blender/freestyle/intern/system/BaseIterator.h index 3826a129a1c..651f2bf4387 100644 --- a/source/blender/freestyle/intern/system/BaseIterator.h +++ b/source/blender/freestyle/intern/system/BaseIterator.h @@ -30,7 +30,7 @@ namespace Freestyle { -// use for iterators defintions +// use for iterators definitions template<class Element> class Nonconst_traits; template<class Element> class Const_traits { diff --git a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp index 8e10d06d623..2df5ecd0867 100644 --- a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp +++ b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp @@ -131,7 +131,7 @@ void CulledOccluderSource::cullViewEdges(ViewMap &viewMap, bool extensiveFEdgeSe GridHelpers::getDefaultViewProscenium(occluderProscenium); // XXX Freestyle is inconsistent in its use of ViewMap::viewedges_container and - // vector<ViewEdge*>::iterator. Probably all occurences of vector<ViewEdge*>::iterator should be + // vector<ViewEdge*>::iterator. Probably all occurrences of vector<ViewEdge*>::iterator should be // replaced ViewMap::viewedges_container throughout the code. For each view edge ViewMap::viewedges_container::iterator ve, veend; @@ -144,7 +144,7 @@ void CulledOccluderSource::cullViewEdges(ViewMap &viewMap, bool extensiveFEdgeSe // If none exists, find the feature edge with center point closest to viewport origin. // Expand occluder proscenium to enclose center point. - // For each feature edge, while bestOccluderTarget not found and view edge not visibile + // For each feature edge, while bestOccluderTarget not found and view edge not visible bool bestOccluderTargetFound = false; FEdge *bestOccluderTarget = NULL; real bestOccluderDistance = 0.0; diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp index 5c3ba1c3db3..3788b5e3545 100644 --- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp @@ -132,7 +132,7 @@ void FEdgeXDetector::preProcessShape(WXShape *iWShape) vector<WFace *> &wfaces = iWShape->GetFaceList(); vector<WFace *>::iterator f, fend; - // view dependant stuff + // view dependent stuff for (f = wfaces.begin(), fend = wfaces.end(); f != fend; ++f) { preProcessFace((WXFace *)(*f)); } @@ -226,7 +226,7 @@ void FEdgeXDetector::computeCurvatures(WXVertex *vertex) _minK1 = absK1; } } - // view dependant + // view dependent C = vertex->curvatures(); if (C == 0) { return; diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h index 5e9edd234ef..4168cce6bd8 100644 --- a/source/blender/freestyle/intern/view_map/Silhouette.h +++ b/source/blender/freestyle/intern/view_map/Silhouette.h @@ -168,7 +168,7 @@ class SVertex : public Interface0D { public: /*! A field that can be used by the user to store any data. - * This field must be reseted afterwards using ResetUserData(). + * This field must be reset afterwards using ResetUserData(). */ void *userdata; @@ -535,7 +535,7 @@ class FEdge : public Interface1D { public: /*! A field that can be used by the user to store any data. - * This field must be reseted afterwards using ResetUserData(). + * This field must be reset afterwards using ResetUserData(). */ void *userdata; diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp index fde4ee7e476..d024c360e3f 100644 --- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp @@ -37,7 +37,7 @@ void ViewEdgeXBuilder::Init(ViewShape *oVShape) return; } - // for design conveniance, we store the current SShape. + // for design convenience, we store the current SShape. _pCurrentSShape = oVShape->sshape(); if (0 == _pCurrentSShape) { return; @@ -627,12 +627,12 @@ OWXEdge ViewEdgeXBuilder::FindNextWEdge(const OWXEdge &iEdge) } if (wxe->GetaVertex() == v) { - // That means that the face necesarily lies on the edge left. + // That means that the face necessarily lies on the edge left. // So the vertex order is OK. return OWXEdge(wxe, true); } else { - // That means that the face necesarily lies on the edge left. + // That means that the face necessarily lies on the edge left. // So the vertex order is OK. return OWXEdge(wxe, false); } diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h index 26f114497c0..b1934d08376 100644 --- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h +++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h @@ -272,11 +272,11 @@ class ViewEdgeXBuilder { FEdge *BuildSharpFEdge(FEdge *feprevious, const OWXEdge &iwe); // GENERAL // - /*! Instanciate a SVertex */ + /*! Instantiate a SVertex */ SVertex *MakeSVertex(Vec3r &iPoint); - /*! Instanciate a SVertex if it hasn't been already created */ + /*! Instantiate a SVertex if it hasn't been already created */ SVertex *MakeSVertex(Vec3r &iPoint, bool shared); - /*! instanciate a ViewVertex from a SVertex, if it doesn't exist yet */ + /*! instantiate a ViewVertex from a SVertex, if it doesn't exist yet */ ViewVertex *MakeViewVertex(SVertex *iSVertex); // oldtmp values diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h index a6ca4e3c072..83c45be8c61 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.h +++ b/source/blender/freestyle/intern/view_map/ViewMap.h @@ -81,7 +81,7 @@ class ViewMap { public: /*! A field that can be used by the user to store any data. - * This field must be reseted afterwards using ResetUserData(). + * This field must be reset afterwards using ResetUserData(). */ void *userdata; @@ -292,7 +292,7 @@ class ViewVertex : public Interface0D { public: /*! A field that can be used by the user to store any data. - * This field must be reseted afterwards using ResetUserData(). + * This field must be reset afterwards using ResetUserData(). */ void *userdata; @@ -962,7 +962,7 @@ class ViewEdge : public Interface1D { public: /*! A field that can be used by the user to store any data. - * This field must be reseted afterwards using ResetUserData(). + * This field must be reset afterwards using ResetUserData(). */ void *userdata; @@ -1414,7 +1414,7 @@ class ViewShape { public: /*! A field that can be used by the user to store any data. - * This field must be reseted afterwards using ResetUserData(). + * This field must be reset afterwards using ResetUserData(). */ void *userdata; diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp index aaab3936fa6..c056a25e755 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp @@ -1137,7 +1137,7 @@ void ViewMapBuilder::CullViewEdges(ViewMap *ioViewMap, // If none exists, find the feature edge with center point closest to viewport origin. // Expand occluder proscenium to enclose center point. - // For each feature edge, while bestOccluderTarget not found and view edge not visibile + // For each feature edge, while bestOccluderTarget not found and view edge not visible bool bestOccluderTargetFound = false; FEdge *bestOccluderTarget = NULL; real bestOccluderDistance = 0.0; diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp index a293d2da62b..591d6518741 100644 --- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp +++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp @@ -546,7 +546,7 @@ void gts_vertex_principal_directions(WVertex *v, Vec3r Kh, real Kg, Vec3r &e1, V e1[2] = eig[0] * basis1[2] + eig[1] * basis2[2]; e1.normalize(); - /* make N,e1,e2 a right handed coordinate sytem */ + /* make N,e1,e2 a right handed coordinate system */ e2 = N ^ e1; e2.normalize(); } |