TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removing PT (PointerTo) makro where not required, part 2

Browse Source
This commit is contained in:
enn0x 2010-01-05 12:19:11 +00:00
parent 069cc6aab9
commit 319d89d213
14 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/physx/physxConvexForceFieldShapeDesc.cxx
View File

@ -21,7 +21,7 @@
// Description: Sets the convex mesh for this force field shape. // Description: Sets the convex mesh for this force field shape.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void PhysxConvexForceFieldShapeDesc:: void PhysxConvexForceFieldShapeDesc::
set_mesh(PT(PhysxConvexMesh) mesh) { set_mesh(PhysxConvexMesh *mesh) {
_desc.meshData = mesh->ptr(); _desc.meshData = mesh->ptr();
} }

2
panda/src/physx/physxConvexForceFieldShapeDesc.h
View File

@ -37,7 +37,7 @@ PUBLISHED:
INLINE void set_to_default(); INLINE void set_to_default();
INLINE bool is_valid() const; INLINE bool is_valid() const;
void set_mesh(PT(PhysxConvexMesh) mesh); void set_mesh(PhysxConvexMesh *mesh);
public: public:
NxForceFieldShapeDesc *ptr() const { return (NxForceFieldShapeDesc *)&_desc; }; NxForceFieldShapeDesc *ptr() const { return (NxForceFieldShapeDesc *)&_desc; };

2
panda/src/physx/physxConvexShapeDesc.cxx
View File

@ -21,7 +21,7 @@
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void PhysxConvexShapeDesc:: void PhysxConvexShapeDesc::
set_mesh(PT(PhysxConvexMesh) mesh) { set_mesh(PhysxConvexMesh *mesh) {
_desc.meshData = mesh->ptr(); _desc.meshData = mesh->ptr();
} }

2
panda/src/physx/physxConvexShapeDesc.h
View File

@ -37,7 +37,7 @@ PUBLISHED:
INLINE void set_to_default(); INLINE void set_to_default();
INLINE bool is_valid() const; INLINE bool is_valid() const;
void set_mesh(PT(PhysxConvexMesh) mesh); void set_mesh(PhysxConvexMesh *mesh);
public: public:
NxShapeDesc *ptr() const { return (NxShapeDesc *)&_desc; }; NxShapeDesc *ptr() const { return (NxShapeDesc *)&_desc; };

4
panda/src/physx/physxForceFieldDesc.cxx
View File

