mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 19:29:54 +02:00
Make default copy constructors explicit
Recent versions of gcc generate a warning without this
This commit is contained in:
parent
15e9d08bff
commit
68d10a2fe1
5 changed files with 10 additions and 0 deletions
|
@ -31,6 +31,8 @@ public:
|
||||||
surfaceNormal = stylusPickResult.surfaceNormal;
|
surfaceNormal = stylusPickResult.surfaceNormal;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
StylusPickResult& operator=(const StylusPickResult &right) = default;
|
||||||
|
|
||||||
IntersectionType type { NONE };
|
IntersectionType type { NONE };
|
||||||
bool intersects { false };
|
bool intersects { false };
|
||||||
QUuid objectID;
|
QUuid objectID;
|
||||||
|
|
|
@ -162,6 +162,7 @@ protected:
|
||||||
const QString& typeVarIn, const QString& weightVarIn, float weightIn, const std::vector<float>& flexCoefficientsIn,
|
const QString& typeVarIn, const QString& weightVarIn, float weightIn, const std::vector<float>& flexCoefficientsIn,
|
||||||
const QString& poleVectorEnabledVar, const QString& poleReferenceVectorVar, const QString& poleVectorVar);
|
const QString& poleVectorEnabledVar, const QString& poleReferenceVectorVar, const QString& poleVectorVar);
|
||||||
IKTargetVar(const IKTargetVar& orig);
|
IKTargetVar(const IKTargetVar& orig);
|
||||||
|
AnimInverseKinematics::IKTargetVar& operator=(const AnimInverseKinematics::IKTargetVar&) = default;
|
||||||
|
|
||||||
QString jointName;
|
QString jointName;
|
||||||
QString positionVar;
|
QString positionVar;
|
||||||
|
|
|
@ -121,6 +121,8 @@ public:
|
||||||
static void propertiesToBlob(QScriptEngine& scriptEngine, const QUuid& myAvatarID, const EntityItemProperties& properties, QByteArray& blob);
|
static void propertiesToBlob(QScriptEngine& scriptEngine, const QUuid& myAvatarID, const EntityItemProperties& properties, QByteArray& blob);
|
||||||
|
|
||||||
EntityItemProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags());
|
EntityItemProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags());
|
||||||
|
EntityItemProperties(const EntityItemProperties&) = default;
|
||||||
|
|
||||||
virtual ~EntityItemProperties() = default;
|
virtual ~EntityItemProperties() = default;
|
||||||
|
|
||||||
void merge(const EntityItemProperties& other);
|
void merge(const EntityItemProperties& other);
|
||||||
|
|
|
@ -112,6 +112,7 @@ public:
|
||||||
|
|
||||||
SimulationOwner();
|
SimulationOwner();
|
||||||
SimulationOwner(const QUuid& id, uint8_t priority);
|
SimulationOwner(const QUuid& id, uint8_t priority);
|
||||||
|
SimulationOwner(const SimulationOwner &) = default;
|
||||||
|
|
||||||
const QUuid& getID() const { return _id; }
|
const QUuid& getID() const { return _id; }
|
||||||
const uint64_t& getExpiry() const { return _expiry; }
|
const uint64_t& getExpiry() const { return _expiry; }
|
||||||
|
|
|
@ -19,6 +19,8 @@ public:
|
||||||
|
|
||||||
CubicHermiteSplineFunctor(const CubicHermiteSplineFunctor& orig) : _p0(orig._p0), _m0(orig._m0), _p1(orig._p1), _m1(orig._m1) {}
|
CubicHermiteSplineFunctor(const CubicHermiteSplineFunctor& orig) : _p0(orig._p0), _m0(orig._m0), _p1(orig._p1), _m1(orig._m1) {}
|
||||||
|
|
||||||
|
CubicHermiteSplineFunctor& operator=(const CubicHermiteSplineFunctor&) = default;
|
||||||
|
|
||||||
virtual ~CubicHermiteSplineFunctor() {}
|
virtual ~CubicHermiteSplineFunctor() {}
|
||||||
|
|
||||||
// evalute the hermite curve at parameter t (0..1)
|
// evalute the hermite curve at parameter t (0..1)
|
||||||
|
@ -85,6 +87,8 @@ public:
|
||||||
memcpy(_values, orig._values, sizeof(float) * (NUM_SUBDIVISIONS + 1));
|
memcpy(_values, orig._values, sizeof(float) * (NUM_SUBDIVISIONS + 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CubicHermiteSplineFunctorWithArcLength& operator=(const CubicHermiteSplineFunctorWithArcLength&) = default;
|
||||||
|
|
||||||
// given the spline parameter (0..1) output the arcLength of the spline up to that point.
|
// given the spline parameter (0..1) output the arcLength of the spline up to that point.
|
||||||
float arcLength(float t) const {
|
float arcLength(float t) const {
|
||||||
float index = t * NUM_SUBDIVISIONS;
|
float index = t * NUM_SUBDIVISIONS;
|
||||||
|
|
Loading…
Reference in a new issue