griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Added support for WITH_CXX_GUARDEDALLOC build option to the Freestyle module.

Browse Source
This commit is contained in:
Tamito Kajiyama
2013-05-13 22:58:27 +00:00
parent 1a91af691e
commit 6ea2dec330
67 changed files with 731 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/freestyle/intern/application/AppConfig.h
View File

@@ -32,6 +32,10 @@
#include "../system/FreestyleConfig.h"
#include "../system/Precision.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
namespace Freestyle {
@@ -68,6 +72,10 @@ public:
const string& getHomeDir() const {return _HomeDir;}
static string getEnvVar(const string& iEnvVarName);
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Config:Path")
#endif
};
//

9
source/blender/freestyle/intern/application/AppView.h
View File

@@ -31,6 +31,10 @@
#include "../scene_graph/NodeDrawingStyle.h"
#include "../system/Precision.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
using namespace Geometry;
@@ -228,6 +232,11 @@ protected:
bool _Draw3DScene;
NodeGroup _p2DNode;
NodeDrawingStyle *_p2DSelectionNode;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:AppView")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/application/Controller.h
View File

@@ -45,6 +45,10 @@ extern "C" {
#include "DNA_scene_types.h"
}
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class AppView;
@@ -238,6 +242,11 @@ private:
bool _ComputeSteerableViewMap;
FEdgeXDetector edgeDetector;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Controller")
#endif
};
extern Controller *g_pController;

9
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
View File

@@ -53,6 +53,10 @@ extern "C" {
#include "BLI_math.h"
}
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class NodeGroup;
@@ -120,6 +124,11 @@ protected:
float _z_near, _z_far;
RenderMonitor *_pRenderMonitor;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BlenderFileLoader")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/geometry/BBox.h
View File

@@ -28,6 +28,10 @@
* \date 22/05/2003
*/
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
template <class Point>
@@ -130,6 +134,11 @@ private:
Point _min;
Point _max;
bool _empty;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BBox")
#endif
};
template <class Point>

13
source/blender/freestyle/intern/geometry/Bezier.h
View File

@@ -34,6 +34,10 @@
#include "../system/FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
using namespace Geometry;
@@ -60,8 +64,11 @@ public:
{
return _Vertices;
}
};
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BezierCurveSegment")
#endif
};
class LIB_GEOMETRY_EXPORT BezierCurve
{
@@ -86,6 +93,10 @@ public:
{
return _Segments;
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BezierCurve")
#endif
};
} /* namespace Freestyle */

12
source/blender/freestyle/intern/geometry/GeomCleaner.h
View File

@@ -32,6 +32,10 @@
#include "../system/FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
using namespace Geometry;
@@ -128,6 +132,10 @@ public:
*/
static void CleanIndexedVertexArray(const float *iVertices, unsigned iVSize, const unsigned *iIndices,
unsigned iISize, real **oVertices, unsigned *oVSize, unsigned **oIndices);
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:GeomCleaner")
#endif
};
@@ -210,6 +218,10 @@ public:
{
return (_Vector == v._Vector);
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:IndexedVertex")
#endif
};
#if 0

23
source/blender/freestyle/intern/geometry/Grid.h
View File

@@ -45,6 +45,10 @@ extern "C" {
#include "BLI_utildefines.h"
}
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
namespace Freestyle {
@@ -83,6 +87,11 @@ public:
private:
Vec3r _orig;
OccludersSet _occluders;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Cell")
#endif
};
@@ -100,6 +109,10 @@ public:
virtual bool stop() {
return false;
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:GridVisitor")
#endif
};
/*! Gathers all the occluders belonging to the cells traversed by the ray */
@@ -357,6 +370,11 @@ protected:
//OccludersSet _ray_occluders; // Set storing the occluders contained in the cells traversed by a ray
OccludersSet _occluders; // List of all occluders inserted in the grid
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Grid")
#endif
};
//
@@ -375,6 +393,11 @@ private:
Polygon3r *firstOccluderFromNextCell();
Grid& grid;
OccludersSet::iterator it, end;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:VirtualOccludersSet")
#endif
};
} /* namespace Freestyle */