@ -207,7 +207,7 @@ add_include_group_shape(PhysxForceFieldShapeDesc &desc) {
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void PhysxForceFieldDesc:: void PhysxForceFieldDesc::
add_shape_group(PT(PhysxForceFieldShapeGroup) group) { add_shape_group(PhysxForceFieldShapeGroup *group) {
_desc.shapeGroups.push_back(group->ptr()); _desc.shapeGroups.push_back(group->ptr());
} }
@ -218,7 +218,7 @@ add_shape_group(PT(PhysxForceFieldShapeGroup) group) {
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void PhysxForceFieldDesc:: void PhysxForceFieldDesc::
set_actor(PT(PhysxActor) actor) { set_actor(PhysxActor *actor) {
_desc.actor = actor->ptr(); _desc.actor = actor->ptr();
} }

4
panda/src/physx/physxForceFieldDesc.h
View File

@ -47,7 +47,7 @@ PUBLISHED:
void set_mat(const LMatrix4f &mat); void set_mat(const LMatrix4f &mat);
void set_hpr(float h, float p, float r); void set_hpr(float h, float p, float r);
void set_coordinates(PhysxForceFieldCoordinates coordinates); void set_coordinates(PhysxForceFieldCoordinates coordinates);
void set_actor(PT(PhysxActor) actor); void set_actor(PhysxActor *actor);
void set_kernel_constant(const LVector3f &constant); void set_kernel_constant(const LVector3f &constant);
void set_kernel_position_target(const LPoint3f &target); void set_kernel_position_target(const LPoint3f &target);
@ -60,7 +60,7 @@ PUBLISHED:
void set_kernel_noise(const LVector3f &noise); void set_kernel_noise(const LVector3f &noise);
void add_include_group_shape(PhysxForceFieldShapeDesc &shapeDesc); void add_include_group_shape(PhysxForceFieldShapeDesc &shapeDesc);
void add_shape_group(PT(PhysxForceFieldShapeGroup) group); void add_shape_group(PhysxForceFieldShapeGroup *group);
public: public:
void create_kernel(NxScene *scenePtr); void create_kernel(NxScene *scenePtr);

8
panda/src/physx/physxKitchen.cxx
View File

@ -88,7 +88,7 @@ cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc, const Filename &filena
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PT(PhysxConvexMesh) PhysxKitchen:: PhysxConvexMesh *PhysxKitchen::
cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc) { cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc) {
nassertr_always(meshDesc.is_valid(), false); nassertr_always(meshDesc.is_valid(), false);
@ -100,7 +100,7 @@ cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc) {
NxPhysicsSDK *sdk = NxGetPhysicsSDK(); NxPhysicsSDK *sdk = NxGetPhysicsSDK();
nassertr(sdk, NULL); nassertr(sdk, NULL);
PT(PhysxConvexMesh) mesh = new PhysxConvexMesh(); PhysxConvexMesh *mesh = new PhysxConvexMesh();
nassertr(mesh, NULL); nassertr(mesh, NULL);
NxConvexMesh *meshPtr = sdk->createConvexMesh(PhysxMemoryReadBuffer(buffer.data)); NxConvexMesh *meshPtr = sdk->createConvexMesh(PhysxMemoryReadBuffer(buffer.data));
@ -116,7 +116,7 @@ cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc) {
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PT(PhysxTriangleMesh) PhysxKitchen:: PhysxTriangleMesh *PhysxKitchen::
cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc) { cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc) {
nassertr_always(meshDesc.is_valid(), false); nassertr_always(meshDesc.is_valid(), false);
@ -128,7 +128,7 @@ cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc) {
NxPhysicsSDK *sdk = NxGetPhysicsSDK(); NxPhysicsSDK *sdk = NxGetPhysicsSDK();
nassertr(sdk, NULL); nassertr(sdk, NULL);
PT(PhysxTriangleMesh) mesh = new PhysxTriangleMesh(); PhysxTriangleMesh *mesh = new PhysxTriangleMesh();
nassertr(mesh, NULL); nassertr(mesh, NULL);
NxTriangleMesh *meshPtr = sdk->createTriangleMesh(PhysxMemoryReadBuffer(buffer.data)); NxTriangleMesh *meshPtr = sdk->createTriangleMesh(PhysxMemoryReadBuffer(buffer.data));

4
panda/src/physx/physxKitchen.h
View File

@ -42,8 +42,8 @@ PUBLISHED:
bool cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc, const Filename &filename); bool cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc, const Filename &filename);
bool cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc, const Filename &filename); bool cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc, const Filename &filename);
PT(PhysxConvexMesh) cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc); PhysxConvexMesh *cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc);
PT(PhysxTriangleMesh) cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc); PhysxTriangleMesh *cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc);
private: private:
NxCookingInterface *_cooking; NxCookingInterface *_cooking;

16
panda/src/physx/physxManager.cxx
View File

