TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 17:35:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Renamed BulletDistanceConstraint to BulletSphericalConstraint

Browse Source
This commit is contained in:
enn0x 2011-08-22 21:12:20 +00:00
parent f0ecfd9f8b
commit b110845659
6 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
panda/src/bullet/Sources.pp
View File

@ -41,8 +41,6 @@
bulletCylinderShape.h \
bulletDebugNode.I \
bulletDebugNode.h \
bulletDistanceConstraint.I \
bulletDistanceConstraint.h \
bulletGenericConstraint.I \
bulletGenericConstraint.h \
bulletGhostNode.I \
@ -77,6 +75,8 @@
bulletSoftBodyWorldInfo.h \
bulletSphereShape.I \
bulletSphereShape.h \
bulletSphericalConstraint.I \
bulletSphericalConstraint.h \
bulletTriangleMesh.I \
bulletTriangleMesh.h \
bulletTriangleMeshShape.I \
@ -108,7 +108,6 @@
bulletConvexPointCloudShape.cxx \
bulletCylinderShape.cxx \
bulletDebugNode.cxx \
bulletDistanceConstraint.cxx \
bulletGenericConstraint.cxx \
bulletGhostNode.cxx \
bulletHeightfieldShape.cxx \
@ -126,6 +125,7 @@
bulletSoftBodyShape.cxx \
bulletSoftBodyWorldInfo.cxx \
bulletSphereShape.cxx \
bulletSphericalConstraint.cxx \
bulletTriangleMesh.cxx \
bulletTriangleMeshShape.cxx \
bulletVehicle.cxx \
@ -167,8 +167,6 @@
bulletCylinderShape.h \
bulletDebugNode.I \
bulletDebugNode.h \
bulletDistanceConstraint.I \
bulletDistanceConstraint.h \
bulletGenericConstraint.I \
bulletGenericConstraint.h \
bulletGhostNode.I \
@ -203,6 +201,8 @@
bulletSoftBodyWorldInfo.h \
bulletSphereShape.I \
bulletSphereShape.h \
bulletSphericalConstraint.I \
bulletSphericalConstraint.h \
bulletTriangleMesh.I \
bulletTriangleMesh.h \
bulletTriangleMeshShape.I \

8
panda/src/bullet/bulletDistanceConstraint.I → panda/src/bullet/bulletSphericalConstraint.I
View File