8
source/blender/freestyle/intern/geometry/GridHelpers.h
View File

@@ -37,6 +37,10 @@
#include "../winged_edge/WEdge.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
namespace GridHelpers {
@@ -121,6 +125,10 @@ class Transform
public:
virtual ~Transform () = 0;
virtual Vec3r operator()(const Vec3r& point) const = 0;
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:GridHelpers:Transform")
#endif
};
inline bool insideProscenium (const real proscenium[4], const Polygon3r& polygon)

9
source/blender/freestyle/intern/geometry/Noise.h
View File

@@ -32,6 +32,10 @@
#include "../system/FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
namespace Freestyle {
@@ -75,6 +79,11 @@ private:
float g1[_NOISE_B + _NOISE_B + 2];
/* UNUSED */
// int start;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Noise")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/geometry/Polygon.h
View File

@@ -33,6 +33,10 @@
#include "Geom.h"
#include "GeomUtils.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
namespace Freestyle {
@@ -165,6 +169,11 @@ protected:
Point _min;
Point _max;
unsigned _id;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Geometry:Polygon")
#endif
};

18
source/blender/freestyle/intern/geometry/SweepLine.h
View File

@@ -31,6 +31,10 @@
#include <list>
#include <vector>
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
/*! Class to define the intersection berween two segments*/
@@ -74,6 +78,10 @@ public:
Edge *EdgeB; // second segment
real tA; // parameter defining the intersection point with respect to the segment EdgeA.
real tB; // parameter defining the intersection point with respect to the segment EdgeB.
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Intersection")
#endif
};
#ifdef _MSC_VER
@@ -180,6 +188,11 @@ private:
Point B;
std::vector<Intersection<Segment<T, Point> >*> _Intersections; // list of intersections parameters
bool _order; // true if A and B are in the same order than _edge.A and _edge.B. false otherwise.
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Segment")
#endif
};
#ifdef _MSC_VER
@@ -322,6 +335,11 @@ private:
std::list<Segment<T, Point> *> _set; // set of active edges for a given position of the sweep line
std::vector<Segment<T, Point> *> _IntersectedEdges; // the list of intersected edges
std::vector<Intersection<Segment<T, Point> > *> _Intersections; // the list of all intersections.
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SweepLine")
#endif
};
} /* namespace Freestyle */

14
source/blender/freestyle/intern/geometry/VecMat.h
View File

@@ -34,6 +34,10 @@
#include <math.h>
#include <vector>
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
namespace VecMat {
@@ -272,6 +276,11 @@ protected:
enum {
_dim = N,
};
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:VecMat:Vec")
#endif
};
@@ -755,6 +764,11 @@ public:
protected:
value_type _coord[_SIZE];
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:VecMat:Matrix")
#endif
};
#undef _SIZE

9
source/blender/freestyle/intern/geometry/normal_cycle.h
View File

@@ -43,6 +43,10 @@
#include "../system/FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
using namespace Geometry;
@@ -123,6 +127,11 @@ private:
real eigen_value_[3];
real M_[6];
int i_[3];
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:OGF:NormalCycle")
#endif
};
inline void NormalCycle::accumulate_dihedral_angle(const Vec3r& edge, const double beta, double neigh_area)

9
source/blender/freestyle/intern/image/GaussianFilter.h
View File