@ -125,7 +125,7 @@ get_num_scenes() const {
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PT(PhysxScene) PhysxManager:: PhysxScene *PhysxManager::
create_scene(PhysxSceneDesc &desc) { create_scene(PhysxSceneDesc &desc) {
nassertr(desc.is_valid(),NULL); nassertr(desc.is_valid(),NULL);
@ -137,7 +137,7 @@ create_scene(PhysxSceneDesc &desc) {
desc._desc.flags |= NX_SF_ENABLE_ACTIVETRANSFORMS; desc._desc.flags |= NX_SF_ENABLE_ACTIVETRANSFORMS;
desc._desc.flags |= NX_SF_SIMULATE_SEPARATE_THREAD; desc._desc.flags |= NX_SF_SIMULATE_SEPARATE_THREAD;
PT(PhysxScene) scene = new PhysxScene(); PhysxScene *scene = new PhysxScene();
nassertr(scene, NULL); nassertr(scene, NULL);
NxScene *scenePtr = _sdk->createScene(desc._desc); NxScene *scenePtr = _sdk->createScene(desc._desc);
@ -153,7 +153,7 @@ create_scene(PhysxSceneDesc &desc) {
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PT(PhysxScene) PhysxManager:: PhysxScene *PhysxManager::
get_scene(unsigned int idx) const { get_scene(unsigned int idx) const {
nassertr_always(idx < _sdk->getNbScenes(), NULL); nassertr_always(idx < _sdk->getNbScenes(), NULL);
@ -180,12 +180,12 @@ get_num_height_fields() {
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PT(PhysxHeightField) PhysxManager:: PhysxHeightField *PhysxManager::
create_height_field(PhysxHeightFieldDesc &desc) { create_height_field(PhysxHeightFieldDesc &desc) {
nassertr(desc.is_valid(),NULL); nassertr(desc.is_valid(),NULL);
PT(PhysxHeightField) hf = new PhysxHeightField(); PhysxHeightField *hf = new PhysxHeightField();
nassertr(hf, NULL); nassertr(hf, NULL);
NxHeightField *hfPtr = _sdk->createHeightField(desc._desc); NxHeightField *hfPtr = _sdk->createHeightField(desc._desc);
@ -201,7 +201,7 @@ create_height_field(PhysxHeightFieldDesc &desc) {
// Access: Public // Access: Public
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PT(PhysxHeightField) PhysxManager:: PhysxHeightField *PhysxManager::
get_height_field(unsigned int idx) { get_height_field(unsigned int idx) {
nassertr_always(idx < _sdk->getNbHeightFields(), NULL); nassertr_always(idx < _sdk->getNbHeightFields(), NULL);
@ -225,7 +225,7 @@ get_num_convex_meshes() {
// Access: Public // Access: Public
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PT(PhysxConvexMesh) PhysxManager:: PhysxConvexMesh *PhysxManager::
get_convex_mesh(unsigned int idx) { get_convex_mesh(unsigned int idx) {
nassertr_always(idx < _sdk->getNbConvexMeshes(), NULL); nassertr_always(idx < _sdk->getNbConvexMeshes(), NULL);
@ -249,7 +249,7 @@ get_num_triangle_meshes() {
// Access: Public // Access: Public
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PT(PhysxTriangleMesh) PhysxManager:: PhysxTriangleMesh *PhysxManager::
get_triangle_mesh(unsigned int idx) { get_triangle_mesh(unsigned int idx) {
nassertr_always(idx < _sdk->getNbTriangleMeshes(), NULL); nassertr_always(idx < _sdk->getNbTriangleMeshes(), NULL);

12
panda/src/physx/physxManager.h
View File

@ -57,21 +57,21 @@ PUBLISHED:
const char *get_internal_version(); const char *get_internal_version();
unsigned int get_num_scenes() const; unsigned int get_num_scenes() const;
PT(PhysxScene) create_scene(PhysxSceneDesc &desc); PhysxScene *create_scene(PhysxSceneDesc &desc);
PT(PhysxScene) get_scene(unsigned int idx) const; PhysxScene *get_scene(unsigned int idx) const;
MAKE_SEQ(get_scenes, get_num_scenes, get_scene); MAKE_SEQ(get_scenes, get_num_scenes, get_scene);
unsigned int get_num_height_fields(); unsigned int get_num_height_fields();
PT(PhysxHeightField) create_height_field(PhysxHeightFieldDesc &desc); PhysxHeightField *create_height_field(PhysxHeightFieldDesc &desc);
PT(PhysxHeightField) get_height_field(unsigned int idx); PhysxHeightField *get_height_field(unsigned int idx);
MAKE_SEQ(get_height_fields, get_num_height_fields, get_height_field); MAKE_SEQ(get_height_fields, get_num_height_fields, get_height_field);
unsigned int get_num_convex_meshes(); unsigned int get_num_convex_meshes();
PT(PhysxConvexMesh) get_convex_mesh(unsigned int idx); PhysxConvexMesh *get_convex_mesh(unsigned int idx);
MAKE_SEQ(get_convex_meshes, get_num_convex_meshes, get_convex_mesh); MAKE_SEQ(get_convex_meshes, get_num_convex_meshes, get_convex_mesh);
unsigned int get_num_triangle_meshes(); unsigned int get_num_triangle_meshes();
PT(PhysxTriangleMesh) get_triangle_mesh(unsigned int idx); PhysxTriangleMesh *get_triangle_mesh(unsigned int idx);
MAKE_SEQ(get_triangle_meshes, get_num_triangle_meshes, get_triangle_mesh); MAKE_SEQ(get_triangle_meshes, get_num_triangle_meshes, get_triangle_mesh);
INLINE void ls() const; INLINE void ls() const;

16
panda/src/physx/physxMeshPool.cxx
View File

@ -54,13 +54,13 @@ prepare_filename(Filename &fn) {
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PT(PhysxConvexMesh) PhysxMeshPool:: PhysxConvexMesh *PhysxMeshPool::
load_convex_mesh(const Filename &filename) { load_convex_mesh(const Filename &filename) {
Filename fn(filename); Filename fn(filename);
if (!prepare_filename(fn)) return NULL; if (!prepare_filename(fn)) return NULL;
PT(PhysxConvexMesh) mesh; PhysxConvexMesh *mesh;
ConvexMeshes::iterator it = _convex_meshes.find(fn); ConvexMeshes::iterator it = _convex_meshes.find(fn);
if (it == _convex_meshes.end()) { if (it == _convex_meshes.end()) {
@ -94,13 +94,13 @@ load_convex_mesh(const Filename &filename) {
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PT(PhysxTriangleMesh) PhysxMeshPool:: PhysxTriangleMesh *PhysxMeshPool::
load_triangle_mesh(const Filename &filename) { load_triangle_mesh(const Filename &filename) {
Filename fn(filename); Filename fn(filename);
if (!prepare_filename(fn)) return NULL; if (!prepare_filename(fn)) return NULL;
PT(PhysxTriangleMesh) mesh; PhysxTriangleMesh *mesh;
TriangleMeshes::iterator it = _triangle_meshes.find(fn); TriangleMeshes::iterator it = _triangle_meshes.find(fn);
if (it == _triangle_meshes.end()) { if (it == _triangle_meshes.end()) {
@ -135,7 +135,7 @@ load_triangle_mesh(const Filename &filename) {
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool PhysxMeshPool:: bool PhysxMeshPool::
release_convex_mesh(PT(PhysxConvexMesh) mesh) { release_convex_mesh(PhysxConvexMesh *mesh) {
ConvexMeshes::iterator it; ConvexMeshes::iterator it;
for (it=_convex_meshes.begin(); it != _convex_meshes.end(); ++it) { for (it=_convex_meshes.begin(); it != _convex_meshes.end(); ++it) {
@ -154,7 +154,7 @@ release_convex_mesh(PT(PhysxConvexMesh) mesh) {
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool PhysxMeshPool:: bool PhysxMeshPool::
release_triangle_mesh(PT(PhysxTriangleMesh) mesh) { release_triangle_mesh(PhysxTriangleMesh *mesh) {
TriangleMeshes::iterator it; TriangleMeshes::iterator it;
for (it=_triangle_meshes.begin(); it != _triangle_meshes.end(); ++it) { for (it=_triangle_meshes.begin(); it != _triangle_meshes.end(); ++it) {
@ -192,7 +192,7 @@ list_contents( ostream &out ) {
ConvexMeshes::const_iterator it; ConvexMeshes::const_iterator it;
for (it=_convex_meshes.begin(); it != _convex_meshes.end(); ++it) { for (it=_convex_meshes.begin(); it != _convex_meshes.end(); ++it) {
Filename fn = (*it).first; Filename fn = (*it).first;
PT(PhysxConvexMesh) mesh = (*it).second; PhysxConvexMesh *mesh = (*it).second;
out << " " << fn.get_fullpath() out << " " << fn.get_fullpath()
<< " (convex mesh, " << mesh->ptr()->getReferenceCount() << " (convex mesh, " << mesh->ptr()->getReferenceCount()
@ -205,7 +205,7 @@ list_contents( ostream &out ) {
TriangleMeshes::const_iterator it; TriangleMeshes::const_iterator it;
for (it=_triangle_meshes.begin(); it != _triangle_meshes.end(); ++it) { for (it=_triangle_meshes.begin(); it != _triangle_meshes.end(); ++it) {
Filename fn = (*it).first; Filename fn = (*it).first;
PT(PhysxTriangleMesh) mesh = (*it).second; PhysxTriangleMesh *mesh = (*it).second;
out << " " << fn.get_fullpath() out << " " << fn.get_fullpath()
<< " (triangle mesh, " << mesh->ptr()->getReferenceCount() << " (triangle mesh, " << mesh->ptr()->getReferenceCount()

13
panda/src/physx/physxMeshPool.h
View File

@ -41,11 +41,11 @@ PUBLISHED:
INLINE PhysxMeshPool(); INLINE PhysxMeshPool();
INLINE ~PhysxMeshPool(); INLINE ~PhysxMeshPool();
static PT(PhysxConvexMesh) load_convex_mesh(const Filename &filename); static PhysxConvexMesh *load_convex_mesh(const Filename &filename);
static PT(PhysxTriangleMesh) load_triangle_mesh(const Filename &filename); static PhysxTriangleMesh *load_triangle_mesh(const Filename &filename);
static bool release_convex_mesh(PT(PhysxConvexMesh) mesh); static bool release_convex_mesh(PhysxConvexMesh *mesh);
static bool release_triangle_mesh(PT(PhysxTriangleMesh) mesh); static bool release_triangle_mesh(PhysxTriangleMesh *mesh);
static void list_contents(); static void list_contents();
static void list_contents(ostream &out); static void list_contents(ostream &out);
@ -55,12 +55,11 @@ private:
typedef pmap<Filename, PT(PhysxConvexMesh)> ConvexMeshes; typedef pmap<Filename, PT(PhysxConvexMesh)> ConvexMeshes;
typedef pmap<Filename, PT(PhysxTriangleMesh)> TriangleMeshes; typedef pmap<Filename, PT(PhysxTriangleMesh)> TriangleMeshes;
//typedef pmap<Filename, PT(PhysxClothMesh)> ClothMeshes;
//typedef pmap<Filename, PT(PhysxSoftBodyMesh)> SoftbodyMeshes;
static ConvexMeshes _convex_meshes; static ConvexMeshes _convex_meshes;
static TriangleMeshes _triangle_meshes; static TriangleMeshes _triangle_meshes;
//typedef pmap<Filename, PT(PhysxClothMesh)> ClothMeshes;
//typedef pmap<Filename, PT(PhysxSoftBodyMesh)> SoftbodyMeshes;
//static ClothMeshes _cloth_meshes; //static ClothMeshes _cloth_meshes;
//static SoftbodyMeshes _softbody_meshes; //static SoftbodyMeshes _softbody_meshes;
}; };

2
panda/src/physx/physxTriangleMeshShapeDesc.cxx
View File

@ -21,7 +21,7 @@
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void PhysxTriangleMeshShapeDesc:: void PhysxTriangleMeshShapeDesc::
set_mesh(PT(PhysxTriangleMesh) mesh) { set_mesh(PhysxTriangleMesh *mesh) {
_desc.meshData = mesh->ptr(); _desc.meshData = mesh->ptr();
} }

2
panda/src/physx/physxTriangleMeshShapeDesc.h
View File

@ -37,7 +37,7 @@ PUBLISHED:
INLINE void set_to_default(); INLINE void set_to_default();
INLINE bool is_valid() const; INLINE bool is_valid() const;
void set_mesh(PT(PhysxTriangleMesh) mesh); void set_mesh(PhysxTriangleMesh *mesh);
public: public:
NxShapeDesc *ptr() const { return (NxShapeDesc *)&_desc; }; NxShapeDesc *ptr() const { return (NxShapeDesc *)&_desc; };