diff --git a/panda/src/chan/movingPartMatrix.cxx b/panda/src/chan/movingPartMatrix.cxx index a1e06b5edd..10ba282cdf 100644 --- a/panda/src/chan/movingPartMatrix.cxx +++ b/panda/src/chan/movingPartMatrix.cxx @@ -32,6 +32,15 @@ TypeHandle MovingPartMatrix::_type_handle; +//////////////////////////////////////////////////////////////////// +// Function: MovingPartMatrix::Destructor +// Access: Public, Virtual +// Description: +//////////////////////////////////////////////////////////////////// +MovingPartMatrix:: +~MovingPartMatrix() { +} + //////////////////////////////////////////////////////////////////// // Function: MovingPartMatrix::get_blend_value // Access: Public diff --git a/panda/src/chan/movingPartMatrix.h b/panda/src/chan/movingPartMatrix.h index ab8a89cb9f..75918bcafd 100644 --- a/panda/src/chan/movingPartMatrix.h +++ b/panda/src/chan/movingPartMatrix.h @@ -40,6 +40,7 @@ public: INLINE MovingPartMatrix(PartGroup *parent, const string &name, const LMatrix4f &initial_value = LMatrix4f::ident_mat()); + virtual ~MovingPartMatrix(); virtual void get_blend_value(const PartBundle *root); diff --git a/panda/src/chan/movingPartScalar.cxx b/panda/src/chan/movingPartScalar.cxx index ef8435a7a2..27906f72cb 100644 --- a/panda/src/chan/movingPartScalar.cxx +++ b/panda/src/chan/movingPartScalar.cxx @@ -30,6 +30,15 @@ TypeHandle MovingPartScalar::_type_handle; +//////////////////////////////////////////////////////////////////// +// Function: MovingPartScalar::Destructor +// Access: Public, Virtual +// Description: +//////////////////////////////////////////////////////////////////// +MovingPartScalar:: +~MovingPartScalar() { +} + //////////////////////////////////////////////////////////////////// // Function: MovingPartScalar::get_blend_value // Access: Public diff --git a/panda/src/chan/movingPartScalar.h b/panda/src/chan/movingPartScalar.h index c2c93fef8b..c818b79bee 100644 --- a/panda/src/chan/movingPartScalar.h +++ b/panda/src/chan/movingPartScalar.h @@ -39,6 +39,7 @@ protected: public: INLINE MovingPartScalar(PartGroup *parent, const string &name, const float &initial_value = 0); + virtual ~MovingPartScalar(); virtual void get_blend_value(const PartBundle *root); diff --git a/panda/src/collide/collisionPolygon.cxx b/panda/src/collide/collisionPolygon.cxx index 2df62b1136..42fe8cc104 100644 --- a/panda/src/collide/collisionPolygon.cxx +++ b/panda/src/collide/collisionPolygon.cxx @@ -486,7 +486,7 @@ test_intersection_from_sphere(const CollisionEntry &entry) const { } LPoint2f p = to_2d(from_center - dist * get_normal()); - float edge_dist; + float edge_dist = 0.0f; const ClipPlaneAttrib *cpa = entry.get_into_clip_planes(); if (cpa != (ClipPlaneAttrib *)NULL) { diff --git a/panda/src/event/eventParameter.I b/panda/src/event/eventParameter.I index 7f726303ad..a97df05e9b 100644 --- a/panda/src/event/eventParameter.I +++ b/panda/src/event/eventParameter.I @@ -213,6 +213,38 @@ operator << (ostream &out, const EventParameter ¶m) { } +//////////////////////////////////////////////////////////////////// +// Function: EventStoreValue::Default Constructor +// Access: Private +// Description: This constructor is only for make_from_bam(). +//////////////////////////////////////////////////////////////////// +template +EventStoreValue:: +EventStoreValue() { +} + +//////////////////////////////////////////////////////////////////// +// Function: EventStoreValue::Constructor +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// +template +EventStoreValue:: +EventStoreValue(const Type &value) : + _value(value) +{ +} + +//////////////////////////////////////////////////////////////////// +// Function: EventStoreValue::Destructor +// Access: Public, Virtual +// Description: +//////////////////////////////////////////////////////////////////// +template +EventStoreValue:: +~EventStoreValue() { +} + //////////////////////////////////////////////////////////////////// // Function: EventStoreValue::set_value // Access: Public diff --git a/panda/src/event/eventParameter.h b/panda/src/event/eventParameter.h index adcce0e449..37b527cdd6 100644 --- a/panda/src/event/eventParameter.h +++ b/panda/src/event/eventParameter.h @@ -113,10 +113,10 @@ private: template class EventStoreValue : public EventStoreValueBase { private: - // This constructor is only for make_from_bam(). - EventStoreValue() { } + INLINE EventStoreValue(); public: - EventStoreValue(const Type &value) : _value(value) { } + INLINE EventStoreValue(const Type &value); + virtual ~EventStoreValue(); INLINE void set_value(const Type &value); INLINE const Type &get_value() const; diff --git a/panda/src/mathutil/plane_src.I b/panda/src/mathutil/plane_src.I index d966f1947d..1e487e2e56 100644 --- a/panda/src/mathutil/plane_src.I +++ b/panda/src/mathutil/plane_src.I @@ -196,6 +196,7 @@ intersects_line(FLOATTYPE &t, const FLOATNAME(LVector3) &delta) const { FLOATTYPE denom = ::dot(get_normal(), delta); if (IS_NEARLY_ZERO(denom)) { + t = 0.0f; return false; } diff --git a/panda/src/parametrics/nurbsCurveInterface.cxx b/panda/src/parametrics/nurbsCurveInterface.cxx index 16ba7cd078..aaefc4ba94 100644 --- a/panda/src/parametrics/nurbsCurveInterface.cxx +++ b/panda/src/parametrics/nurbsCurveInterface.cxx @@ -22,6 +22,15 @@ TypeHandle NurbsCurveInterface::_type_handle; +//////////////////////////////////////////////////////////////////// +// Function: NurbsCurveInterface::Destructor +// Access: Published, Virtual +// Description: +//////////////////////////////////////////////////////////////////// +NurbsCurveInterface:: +~NurbsCurveInterface() { +} + //////////////////////////////////////////////////////////////////// // Function: NurbsCurveInterface::set_cv_weight // Access: Published diff --git a/panda/src/parametrics/nurbsCurveInterface.h b/panda/src/parametrics/nurbsCurveInterface.h index e19c0a97ea..c041ce708b 100644 --- a/panda/src/parametrics/nurbsCurveInterface.h +++ b/panda/src/parametrics/nurbsCurveInterface.h @@ -37,6 +37,7 @@ class ParametricCurve; //////////////////////////////////////////////////////////////////// class EXPCL_PANDA NurbsCurveInterface { PUBLISHED: + virtual ~NurbsCurveInterface(); virtual void set_order(int order)=0; virtual int get_order() const=0; diff --git a/panda/src/pgraph/pandaNode.cxx b/panda/src/pgraph/pandaNode.cxx index 1e43aaee8f..b4ebfb8dfe 100644 --- a/panda/src/pgraph/pandaNode.cxx +++ b/panda/src/pgraph/pandaNode.cxx @@ -372,8 +372,8 @@ PandaNode:: //////////////////////////////////////////////////////////////////// PandaNode:: PandaNode(const PandaNode ©) : - TypedWritable(copy), ReferenceCount(copy), + TypedWritable(copy), Namable(copy) { // Copying a node does not copy its children.