@@ -37,6 +37,10 @@ extern "C" {
#include "BLI_math.h"
}
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class LIB_IMAGE_EXPORT GaussianFilter
@@ -109,6 +113,11 @@ public:
protected:
void computeMask();
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:GaussianFilter")
#endif
};
/*

9
source/blender/freestyle/intern/image/Image.h
View File

@@ -30,6 +30,10 @@
#include <string.h> // for memcpy
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
//
@@ -167,6 +171,11 @@ protected:
unsigned _storedHeight;
unsigned _Ox; // origin of the stored part
unsigned _Oy; // origin of the stored part
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:FrsImage")
#endif
};

8
source/blender/freestyle/intern/image/ImagePyramid.h
View File

@@ -32,6 +32,10 @@
#include "../system/FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class GrayImage;
@@ -78,6 +82,10 @@ public:
{
return _levels.size();
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ImagePyramid")
#endif
};
class LIB_IMAGE_EXPORT GaussianPyramid : public ImagePyramid

9
source/blender/freestyle/intern/scene_graph/DrawingStyle.h
View File

@@ -28,6 +28,10 @@
* \date 10/10/2002
*/
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class DrawingStyle
@@ -100,6 +104,11 @@ private:
float LineWidth;
float PointSize;
bool LightingEnabled;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:DrawingStyle")
#endif
};
DrawingStyle::DrawingStyle(const DrawingStyle& iBrother)

9
source/blender/freestyle/intern/scene_graph/FrsMaterial.h
View File

@@ -30,6 +30,10 @@
#include "../system/FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
/*! Class defining a material */
@@ -253,6 +257,11 @@ private:
float Ambient[4];
float Emission[4];
float Shininess;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:FrsMaterial")
#endif
};
FrsMaterial::FrsMaterial()

8
source/blender/freestyle/intern/scene_graph/SceneVisitor.h
View File

@@ -30,6 +30,10 @@
#include "../system/FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
#define VISIT_COMPLETE_DEF(type) \
@@ -92,6 +96,10 @@ public:
VISIT_COMPLETE_DEF(IndexedFaceSet)
VISIT_COMPLETE_DEF(DrawingStyle)
VISIT_COMPLETE_DEF(FrsMaterial)
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SceneVisitor")
#endif
};
} /* namespace Freestyle */

8
source/blender/freestyle/intern/stroke/Canvas.h
View File

@@ -40,6 +40,10 @@
#include "../system/FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
using namespace Geometry;
@@ -239,6 +243,10 @@ public:
void resetModified(bool iMod = false);
void causalStyleModules(std::vector<unsigned>& vec, unsigned index = 0);
void setModified(unsigned index, bool b);
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Canvas")
#endif
};
} /* namespace Freestyle */

4
source/blender/freestyle/intern/stroke/Curve.h
View File

@@ -41,6 +41,10 @@
#include "../system/BaseIterator.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
namespace Freestyle {

8
source/blender/freestyle/intern/stroke/Modifiers.h
View File

@@ -30,6 +30,10 @@
#include "TimeStamp.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
/* ----------------------------------------- *
@@ -49,6 +53,10 @@ struct EdgeModifier : public unary_function<Edge, void>
/*! the () operator */
virtual void operator()(Edge& iEdge) {}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:EdgeModifier")
#endif
};
/*! Modifier that sets the time stamp of an Interface1D to the time stamp of the system. */

9
source/blender/freestyle/intern/stroke/Module.h
View File

@@ -31,6 +31,10 @@
#include "Canvas.h"
#include "StyleModule.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class Module
@@ -72,6 +76,11 @@ private:
Canvas *canvas = Canvas::getInstance();
return canvas->getCurrentStyleModule();
}
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Module")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/stroke/Operators.h
View File

@@ -43,6 +43,10 @@
#include "../view_map/Interface1D.h"
#include "../view_map/ViewMap.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
/*! Class defining the operators used in a style module.
@@ -264,6 +268,11 @@ private:
static I1DContainer _current_chains_set;
static I1DContainer *_current_set;
static StrokesContainer _current_strokes_set;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Operators")
#endif
};
} /* namespace Freestyle */

14
source/blender/freestyle/intern/stroke/Predicates0D.h
View File

