From 4ace5b5bc9699c90e7653420541e340264b2a07a Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 16 Mar 2016 14:04:15 +0100 Subject: [PATCH] Fix compilation issues --- panda/src/bullet/bulletManifoldPoint.cxx | 2 +- panda/src/physx/physxClothDesc.cxx | 2 +- panda/src/physx/physxVehicle.cxx | 6 ++++-- panda/src/physx/physxVehicle.h | 7 ++++--- panda/src/physx/physxVehicleDesc.cxx | 2 +- panda/src/physx/physxWheel.cxx | 8 ++++++-- panda/src/physx/physxWheel.h | 11 +++++------ panda/src/physx/physxWheelDesc.cxx | 2 +- 8 files changed, 23 insertions(+), 17 deletions(-) diff --git a/panda/src/bullet/bulletManifoldPoint.cxx b/panda/src/bullet/bulletManifoldPoint.cxx index 319050f29c..00651186f0 100644 --- a/panda/src/bullet/bulletManifoldPoint.cxx +++ b/panda/src/bullet/bulletManifoldPoint.cxx @@ -89,7 +89,7 @@ get_position_world_on_b() const { /** * */ -LPoint3 BulletManifoldPoint:: +LVector3 BulletManifoldPoint:: get_normal_world_on_b() const { return btVector3_to_LVector3(_pt.m_normalWorldOnB); diff --git a/panda/src/physx/physxClothDesc.cxx b/panda/src/physx/physxClothDesc.cxx index cfe9fdf53b..3c1ffce57d 100644 --- a/panda/src/physx/physxClothDesc.cxx +++ b/panda/src/physx/physxClothDesc.cxx @@ -281,11 +281,11 @@ get_solver_iterations() const { return _desc.solverIterations; } -/* /** * Used by PhysScene to query the sizes of arrays to allocate for the user * buffers in PhysxClothNode. */ +/* void PhysxClothDesc:: get_mesh_numbers(NxU32 &numVertices, NxU32 &numTriangles) { diff --git a/panda/src/physx/physxVehicle.cxx b/panda/src/physx/physxVehicle.cxx index 39314bff32..c4aa1a57fc 100644 --- a/panda/src/physx/physxVehicle.cxx +++ b/panda/src/physx/physxVehicle.cxx @@ -57,10 +57,10 @@ update_vehicle(float dt) { // TODO !!! } -/* /** * Returns the actor for this vehicle. */ +/* PhysxActor *PhysxVehicle:: get_actor() const { @@ -69,20 +69,22 @@ get_actor() const { } */ -/* /** * Returns the number of wheels on this vehicle. */ +/* unsigned int PhysxVehicle:: get_num_wheels() const { nassertr(_error_type == ET_ok, 0); return _wheels.size(); } +*/ /** * Returns the n-th wheel of this vehicle. */ +/* PhysxWheel *PhysxVehicle:: get_wheel(unsigned int idx) const { diff --git a/panda/src/physx/physxVehicle.h b/panda/src/physx/physxVehicle.h index 62f86a9de0..78b358e667 100644 --- a/panda/src/physx/physxVehicle.h +++ b/panda/src/physx/physxVehicle.h @@ -34,10 +34,11 @@ PUBLISHED: INLINE PhysxVehicle(); INLINE ~PhysxVehicle(); - // PhysxActor *get_actor() const; + //PhysxActor *get_actor() const; - // unsigned int get_num_wheels() const; PhysxWheel *get_wheel(unsigned int - // idx) const; MAKE_SEQ(get_wheels, get_num_wheels, get_wheel); + //unsigned int get_num_wheels() const; + //PhysxWheel *get_wheel(unsigned int idx) const; + //MAKE_SEQ(get_wheels, get_num_wheels, get_wheel); INLINE void ls() const; INLINE void ls(ostream &out, int indent_level=0) const; diff --git a/panda/src/physx/physxVehicleDesc.cxx b/panda/src/physx/physxVehicleDesc.cxx index e74d031e58..0a114773cd 100644 --- a/panda/src/physx/physxVehicleDesc.cxx +++ b/panda/src/physx/physxVehicleDesc.cxx @@ -13,10 +13,10 @@ #include "physxVehicleDesc.h" -/* /** * */ +/* void PhysxVehicleDesc:: add_wheel(PhysxWheelDesc *wheelDesc) { diff --git a/panda/src/physx/physxWheel.cxx b/panda/src/physx/physxWheel.cxx index 897c4b54cf..d8c3663532 100644 --- a/panda/src/physx/physxWheel.cxx +++ b/panda/src/physx/physxWheel.cxx @@ -17,10 +17,10 @@ TypeHandle PhysxWheel::_type_handle; -/* /** * */ +/* PhysxWheelShape *PhysxWheel:: get_wheel_shape() const { @@ -28,7 +28,6 @@ get_wheel_shape() const { } */ -/* /** * Attaches a node path to this wheel. The node path's transform will be * updated automatically. @@ -36,6 +35,7 @@ get_wheel_shape() const { * Note: any non-uniform scale or shear set on the NodePath's transform will * be overwritten at the time of the first update. */ +/* void PhysxWheel:: attach_node_path(const NodePath &np) { @@ -43,22 +43,26 @@ attach_node_path(const NodePath &np) { nassertv_always(!np.is_empty()); _np = NodePath(np); } +*/ /** * Detaches a previously assigned NodePath from this wheel. The NodePath's * transform will no longer be updated. */ +/* void PhysxWheel:: detach_node_path() { nassertv(_error_type == ET_ok); _np = NodePath(); } +*/ /** * Retrieves a previously attached NodePath. An empty NodePath will be * returned if no NodePath has been attached to this wheel. */ +/* NodePath PhysxWheel:: get_node_path() const { diff --git a/panda/src/physx/physxWheel.h b/panda/src/physx/physxWheel.h index 25bc92e241..84aa5a3acd 100644 --- a/panda/src/physx/physxWheel.h +++ b/panda/src/physx/physxWheel.h @@ -32,17 +32,16 @@ PUBLISHED: INLINE PhysxWheel(); INLINE ~PhysxWheel(); - // PhysxActor *get_touched_actor() const; PhysxWheelShape *get_wheel_shape() - // const; + //PhysxActor *get_touched_actor() const; + //PhysxWheelShape *get_wheel_shape() const; - // void attach_node_path(const NodePath &np); void detach_node_path(); - // NodePath get_node_path() const; + //void attach_node_path(const NodePath &np); + //void detach_node_path(); + //NodePath get_node_path() const; INLINE void ls() const; INLINE void ls(ostream &out, int indent_level=0) const; -public: - private: PT(PhysxWheelShape) _wheelShape; NodePath _np; diff --git a/panda/src/physx/physxWheelDesc.cxx b/panda/src/physx/physxWheelDesc.cxx index 6eac9897ba..20c71c173a 100644 --- a/panda/src/physx/physxWheelDesc.cxx +++ b/panda/src/physx/physxWheelDesc.cxx @@ -13,10 +13,10 @@ #include "physxWheelDesc.h" -/* /** * */ +/* void PhysxWheelDesc:: set_wheel_radius(float wheelRadius) {