mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 10:22:45 -04:00
Fix compilation issues
This commit is contained in:
parent
01932c9e79
commit
4ace5b5bc9
@ -89,7 +89,7 @@ get_position_world_on_b() const {
|
|||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
LPoint3 BulletManifoldPoint::
|
LVector3 BulletManifoldPoint::
|
||||||
get_normal_world_on_b() const {
|
get_normal_world_on_b() const {
|
||||||
|
|
||||||
return btVector3_to_LVector3(_pt.m_normalWorldOnB);
|
return btVector3_to_LVector3(_pt.m_normalWorldOnB);
|
||||||
|
@ -281,11 +281,11 @@ get_solver_iterations() const {
|
|||||||
return _desc.solverIterations;
|
return _desc.solverIterations;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
/**
|
/**
|
||||||
* Used by PhysScene to query the sizes of arrays to allocate for the user
|
* Used by PhysScene to query the sizes of arrays to allocate for the user
|
||||||
* buffers in PhysxClothNode.
|
* buffers in PhysxClothNode.
|
||||||
*/
|
*/
|
||||||
|
/*
|
||||||
void PhysxClothDesc::
|
void PhysxClothDesc::
|
||||||
get_mesh_numbers(NxU32 &numVertices, NxU32 &numTriangles) {
|
get_mesh_numbers(NxU32 &numVertices, NxU32 &numTriangles) {
|
||||||
|
|
||||||
|
@ -57,10 +57,10 @@ update_vehicle(float dt) {
|
|||||||
// TODO !!!
|
// TODO !!!
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
/**
|
/**
|
||||||
* Returns the actor for this vehicle.
|
* Returns the actor for this vehicle.
|
||||||
*/
|
*/
|
||||||
|
/*
|
||||||
PhysxActor *PhysxVehicle::
|
PhysxActor *PhysxVehicle::
|
||||||
get_actor() const {
|
get_actor() const {
|
||||||
|
|
||||||
@ -69,20 +69,22 @@ get_actor() const {
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
/**
|
/**
|
||||||
* Returns the number of wheels on this vehicle.
|
* Returns the number of wheels on this vehicle.
|
||||||
*/
|
*/
|
||||||
|
/*
|
||||||
unsigned int PhysxVehicle::
|
unsigned int PhysxVehicle::
|
||||||
get_num_wheels() const {
|
get_num_wheels() const {
|
||||||
|
|
||||||
nassertr(_error_type == ET_ok, 0);
|
nassertr(_error_type == ET_ok, 0);
|
||||||
return _wheels.size();
|
return _wheels.size();
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the n-th wheel of this vehicle.
|
* Returns the n-th wheel of this vehicle.
|
||||||
*/
|
*/
|
||||||
|
/*
|
||||||
PhysxWheel *PhysxVehicle::
|
PhysxWheel *PhysxVehicle::
|
||||||
get_wheel(unsigned int idx) const {
|
get_wheel(unsigned int idx) const {
|
||||||
|
|
||||||
|
@ -34,10 +34,11 @@ PUBLISHED:
|
|||||||
INLINE PhysxVehicle();
|
INLINE PhysxVehicle();
|
||||||
INLINE ~PhysxVehicle();
|
INLINE ~PhysxVehicle();
|
||||||
|
|
||||||
// PhysxActor *get_actor() const;
|
//PhysxActor *get_actor() const;
|
||||||
|
|
||||||
// unsigned int get_num_wheels() const; PhysxWheel *get_wheel(unsigned int
|
//unsigned int get_num_wheels() const;
|
||||||
// idx) const; MAKE_SEQ(get_wheels, get_num_wheels, get_wheel);
|
//PhysxWheel *get_wheel(unsigned int idx) const;
|
||||||
|
//MAKE_SEQ(get_wheels, get_num_wheels, get_wheel);
|
||||||
|
|
||||||
INLINE void ls() const;
|
INLINE void ls() const;
|
||||||
INLINE void ls(ostream &out, int indent_level=0) const;
|
INLINE void ls(ostream &out, int indent_level=0) const;
|
||||||
|
@ -13,10 +13,10 @@
|
|||||||
|
|
||||||
#include "physxVehicleDesc.h"
|
#include "physxVehicleDesc.h"
|
||||||
|
|
||||||
/*
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
/*
|
||||||
void PhysxVehicleDesc::
|
void PhysxVehicleDesc::
|
||||||
add_wheel(PhysxWheelDesc *wheelDesc) {
|
add_wheel(PhysxWheelDesc *wheelDesc) {
|
||||||
|
|
||||||
|
@ -17,10 +17,10 @@
|
|||||||
|
|
||||||
TypeHandle PhysxWheel::_type_handle;
|
TypeHandle PhysxWheel::_type_handle;
|
||||||
|
|
||||||
/*
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
/*
|
||||||
PhysxWheelShape *PhysxWheel::
|
PhysxWheelShape *PhysxWheel::
|
||||||
get_wheel_shape() const {
|
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
|
* Attaches a node path to this wheel. The node path's transform will be
|
||||||
* updated automatically.
|
* updated automatically.
|
||||||
@ -36,6 +35,7 @@ get_wheel_shape() const {
|
|||||||
* Note: any non-uniform scale or shear set on the NodePath's transform will
|
* Note: any non-uniform scale or shear set on the NodePath's transform will
|
||||||
* be overwritten at the time of the first update.
|
* be overwritten at the time of the first update.
|
||||||
*/
|
*/
|
||||||
|
/*
|
||||||
void PhysxWheel::
|
void PhysxWheel::
|
||||||
attach_node_path(const NodePath &np) {
|
attach_node_path(const NodePath &np) {
|
||||||
|
|
||||||
@ -43,22 +43,26 @@ attach_node_path(const NodePath &np) {
|
|||||||
nassertv_always(!np.is_empty());
|
nassertv_always(!np.is_empty());
|
||||||
_np = NodePath(np);
|
_np = NodePath(np);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Detaches a previously assigned NodePath from this wheel. The NodePath's
|
* Detaches a previously assigned NodePath from this wheel. The NodePath's
|
||||||
* transform will no longer be updated.
|
* transform will no longer be updated.
|
||||||
*/
|
*/
|
||||||
|
/*
|
||||||
void PhysxWheel::
|
void PhysxWheel::
|
||||||
detach_node_path() {
|
detach_node_path() {
|
||||||
|
|
||||||
nassertv(_error_type == ET_ok);
|
nassertv(_error_type == ET_ok);
|
||||||
_np = NodePath();
|
_np = NodePath();
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves a previously attached NodePath. An empty NodePath will be
|
* Retrieves a previously attached NodePath. An empty NodePath will be
|
||||||
* returned if no NodePath has been attached to this wheel.
|
* returned if no NodePath has been attached to this wheel.
|
||||||
*/
|
*/
|
||||||
|
/*
|
||||||
NodePath PhysxWheel::
|
NodePath PhysxWheel::
|
||||||
get_node_path() const {
|
get_node_path() const {
|
||||||
|
|
||||||
|
@ -32,17 +32,16 @@ PUBLISHED:
|
|||||||
INLINE PhysxWheel();
|
INLINE PhysxWheel();
|
||||||
INLINE ~PhysxWheel();
|
INLINE ~PhysxWheel();
|
||||||
|
|
||||||
// PhysxActor *get_touched_actor() const; PhysxWheelShape *get_wheel_shape()
|
//PhysxActor *get_touched_actor() const;
|
||||||
// const;
|
//PhysxWheelShape *get_wheel_shape() const;
|
||||||
|
|
||||||
// void attach_node_path(const NodePath &np); void detach_node_path();
|
//void attach_node_path(const NodePath &np);
|
||||||
// NodePath get_node_path() const;
|
//void detach_node_path();
|
||||||
|
//NodePath get_node_path() const;
|
||||||
|
|
||||||
INLINE void ls() const;
|
INLINE void ls() const;
|
||||||
INLINE void ls(ostream &out, int indent_level=0) const;
|
INLINE void ls(ostream &out, int indent_level=0) const;
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
PT(PhysxWheelShape) _wheelShape;
|
PT(PhysxWheelShape) _wheelShape;
|
||||||
NodePath _np;
|
NodePath _np;
|
||||||
|
@ -13,10 +13,10 @@
|
|||||||
|
|
||||||
#include "physxWheelDesc.h"
|
#include "physxWheelDesc.h"
|
||||||
|
|
||||||
/*
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
/*
|
||||||
void PhysxWheelDesc::
|
void PhysxWheelDesc::
|
||||||
set_wheel_radius(float wheelRadius) {
|
set_wheel_radius(float wheelRadius) {
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user