@@ -33,6 +33,10 @@
#include "../view_map/Functions0D.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
//
@@ -76,6 +80,11 @@ public:
{
return Director_BPy_UnaryPredicate0D___call__(this, it);
}
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:UnaryPredicate0D")
#endif
};
@@ -122,6 +131,11 @@ public:
{
return Director_BPy_BinaryPredicate0D___call__(this, inter1, inter2);
}
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BinaryPredicate0D")
#endif
};

12
source/blender/freestyle/intern/stroke/Predicates1D.h
View File

@@ -40,6 +40,10 @@
#include "../view_map/Interface1D.h"
#include "../view_map/Functions1D.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
//
@@ -83,6 +87,10 @@ public:
{
return Director_BPy_UnaryPredicate1D___call__(this, inter);
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:UnaryPredicate1D")
#endif
};
@@ -129,6 +137,10 @@ public:
{
return Director_BPy_BinaryPredicate1D___call__(this, inter1, inter2);
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BinaryPredicate1D")
#endif
};

9
source/blender/freestyle/intern/stroke/Stroke.h
View File

@@ -39,6 +39,10 @@
#include "../system/FreestyleConfig.h"
#include "../system/StringUtils.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
//
@@ -297,6 +301,11 @@ private:
realMap *_userAttributesReal;
Vec2fMap *_userAttributesVec2f;
Vec3fMap *_userAttributesVec3f;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeAttribute")
#endif
};

8
source/blender/freestyle/intern/stroke/StrokeLayer.h
View File

@@ -30,6 +30,10 @@
#include <deque>
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class Stroke;
@@ -96,6 +100,10 @@ public:
{
_strokes.push_back(iStroke);
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeLayer")
#endif
};
} /* namespace Freestyle */

13
source/blender/freestyle/intern/stroke/StrokeRenderer.h
View File

@@ -38,6 +38,10 @@
#include "../system/FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
/**********************************/
@@ -107,6 +111,11 @@ protected:
static string _patterns_path;
static string _brushes_path;
unsigned int _defaultTextureId;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:TextureManager")
#endif
};
@@ -135,6 +144,10 @@ public:
//static unsigned int getTextureIndex(unsigned int index);
static TextureManager *_textureManager;
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeRenderer")
#endif
};
} /* namespace Freestyle */

17
source/blender/freestyle/intern/stroke/StrokeRep.h
View File

@@ -32,6 +32,10 @@
#include "../geometry/Geom.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
using namespace Geometry;
@@ -114,6 +118,11 @@ protected:
Vec2r _texCoord;
Vec3r _color;
float _alpha;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeVertexRep")
#endif
};
class Strip
@@ -147,6 +156,10 @@ public:
{
return _vertices;
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Strip")
#endif
};
class StrokeRep
@@ -207,6 +220,10 @@ public:
{
_textureId = textureId;
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeRep")
#endif
};
} /* namespace Freestyle */

8
source/blender/freestyle/intern/stroke/StrokeShader.h
View File

@@ -34,6 +34,10 @@
#include "../python/Director.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
//
@@ -97,6 +101,10 @@ public:
{
return Director_BPy_StrokeShader_shade( const_cast<StrokeShader *>(this), ioStroke);
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeShader")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/stroke/StrokeTesselator.h
View File

@@ -32,6 +32,10 @@
#include "../scene_graph/LineRep.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class StrokeTesselator
@@ -68,6 +72,11 @@ public:
private:
FrsMaterial _FrsMaterial;
bool _overloadFrsMaterial;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeTesselator")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/stroke/StyleModule.h
View File

@@ -39,6 +39,10 @@
#include "../system/Interpreter.h"
#include "../system/StringUtils.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
namespace Freestyle {
@@ -174,6 +178,11 @@ private:
protected:
Interpreter *_inter;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StyleModule")
#endif
};
} /* namespace Freestyle */

25
source/blender/freestyle/intern/system/BaseIterator.h
View File

