This implements the proposal from #124512. For that it contains the following changes: * Remove the global override of `new`/`delete` when `WITH_CXX_GUARDEDALLOC` was enabled. * Always use `MEM_CXX_CLASS_ALLOC_FUNCS` where it is currently used. This used to be guarded by `WITH_CXX_GUARDEDALLOC` in some but not all cases. This means that a few classes which didn't use our guarded allocator by default before, are now using it. Pull Request: https://projects.blender.org/blender/blender/pulls/130181
108 lines
1.8 KiB
C++
108 lines
1.8 KiB
C++
/* SPDX-FileCopyrightText: 2023 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
#pragma once
|
|
|
|
/** \file
|
|
* \ingroup freestyle
|
|
* \brief Class to define the drawing style of a node
|
|
*/
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
namespace Freestyle {
|
|
|
|
class DrawingStyle {
|
|
public:
|
|
enum STYLE {
|
|
FILLED,
|
|
LINES,
|
|
POINTS,
|
|
INVISIBLE,
|
|
};
|
|
|
|
inline DrawingStyle()
|
|
{
|
|
Style = FILLED;
|
|
LineWidth = 2.0f;
|
|
PointSize = 2.0f;
|
|
LightingEnabled = true;
|
|
}
|
|
|
|
inline explicit DrawingStyle(const DrawingStyle &iBrother);
|
|
|
|
virtual ~DrawingStyle() {}
|
|
|
|
/** operators */
|
|
inline DrawingStyle &operator=(const DrawingStyle &ds);
|
|
|
|
inline void setStyle(const STYLE iStyle)
|
|
{
|
|
Style = iStyle;
|
|
}
|
|
|
|
inline void setLineWidth(const float iLineWidth)
|
|
{
|
|
LineWidth = iLineWidth;
|
|
}
|
|
|
|
inline void setPointSize(const float iPointSize)
|
|
{
|
|
PointSize = iPointSize;
|
|
}
|
|
|
|
inline void setLightingEnabled(const bool on)
|
|
{
|
|
LightingEnabled = on;
|
|
}
|
|
|
|
inline STYLE style() const
|
|
{
|
|
return Style;
|
|
}
|
|
|
|
inline float lineWidth() const
|
|
{
|
|
return LineWidth;
|
|
}
|
|
|
|
inline float pointSize() const
|
|
{
|
|
return PointSize;
|
|
}
|
|
|
|
inline bool lightingEnabled() const
|
|
{
|
|
return LightingEnabled;
|
|
}
|
|
|
|
private:
|
|
STYLE Style;
|
|
float LineWidth;
|
|
float PointSize;
|
|
bool LightingEnabled;
|
|
|
|
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:DrawingStyle")
|
|
};
|
|
|
|
DrawingStyle::DrawingStyle(const DrawingStyle &iBrother)
|
|
{
|
|
Style = iBrother.Style;
|
|
LineWidth = iBrother.LineWidth;
|
|
PointSize = iBrother.PointSize;
|
|
LightingEnabled = iBrother.LightingEnabled;
|
|
}
|
|
|
|
DrawingStyle &DrawingStyle::operator=(const DrawingStyle &ds)
|
|
{
|
|
Style = ds.Style;
|
|
LineWidth = ds.LineWidth;
|
|
PointSize = ds.PointSize;
|
|
LightingEnabled = ds.LightingEnabled;
|
|
|
|
return *this;
|
|
}
|
|
|
|
} /* namespace Freestyle */
|