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

Fix compilation issues

Browse Source
This commit is contained in:
rdb 2016-03-16 14:04:15 +01:00
parent 01932c9e79
commit 4ace5b5bc9
8 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);

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

@ -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) {

6
panda/src/physx/physxVehicle.cxx
View File

@ -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 {

7
panda/src/physx/physxVehicle.h
View File

@ -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;

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

@ -13,10 +13,10 @@
#include "physxVehicleDesc.h"
/*
/**
*
*/
/*
void PhysxVehicleDesc::
add_wheel(PhysxWheelDesc *wheelDesc) {

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

@ -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 {

11
panda/src/physx/physxWheel.h
View File

@ -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;

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

@ -13,10 +13,10 @@
#include "physxWheelDesc.h"
/*
/**
*
*/
/*
void PhysxWheelDesc::
set_wheel_radius(float wheelRadius) {