@@ -30,6 +30,10 @@
#include <iterator>
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
// use for iterators defintions
@@ -45,6 +49,10 @@ public:
typedef const Element *pointer;
typedef ptrdiff_t difference_type;
typedef Nonconst_traits<Element> Non_const_traits;
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Const_traits")
#endif
};
template <class Element>
@@ -56,18 +64,30 @@ public:
typedef Element *pointer;
typedef ptrdiff_t difference_type;
typedef Nonconst_traits<Element> Non_const_traits;
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Nonconst_traits")
#endif
};
class InputIteratorTag_Traits
{
public:
typedef std::input_iterator_tag iterator_category;
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:InputIteratorTag_Traits")
#endif
};
class BidirectionalIteratorTag_Traits
{
public:
typedef std::bidirectional_iterator_tag iterator_category;
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BidirectionalIteratorTag_Traits")
#endif
};
template<class Traits, class IteratorTagTraits>
@@ -87,6 +107,11 @@ public:
protected:
IteratorBase() {}
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:IteratorBase")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/system/BaseObject.h
View File

@@ -31,6 +31,10 @@
#include "FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class LIB_SYSTEM_EXPORT BaseObject
@@ -67,6 +71,11 @@ public:
private:
unsigned _ref_counter;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BaseObject")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/system/Exception.h
View File

@@ -30,6 +30,10 @@
#include "FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class LIB_SYSTEM_EXPORT Exception
@@ -60,6 +64,11 @@ public:
private:
static exception_type _exception;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Exception")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/system/Id.h
View File

@@ -28,6 +28,10 @@
* \date 01/07/2003
*/
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
/*! Class used to tag any object by an id.
@@ -125,6 +129,11 @@ public:
private:
id_type _first;
id_type _second;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Id")
#endif
};
// stream operator

9
source/blender/freestyle/intern/system/Interpreter.h
View File

@@ -30,6 +30,10 @@
#include <string>
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
namespace Freestyle {
@@ -55,6 +59,11 @@ public:
protected:
string _language;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Interpreter")
#endif
};
} /* namespace Freestyle */

8
source/blender/freestyle/intern/system/Iterator.h
View File

@@ -28,6 +28,10 @@
#include <iostream>
#include <string>
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
namespace Freestyle {
@@ -65,6 +69,10 @@ public:
cerr << "Warning: isEnd() not implemented" << endl;
return false;
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Iterator")
#endif
};
} /* namespace Freestyle */

8
source/blender/freestyle/intern/system/PointerSequence.h
View File

@@ -61,6 +61,10 @@
#include <algorithm>
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
template <typename C, typename T>
@@ -86,6 +90,10 @@ public:
{
for_each(this->begin(), this->end(), destroyer);
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:PointerSequence")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/system/ProgressBar.h
View File

@@ -30,6 +30,10 @@
#include <string>
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
namespace Freestyle {
@@ -86,6 +90,11 @@ protected:
unsigned _numtotalsteps;
unsigned _progress;
string _label;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ProgressBar")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/system/PseudoNoise.h
View File

@@ -31,6 +31,10 @@
#include "FreestyleConfig.h"
#include "Precision.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class LIB_SYSTEM_EXPORT PseudoNoise
@@ -50,6 +54,11 @@ public:
protected:
static real *_values;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:PseudoNoise")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/system/RandGen.h
View File

@@ -34,6 +34,10 @@
#include "../system/Precision.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class LIB_SYSTEM_EXPORT RandGen
@@ -44,6 +48,11 @@ public:
private:
static void next();
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:RandGen")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/system/RenderMonitor.h
View File

@@ -32,6 +32,10 @@ extern "C" {
#include "render_types.h"
}
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class RenderMonitor
@@ -51,6 +55,11 @@ public:
protected:
Render *_re;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:RenderMonitor")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/system/TimeStamp.h
View File

@@ -30,6 +30,10 @@
#include "FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class LIB_SYSTEM_EXPORT TimeStamp
@@ -68,6 +72,11 @@ protected:
private:
static TimeStamp *_instance;
unsigned _time_stamp;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:TimeStamp")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/system/TimeUtils.h
View File

@@ -32,6 +32,10 @@
#include "FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class Chronometer
@@ -54,6 +58,11 @@ public:
private:
clock_t _start;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Chronometer")
#endif
};
} /* namespace Freestyle */

