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

Merge branch 'release/1.9.x'

Browse Source
This commit is contained in:
rdb 2015-11-25 23:42:36 +01:00
commit a819e9055b
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makepanda/makepanda.py
View File

@ -1374,6 +1374,8 @@ def CompileIgate(woutd,wsrc,opts):
cmd += ' -D_LP64' cmd += ' -D_LP64'
else: else:
cmd += ' -D__i386__' cmd += ' -D__i386__'
if GetTarget() == 'darwin':
cmd += ' -D__APPLE__'
optlevel = GetOptimizeOption(opts) optlevel = GetOptimizeOption(opts)
if (optlevel==1): cmd += ' -D_DEBUG' if (optlevel==1): cmd += ' -D_DEBUG'

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

@ -117,12 +117,12 @@ set_body(PhysxBodyDesc &desc) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PhysxBodyDesc PhysxActorDesc:: PhysxBodyDesc PhysxActorDesc::
get_body() const { get_body() const {
assert(false /* Not implemented */);
throw "Not Implemented";
//PhysxBodyDesc value; //PhysxBodyDesc value;
//value._desc = *(_desc.body); //value._desc = *(_desc.body);
//return value; //return value;
return PhysxBodyDesc();
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

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

@ -55,6 +55,8 @@ factory(NxControllerType controllerType) {
case NX_CONTROLLER_CAPSULE: case NX_CONTROLLER_CAPSULE:
return new PhysxCapsuleController(); return new PhysxCapsuleController();
default:
break;
} }
physx_cat.error() << "Unknown controller type.\n"; physx_cat.error() << "Unknown controller type.\n";

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

@ -135,7 +135,7 @@ get_include_shape_group() const {
unsigned int PhysxForceField:: unsigned int PhysxForceField::
get_num_shape_groups() const { get_num_shape_groups() const {
nassertr(_error_type == ET_ok, NULL); nassertr(_error_type == ET_ok, 0);
return _ptr->getNbShapeGroups(); return _ptr->getNbShapeGroups();
} }

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

@ -170,7 +170,7 @@ cook_texcoords(const PhysxClothMeshDesc &meshDesc, const Filename &filename) {
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(), NULL);
PhysxMemoryWriteBuffer buffer; PhysxMemoryWriteBuffer buffer;
bool status = _cooking->NxCookConvexMesh(meshDesc.get_desc(), buffer); bool status = _cooking->NxCookConvexMesh(meshDesc.get_desc(), buffer);
@ -198,7 +198,7 @@ cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc) {
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(), NULL);
PhysxMemoryWriteBuffer buffer; PhysxMemoryWriteBuffer buffer;
bool status = _cooking->NxCookTriangleMesh(meshDesc.get_desc(), buffer); bool status = _cooking->NxCookTriangleMesh(meshDesc.get_desc(), buffer);
@ -226,7 +226,7 @@ cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc) {
PhysxClothMesh *PhysxKitchen:: PhysxClothMesh *PhysxKitchen::
cook_cloth_mesh(const PhysxClothMeshDesc &meshDesc) { cook_cloth_mesh(const PhysxClothMeshDesc &meshDesc) {
nassertr_always(meshDesc.is_valid(), false); nassertr_always(meshDesc.is_valid(), NULL);
PhysxMemoryWriteBuffer wbuffer; PhysxMemoryWriteBuffer wbuffer;
bool status = _cooking->NxCookClothMesh(meshDesc.get_desc(), wbuffer); bool status = _cooking->NxCookClothMesh(meshDesc.get_desc(), wbuffer);
@ -255,7 +255,7 @@ cook_cloth_mesh(const PhysxClothMeshDesc &meshDesc) {
PhysxSoftBodyMesh *PhysxKitchen:: PhysxSoftBodyMesh *PhysxKitchen::
cook_soft_body_mesh(const PhysxSoftBodyMeshDesc &meshDesc) { cook_soft_body_mesh(const PhysxSoftBodyMeshDesc &meshDesc) {
nassertr_always(meshDesc.is_valid(), false); nassertr_always(meshDesc.is_valid(), NULL);
PhysxMemoryWriteBuffer wbuffer; PhysxMemoryWriteBuffer wbuffer;
bool status = _cooking->NxCookSoftBodyMesh(meshDesc.get_desc(), wbuffer); bool status = _cooking->NxCookSoftBodyMesh(meshDesc.get_desc(), wbuffer);

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

@ -309,7 +309,7 @@ void PhysxScene::
set_timing_variable() { set_timing_variable() {
nassertv(_error_type == ET_ok); nassertv(_error_type == ET_ok);
_ptr->setTiming(NULL, NULL, NX_TIMESTEP_VARIABLE); _ptr->setTiming(0, 0, NX_TIMESTEP_VARIABLE);
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

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

@ -93,16 +93,16 @@ set_max_bounds(PhysxBounds3 &bounds) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: PhysxSceneDesc::get_max_bounds // Function: PhysxSceneDesc::get_max_bounds
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PhysxBounds3 PhysxSceneDesc:: PhysxBounds3 PhysxSceneDesc::
get_max_bounds() const { get_max_bounds() const {
assert(false /* Not implemented */);
throw "Not Implemented";
//PhysxBounds3 value; //PhysxBounds3 value;
//value._bounds = *(_desc.maxBounds); //value._bounds = *(_desc.maxBounds);
//return value; //return value;
return PhysxBounds3();
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////