diff --git a/direct/src/particles/ForceGroup.py b/direct/src/particles/ForceGroup.py index b239e9acb9..0266383d8b 100644 --- a/direct/src/particles/ForceGroup.py +++ b/direct/src/particles/ForceGroup.py @@ -117,11 +117,11 @@ class ForceGroup(DirectObject): elif isinstance(f, LinearNoiseForce): file.write(fname + ' = LinearNoiseForce(%.4f, %d)\n' % (amplitude, massDependent)) elif isinstance(f, LinearVectorForce): - vec = f.getVector() + vec = f.getLocalVector() file.write(fname + ' = LinearVectorForce(Vec3(%.4f, %.4f, %.4f), %.4f, %d)\n' % (vec[0], vec[1], vec[2], amplitude, massDependent)) elif isinstance(f, AngularForce): if isinstance(f, AngularVectorForce): - vec = f.getVector() + vec = f.getLocalVector() file.write(fname + ' = AngularVectorForce(Vec3(%.4f, %.4f, %.4f))\n' % (vec[0], vec[1], vec[2])) file.write(fname + '.setActive(%d)\n' % f.getActive()) file.write(targ + '.addForce(%s)\n' % fname) diff --git a/panda/src/physics/angularVectorForce.I b/panda/src/physics/angularVectorForce.I index 8ffdcccbd9..3577dfd84d 100644 --- a/panda/src/physics/angularVectorForce.I +++ b/panda/src/physics/angularVectorForce.I @@ -22,10 +22,10 @@ set_vector(float x, float y, float z) { } //////////////////////////////////////////////////////////////////// -// Function : get_vector +// Function : get_local_vector // Access : public //////////////////////////////////////////////////////////////////// INLINE LVector3f AngularVectorForce:: -get_vector(void) const { +get_local_vector(void) const { return _fvec; } diff --git a/panda/src/physics/angularVectorForce.h b/panda/src/physics/angularVectorForce.h index 69c5027ed1..c23cd37321 100644 --- a/panda/src/physics/angularVectorForce.h +++ b/panda/src/physics/angularVectorForce.h @@ -28,7 +28,7 @@ PUBLISHED: INLINE void set_vector(const LVector3f& v); INLINE void set_vector(float x, float y, float z); - INLINE LVector3f get_vector(void) const; + INLINE LVector3f get_local_vector(void) const; public: static TypeHandle get_class_type(void) { diff --git a/panda/src/physics/linearVectorForce.I b/panda/src/physics/linearVectorForce.I index 67958d1bb1..9976a556ff 100644 --- a/panda/src/physics/linearVectorForce.I +++ b/panda/src/physics/linearVectorForce.I @@ -24,11 +24,11 @@ set_vector(float x, float y, float z) { } //////////////////////////////////////////////////////////////////// -// Function : get_vector +// Function : get_local_vector // Access : Public // Description : //////////////////////////////////////////////////////////////////// INLINE LVector3f LinearVectorForce:: -get_vector(void) const { +get_local_vector(void) const { return _fvec; } diff --git a/panda/src/physics/linearVectorForce.h b/panda/src/physics/linearVectorForce.h index ee3abcb694..3ac17cafa3 100644 --- a/panda/src/physics/linearVectorForce.h +++ b/panda/src/physics/linearVectorForce.h @@ -30,7 +30,7 @@ PUBLISHED: INLINE void set_vector(const LVector3f& v); INLINE void set_vector(float x, float y, float z); - INLINE LVector3f get_vector(void) const; + INLINE LVector3f get_local_vector(void) const; public: static TypeHandle get_class_type(void) {