19
source/blender/freestyle/intern/view_map/BoxGrid.h
View File

@@ -50,6 +50,10 @@
#include "BKE_global.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class BoxGrid
@@ -66,6 +70,11 @@ public:
// However, code comments make it clear that userdata is deprecated, so we avoid the temptation
// to save 4 or 8 bytes.
WFace *face;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BoxGrid:OccluderData")
#endif
};
private:
@@ -126,6 +135,11 @@ public:
real _occludeeDepth;
//deque<OccluderData*>::iterator _current, _occludeeCandidate;
vector<OccluderData*>::iterator _current, _occludeeCandidate;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BoxGrid:Iterator")
#endif
};
class Transform : public GridHelpers::Transform
@@ -176,6 +190,11 @@ private:
occluderContainer _faces;
Vec3r _viewpoint;
bool _enableQI;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BoxGrid")
#endif
};
inline void BoxGrid::Iterator::initBeforeTarget()

9
source/blender/freestyle/intern/view_map/FEdgeXDetector.h
View File

@@ -39,6 +39,10 @@
#include "../winged_edge/Curvature.h"
#include "../winged_edge/WXEdge.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
using namespace Geometry;
@@ -231,6 +235,11 @@ protected:
ProgressBar *_pProgressBar;
RenderMonitor *_pRenderMonitor;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:FEdgeXDetector")
#endif
};
} /* namespace Freestyle */

8
source/blender/freestyle/intern/view_map/Functions0D.h
View File

@@ -43,6 +43,10 @@
#include "../system/Exception.h"
#include "../system/Precision.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class FEdge;
@@ -103,6 +107,10 @@ public:
{
return Director_BPy_UnaryFunction0D___call__(this, py_uf0D, iter);
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:UnaryFunction0D")
#endif
};
#ifdef SWIG

14
source/blender/freestyle/intern/view_map/Functions1D.h
View File

@@ -39,6 +39,10 @@
#include "../python/Director.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
//
@@ -119,6 +123,11 @@ public:
protected:
IntegrationType _integration;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:UnaryFunction1D")
#endif
};
@@ -161,6 +170,11 @@ public:
protected:
IntegrationType _integration;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:UnaryFunction1D_void")
#endif
};

13
source/blender/freestyle/intern/view_map/GridDensityProvider.h
View File

@@ -37,6 +37,10 @@
#include "BKE_global.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class GridDensityProvider
@@ -123,6 +127,11 @@ protected:
unsigned _cellsX, _cellsY;
float _cellSize;
float _cellOrigin[2];
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:GridDensityProvider")
#endif
};
class GridDensityProviderFactory
@@ -142,6 +151,10 @@ public:
virtual auto_ptr<GridDensityProvider> newGridDensityProvider(OccluderSource& source) = 0;
virtual ~GridDensityProviderFactory () {}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:GridDensityProviderFactory")
#endif
};
} /* namespace Freestyle */

8
source/blender/freestyle/intern/view_map/Interface0D.h
View File

@@ -40,6 +40,10 @@
#include "../winged_edge/Nature.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
namespace Freestyle {
@@ -176,6 +180,10 @@ public:
PyErr_SetString(PyExc_TypeError, "method castToTVertex() not properly overridden");
return 0;
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Interface0D")
#endif
};

9
source/blender/freestyle/intern/view_map/Interface1D.h
View File

@@ -40,6 +40,10 @@
#include "../winged_edge/Nature.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
namespace Freestyle {
@@ -220,6 +224,11 @@ public:
protected:
unsigned _timeStamp;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Interface1D")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/view_map/OccluderSource.h
View File

@@ -32,6 +32,10 @@
#include "../winged_edge/WEdge.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class OccluderSource
@@ -66,6 +70,11 @@ protected:
const GridHelpers::Transform& transform;
void buildCachedPolygon();
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:OccluderSource")
#endif
};
} /* namespace Freestyle */

