Cleanup: modernize-use-equals-default
This was missing from rB19dfb6ea1f6745c0dbc2ce21839c30184b553878.
This commit is contained in:
@@ -26,13 +26,7 @@ using namespace std;
|
|||||||
|
|
||||||
namespace Freestyle {
|
namespace Freestyle {
|
||||||
|
|
||||||
BezierCurveSegment::BezierCurveSegment()
|
BezierCurveSegment::~BezierCurveSegment() = default;
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
BezierCurveSegment::~BezierCurveSegment()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void BezierCurveSegment::AddControlPoint(const Vec2d &iPoint)
|
void BezierCurveSegment::AddControlPoint(const Vec2d &iPoint)
|
||||||
{
|
{
|
||||||
|
@@ -41,7 +41,6 @@ class BezierCurveSegment {
|
|||||||
std::vector<Vec2d> _Vertices;
|
std::vector<Vec2d> _Vertices;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
BezierCurveSegment();
|
|
||||||
virtual ~BezierCurveSegment();
|
virtual ~BezierCurveSegment();
|
||||||
|
|
||||||
void AddControlPoint(const Vec2d &iPoint);
|
void AddControlPoint(const Vec2d &iPoint);
|
||||||
|
@@ -462,10 +462,6 @@ static Vector2 V2SubII(Vector2 a, Vector2 b)
|
|||||||
|
|
||||||
//------------------------- WRAPPER -----------------------------//
|
//------------------------- WRAPPER -----------------------------//
|
||||||
|
|
||||||
FitCurveWrapper::FitCurveWrapper()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
FitCurveWrapper::~FitCurveWrapper()
|
FitCurveWrapper::~FitCurveWrapper()
|
||||||
{
|
{
|
||||||
_vertices.clear();
|
_vertices.clear();
|
||||||
|
@@ -70,7 +70,6 @@ class FitCurveWrapper {
|
|||||||
std::vector<Vector2> _vertices;
|
std::vector<Vector2> _vertices;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
FitCurveWrapper();
|
|
||||||
~FitCurveWrapper();
|
~FitCurveWrapper();
|
||||||
|
|
||||||
/*! Fits a set of 2D data points to a set of Bezier Curve segments
|
/*! Fits a set of 2D data points to a set of Bezier Curve segments
|
||||||
|
@@ -42,8 +42,6 @@ void GridHelpers::getDefaultViewProscenium(real viewProscenium[4])
|
|||||||
viewProscenium[3] = g_freestyle.viewport[3] * (1.0f - borderZone + bufferZone);
|
viewProscenium[3] = g_freestyle.viewport[3] * (1.0f - borderZone + bufferZone);
|
||||||
}
|
}
|
||||||
|
|
||||||
GridHelpers::Transform::~Transform()
|
GridHelpers::Transform::~Transform() = default;
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
} /* namespace Freestyle */
|
} /* namespace Freestyle */
|
||||||
|
@@ -36,10 +36,6 @@ namespace Freestyle::OGF {
|
|||||||
|
|
||||||
//_________________________________________________________
|
//_________________________________________________________
|
||||||
|
|
||||||
NormalCycle::NormalCycle()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void NormalCycle::begin()
|
void NormalCycle::begin()
|
||||||
{
|
{
|
||||||
M_[0] = M_[1] = M_[2] = M_[3] = M_[4] = M_[5] = 0;
|
M_[0] = M_[1] = M_[2] = M_[3] = M_[4] = M_[5] = 0;
|
||||||
|
@@ -64,7 +64,6 @@ template<class T> inline void ogf_swap(T &x, T &y)
|
|||||||
*/
|
*/
|
||||||
class NormalCycle {
|
class NormalCycle {
|
||||||
public:
|
public:
|
||||||
NormalCycle();
|
|
||||||
void begin();
|
void begin();
|
||||||
void end();
|
void end();
|
||||||
/**
|
/**
|
||||||
|
@@ -105,17 +105,6 @@ NodeOrthographicCamera::NodeOrthographicCamera(
|
|||||||
projection_matrix_[11] = -(zFar + zNear) / (zFar - zNear);
|
projection_matrix_[11] = -(zFar + zNear) / (zFar - zNear);
|
||||||
}
|
}
|
||||||
|
|
||||||
NodeOrthographicCamera::NodeOrthographicCamera(const NodeOrthographicCamera &iBrother)
|
|
||||||
: NodeCamera(iBrother),
|
|
||||||
left_(iBrother.left_),
|
|
||||||
right_(iBrother.right_),
|
|
||||||
bottom_(iBrother.bottom_),
|
|
||||||
top_(iBrother.top_),
|
|
||||||
zNear_(iBrother.zNear_),
|
|
||||||
zFar_(iBrother.zFar_)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
NodePerspectiveCamera::NodePerspectiveCamera() : NodeCamera(NodeCamera::PERSPECTIVE)
|
NodePerspectiveCamera::NodePerspectiveCamera() : NodeCamera(NodeCamera::PERSPECTIVE)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@@ -136,7 +136,7 @@ class NodeOrthographicCamera : public NodeCamera {
|
|||||||
return zFar_;
|
return zFar_;
|
||||||
}
|
}
|
||||||
|
|
||||||
NodeOrthographicCamera(const NodeOrthographicCamera &iBrother);
|
NodeOrthographicCamera(const NodeOrthographicCamera &iBrother) = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
double left_;
|
double left_;
|
||||||
|
@@ -41,10 +41,6 @@ namespace Freestyle {
|
|||||||
|
|
||||||
real PseudoNoise::_values[];
|
real PseudoNoise::_values[];
|
||||||
|
|
||||||
PseudoNoise::PseudoNoise()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void PseudoNoise::init(long seed)
|
void PseudoNoise::init(long seed)
|
||||||
{
|
{
|
||||||
RandGen::srand48(seed);
|
RandGen::srand48(seed);
|
||||||
|
@@ -31,8 +31,6 @@ namespace Freestyle {
|
|||||||
|
|
||||||
class PseudoNoise {
|
class PseudoNoise {
|
||||||
public:
|
public:
|
||||||
PseudoNoise();
|
|
||||||
|
|
||||||
virtual ~PseudoNoise()
|
virtual ~PseudoNoise()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@@ -55,10 +55,6 @@ ArbitraryGridDensityProvider::ArbitraryGridDensityProvider(OccluderSource &sourc
|
|||||||
initialize(proscenium);
|
initialize(proscenium);
|
||||||
}
|
}
|
||||||
|
|
||||||
ArbitraryGridDensityProvider::~ArbitraryGridDensityProvider()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ArbitraryGridDensityProvider::initialize(const real proscenium[4])
|
void ArbitraryGridDensityProvider::initialize(const real proscenium[4])
|
||||||
{
|
{
|
||||||
float prosceniumWidth = (proscenium[1] - proscenium[0]);
|
float prosceniumWidth = (proscenium[1] - proscenium[0]);
|
||||||
@@ -99,10 +95,6 @@ ArbitraryGridDensityProviderFactory::ArbitraryGridDensityProviderFactory(unsigne
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
ArbitraryGridDensityProviderFactory::~ArbitraryGridDensityProviderFactory()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
AutoPtr<GridDensityProvider> ArbitraryGridDensityProviderFactory::newGridDensityProvider(
|
AutoPtr<GridDensityProvider> ArbitraryGridDensityProviderFactory::newGridDensityProvider(
|
||||||
OccluderSource &source, const real proscenium[4])
|
OccluderSource &source, const real proscenium[4])
|
||||||
{
|
{
|
||||||
|
@@ -39,7 +39,6 @@ class ArbitraryGridDensityProvider : public GridDensityProvider {
|
|||||||
const GridHelpers::Transform &transform,
|
const GridHelpers::Transform &transform,
|
||||||
unsigned numCells);
|
unsigned numCells);
|
||||||
ArbitraryGridDensityProvider(OccluderSource &source, unsigned numCells);
|
ArbitraryGridDensityProvider(OccluderSource &source, unsigned numCells);
|
||||||
virtual ~ArbitraryGridDensityProvider();
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
unsigned numCells;
|
unsigned numCells;
|
||||||
@@ -51,7 +50,6 @@ class ArbitraryGridDensityProvider : public GridDensityProvider {
|
|||||||
class ArbitraryGridDensityProviderFactory : public GridDensityProviderFactory {
|
class ArbitraryGridDensityProviderFactory : public GridDensityProviderFactory {
|
||||||
public:
|
public:
|
||||||
ArbitraryGridDensityProviderFactory(unsigned numCells);
|
ArbitraryGridDensityProviderFactory(unsigned numCells);
|
||||||
~ArbitraryGridDensityProviderFactory();
|
|
||||||
|
|
||||||
AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource &source,
|
AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource &source,
|
||||||
const real proscenium[4]);
|
const real proscenium[4]);
|
||||||
|
@@ -56,10 +56,6 @@ AverageAreaGridDensityProvider::AverageAreaGridDensityProvider(OccluderSource &s
|
|||||||
initialize(proscenium, sizeFactor);
|
initialize(proscenium, sizeFactor);
|
||||||
}
|
}
|
||||||
|
|
||||||
AverageAreaGridDensityProvider::~AverageAreaGridDensityProvider()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void AverageAreaGridDensityProvider::initialize(const real proscenium[4], real sizeFactor)
|
void AverageAreaGridDensityProvider::initialize(const real proscenium[4], real sizeFactor)
|
||||||
{
|
{
|
||||||
float prosceniumWidth = (proscenium[1] - proscenium[0]);
|
float prosceniumWidth = (proscenium[1] - proscenium[0]);
|
||||||
@@ -120,10 +116,6 @@ AverageAreaGridDensityProviderFactory::AverageAreaGridDensityProviderFactory(rea
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
AverageAreaGridDensityProviderFactory::~AverageAreaGridDensityProviderFactory()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
AutoPtr<GridDensityProvider> AverageAreaGridDensityProviderFactory::newGridDensityProvider(
|
AutoPtr<GridDensityProvider> AverageAreaGridDensityProviderFactory::newGridDensityProvider(
|
||||||
OccluderSource &source, const real proscenium[4])
|
OccluderSource &source, const real proscenium[4])
|
||||||
{
|
{
|
||||||
|
@@ -39,7 +39,6 @@ class AverageAreaGridDensityProvider : public GridDensityProvider {
|
|||||||
const GridHelpers::Transform &transform,
|
const GridHelpers::Transform &transform,
|
||||||
real sizeFactor);
|
real sizeFactor);
|
||||||
AverageAreaGridDensityProvider(OccluderSource &source, real sizeFactor);
|
AverageAreaGridDensityProvider(OccluderSource &source, real sizeFactor);
|
||||||
virtual ~AverageAreaGridDensityProvider();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void initialize(const real proscenium[4], real sizeFactor);
|
void initialize(const real proscenium[4], real sizeFactor);
|
||||||
@@ -48,7 +47,6 @@ class AverageAreaGridDensityProvider : public GridDensityProvider {
|
|||||||
class AverageAreaGridDensityProviderFactory : public GridDensityProviderFactory {
|
class AverageAreaGridDensityProviderFactory : public GridDensityProviderFactory {
|
||||||
public:
|
public:
|
||||||
AverageAreaGridDensityProviderFactory(real sizeFactor);
|
AverageAreaGridDensityProviderFactory(real sizeFactor);
|
||||||
~AverageAreaGridDensityProviderFactory();
|
|
||||||
|
|
||||||
AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource &source,
|
AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource &source,
|
||||||
const real proscenium[4]);
|
const real proscenium[4]);
|
||||||
|
@@ -38,14 +38,6 @@ namespace Freestyle {
|
|||||||
// Cell
|
// Cell
|
||||||
/////////
|
/////////
|
||||||
|
|
||||||
BoxGrid::Cell::Cell()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
BoxGrid::Cell::~Cell()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void BoxGrid::Cell::setDimensions(real x, real y, real sizeX, real sizeY)
|
void BoxGrid::Cell::setDimensions(real x, real y, real sizeX, real sizeY)
|
||||||
{
|
{
|
||||||
const real epsilon = 1.0e-06;
|
const real epsilon = 1.0e-06;
|
||||||
@@ -87,10 +79,6 @@ BoxGrid::Iterator::Iterator(BoxGrid &grid, Vec3r ¢er, real /*epsilon*/)
|
|||||||
_current = _cell->faces.begin();
|
_current = _cell->faces.begin();
|
||||||
}
|
}
|
||||||
|
|
||||||
BoxGrid::Iterator::~Iterator()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// BoxGrid
|
// BoxGrid
|
||||||
/////////////////
|
/////////////////
|
||||||
|
|
||||||
@@ -124,9 +112,7 @@ BoxGrid::BoxGrid(OccluderSource &source,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BoxGrid::~BoxGrid()
|
BoxGrid::~BoxGrid() = default;
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void BoxGrid::assignCells(OccluderSource & /*source*/,
|
void BoxGrid::assignCells(OccluderSource & /*source*/,
|
||||||
GridDensityProvider &density,
|
GridDensityProvider &density,
|
||||||
@@ -242,10 +228,6 @@ bool BoxGrid::enableQI() const
|
|||||||
return _enableQI;
|
return _enableQI;
|
||||||
}
|
}
|
||||||
|
|
||||||
BoxGrid::Transform::Transform()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
Vec3r BoxGrid::Transform::operator()(const Vec3r &point) const
|
Vec3r BoxGrid::Transform::operator()(const Vec3r &point) const
|
||||||
{
|
{
|
||||||
return Vec3r(point[0], point[1], -point[2]);
|
return Vec3r(point[0], point[1], -point[2]);
|
||||||
|
@@ -73,8 +73,7 @@ class BoxGrid {
|
|||||||
// Cell(const Cell& other);
|
// Cell(const Cell& other);
|
||||||
// Cell& operator=(const Cell& other);
|
// Cell& operator=(const Cell& other);
|
||||||
|
|
||||||
explicit Cell();
|
explicit Cell() = default;
|
||||||
~Cell();
|
|
||||||
|
|
||||||
static bool compareOccludersByShallowestPoint(const OccluderData *a, const OccluderData *b);
|
static bool compareOccludersByShallowestPoint(const OccluderData *a, const OccluderData *b);
|
||||||
|
|
||||||
@@ -105,7 +104,6 @@ class BoxGrid {
|
|||||||
// epsilon is not used in this class, but other grids with the same interface may need an
|
// epsilon is not used in this class, but other grids with the same interface may need an
|
||||||
// epsilon
|
// epsilon
|
||||||
explicit Iterator(BoxGrid &grid, Vec3r ¢er, real epsilon = 1.0e-06);
|
explicit Iterator(BoxGrid &grid, Vec3r ¢er, real epsilon = 1.0e-06);
|
||||||
~Iterator();
|
|
||||||
void initBeforeTarget();
|
void initBeforeTarget();
|
||||||
void initAfterTarget();
|
void initAfterTarget();
|
||||||
void nextOccluder();
|
void nextOccluder();
|
||||||
@@ -134,7 +132,7 @@ class BoxGrid {
|
|||||||
|
|
||||||
class Transform : public GridHelpers::Transform {
|
class Transform : public GridHelpers::Transform {
|
||||||
public:
|
public:
|
||||||
explicit Transform();
|
explicit Transform() = default;
|
||||||
explicit Transform(Transform &other);
|
explicit Transform(Transform &other);
|
||||||
Vec3r operator()(const Vec3r &point) const;
|
Vec3r operator()(const Vec3r &point) const;
|
||||||
};
|
};
|
||||||
|
@@ -44,10 +44,6 @@ CulledOccluderSource::CulledOccluderSource(const GridHelpers::Transform &t,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CulledOccluderSource::~CulledOccluderSource()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool CulledOccluderSource::testCurrent()
|
bool CulledOccluderSource::testCurrent()
|
||||||
{
|
{
|
||||||
if (valid) {
|
if (valid) {
|
||||||
|
@@ -36,7 +36,6 @@ class CulledOccluderSource : public OccluderSource {
|
|||||||
WingedEdge &we,
|
WingedEdge &we,
|
||||||
ViewMap &viewMap,
|
ViewMap &viewMap,
|
||||||
bool extensiveFEdgeSearch = true);
|
bool extensiveFEdgeSearch = true);
|
||||||
virtual ~CulledOccluderSource();
|
|
||||||
|
|
||||||
void cullViewEdges(ViewMap &viewMap, bool extensiveFEdgeSearch);
|
void cullViewEdges(ViewMap &viewMap, bool extensiveFEdgeSearch);
|
||||||
|
|
||||||
|
@@ -29,10 +29,6 @@ HeuristicGridDensityProviderFactory::HeuristicGridDensityProviderFactory(real si
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
HeuristicGridDensityProviderFactory::~HeuristicGridDensityProviderFactory()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
AutoPtr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensityProvider(
|
AutoPtr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensityProvider(
|
||||||
OccluderSource &source, const real proscenium[4])
|
OccluderSource &source, const real proscenium[4])
|
||||||
{
|
{
|
||||||
|
@@ -32,7 +32,6 @@ namespace Freestyle {
|
|||||||
class HeuristicGridDensityProviderFactory : public GridDensityProviderFactory {
|
class HeuristicGridDensityProviderFactory : public GridDensityProviderFactory {
|
||||||
public:
|
public:
|
||||||
HeuristicGridDensityProviderFactory(real sizeFactor, unsigned numFaces);
|
HeuristicGridDensityProviderFactory(real sizeFactor, unsigned numFaces);
|
||||||
~HeuristicGridDensityProviderFactory();
|
|
||||||
|
|
||||||
AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource &source,
|
AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource &source,
|
||||||
const real proscenium[4]);
|
const real proscenium[4]);
|
||||||
|
@@ -33,9 +33,7 @@ OccluderSource::OccluderSource(const GridHelpers::Transform &t, WingedEdge &we)
|
|||||||
begin();
|
begin();
|
||||||
}
|
}
|
||||||
|
|
||||||
OccluderSource::~OccluderSource()
|
OccluderSource::~OccluderSource() = default;
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OccluderSource::buildCachedPolygon()
|
void OccluderSource::buildCachedPolygon()
|
||||||
{
|
{
|
||||||
|
@@ -54,10 +54,6 @@ Pow23GridDensityProvider::Pow23GridDensityProvider(OccluderSource &source, unsig
|
|||||||
initialize(proscenium);
|
initialize(proscenium);
|
||||||
}
|
}
|
||||||
|
|
||||||
Pow23GridDensityProvider::~Pow23GridDensityProvider()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void Pow23GridDensityProvider::initialize(const real proscenium[4])
|
void Pow23GridDensityProvider::initialize(const real proscenium[4])
|
||||||
{
|
{
|
||||||
float prosceniumWidth = (proscenium[1] - proscenium[0]);
|
float prosceniumWidth = (proscenium[1] - proscenium[0]);
|
||||||
@@ -98,10 +94,6 @@ Pow23GridDensityProviderFactory::Pow23GridDensityProviderFactory(unsigned numFac
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
Pow23GridDensityProviderFactory::~Pow23GridDensityProviderFactory()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
AutoPtr<GridDensityProvider> Pow23GridDensityProviderFactory::newGridDensityProvider(
|
AutoPtr<GridDensityProvider> Pow23GridDensityProviderFactory::newGridDensityProvider(
|
||||||
OccluderSource &source, const real proscenium[4])
|
OccluderSource &source, const real proscenium[4])
|
||||||
{
|
{
|
||||||
|
@@ -37,7 +37,6 @@ class Pow23GridDensityProvider : public GridDensityProvider {
|
|||||||
const GridHelpers::Transform &transform,
|
const GridHelpers::Transform &transform,
|
||||||
unsigned numFaces);
|
unsigned numFaces);
|
||||||
Pow23GridDensityProvider(OccluderSource &source, unsigned numFaces);
|
Pow23GridDensityProvider(OccluderSource &source, unsigned numFaces);
|
||||||
virtual ~Pow23GridDensityProvider();
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
unsigned numFaces;
|
unsigned numFaces;
|
||||||
@@ -49,7 +48,6 @@ class Pow23GridDensityProvider : public GridDensityProvider {
|
|||||||
class Pow23GridDensityProviderFactory : public GridDensityProviderFactory {
|
class Pow23GridDensityProviderFactory : public GridDensityProviderFactory {
|
||||||
public:
|
public:
|
||||||
Pow23GridDensityProviderFactory(unsigned numFaces);
|
Pow23GridDensityProviderFactory(unsigned numFaces);
|
||||||
~Pow23GridDensityProviderFactory();
|
|
||||||
|
|
||||||
AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource &source,
|
AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource &source,
|
||||||
const real proscenium[4]);
|
const real proscenium[4]);
|
||||||
|
@@ -38,14 +38,6 @@ namespace Freestyle {
|
|||||||
// Cell
|
// Cell
|
||||||
/////////
|
/////////
|
||||||
|
|
||||||
SphericalGrid::Cell::Cell()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
SphericalGrid::Cell::~Cell()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SphericalGrid::Cell::setDimensions(real x, real y, real sizeX, real sizeY)
|
void SphericalGrid::Cell::setDimensions(real x, real y, real sizeX, real sizeY)
|
||||||
{
|
{
|
||||||
const real epsilon = 1.0e-06;
|
const real epsilon = 1.0e-06;
|
||||||
@@ -87,10 +79,6 @@ SphericalGrid::Iterator::Iterator(SphericalGrid &grid, Vec3r ¢er, real /*eps
|
|||||||
_current = _cell->faces.begin();
|
_current = _cell->faces.begin();
|
||||||
}
|
}
|
||||||
|
|
||||||
SphericalGrid::Iterator::~Iterator()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// SphericalGrid
|
// SphericalGrid
|
||||||
/////////////////
|
/////////////////
|
||||||
|
|
||||||
@@ -121,9 +109,7 @@ SphericalGrid::SphericalGrid(OccluderSource &source,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SphericalGrid::~SphericalGrid()
|
SphericalGrid::~SphericalGrid() = default;
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SphericalGrid::assignCells(OccluderSource & /*source*/,
|
void SphericalGrid::assignCells(OccluderSource & /*source*/,
|
||||||
GridDensityProvider &density,
|
GridDensityProvider &density,
|
||||||
@@ -238,10 +224,6 @@ bool SphericalGrid::enableQI() const
|
|||||||
return _enableQI;
|
return _enableQI;
|
||||||
}
|
}
|
||||||
|
|
||||||
SphericalGrid::Transform::Transform()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
Vec3r SphericalGrid::Transform::operator()(const Vec3r &point) const
|
Vec3r SphericalGrid::Transform::operator()(const Vec3r &point) const
|
||||||
{
|
{
|
||||||
return sphericalProjection(point);
|
return sphericalProjection(point);
|
||||||
|
@@ -73,8 +73,7 @@ class SphericalGrid {
|
|||||||
// Cell(const Cell& other);
|
// Cell(const Cell& other);
|
||||||
// Cell& operator=(const Cell& other);
|
// Cell& operator=(const Cell& other);
|
||||||
|
|
||||||
explicit Cell();
|
explicit Cell() = default;
|
||||||
~Cell();
|
|
||||||
|
|
||||||
static bool compareOccludersByShallowestPoint(const OccluderData *a, const OccluderData *b);
|
static bool compareOccludersByShallowestPoint(const OccluderData *a, const OccluderData *b);
|
||||||
|
|
||||||
@@ -106,7 +105,6 @@ class SphericalGrid {
|
|||||||
// epsilon is not used in this class, but other grids with the same interface may need an
|
// epsilon is not used in this class, but other grids with the same interface may need an
|
||||||
// epsilon
|
// epsilon
|
||||||
explicit Iterator(SphericalGrid &grid, Vec3r ¢er, real epsilon = 1.0e-06);
|
explicit Iterator(SphericalGrid &grid, Vec3r ¢er, real epsilon = 1.0e-06);
|
||||||
~Iterator();
|
|
||||||
void initBeforeTarget();
|
void initBeforeTarget();
|
||||||
void initAfterTarget();
|
void initAfterTarget();
|
||||||
void nextOccluder();
|
void nextOccluder();
|
||||||
@@ -135,7 +133,7 @@ class SphericalGrid {
|
|||||||
|
|
||||||
class Transform : public GridHelpers::Transform {
|
class Transform : public GridHelpers::Transform {
|
||||||
public:
|
public:
|
||||||
explicit Transform();
|
explicit Transform() = default;
|
||||||
explicit Transform(Transform &other);
|
explicit Transform(Transform &other);
|
||||||
Vec3r operator()(const Vec3r &point) const;
|
Vec3r operator()(const Vec3r &point) const;
|
||||||
static Vec3r sphericalProjection(const Vec3r &M);
|
static Vec3r sphericalProjection(const Vec3r &M);
|
||||||
|
@@ -46,11 +46,6 @@ inline static uint colorDistance(Color32 c0, Color32 c1)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/** Default constructor. */
|
|
||||||
ColorBlock::ColorBlock()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Init the color block from an array of colors. */
|
/** Init the color block from an array of colors. */
|
||||||
ColorBlock::ColorBlock(const uint *linearImage)
|
ColorBlock::ColorBlock(const uint *linearImage)
|
||||||
{
|
{
|
||||||
|
@@ -34,7 +34,7 @@
|
|||||||
|
|
||||||
/** Uncompressed 4x4 color block. */
|
/** Uncompressed 4x4 color block. */
|
||||||
struct ColorBlock {
|
struct ColorBlock {
|
||||||
ColorBlock();
|
ColorBlock() = default;
|
||||||
ColorBlock(const uint *linearImage);
|
ColorBlock(const uint *linearImage);
|
||||||
ColorBlock(const ColorBlock &block);
|
ColorBlock(const ColorBlock &block);
|
||||||
ColorBlock(const Image *img, uint x, uint y);
|
ColorBlock(const Image *img, uint x, uint y);
|
||||||
|
@@ -890,10 +890,6 @@ DirectDrawSurface::DirectDrawSurface(unsigned char *mem, uint size) : stream(mem
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
DirectDrawSurface::~DirectDrawSurface()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool DirectDrawSurface::isValid() const
|
bool DirectDrawSurface::isValid() const
|
||||||
{
|
{
|
||||||
if (header.fourcc != FOURCC_DDS || header.size != 124) {
|
if (header.fourcc != FOURCC_DDS || header.size != 124) {
|
||||||
|
@@ -136,7 +136,6 @@ struct DDSHeader {
|
|||||||
class DirectDrawSurface {
|
class DirectDrawSurface {
|
||||||
public:
|
public:
|
||||||
DirectDrawSurface(unsigned char *mem, uint size);
|
DirectDrawSurface(unsigned char *mem, uint size);
|
||||||
~DirectDrawSurface();
|
|
||||||
|
|
||||||
bool isValid() const;
|
bool isValid() const;
|
||||||
bool isSupported() const;
|
bool isSupported() const;
|
||||||
|
@@ -35,11 +35,6 @@ ErrorHandler::ErrorHandler() : mError(false)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------
|
|
||||||
ErrorHandler::~ErrorHandler()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------
|
//--------------------------------------------------------------------
|
||||||
bool ErrorHandler::handleError(const COLLADASaxFWL::IError *error)
|
bool ErrorHandler::handleError(const COLLADASaxFWL::IError *error)
|
||||||
{
|
{
|
||||||
|
@@ -34,8 +34,6 @@ class ErrorHandler : public COLLADASaxFWL::IErrorHandler {
|
|||||||
/** Constructor. */
|
/** Constructor. */
|
||||||
ErrorHandler();
|
ErrorHandler();
|
||||||
|
|
||||||
/** Destructor. */
|
|
||||||
virtual ~ErrorHandler();
|
|
||||||
/** handle any error thrown by the parser. */
|
/** handle any error thrown by the parser. */
|
||||||
bool virtual handleError(const COLLADASaxFWL::IError *error);
|
bool virtual handleError(const COLLADASaxFWL::IError *error);
|
||||||
/** True if there was an error during parsing. */
|
/** True if there was an error during parsing. */
|
||||||
|
@@ -32,9 +32,7 @@ ExtraTags::ExtraTags(std::string profile)
|
|||||||
this->tags = std::map<std::string, std::string>();
|
this->tags = std::map<std::string, std::string>();
|
||||||
}
|
}
|
||||||
|
|
||||||
ExtraTags::~ExtraTags()
|
ExtraTags::~ExtraTags() = default;
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ExtraTags::isProfile(std::string profile)
|
bool ExtraTags::isProfile(std::string profile)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user