diff --git a/panda/src/physx/physxConvexForceFieldShapeDesc.cxx b/panda/src/physx/physxConvexForceFieldShapeDesc.cxx index 1e13253ad5..3e8585795e 100644 --- a/panda/src/physx/physxConvexForceFieldShapeDesc.cxx +++ b/panda/src/physx/physxConvexForceFieldShapeDesc.cxx @@ -21,7 +21,7 @@ // Description: Sets the convex mesh for this force field shape. //////////////////////////////////////////////////////////////////// void PhysxConvexForceFieldShapeDesc:: -set_mesh(PT(PhysxConvexMesh) mesh) { +set_mesh(PhysxConvexMesh *mesh) { _desc.meshData = mesh->ptr(); } diff --git a/panda/src/physx/physxConvexForceFieldShapeDesc.h b/panda/src/physx/physxConvexForceFieldShapeDesc.h index bef2c9fbac..75e8c13349 100644 --- a/panda/src/physx/physxConvexForceFieldShapeDesc.h +++ b/panda/src/physx/physxConvexForceFieldShapeDesc.h @@ -37,7 +37,7 @@ PUBLISHED: INLINE void set_to_default(); INLINE bool is_valid() const; - void set_mesh(PT(PhysxConvexMesh) mesh); + void set_mesh(PhysxConvexMesh *mesh); public: NxForceFieldShapeDesc *ptr() const { return (NxForceFieldShapeDesc *)&_desc; }; diff --git a/panda/src/physx/physxConvexShapeDesc.cxx b/panda/src/physx/physxConvexShapeDesc.cxx index d902cefdb1..1d908aab52 100644 --- a/panda/src/physx/physxConvexShapeDesc.cxx +++ b/panda/src/physx/physxConvexShapeDesc.cxx @@ -21,7 +21,7 @@ // Description: //////////////////////////////////////////////////////////////////// void PhysxConvexShapeDesc:: -set_mesh(PT(PhysxConvexMesh) mesh) { +set_mesh(PhysxConvexMesh *mesh) { _desc.meshData = mesh->ptr(); } diff --git a/panda/src/physx/physxConvexShapeDesc.h b/panda/src/physx/physxConvexShapeDesc.h index d8670a1192..3f1a8f1de3 100644 --- a/panda/src/physx/physxConvexShapeDesc.h +++ b/panda/src/physx/physxConvexShapeDesc.h @@ -37,7 +37,7 @@ PUBLISHED: INLINE void set_to_default(); INLINE bool is_valid() const; - void set_mesh(PT(PhysxConvexMesh) mesh); + void set_mesh(PhysxConvexMesh *mesh); public: NxShapeDesc *ptr() const { return (NxShapeDesc *)&_desc; }; diff --git a/panda/src/physx/physxForceFieldDesc.cxx b/panda/src/physx/physxForceFieldDesc.cxx index 72c35917f4..76f9aa10b5 100644 --- a/panda/src/physx/physxForceFieldDesc.cxx +++ b/panda/src/physx/physxForceFieldDesc.cxx @@ -207,7 +207,7 @@ add_include_group_shape(PhysxForceFieldShapeDesc &desc) { // Description: //////////////////////////////////////////////////////////////////// void PhysxForceFieldDesc:: -add_shape_group(PT(PhysxForceFieldShapeGroup) group) { +add_shape_group(PhysxForceFieldShapeGroup *group) { _desc.shapeGroups.push_back(group->ptr()); } @@ -218,7 +218,7 @@ add_shape_group(PT(PhysxForceFieldShapeGroup) group) { // Description: //////////////////////////////////////////////////////////////////// void PhysxForceFieldDesc:: -set_actor(PT(PhysxActor) actor) { +set_actor(PhysxActor *actor) { _desc.actor = actor->ptr(); } diff --git a/panda/src/physx/physxForceFieldDesc.h b/panda/src/physx/physxForceFieldDesc.h index cfc1098998..e9a049021e 100644 --- a/panda/src/physx/physxForceFieldDesc.h +++ b/panda/src/physx/physxForceFieldDesc.h @@ -47,7 +47,7 @@ PUBLISHED: void set_mat(const LMatrix4f &mat); void set_hpr(float h, float p, float r); 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_position_target(const LPoint3f &target); @@ -60,7 +60,7 @@ PUBLISHED: void set_kernel_noise(const LVector3f &noise); void add_include_group_shape(PhysxForceFieldShapeDesc &shapeDesc); - void add_shape_group(PT(PhysxForceFieldShapeGroup) group); + void add_shape_group(PhysxForceFieldShapeGroup *group); public: void create_kernel(NxScene *scenePtr); diff --git a/panda/src/physx/physxKitchen.cxx b/panda/src/physx/physxKitchen.cxx index 1caa72faca..1148b30206 100644 --- a/panda/src/physx/physxKitchen.cxx +++ b/panda/src/physx/physxKitchen.cxx @@ -88,7 +88,7 @@ cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc, const Filename &filena // Access: Published // Description: //////////////////////////////////////////////////////////////////// -PT(PhysxConvexMesh) PhysxKitchen:: +PhysxConvexMesh *PhysxKitchen:: cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc) { nassertr_always(meshDesc.is_valid(), false); @@ -100,7 +100,7 @@ cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc) { NxPhysicsSDK *sdk = NxGetPhysicsSDK(); nassertr(sdk, NULL); - PT(PhysxConvexMesh) mesh = new PhysxConvexMesh(); + PhysxConvexMesh *mesh = new PhysxConvexMesh(); nassertr(mesh, NULL); NxConvexMesh *meshPtr = sdk->createConvexMesh(PhysxMemoryReadBuffer(buffer.data)); @@ -116,7 +116,7 @@ cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc) { // Access: Published // Description: //////////////////////////////////////////////////////////////////// -PT(PhysxTriangleMesh) PhysxKitchen:: +PhysxTriangleMesh *PhysxKitchen:: cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc) { nassertr_always(meshDesc.is_valid(), false); @@ -128,7 +128,7 @@ cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc) { NxPhysicsSDK *sdk = NxGetPhysicsSDK(); nassertr(sdk, NULL); - PT(PhysxTriangleMesh) mesh = new PhysxTriangleMesh(); + PhysxTriangleMesh *mesh = new PhysxTriangleMesh(); nassertr(mesh, NULL); NxTriangleMesh *meshPtr = sdk->createTriangleMesh(PhysxMemoryReadBuffer(buffer.data)); diff --git a/panda/src/physx/physxKitchen.h b/panda/src/physx/physxKitchen.h index d527c9de38..381b601ae0 100644 --- a/panda/src/physx/physxKitchen.h +++ b/panda/src/physx/physxKitchen.h @@ -42,8 +42,8 @@ PUBLISHED: bool cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc, const Filename &filename); bool cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc, const Filename &filename); - PT(PhysxConvexMesh) cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc); - PT(PhysxTriangleMesh) cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc); + PhysxConvexMesh *cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc); + PhysxTriangleMesh *cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc); private: NxCookingInterface *_cooking; diff --git a/panda/src/physx/physxManager.cxx b/panda/src/physx/physxManager.cxx index 94c01689f1..fb2f2ce24b 100644 --- a/panda/src/physx/physxManager.cxx +++ b/panda/src/physx/physxManager.cxx @@ -125,7 +125,7 @@ get_num_scenes() const { // Access: Published // Description: //////////////////////////////////////////////////////////////////// -PT(PhysxScene) PhysxManager:: +PhysxScene *PhysxManager:: create_scene(PhysxSceneDesc &desc) { 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_SIMULATE_SEPARATE_THREAD; - PT(PhysxScene) scene = new PhysxScene(); + PhysxScene *scene = new PhysxScene(); nassertr(scene, NULL); NxScene *scenePtr = _sdk->createScene(desc._desc); @@ -153,7 +153,7 @@ create_scene(PhysxSceneDesc &desc) { // Access: Published // Description: //////////////////////////////////////////////////////////////////// -PT(PhysxScene) PhysxManager:: +PhysxScene *PhysxManager:: get_scene(unsigned int idx) const { nassertr_always(idx < _sdk->getNbScenes(), NULL); @@ -180,12 +180,12 @@ get_num_height_fields() { // Access: Published // Description: //////////////////////////////////////////////////////////////////// -PT(PhysxHeightField) PhysxManager:: +PhysxHeightField *PhysxManager:: create_height_field(PhysxHeightFieldDesc &desc) { nassertr(desc.is_valid(),NULL); - PT(PhysxHeightField) hf = new PhysxHeightField(); + PhysxHeightField *hf = new PhysxHeightField(); nassertr(hf, NULL); NxHeightField *hfPtr = _sdk->createHeightField(desc._desc); @@ -201,7 +201,7 @@ create_height_field(PhysxHeightFieldDesc &desc) { // Access: Public // Description: //////////////////////////////////////////////////////////////////// -PT(PhysxHeightField) PhysxManager:: +PhysxHeightField *PhysxManager:: get_height_field(unsigned int idx) { nassertr_always(idx < _sdk->getNbHeightFields(), NULL); @@ -225,7 +225,7 @@ get_num_convex_meshes() { // Access: Public // Description: //////////////////////////////////////////////////////////////////// -PT(PhysxConvexMesh) PhysxManager:: +PhysxConvexMesh *PhysxManager:: get_convex_mesh(unsigned int idx) { nassertr_always(idx < _sdk->getNbConvexMeshes(), NULL); @@ -249,7 +249,7 @@ get_num_triangle_meshes() { // Access: Public // Description: //////////////////////////////////////////////////////////////////// -PT(PhysxTriangleMesh) PhysxManager:: +PhysxTriangleMesh *PhysxManager:: get_triangle_mesh(unsigned int idx) { nassertr_always(idx < _sdk->getNbTriangleMeshes(), NULL); diff --git a/panda/src/physx/physxManager.h b/panda/src/physx/physxManager.h index 12244fbcd3..2cb2ea4da0 100644 --- a/panda/src/physx/physxManager.h +++ b/panda/src/physx/physxManager.h @@ -57,21 +57,21 @@ PUBLISHED: const char *get_internal_version(); unsigned int get_num_scenes() const; - PT(PhysxScene) create_scene(PhysxSceneDesc &desc); - PT(PhysxScene) get_scene(unsigned int idx) const; + PhysxScene *create_scene(PhysxSceneDesc &desc); + PhysxScene *get_scene(unsigned int idx) const; MAKE_SEQ(get_scenes, get_num_scenes, get_scene); unsigned int get_num_height_fields(); - PT(PhysxHeightField) create_height_field(PhysxHeightFieldDesc &desc); - PT(PhysxHeightField) get_height_field(unsigned int idx); + PhysxHeightField *create_height_field(PhysxHeightFieldDesc &desc); + PhysxHeightField *get_height_field(unsigned int idx); MAKE_SEQ(get_height_fields, get_num_height_fields, get_height_field); 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); 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); INLINE void ls() const; diff --git a/panda/src/physx/physxMeshPool.cxx b/panda/src/physx/physxMeshPool.cxx index ab62da3899..ada4132e59 100644 --- a/panda/src/physx/physxMeshPool.cxx +++ b/panda/src/physx/physxMeshPool.cxx @@ -54,13 +54,13 @@ prepare_filename(Filename &fn) { // Access: Published // Description: //////////////////////////////////////////////////////////////////// -PT(PhysxConvexMesh) PhysxMeshPool:: +PhysxConvexMesh *PhysxMeshPool:: load_convex_mesh(const Filename &filename) { Filename fn(filename); if (!prepare_filename(fn)) return NULL; - PT(PhysxConvexMesh) mesh; + PhysxConvexMesh *mesh; ConvexMeshes::iterator it = _convex_meshes.find(fn); if (it == _convex_meshes.end()) { @@ -94,13 +94,13 @@ load_convex_mesh(const Filename &filename) { // Access: Published // Description: //////////////////////////////////////////////////////////////////// -PT(PhysxTriangleMesh) PhysxMeshPool:: +PhysxTriangleMesh *PhysxMeshPool:: load_triangle_mesh(const Filename &filename) { Filename fn(filename); if (!prepare_filename(fn)) return NULL; - PT(PhysxTriangleMesh) mesh; + PhysxTriangleMesh *mesh; TriangleMeshes::iterator it = _triangle_meshes.find(fn); if (it == _triangle_meshes.end()) { @@ -135,7 +135,7 @@ load_triangle_mesh(const Filename &filename) { // Description: //////////////////////////////////////////////////////////////////// bool PhysxMeshPool:: -release_convex_mesh(PT(PhysxConvexMesh) mesh) { +release_convex_mesh(PhysxConvexMesh *mesh) { ConvexMeshes::iterator it; for (it=_convex_meshes.begin(); it != _convex_meshes.end(); ++it) { @@ -154,7 +154,7 @@ release_convex_mesh(PT(PhysxConvexMesh) mesh) { // Description: //////////////////////////////////////////////////////////////////// bool PhysxMeshPool:: -release_triangle_mesh(PT(PhysxTriangleMesh) mesh) { +release_triangle_mesh(PhysxTriangleMesh *mesh) { TriangleMeshes::iterator it; for (it=_triangle_meshes.begin(); it != _triangle_meshes.end(); ++it) { @@ -192,7 +192,7 @@ list_contents( ostream &out ) { ConvexMeshes::const_iterator it; for (it=_convex_meshes.begin(); it != _convex_meshes.end(); ++it) { Filename fn = (*it).first; - PT(PhysxConvexMesh) mesh = (*it).second; + PhysxConvexMesh *mesh = (*it).second; out << " " << fn.get_fullpath() << " (convex mesh, " << mesh->ptr()->getReferenceCount() @@ -205,7 +205,7 @@ list_contents( ostream &out ) { TriangleMeshes::const_iterator it; for (it=_triangle_meshes.begin(); it != _triangle_meshes.end(); ++it) { Filename fn = (*it).first; - PT(PhysxTriangleMesh) mesh = (*it).second; + PhysxTriangleMesh *mesh = (*it).second; out << " " << fn.get_fullpath() << " (triangle mesh, " << mesh->ptr()->getReferenceCount() diff --git a/panda/src/physx/physxMeshPool.h b/panda/src/physx/physxMeshPool.h index 0024ddc1bd..f8a61c7be0 100644 --- a/panda/src/physx/physxMeshPool.h +++ b/panda/src/physx/physxMeshPool.h @@ -41,11 +41,11 @@ PUBLISHED: INLINE PhysxMeshPool(); INLINE ~PhysxMeshPool(); - static PT(PhysxConvexMesh) load_convex_mesh(const Filename &filename); - static PT(PhysxTriangleMesh) load_triangle_mesh(const Filename &filename); + static PhysxConvexMesh *load_convex_mesh(const Filename &filename); + static PhysxTriangleMesh *load_triangle_mesh(const Filename &filename); - static bool release_convex_mesh(PT(PhysxConvexMesh) mesh); - static bool release_triangle_mesh(PT(PhysxTriangleMesh) mesh); + static bool release_convex_mesh(PhysxConvexMesh *mesh); + static bool release_triangle_mesh(PhysxTriangleMesh *mesh); static void list_contents(); static void list_contents(ostream &out); @@ -55,12 +55,11 @@ private: typedef pmap ConvexMeshes; typedef pmap TriangleMeshes; + //typedef pmap ClothMeshes; + //typedef pmap SoftbodyMeshes; static ConvexMeshes _convex_meshes; static TriangleMeshes _triangle_meshes; - - //typedef pmap ClothMeshes; - //typedef pmap SoftbodyMeshes; //static ClothMeshes _cloth_meshes; //static SoftbodyMeshes _softbody_meshes; }; diff --git a/panda/src/physx/physxTriangleMeshShapeDesc.cxx b/panda/src/physx/physxTriangleMeshShapeDesc.cxx index 48a9589d6b..b754ed5983 100644 --- a/panda/src/physx/physxTriangleMeshShapeDesc.cxx +++ b/panda/src/physx/physxTriangleMeshShapeDesc.cxx @@ -21,7 +21,7 @@ // Description: //////////////////////////////////////////////////////////////////// void PhysxTriangleMeshShapeDesc:: -set_mesh(PT(PhysxTriangleMesh) mesh) { +set_mesh(PhysxTriangleMesh *mesh) { _desc.meshData = mesh->ptr(); } diff --git a/panda/src/physx/physxTriangleMeshShapeDesc.h b/panda/src/physx/physxTriangleMeshShapeDesc.h index 6c92d2b79c..3bedd91a44 100644 --- a/panda/src/physx/physxTriangleMeshShapeDesc.h +++ b/panda/src/physx/physxTriangleMeshShapeDesc.h @@ -37,7 +37,7 @@ PUBLISHED: INLINE void set_to_default(); INLINE bool is_valid() const; - void set_mesh(PT(PhysxTriangleMesh) mesh); + void set_mesh(PhysxTriangleMesh *mesh); public: NxShapeDesc *ptr() const { return (NxShapeDesc *)&_desc; };