8
source/blender/freestyle/intern/view_map/Silhouette.h
View File

@@ -48,6 +48,10 @@
#include "../winged_edge/Curvature.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
namespace Freestyle {
@@ -1867,6 +1871,10 @@ public:
{
_importance = importance;
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SShape")
#endif
};
} /* namespace Freestyle */

8
source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
View File

@@ -35,6 +35,10 @@
#include "../system/FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
using namespace Geometry;
@@ -126,6 +130,10 @@ public:
/*! From world to image */
static Vec3r WorldToImage(const Vec3r& M);
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SilhouetteGeomEngine")
#endif
};
} /* namespace Freestyle */

19
source/blender/freestyle/intern/view_map/SphericalGrid.h
View File

@@ -49,6 +49,10 @@
#include "BKE_global.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class SphericalGrid
@@ -65,6 +69,10 @@ public:
// However, code comments make it clear that userdata is deprecated, so we avoid the temptation to save
// 4 or 8 bytes.
WFace *face;
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SphericalGrid:OccluderData")
#endif
};
private:
@@ -125,6 +133,12 @@ public:
real _occludeeDepth;
//deque<OccluderData*>::iterator _current, _occludeeCandidate;
vector<OccluderData*>::iterator _current, _occludeeCandidate;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SphericalGrid:Iterator")
#endif
};
class Transform : public GridHelpers::Transform
@@ -175,6 +189,11 @@ private:
occluderContainer _faces;
Vec3r _viewpoint;
bool _enableQI;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SphericalGrid")
#endif
};
inline void SphericalGrid::Iterator::initBeforeTarget()

9
source/blender/freestyle/intern/view_map/SteerableViewMap.h
View File

@@ -34,6 +34,10 @@
#include "../system/FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
namespace Freestyle {
@@ -144,6 +148,11 @@ public:
protected:
void Clear();
void Build();
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SteerableViewMap")
#endif
};
} /* namespace Freestyle */

17
source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
View File

@@ -47,6 +47,10 @@
#include "../system/FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
namespace Freestyle {
@@ -121,6 +125,10 @@ public:
{
return !(*this == b);
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:OWXFaceLayer")
#endif
};
class WXEdge;
@@ -160,6 +168,10 @@ public:
{
return !(*this == b);
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:OWXEdge")
#endif
};
class WOEdge;
@@ -279,6 +291,11 @@ protected:
SVertexMap _SVertexMap;
SShape *_pCurrentSShape;
ViewShape *_pCurrentVShape;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ViewEdgeXBuilder")
#endif
};
} /* namespace Freestyle */

12
source/blender/freestyle/intern/view_map/ViewMap.h
View File

@@ -39,6 +39,10 @@
#include "../system/BaseIterator.h"
#include "../system/FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
/**********************************/
@@ -231,6 +235,10 @@ public:
/* connects a FEdge to the graph trough a SVertex */
//FEdge *Connect(FEdge *ioEdge, SVertex *ioVertex);
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ViewMap")
#endif
};
/**********************************/
@@ -1584,6 +1592,10 @@ public:
/* removes the view vertex iViewVertex in the View Shape. */
void RemoveVertex(ViewVertex *iViewVertex);
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ViewShape")
#endif
};

9
source/blender/freestyle/intern/view_map/ViewMapBuilder.h
View File

@@ -52,6 +52,10 @@
#include "../winged_edge/WEdge.h"
#include "../winged_edge/WXEdge.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
using namespace Geometry;
@@ -247,6 +251,11 @@ protected:
void FindOccludee(FEdge *fe, Grid *iGrid, real epsilon, Polygon3r **oaPolygon, unsigned timestamp);
void FindOccludee(FEdge *fe, Grid *iGrid, real epsilon, Polygon3r **oaPolygon, unsigned timestamp,
Vec3r& u, Vec3r& A, Vec3r& origin, Vec3r& edge, vector<WVertex*>& faceVertices);
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ViewMapBuilder")
#endif
};
} /* namespace Freestyle */