@ -1,4 +1,4 @@
// Filename: bulletDistanceConstraint.I
// Filename: bulletSphericalConstraint.I
// Created by: enn0x (01Mar10)
//
////////////////////////////////////////////////////////////////////
@ -13,12 +13,12 @@
////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////
// Function: BulletDistanceConstraint::Destructor
// Function: BulletSphericalConstraint::Destructor
// Access: Published
// Description:
////////////////////////////////////////////////////////////////////
INLINE BulletDistanceConstraint::
~BulletDistanceConstraint() {
INLINE BulletSphericalConstraint::
~BulletSphericalConstraint() {
delete _constraint;
}

46
panda/src/bullet/bulletDistanceConstraint.cxx → panda/src/bullet/bulletSphericalConstraint.cxx
View File

@ -1,4 +1,4 @@
// Filename: bulletDistanceConstraint.cxx
// Filename: bulletSphericalConstraint.cxx
// Created by: enn0x (01Mar10)
//
////////////////////////////////////////////////////////////////////
@ -12,19 +12,19 @@
//
////////////////////////////////////////////////////////////////////
#include "bulletDistanceConstraint.h"
#include "bulletSphericalConstraint.h"
#include "bulletRigidBodyNode.h"
TypeHandle BulletDistanceConstraint::_type_handle;
TypeHandle BulletSphericalConstraint::_type_handle;
////////////////////////////////////////////////////////////////////
// Function: BulletDistanceConstraint::Constructor
// Function: BulletSphericalConstraint::Constructor
// Access: Published
// Description:
////////////////////////////////////////////////////////////////////
BulletDistanceConstraint::
BulletDistanceConstraint(const BulletRigidBodyNode *node_a,
const LPoint3f &pivot_a) {
BulletSphericalConstraint::
BulletSphericalConstraint(const BulletRigidBodyNode *node_a,
const LPoint3f &pivot_a) {
btRigidBody *ptr_a = btRigidBody::upcast(node_a->get_object());
btVector3 pos_a = LVecBase3f_to_btVector3(pivot_a);
@ -33,15 +33,15 @@ BulletDistanceConstraint(const BulletRigidBodyNode *node_a,
}
////////////////////////////////////////////////////////////////////
// Function: BulletDistanceConstraint::Constructor
// Function: BulletSphericalConstraint::Constructor
// Access: Published
// Description:
////////////////////////////////////////////////////////////////////
BulletDistanceConstraint::
BulletDistanceConstraint(const BulletRigidBodyNode *node_a,
const BulletRigidBodyNode *node_b,
const LPoint3f &pivot_a,
const LPoint3f &pivot_b) {
BulletSphericalConstraint::
BulletSphericalConstraint(const BulletRigidBodyNode *node_a,
const BulletRigidBodyNode *node_b,
const LPoint3f &pivot_a,
const LPoint3f &pivot_b) {
btRigidBody *ptr_a = btRigidBody::upcast(node_a->get_object());
btVector3 pos_a = LVecBase3f_to_btVector3(pivot_a);
@ -53,22 +53,22 @@ BulletDistanceConstraint(const BulletRigidBodyNode *node_a,
}
////////////////////////////////////////////////////////////////////
// Function: BulletDistanceConstraint::ptr
// Function: BulletSphericalConstraint::ptr
// Access: Public
// Description:
////////////////////////////////////////////////////////////////////
btTypedConstraint *BulletDistanceConstraint::
btTypedConstraint *BulletSphericalConstraint::
ptr() const {
return _constraint;
}
////////////////////////////////////////////////////////////////////
// Function: BulletDistanceConstraint::set_pivot_a
// Function: BulletSphericalConstraint::set_pivot_a
// Access: Published
// Description:
////////////////////////////////////////////////////////////////////
void BulletDistanceConstraint::
void BulletSphericalConstraint::
set_pivot_a(const LPoint3f &pivot_a) {
nassertv(!pivot_a.is_nan());
@ -76,11 +76,11 @@ set_pivot_a(const LPoint3f &pivot_a) {
}
////////////////////////////////////////////////////////////////////
// Function: BulletDistanceConstraint::set_pivot_b
// Function: BulletSphericalConstraint::set_pivot_b
// Access: Published
// Description:
////////////////////////////////////////////////////////////////////
void BulletDistanceConstraint::
void BulletSphericalConstraint::
set_pivot_b(const LPoint3f &pivot_b) {
nassertv(!pivot_b.is_nan());
@ -88,22 +88,22 @@ set_pivot_b(const LPoint3f &pivot_b) {
}
////////////////////////////////////////////////////////////////////
// Function: BulletDistanceConstraint::set_pivot_in_a
// Function: BulletSphericalConstraint::set_pivot_in_a
// Access: Published
// Description:
////////////////////////////////////////////////////////////////////
LPoint3f BulletDistanceConstraint::
LPoint3f BulletSphericalConstraint::
get_pivot_in_a() const {
return btVector3_to_LPoint3f(_constraint->getPivotInA());
}
////////////////////////////////////////////////////////////////////
// Function: BulletDistanceConstraint::set_pivot_in_b
// Function: BulletSphericalConstraint::set_pivot_in_b
// Access: Published
// Description:
////////////////////////////////////////////////////////////////////
LPoint3f BulletDistanceConstraint::
LPoint3f BulletSphericalConstraint::
get_pivot_in_b() const {
return btVector3_to_LPoint3f(_constraint->getPivotInB());

30
panda/src/bullet/bulletDistanceConstraint.h → panda/src/bullet/bulletSphericalConstraint.h
View File

@ -1,4 +1,4 @@
// Filename: bulletDistanceConstraint.h
// Filename: bulletSphericalConstraint.h
// Created by: enn0x (01Mar10)
//
////////////////////////////////////////////////////////////////////
@ -12,8 +12,8 @@
//
////////////////////////////////////////////////////////////////////
#ifndef __BULLET_DISTANCE_CONSTRAINT_H__
#define __BULLET_DISTANCE_CONSTRAINT_H__
#ifndef __BULLET_SPHERICAL_CONSTRAINT_H__
#define __BULLET_SPHERICAL_CONSTRAINT_H__
#include "pandabase.h"
@ -26,19 +26,19 @@
class BulletRigidBodyNode;
////////////////////////////////////////////////////////////////////
// Class : BulletDistanceConstraint
// Class : BulletSphericalConstraint
// Description :
////////////////////////////////////////////////////////////////////
class EXPCL_PANDABULLET BulletDistanceConstraint : public BulletConstraint {
class EXPCL_PANDABULLET BulletSphericalConstraint : public BulletConstraint {
PUBLISHED:
BulletDistanceConstraint(const BulletRigidBodyNode *node_a,
const LPoint3f &pivot_a);
BulletDistanceConstraint(const BulletRigidBodyNode *node_a,
const BulletRigidBodyNode *node_b,
const LPoint3f &pivot_a,
const LPoint3f &pivot_b);
INLINE ~BulletDistanceConstraint();
BulletSphericalConstraint(const BulletRigidBodyNode *node_a,
const LPoint3f &pivot_a);
BulletSphericalConstraint(const BulletRigidBodyNode *node_a,
const BulletRigidBodyNode *node_b,
const LPoint3f &pivot_a,
const LPoint3f &pivot_b);
INLINE ~BulletSphericalConstraint();
void set_pivot_a(const LPoint3f &pivot_a);
void set_pivot_b(const LPoint3f &pivot_b);
@ -59,7 +59,7 @@ public:
}
static void init_type() {
BulletConstraint::init_type();
register_type(_type_handle, "BulletDistanceConstraint",
register_type(_type_handle, "BulletSphericalConstraint",
BulletConstraint::get_class_type());
}
virtual TypeHandle get_type() const {
@ -74,6 +74,6 @@ private:
static TypeHandle _type_handle;
};
#include "bulletDistanceConstraint.I"
#include "bulletSphericalConstraint.I"
#endif // __BULLET_DISTANCE_CONSTRAINT_H__
#endif // __BULLET_SPHERICAL_CONSTRAINT_H__

2
panda/src/bullet/bullet_composite.cxx
View File

@ -15,7 +15,6 @@
#include "bulletCharacterControllerNode.cxx"
#include "bulletCylinderShape.cxx"
#include "bulletDebugNode.cxx"
#include "bulletDistanceConstraint.cxx"
#include "bulletGenericConstraint.cxx"
#include "bulletGhostNode.cxx"
#include "bulletHelper.cxx"
@ -28,6 +27,7 @@
#include "bulletShape.cxx"
#include "bulletSliderConstraint.cxx"
#include "bulletSphereShape.cxx"
#include "bulletSphericalConstraint.cxx"
#include "bulletSoftBodyNode.cxx"
#include "bulletSoftBodyConfig.cxx"
#include "bulletSoftBodyMaterial.cxx"

4
panda/src/bullet/config_bullet.cxx
View File

@ -25,7 +25,6 @@
#include "bulletConvexPointCloudShape.h"
#include "bulletCylinderShape.h"
#include "bulletDebugNode.h"
#include "bulletDistanceConstraint.h"
#include "bulletGenericConstraint.h"
#include "bulletGhostNode.h"
#include "bulletHeightfieldShape.h"
@ -35,6 +34,7 @@
#include "bulletShape.h"
#include "bulletSliderConstraint.h"
#include "bulletSphereShape.h"
#include "bulletSphericalConstraint.h"
#include "bulletSoftBodyNode.h"
#include "bulletSoftBodyShape.h"
#include "bulletTriangleMesh.h"
@ -149,7 +149,7 @@ init_libbullet() {
BulletConvexPointCloudShape::init_type();
BulletCylinderShape::init_type();
BulletDebugNode::init_type();
BulletDistanceConstraint::init_type();
BulletSphericalConstraint::init_type();
BulletGenericConstraint::init_type();
BulletGhostNode::init_type();
BulletHeightfieldShape::init_type();