9
source/blender/freestyle/intern/view_map/ViewMapTesselator.h
View File

@@ -39,6 +39,10 @@
#include "../winged_edge/WEdge.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class NodeShape;
@@ -98,6 +102,11 @@ private:
Nature::EdgeNature _nature;
FrsMaterial _FrsMaterial;
bool _overloadFrsMaterial;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ViewMapTesselator")
#endif
};
/*! Class to tesselate the 2D projected silhouette */

12
source/blender/freestyle/intern/winged_edge/Curvature.h
View File

@@ -51,6 +51,10 @@
#include "../system/FreestyleConfig.h"
#include "../system/Precision.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
using namespace Geometry;
@@ -100,6 +104,10 @@ public:
real Kr; // radial curvature
real dKr; // radial curvature
Vec3r er; // radial curvature direction
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:CurvatureInfo")
#endif
};
class Face_Curvature_Info
@@ -119,6 +127,10 @@ public:
}
vector<CurvatureInfo *> vec_curvature_info;
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Face_Curvature_Info")
#endif
};
bool LIB_WINGED_EDGE_EXPORT gts_vertex_mean_curvature_normal(WVertex *v, Vec3r &n);

40
source/blender/freestyle/intern/winged_edge/WEdge.h
View File

@@ -38,6 +38,10 @@
#include "../system/FreestyleConfig.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
namespace Freestyle {
@@ -239,6 +243,11 @@ public:
//virtual WOEdge **operator->();
protected:
virtual void increment();
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WVertex:incoming_edge_iterator")
#endif
};
/*! Iterator to iterate over a vertex faces in the CCW order */
@@ -319,6 +328,11 @@ public:
{
++_edge_it;
}
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WVertex:face_iterator")
#endif
};
public:
@@ -335,6 +349,10 @@ public:
{
return face_iterator(incoming_edges_end());
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WVertex")
#endif
};
@@ -517,6 +535,10 @@ public:
{
userdata = NULL;
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WOEdge")
#endif
};
@@ -700,6 +722,10 @@ public:
{
userdata = NULL;
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WEdge")
#endif
};
@@ -979,6 +1005,10 @@ public:
{
userdata = NULL;
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WFace")
#endif
};
@@ -1250,6 +1280,11 @@ protected:
*/
virtual WFace *MakeFace(vector<WVertex *>& iVertexList, vector<bool>& iFaceEdgeMarksList, unsigned iMaterialIndex,
WFace *face);
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WShape")
#endif
};
@@ -1290,6 +1325,11 @@ public:
private:
vector<WShape *> _wshapes;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WingedEdge")
#endif
};

9
source/blender/freestyle/intern/winged_edge/WFillGrid.h
View File

@@ -34,6 +34,10 @@
#include "../geometry/Grid.h"
#include "../geometry/Polygon.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
class LIB_WINGED_EDGE_EXPORT WFillGrid
@@ -78,6 +82,11 @@ private:
Grid *_grid;
WingedEdge *_winged_edge;
unsigned _polygon_id;
#ifdef WITH_CXX_GUARDEDALLOC
public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WFillGrid")
#endif
};
} /* namespace Freestyle */

12
source/blender/freestyle/intern/winged_edge/WXEdge.h
View File

@@ -32,6 +32,10 @@
#include "Nature.h"
#include "WEdge.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
namespace Freestyle {
typedef Nature::EdgeNature WXNature;
@@ -302,6 +306,10 @@ public:
{
_config = iConf;
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXSmoothEdge")
#endif
};
/* Class to store a value per vertex and a smooth edge.
@@ -471,6 +479,10 @@ public:
++_nNullDotP;
}
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXFaceLayer")
#endif
};
class WXFace : public WFace